又一个热修补丁

data/item/functions/bonus_item/add_score.mcfunction

@@ -19,6 +19,6 @@ function item:refresh_level
 
 # 给予进度
 execute if entity @s[scores={total_score=10..}] run advancement grant @s only ltw:story/score1
-execute if entity @s[scores={total_score=20..}] run advancement grant @s only ltw:story/score2
-execute if entity @s[scores={total_score=30..}] run advancement grant @s only ltw:story/score3
-execute if entity @s[scores={total_score=40..}] run advancement grant @s only ltw:story/score4
+execute if entity @s[scores={total_score=18..}] run advancement grant @s only ltw:story/score2
+execute if entity @s[scores={total_score=26..}] run advancement grant @s only ltw:story/score3
+execute if entity @s[scores={total_score=34..}] run advancement grant @s only ltw:story/score4

data/item/loot_tables/item/blue.json

@@ -92,7 +92,7 @@
         "functions": [
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{CustomPotionColor:4791617,item_name:'{\"text\":\"隐身药水 (0:30) x4\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:14,Amplifier:0,Duration:600}],CustomPotionColor:4791617,display:{Name:'{\"text\":\"隐身药水\",\"italic\":false,\"color\":\"white\"}'}}},{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:14,Amplifier:0,Duration:600}],CustomPotionColor:4791617,display:{Name:'{\"text\":\"隐身药水\",\"italic\":false,\"color\":\"white\"}'}}},{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:14,Amplifier:0,Duration:600}],CustomPotionColor:4791617,display:{Name:'{\"text\":\"隐身药水\",\"italic\":false,\"color\":\"white\"}'}}},{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:14,Amplifier:0,Duration:600}],CustomPotionColor:4791617,display:{Name:'{\"text\":\"隐身药水\",\"italic\":false,\"color\":\"white\"}'}}}]}"
+                "tag": "{CustomPotionColor:4791617,item_name:'{\"text\":\"隐身药水 (0:20) x4\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:14,Amplifier:0,Duration:400}],CustomPotionColor:4791617,display:{Name:'{\"text\":\"隐身药水\",\"italic\":false,\"color\":\"white\"}'}}},{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:14,Amplifier:0,Duration:400}],CustomPotionColor:4791617,display:{Name:'{\"text\":\"隐身药水\",\"italic\":false,\"color\":\"white\"}'}}},{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:14,Amplifier:0,Duration:400}],CustomPotionColor:4791617,display:{Name:'{\"text\":\"隐身药水\",\"italic\":false,\"color\":\"white\"}'}}},{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:14,Amplifier:0,Duration:400}],CustomPotionColor:4791617,display:{Name:'{\"text\":\"隐身药水\",\"italic\":false,\"color\":\"white\"}'}}}]}"
             }
         ]
     },

data/item/loot_tables/item/green.json

@@ -29,7 +29,7 @@
         "functions": [
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"<饵钓 IV> 破损的钓鱼竿\",\"color\":\"aqua\"}',Damage:60,is_bonus:1b,bonus_new:1b,bonus_return:1b,Enchantments:[{id:\"lure\",lvl:3}],display:{Name:'{\"text\":\"<饵钓 IV> 破损的钓鱼竿\",\"italic\":false,\"color\":\"aqua\"}'}}"
+                "tag": "{item_name:'{\"text\":\"<饵钓 IV> 破损的钓鱼竿\",\"color\":\"aqua\"}',Damage:60,is_bonus:1b,bonus_new:1b,bonus_return:1b,Enchantments:[{id:\"lure\",lvl:4}],display:{Name:'{\"text\":\"<饵钓 IV> 破损的钓鱼竿\",\"italic\":false,\"color\":\"aqua\"}'}}"
             }
         ]
     },
@@ -125,7 +125,7 @@
         "functions": [
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{CustomPotionColor:4791617,item_name:'{\"text\":\"隐身药水 (0:30) x2\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:14,Amplifier:0,Duration:600}],CustomPotionColor:4791617,display:{Name:'{\"text\":\"隐身药水\",\"italic\":false,\"color\":\"white\"}'}}},{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:14,Amplifier:0,Duration:600}],CustomPotionColor:4791617,display:{Name:'{\"text\":\"隐身药水\",\"italic\":false,\"color\":\"white\"}'}}}]}"
+                "tag": "{CustomPotionColor:4791617,item_name:'{\"text\":\"隐身药水 (0:20) x2\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:14,Amplifier:0,Duration:400}],CustomPotionColor:4791617,display:{Name:'{\"text\":\"隐身药水\",\"italic\":false,\"color\":\"white\"}'}}},{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:14,Amplifier:0,Duration:400}],CustomPotionColor:4791617,display:{Name:'{\"text\":\"隐身药水\",\"italic\":false,\"color\":\"white\"}'}}}]}"
             }
         ]
     },

data/item/loot_tables/item/white.json

@@ -148,7 +148,7 @@
         "functions": [
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{CustomPotionColor:4791617,item_name:'{\"text\":\"隐身药水 (0:30)\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:14,Amplifier:0,Duration:600}],CustomPotionColor:4791617,display:{Name:'{\"text\":\"隐身药水\",\"italic\":false,\"color\":\"white\"}'}}}]}"
+                "tag": "{CustomPotionColor:4791617,item_name:'{\"text\":\"隐身药水 (0:20)\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:14,Amplifier:0,Duration:400}],CustomPotionColor:4791617,display:{Name:'{\"text\":\"隐身药水\",\"italic\":false,\"color\":\"white\"}'}}}]}"
             }
         ]
     },
@@ -192,7 +192,7 @@
         "functions": [
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"<荆棘 I> 钻石护腿\",\"color\":\"white\"}',Name:'{\"text\":\"<荆棘 I> 钻石护腿\",\"italic\":false,\"color\":\"white\"}',Enchantments:[{id:\"thorns\",lvl:1}],is_bonus:1b,bonus_new:1b,bonus_return:1b}"
+                "tag": "{item_name:'{\"text\":\"<荆棘 II> 钻石护腿\",\"color\":\"white\"}',Name:'{\"text\":\"<荆棘 II> 钻石护腿\",\"italic\":false,\"color\":\"white\"}',Enchantments:[{id:\"thorns\",lvl:2}],is_bonus:1b,bonus_new:1b,bonus_return:1b}"
             }
         ]
     },

data/item/loot_tables/mixed/blue.json

@@ -2,7 +2,7 @@
 
     {
         "type": "minecraft:item",
-        "weight": 1,
+        "weight": 2,
         "name": "minecraft:blaze_powder",
         "functions": [
             {
@@ -17,12 +17,12 @@
     },
     {
         "type": "minecraft:loot_table",
-        "weight": 12,
+        "weight": 30,
         "name": "item:item/blue"
     },
     {
         "type": "minecraft:item",
-        "weight": 1,
+        "weight": 2,
         "name": "minecraft:blaze_powder",
         "functions": [
             {
@@ -33,7 +33,7 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 1,
+        "weight": 3,
         "name": "minecraft:shulker_shell",
         "functions": [
             {
@@ -44,7 +44,7 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 1,
+        "weight": 3,
         "name": "minecraft:shulker_shell",
         "functions": [
             {

data/item/loot_tables/mixed/green.json

@@ -7,7 +7,7 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 5,
+        "weight": 4,
         "name": "minecraft:blaze_powder",
         "functions": [
             {
@@ -27,7 +27,7 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 5,
+        "weight": 4,
         "name": "minecraft:blaze_powder",
         "functions": [
             {
@@ -38,7 +38,7 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 5,
+        "weight": 6,
         "name": "minecraft:shulker_shell",
         "functions": [
             {
@@ -49,7 +49,7 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 5,
+        "weight": 6,
         "name": "minecraft:shulker_shell",
         "functions": [
             {

data/item/loot_tables/mixed/white.json

@@ -7,7 +7,7 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 6,
+        "weight": 5,
         "name": "minecraft:blaze_powder",
         "functions": [
             {
@@ -42,7 +42,7 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 3,
+        "weight": 2,
         "name": "minecraft:blaze_powder",
         "functions": [
             {
@@ -57,7 +57,7 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 6,
+        "weight": 7,
         "name": "minecraft:shulker_shell",
         "functions": [
             {
@@ -68,7 +68,7 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 6,
+        "weight": 7,
         "name": "minecraft:shulker_shell",
         "functions": [
             {

data/item/loot_tables/score/green.json

@@ -158,23 +158,23 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 6,
+    "weight": 4,
     "name": "minecraft:magenta_glazed_terracotta",
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"积分随机 +8 或清零\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_add_score:-1}"
+            "tag": "{item_name:'{\"text\":\"积分随机 +6 或清零\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_add_score:-1}"
         }
     ]
 },
 {
     "type": "minecraft:item",
-    "weight": 6,
+    "weight": 8,
     "name": "minecraft:magenta_glazed_terracotta",
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"积分随机 +8 或清零\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_add_score:8}"
+            "tag": "{item_name:'{\"text\":\"积分随机 +6 或清零\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_add_score:6}"
         }
     ]
 }

data/item/loot_tables/score/white.json

@@ -61,23 +61,23 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 4,
+    "weight": 3,
     "name": "minecraft:magenta_glazed_terracotta",
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"积分随机 +5 或清零\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_add_score:-1}"
+            "tag": "{item_name:'{\"text\":\"积分随机 +4 或清零\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_add_score:-1}"
         }
     ]
 },
 {
     "type": "minecraft:item",
-    "weight": 4,
+    "weight": 5,
     "name": "minecraft:magenta_glazed_terracotta",
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"积分随机 +5 或清零\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_add_score:5}"
+            "tag": "{item_name:'{\"text\":\"积分随机 +4 或清零\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_add_score:4}"
         }
     ]
 }

data/lib/advancements/damage_dealt.json

@@ -6,6 +6,9 @@
                 "damage": {
                     "taken": {
                         "min": 0.1
+                    },
+                    "type": {
+                        "is_magic": false
                     }
                 }
             }

data/lib/advancements/damage_taken.json

@@ -6,6 +6,9 @@
                 "damage": {
                     "taken": {
                         "min": 0.1
+                    },
+                    "type": {
+                        "is_magic": false
                     }
                 }
             }

data/ltw/advancements/blood/iron2.json

@@ -8,7 +8,7 @@
         "text": "铁血大亨 · β "
       },
       "description": [
-        {"text": "【钢铁狂潮】拥有 25 块铁锭\n", "color":"gray"},
+        {"text": "【钢铁狂潮】拥有 20 块铁锭\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "2 绿宝石","color":"white"}
       ],

data/ltw/advancements/blood/iron3.json

@@ -8,7 +8,7 @@
         "text": "铁血大亨 · γ "
       },
       "description": [
-        {"text": "【钢铁狂潮】拥有 40 块铁锭\n", "color":"gray"},
+        {"text": "【钢铁狂潮】拥有 35 块铁锭\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "2 绿宝石","color":"white"}
       ],

data/ltw/advancements/blood/iron4.json

@@ -8,7 +8,7 @@
         "text": "铁血大亨 · Ω "
       },
       "description": [
-        {"text": "【钢铁狂潮】拥有 60 块铁锭\n", "color":"gray"},
+        {"text": "【钢铁狂潮】拥有 50 块铁锭\n", "color":"gray"},
         {"text": "究极隐藏挑战！","color":"dark_gray","italic": true}
       ],
       "frame": "challenge",

data/ltw/advancements/parkour/treasure1.json

@@ -8,7 +8,7 @@
         "text": "争分夺秒 · α "
       },
       "description": [
-        {"text": "【遗迹寻宝】在 100 秒内到达终点\n", "color":"gray"},
+        {"text": "【遗迹寻宝】在 80 秒内到达终点\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "1 绿宝石","color":"white"}
       ],

data/ltw/advancements/story/score2.json

@@ -8,7 +8,7 @@
         "text": "积分猎手 · β "
       },
       "description": [
-        {"text": "在单局游戏中达到 20 积分\n", "color":"gray"},
+        {"text": "在单局游戏中达到 18 积分\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "2 绿宝石","color":"white"}
       ],

data/ltw/advancements/story/score3.json

@@ -8,7 +8,7 @@
         "text": "积分猎手 · γ "
       },
       "description": [
-        {"text": "在单局游戏中达到 30 积分\n", "color":"gray"},
+        {"text": "在单局游戏中达到 26 积分\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "2 绿宝石","color":"white"}
       ],

data/ltw/advancements/story/score4.json

@@ -8,7 +8,7 @@
         "text": "积分猎手 · Ω "
       },
       "description": [
-        {"text": "在单局游戏中达到 40 积分\n", "color":"gray"},
+        {"text": "在单局游戏中达到 34 积分\n", "color":"gray"},
         {"text": "究极隐藏挑战！","color":"dark_gray","italic": true}
       ],
       "frame": "challenge",

data/ltw/functions/state/0/setup/finish.mcfunction

@@ -1,2 +1,3 @@
 tag @s add pass_setup
-function ltw:state/0/player_enter
+function ltw:state/0/player_enter
+tellraw @s [{"text":"\n","color":"gold"},{"text":">> ","bold": true},"丢出最后一格的物品即可准备开始游戏！\n"]

data/ltw/functions/state/0/tick5.mcfunction

@@ -21,7 +21,7 @@ execute store result score #total_count mem if entity @a
 # 开始：提示开始
 execute if score $count mem matches 3.. if score #start_countdown mem matches 999.. run tellraw @a[tag=pass_setup] [{"text":"","color":"green"},{"text": ">> ","bold": true},"游戏即将开始, 请使用快捷栏最后一格确定自己是否参与!"]
 execute if score $count mem matches 3.. if score #start_countdown mem matches 999.. as @a at @s run function lib:sounds/levelup
-execute if score $count mem matches 3.. if score #start_countdown mem matches 999.. run scoreboard players set #start_countdown mem 121
+execute if score $count mem matches 3.. if score #start_countdown mem matches 999.. run scoreboard players set #start_countdown mem 201
 
 # 取消：提示取消
 execute if score $count mem matches ..2 if score #start_countdown mem matches ..999 run tellraw @a[tag=pass_setup] [{"text":"","color":"red"},{"text": ">> ","bold": true},"已准备人数不足, 游戏取消!"]
@@ -37,14 +37,14 @@ scoreboard players operation #start_div mem %= #4 mem
 execute if score #start_sec mem matches 1..10 if score #start_div mem matches 3 run execute as @a at @s run function lib:sounds/hit2
 
 # 20s：提示未准备
-execute if score #start_countdown mem matches 80 run tellraw @a[team=watching,tag=pass_setup] [{"text":"","color":"red"},{"text":">> ","bold": true},"你还没有准备, 如果要参加游戏, 请丢出快捷栏最后一格的物品!"]
+execute if score #start_countdown mem matches 80 run tellraw @a[team=watching,tag=pass_setup] [{"text":"\n","color":"red"},{"text":">> ","bold": true},"请丢出最后一格的物品准备开始，否则将旁观下一局游戏！\n"]
 
-# 10s：提示玩家数量过多
-execute if score #start_countdown mem matches 40 if score $count mem matches 9.. run tellraw @a [{"text":"","color":"gold"},{"text":">> ","bold": true},"已超出游戏最多支持的 8 人人数上限, 将随机抽取 8 人开始游戏!"]
+# 6s：提示玩家数量过多
+execute if score #start_countdown mem matches 24 if score $count mem matches 9.. run tellraw @a[tag=pass_setup] [{"text":"","color":"gold"},{"text":">> ","bold": true},"已超出游戏最多支持的 8 人人数上限, 将随机抽取 8 人开始游戏!"]
 
 # 0s：开始游戏
 execute if score #start_countdown mem matches 0 run function ltw:state/0/start_game
 
 # 显示信息
-execute if score #start_countdown mem matches 1..199 run title @a[team=!debugging,tag=pass_setup] actionbar [{"text":"","color":"green"},{"score":{"name":"$count","objective":"mem"}},"/",{"score":{"name":"#total_count","objective":"mem"}}," 人已准备 | ","将在 ",{"score":{"name":"#start_sec","objective":"mem"}}," 秒后开始游戏"]
-execute if score #start_countdown mem matches 200.. run title @a[team=!debugging,tag=pass_setup] actionbar [{"text":"","color":"red"},{"score":{"name":"$count","objective":"mem"}},"/",{"score":{"name":"#total_count","objective":"mem"}}," 人已准备 | 需要 3 人以开始游戏"]
+execute if score #start_countdown mem matches 1..998 run title @a[team=!debugging,tag=pass_setup] actionbar [{"text":"","color":"green"},{"score":{"name":"$count","objective":"mem"}},"/",{"score":{"name":"#total_count","objective":"mem"}}," 人已准备 | ","将在 ",{"score":{"name":"#start_sec","objective":"mem"}}," 秒后开始游戏"]
+execute if score #start_countdown mem matches 999.. run title @a[team=!debugging,tag=pass_setup] actionbar [{"text":"","color":"red"},{"score":{"name":"$count","objective":"mem"}},"/",{"score":{"name":"#total_count","objective":"mem"}}," 人已准备 | 需要 3 人以开始游戏"]

data/mini/functions/ass/game_start.mcfunction

@@ -4,7 +4,7 @@ scoreboard players set $countdown mem 90
 # HUD
 scoreboard objectives setdisplay list health_disp
 scoreboard objectives setdisplay belowName health_disp
-scoreboard objectives setdisplay sidebar health
+scoreboard objectives setdisplay sidebar health_alive
 scoreboard players set $bossbar_color mem 3
 scoreboard players set $countdown_max mem 90
 scoreboard players set $bossbar_type mem 2

data/mini/functions/ass/init.mcfunction

@@ -1,3 +1,5 @@
 # 重置计分板
 scoreboard objectives remove creeperUse
 scoreboard objectives add creeperUse minecraft.used:minecraft.creeper_spawn_egg "苦力怕计数器"
+scoreboard objectives remove health_alive
+scoreboard objectives add health_alive dummy

data/mini/functions/ass/tick2.mcfunction

@@ -5,3 +5,8 @@ execute as @a[tag=mini_running,scores={countdown_fast=0}] unless data entity @s
 
 # 给予击退棒
 execute as @a[tag=mini_running] unless data entity @s Inventory[{Slot:8b,id:"minecraft:lightning_rod",tag:{game_item:1b}}] run function mini:ass/game/give_stick
+
+# 同步生命值
+scoreboard players reset * health_alive
+scoreboard players set @a[gamemode=!spectator] health_alive 20
+execute as @a[gamemode=!spectator,scores={health=1..}] run scoreboard players operation @s health_alive = @s health

data/mini/functions/iron/game_start.mcfunction

@@ -1,12 +1,12 @@
 gamerule doDaylightCycle true
-scoreboard players set $countdown mem 300
+scoreboard players set $countdown mem 270
 
 # HUD
 scoreboard objectives setdisplay list total_score_disp
 scoreboard objectives setdisplay belowName iron_count
 scoreboard objectives setdisplay sidebar iron_disp
 scoreboard players set $bossbar_color mem 4
-scoreboard players set $countdown_max mem 300
+scoreboard players set $countdown_max mem 270
 scoreboard players set $bossbar_type mem 2
 function lib:bossbar/show
 bossbar set mini:red name "剩余时间"

data/mini/functions/iron/tick20.mcfunction

@@ -41,6 +41,6 @@ execute if score $foursec mem matches 1 run schedule function mini:iron/game/cle
 
 # 给予进度
 advancement grant @a[team=playing,scores={iron_count=10..}] only ltw:blood/iron1
-advancement grant @a[team=playing,scores={iron_count=25..}] only ltw:blood/iron2
-advancement grant @a[team=playing,scores={iron_count=40..}] only ltw:blood/iron3
-advancement grant @a[team=playing,scores={iron_count=60..}] only ltw:blood/iron4
+advancement grant @a[team=playing,scores={iron_count=20..}] only ltw:blood/iron2
+advancement grant @a[team=playing,scores={iron_count=35..}] only ltw:blood/iron3
+advancement grant @a[team=playing,scores={iron_count=50..}] only ltw:blood/iron4

data/mini/functions/parkour/game_start.mcfunction

@@ -1,12 +1,12 @@
 # 游戏结束倒计时
-scoreboard players set $countdown mem 150
+scoreboard players set $countdown mem 130
 
 # HUD
 scoreboard objectives setdisplay list total_score_disp
 scoreboard objectives setdisplay belowName total_score_disp
 scoreboard objectives setdisplay sidebar total_score
 scoreboard players set $bossbar_color mem 4
-scoreboard players set $countdown_max mem 150
+scoreboard players set $countdown_max mem 130
 scoreboard players set $bossbar_type mem 2
 function lib:bossbar/show
 bossbar set mini:blue name "剩余时间"

data/mini/functions/parkour/player_finished.mcfunction

@@ -5,9 +5,9 @@ tag @s remove mini_running
 function mini:main/update_player_count
 
 # 计算时间
-scoreboard players set #temp mem 150
+scoreboard players set #temp mem 130
 scoreboard players operation #temp mem -= $countdown mem
-execute if score #temp mem matches 1..100 run advancement grant @s only ltw:parkour/treasure1
+execute if score #temp mem matches 1..80 run advancement grant @s only ltw:parkour/treasure1
 execute if score #temp mem matches 1..60 run advancement grant @s only ltw:parkour/treasure2
 execute if score #temp mem matches 1..40 run advancement grant @s only ltw:parkour/treasure3
 execute if score #temp mem matches 1..30 run advancement grant @s only ltw:parkour/treasure4

data/mini/functions/trade/game_start.mcfunction

@@ -4,8 +4,8 @@ scoreboard objectives setdisplay list total_score_disp
 scoreboard objectives setdisplay belowName total_score_disp
 scoreboard objectives setdisplay sidebar emerald
 scoreboard players set $bossbar_color mem 4
-scoreboard players set $countdown_max mem 330
-scoreboard players set $countdown mem 330
+scoreboard players set $countdown_max mem 320
+scoreboard players set $countdown mem 320
 scoreboard players set $bossbar_type mem 2
 function lib:bossbar/show
 bossbar set mini:red name "剩余时间"

data/mini/loot_tables/diamond.json

@@ -1,60 +1,102 @@
-{"pools": [{"rolls": 5,"entries": [
-
+{"pools": [
+  
+  {"rolls": 4,"entries": [
+    {
+      "type": "minecraft:item",
+      "weight": 1,
+      "name": "minecraft:coal",
+      "functions": [
+        {
+          "function": "minecraft:set_count",
+          "count": {
+            "min": 1.0,
+            "max": 3.0,
+            "type": "minecraft:uniform"
+          }
+        }
+      ]
+    },
     {
-        "type": "minecraft:item",
-        "weight": 3,
-        "name": "minecraft:nether_star",
-        "functions": [
-            {
-                "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"1 积分\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_add_score:1,display:{Name:'{\"text\":\"1 积分\",\"italic\":false,\"color\":\"white\"}'}}"
-            }
-        ]
+      "type": "minecraft:item",
+      "weight": 2,
+      "name": "minecraft:iron_ingot",
+      "functions": [
+        {
+          "function": "minecraft:set_count",
+          "count": {
+            "min": 2.0,
+            "max": 3.0,
+            "type": "minecraft:uniform"
+          }
+        }
+      ]
     },
     {
-        "type": "minecraft:item",
-        "weight": 1,
-        "name": "minecraft:coal",
-        "functions": [
+      "type": "minecraft:item",
+      "weight": 1,
+      "name": "minecraft:diamond",
+      "functions": [
+        {
+          "function": "minecraft:set_count",
+          "count": {
+            "min": 1.0,
+            "max": 2.0,
+            "type": "minecraft:uniform"
+          }
+        }
+      ]
+    }  
+  ]},
+  {"rolls": 1,"entries": [
+    {
+      "type": "minecraft:empty",
+      "weight": 1
+    },
+    {
+      "type": "minecraft:item",
+      "weight": 1,
+      "name": "minecraft:nether_star",
+      "functions": [
           {
-            "function": "minecraft:set_count",
-            "count": {
-              "min": 1.0,
-              "max": 3.0,
-              "type": "minecraft:uniform"
-            }
+              "function": "minecraft:set_nbt",
+              "tag": "{item_name:'{\"text\":\"1 积分\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_add_score:1,display:{Name:'{\"text\":\"1 积分\",\"italic\":false,\"color\":\"white\"}'}}"
           }
-        ]
+      ]
     },
     {
-        "type": "minecraft:item",
-        "weight": 2,
-        "name": "minecraft:iron_ingot",
-        "functions": [
+      "type": "minecraft:item",
+      "weight": 1,
+      "name": "minecraft:nether_star",
+      "functions": [
           {
-            "function": "minecraft:set_count",
-            "count": {
-              "min": 2.0,
-              "max": 3.0,
-              "type": "minecraft:uniform"
-            }
+              "function": "minecraft:set_nbt",
+              "tag": "{item_name:'{\"text\":\"2 积分\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_add_score:2,display:{Name:'{\"text\":\"2 积分\",\"italic\":false,\"color\":\"aqua\"}'}}"
           }
-        ]
+      ]
     },
     {
-        "type": "minecraft:item",
-        "weight": 1,
-        "name": "minecraft:diamond",
-        "functions": [
+      "type": "minecraft:item",
+      "weight": 1,
+      "name": "minecraft:nether_star",
+      "functions": [
           {
-            "function": "minecraft:set_count",
-            "count": {
-              "min": 1.0,
-              "max": 2.0,
-              "type": "minecraft:uniform"
-            }
+              "function": "minecraft:set_nbt",
+              "tag": "{item_name:'{\"text\":\"3 积分\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_add_score:3,display:{Name:'{\"text\":\"3 积分\",\"italic\":false,\"color\":\"aqua\"}'}}"
           }
-        ]
+      ]
+    },
+    {
+      "type": "minecraft:item",
+      "weight": 1,
+      "name": "minecraft:nether_star",
+      "functions": [
+          {
+              "function": "minecraft:set_nbt",
+              "tag": "{item_name:'{\"text\":\"4 积分\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_add_score:4,display:{Name:'{\"text\":\"4 积分\",\"italic\":false,\"color\":\"light_purple\"}'}}"
+          }
+      ]
     }
-    
-]}]}
+  ]}
+
+
+]}