Merge branch 'master' of github.com:LTCatt/LTW3

data/item/functions/bonus_item/add_score.mcfunction

@@ -22,7 +22,7 @@ function ltw:main/get_max_score
 tag @a remove highest
 tag @a remove may_highest
 execute as @a if score @s total_score = #score_max mem run tag @s add may_highest
-execute at @s run tag @a[tag=may_highest,limit=1,sort=furthest,scores={total_score=1..}] add highest
+execute at @s run tag @a[tag=may_highest,limit=1,sort=furthest,scores={total_score=2..}] add highest
 execute unless entity @a[tag=highest] run tag @s add highest
 
 execute if score #bonus_add_score mem matches 200 run scoreboard players add @s total_score 2
@@ -30,7 +30,7 @@ execute if score #bonus_add_score mem matches 200 run scoreboard players add @s
 execute if score #bonus_add_score mem matches 200 run scoreboard players remove @a[tag=highest] total_score 2
 execute if score #bonus_add_score mem matches 200 run scoreboard players remove @a[tag=highest] total_score_disp 2
 
-execute if score #bonus_add_score mem matches 200 if entity @s[tag=highest] run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s","color":"aqua"}," 试图偷取自己的分数……"]
+execute if score #bonus_add_score mem matches 200 if entity @s[tag=highest] run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s","color":"aqua"}," 没能偷到任何人的分数……"]
 execute if score #bonus_add_score mem matches 200 if entity @s[tag=!highest] run tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@p[tag=highest]","color":"red"}," 被偷取了 ",{"text": "2 分","color":"red"},", 当前共有 ",{"score": {"name": "@p[tag=highest]","objective": "total_score"}}, " 分"]
 execute if score #bonus_add_score mem matches 200 if entity @s[tag=!highest] run tellraw @a ["",{"text": ">> ","color":"green","bold": true},{"selector": "@s","color":"green"}," 偷取了 ",{"text": "2 分","color":"green"},", 当前共有 ",{"score": {"name": "@s","objective": "total_score"}}, " 分"]
 

data/item/functions/bonus_item/gameparty/auto/blue.mcfunction

@@ -1,7 +1,9 @@
 # 生成蓝色品质的物品实体
 
-execute if score $round mem matches ..4 run loot spawn ~ ~ ~ loot item:gameparty/normal/blue
-execute if score $round mem matches 5 run loot spawn ~ ~ ~ loot item:gameparty/last/blue
+execute if score $round mem matches ..2 run function item:bonus_item/gameparty/normal/blue
+execute if score $round mem matches 3 run function item:bonus_item/gameparty/score/blue
+execute if score $round mem matches 4 run function item:bonus_item/gameparty/normal/blue
+execute if score $round mem matches 5.. run function item:bonus_item/gameparty/score/blue
 summon item ~ ~ ~ {Tags:["new_item"],Age:-32768,PickupDelay:0,NoGravity:1,Invulnerable:1,CustomNameVisible:1,Glowing:1,Motion:[0,0,0],Item:{id:"gold_nugget",Count:1}}
 data modify entity @e[tag=new_item,limit=1] Item set from entity @e[limit=1,type=item,sort=nearest,tag=!new_item] Item
 kill @e[limit=1,type=item,sort=nearest,tag=!new_item]

data/item/functions/bonus_item/gameparty/auto/green.mcfunction

@@ -1,7 +1,9 @@
 # 生成绿色品质的物品实体
 
-execute if score $round mem matches ..4 run loot spawn ~ ~ ~ loot item:gameparty/normal/green
-execute if score $round mem matches 5 run loot spawn ~ ~ ~ loot item:gameparty/last/green
+execute if score $round mem matches ..2 run function item:bonus_item/gameparty/normal/green
+execute if score $round mem matches 3 run function item:bonus_item/gameparty/score/green
+execute if score $round mem matches 4 run function item:bonus_item/gameparty/normal/green
+execute if score $round mem matches 5.. run function item:bonus_item/gameparty/score/green
 summon item ~ ~ ~ {Tags:["new_item"],Age:-32768,PickupDelay:0,NoGravity:1,Invulnerable:1,CustomNameVisible:1,Glowing:1,Motion:[0,0,0],Item:{id:"gold_nugget",Count:1}}
 data modify entity @e[tag=new_item,limit=1] Item set from entity @e[limit=1,type=item,sort=nearest,tag=!new_item] Item
 kill @e[limit=1,type=item,sort=nearest,tag=!new_item]

data/item/functions/bonus_item/gameparty/auto/purple.mcfunction

@@ -1,7 +1,9 @@
 # 生成紫色品质的物品实体
 
-execute if score $round mem matches ..4 run loot spawn ~ ~ ~ loot item:gameparty/normal/purple
-execute if score $round mem matches 5 run loot spawn ~ ~ ~ loot item:gameparty/last/purple
+execute if score $round mem matches ..2 run function item:bonus_item/gameparty/normal/purple
+execute if score $round mem matches 3 run function item:bonus_item/gameparty/score/purple
+execute if score $round mem matches 4 run function item:bonus_item/gameparty/normal/purple
+execute if score $round mem matches 5.. run function item:bonus_item/gameparty/score/purple
 summon item ~ ~ ~ {Tags:["new_item"],Age:-32768,PickupDelay:0,NoGravity:1,Invulnerable:1,CustomNameVisible:1,Glowing:1,Motion:[0,0,0],Item:{id:"gold_nugget",Count:1}}
 data modify entity @e[tag=new_item,limit=1] Item set from entity @e[limit=1,type=item,sort=nearest,tag=!new_item] Item
 kill @e[limit=1,type=item,sort=nearest,tag=!new_item]

data/item/functions/bonus_item/gameparty/auto/white.mcfunction

@@ -1,7 +1,9 @@
 # 生成白色品质的物品实体
 
-execute if score $round mem matches ..4 run loot spawn ~ ~ ~ loot item:gameparty/normal/white
-execute if score $round mem matches 5 run loot spawn ~ ~ ~ loot item:gameparty/last/white
+execute if score $round mem matches ..2 run function item:bonus_item/gameparty/normal/white
+execute if score $round mem matches 3 run function item:bonus_item/gameparty/score/white
+execute if score $round mem matches 4 run function item:bonus_item/gameparty/normal/white
+execute if score $round mem matches 5.. run function item:bonus_item/gameparty/score/white
 summon item ~ ~ ~ {Tags:["new_item"],Age:-32768,PickupDelay:0,NoGravity:1,Invulnerable:1,CustomNameVisible:1,Glowing:1,Motion:[0,0,0],Item:{id:"gold_nugget",Count:1}}
 data modify entity @e[tag=new_item,limit=1] Item set from entity @e[limit=1,type=item,sort=nearest,tag=!new_item] Item
 kill @e[limit=1,type=item,sort=nearest,tag=!new_item]

data/item/functions/bonus_item/gameparty/last/random.mcfunction

@@ -1,16 +0,0 @@
-# 根据当前轮数生成随机品质的物品
-
-# 品质 = d100
-scoreboard players set $random_min mem 1
-scoreboard players set $random_max mem 100
-function lib:random
-scoreboard players operation #quality mem = $random mem
-
-# 根据品质生成不同的物品
-execute if score #quality mem matches ..24 run function item:bonus_item/gameparty/last/white
-# 绿色：35%
-execute if score #quality mem matches 25..59 run function item:bonus_item/gameparty/last/green
-# 蓝色：25%
-execute if score #quality mem matches 60..84 run function item:bonus_item/gameparty/last/blue
-# 紫色：15%
-execute if score #quality mem matches 85.. run function item:bonus_item/gameparty/last/purple

data/item/functions/bonus_item/gameparty/normal/random.mcfunction

@@ -1,18 +1,17 @@
-# 根据当前轮数生成随机品质的物品
+# 生成随机品质的物品
 
-# 品质 = d100 + (轮数 - 5) x 10
-scoreboard players set $random_min mem -49
-scoreboard players set $random_max mem 50
+# 品质 = d100
+scoreboard players set $random_min mem 1
+scoreboard players set $random_max mem 100
 function lib:random
-scoreboard players operation #quality mem = $round mem
-scoreboard players operation #quality mem *= #const_10 mem
-scoreboard players operation #quality mem += $random mem
+scoreboard players operation #quality mem = $random mem
 
 # 根据品质生成不同的物品
-execute if score #quality mem matches ..24 run function item:bonus_item/gameparty/normal/white
-# 绿色：35%
-execute if score #quality mem matches 25..59 run function item:bonus_item/gameparty/normal/green
-# 蓝色：25%
-execute if score #quality mem matches 60..84 run function item:bonus_item/gameparty/normal/blue
-# 紫色：15%
-execute if score #quality mem matches 85.. run function item:bonus_item/gameparty/normal/purple
+# 白色：45%
+execute if score #quality mem matches ..44 run function item:bonus_item/gameparty/normal/white
+# 绿色：30%
+execute if score #quality mem matches 45..74 run function item:bonus_item/gameparty/normal/green
+# 蓝色：20%
+execute if score #quality mem matches 75..94 run function item:bonus_item/gameparty/normal/blue
+# 紫色：5%
+execute if score #quality mem matches 95.. run function item:bonus_item/gameparty/normal/purple

data/item/functions/bonus_item/gameparty/random.mcfunction

@@ -1,4 +1,6 @@
 # 根据轮数生成对应的物品
 
-execute if score $round mem matches ..4 run function item:bonus_item/gameparty/normal/random
-execute if score $round mem matches 5 run function item:bonus_item/gameparty/last/random
+execute if score $round mem matches ..2 run function item:bonus_item/gameparty/normal/random
+execute if score $round mem matches 3 run function item:bonus_item/gameparty/score/random
+execute if score $round mem matches 4 run function item:bonus_item/gameparty/normal/random
+execute if score $round mem matches 5.. run function item:bonus_item/gameparty/score/random

data/item/functions/bonus_item/gameparty/last/blue.mcfunction → data/item/functions/bonus_item/gameparty/score/blue.mcfunction

@@ -1,6 +1,6 @@
 # 生成蓝色品质的物品实体
 
-loot spawn ~ ~ ~ loot item:gameparty/last/blue
+loot spawn ~ ~ ~ loot item:gameparty/score/blue
 summon item ~ ~ ~ {Tags:["new_item"],Age:-32768,PickupDelay:0,NoGravity:1,Invulnerable:1,CustomNameVisible:1,Glowing:1,Motion:[0,0,0],Item:{id:"gold_nugget",Count:1}}
 data modify entity @e[tag=new_item,limit=1] Item set from entity @e[limit=1,type=item,sort=nearest,tag=!new_item] Item
 kill @e[limit=1,type=item,sort=nearest,tag=!new_item]

data/item/functions/bonus_item/gameparty/last/green.mcfunction → data/item/functions/bonus_item/gameparty/score/green.mcfunction

@@ -1,6 +1,6 @@
 # 生成绿色品质的物品实体
 
-loot spawn ~ ~ ~ loot item:gameparty/last/green
+loot spawn ~ ~ ~ loot item:gameparty/score/green
 summon item ~ ~ ~ {Tags:["new_item"],Age:-32768,PickupDelay:0,NoGravity:1,Invulnerable:1,CustomNameVisible:1,Glowing:1,Motion:[0,0,0],Item:{id:"gold_nugget",Count:1}}
 data modify entity @e[tag=new_item,limit=1] Item set from entity @e[limit=1,type=item,sort=nearest,tag=!new_item] Item
 kill @e[limit=1,type=item,sort=nearest,tag=!new_item]

data/item/functions/bonus_item/gameparty/last/purple.mcfunction → data/item/functions/bonus_item/gameparty/score/purple.mcfunction

@@ -1,6 +1,6 @@
 # 生成紫色品质的物品实体
 
-loot spawn ~ ~ ~ loot item:gameparty/last/purple
+loot spawn ~ ~ ~ loot item:gameparty/score/purple
 summon item ~ ~ ~ {Tags:["new_item"],Age:-32768,PickupDelay:0,NoGravity:1,Invulnerable:1,CustomNameVisible:1,Glowing:1,Motion:[0,0,0],Item:{id:"gold_nugget",Count:1}}
 data modify entity @e[tag=new_item,limit=1] Item set from entity @e[limit=1,type=item,sort=nearest,tag=!new_item] Item
 kill @e[limit=1,type=item,sort=nearest,tag=!new_item]

data/item/functions/bonus_item/gameparty/score/random.mcfunction

@@ -0,0 +1,17 @@
+# 生成随机品质的物品
+
+# 品质 = d100
+scoreboard players set $random_min mem 1
+scoreboard players set $random_max mem 100
+function lib:random
+scoreboard players operation #quality mem = $random mem
+
+# 根据品质生成不同的物品
+# 白色：40%
+execute if score #quality mem matches ..39 run function item:bonus_item/gameparty/score/white
+# 绿色：30%
+execute if score #quality mem matches 40..69 run function item:bonus_item/gameparty/score/green
+# 蓝色：20%
+execute if score #quality mem matches 70..89 run function item:bonus_item/gameparty/score/blue
+# 紫色：10%
+execute if score #quality mem matches 90.. run function item:bonus_item/gameparty/score/purple

data/item/functions/bonus_item/gameparty/last/white.mcfunction → data/item/functions/bonus_item/gameparty/score/white.mcfunction

@@ -1,6 +1,6 @@
 # 生成白色品质的物品实体
 
-loot spawn ~ ~ ~ loot item:gameparty/last/white
+loot spawn ~ ~ ~ loot item:gameparty/score/white
 summon item ~ ~ ~ {Tags:["new_item"],Age:-32768,PickupDelay:0,NoGravity:1,Invulnerable:1,CustomNameVisible:1,Glowing:1,Motion:[0,0,0],Item:{id:"gold_nugget",Count:1}}
 data modify entity @e[tag=new_item,limit=1] Item set from entity @e[limit=1,type=item,sort=nearest,tag=!new_item] Item
 kill @e[limit=1,type=item,sort=nearest,tag=!new_item]

data/item/functions/shop/buy_pig.mcfunction

@@ -11,6 +11,5 @@ execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":
 execute as @s[tag=canbuy] run function item:shop/special_pig
 scoreboard players remove @s[tag=canbuy] gold 1
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error
-execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
 execute as @s[tag=canbuy] run function item:shop/refresh_gold
 tag @s remove canbuy

data/item/loot_tables/gameparty/normal/blue.json

@@ -2,33 +2,7 @@
 
 {
     "type": "minecraft:item",
-    "weight": 11,
-    "name": "minecraft:nether_star",
-    "functions": [
-        {
-            "function": "minecraft:set_count",
-            "count": 3
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分 +3\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":3}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:ender_eye",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"从最高分玩家处偷取 2 分\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":200}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 4,
+    "weight": 1,
     "name": "minecraft:iron_sword",
     "functions": [
         {
@@ -39,7 +13,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 4,
+    "weight": 1,
     "name": "minecraft:enchanted_golden_apple",
     "functions": [
         {
@@ -50,7 +24,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 4,
+    "weight": 1,
     "name": "minecraft:shield",
     "functions": [
         {
@@ -58,28 +32,6 @@
             "tag": "{\"item_name\":\"{\\\"text\\\":\\\"盾牌\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"display\":{\"Name\":\"{\\\"text\\\":\\\"盾牌\\\",\\\"italic\\\":0,\\\"color\\\":\\\"aqua\\\"}\"}}"
         }
     ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 2,
-    "name": "minecraft:netherite_chestplate",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"下界合金胸甲、靴子\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"bonus_give_items\":[{\"id\":\"minecraft:netherite_boots\",\"Count\":1,\"tag\":{\"bonus_return\":1b,\"is_bonus\":1b}}]}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 2,
-    "name": "minecraft:netherite_boots",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"下界合金护腿、靴子\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"bonus_give_items\":[{\"id\":\"minecraft:netherite_leggings\",\"Count\":1,\"tag\":{\"bonus_return\":1b,\"is_bonus\":1b}}]}"
-        }
-    ]
 }
 
 ]}]}

data/item/loot_tables/gameparty/normal/green.json

@@ -1,34 +1,25 @@
 {"pools": [{"rolls": 1,"entries": [
 
+    {
+        "type": "minecraft:loot_table",
+        "weight": 1,
+        "name": "item:gameparty/score/green"
+    },
+
 {
     "type": "minecraft:item",
-    "weight": 16,
-    "name": "minecraft:nether_star",
-    "functions": [
-        {
-            "function": "minecraft:set_count",
-            "count": 2
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分 +2\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":2}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 4,
-    "name": "minecraft:emerald",
+    "weight": 1,
+    "name": "minecraft:iron_axe",
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分随机翻倍或减半\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":100}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"铁斧\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"display\":{\"Name\":\"{\\\"text\\\":\\\"铁斧\\\",\\\"italic\\\":false,\\\"color\\\":\\\"green\\\"}\"}}"
         }
     ]
 },
 {
     "type": "minecraft:item",
-    "weight": 4,
+    "weight": 1,
     "name": "minecraft:golden_apple",
     "functions": [
         {
@@ -39,23 +30,23 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 4,
+    "weight": 1,
     "name": "minecraft:splash_potion",
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"跳跃提升 VII (0:02)\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"CustomPotionEffects\":[{\"Id\":8,\"Amplifier\":6,\"Duration\":40}],\"CustomPotionColor\":2292811,\"display\":{\"Name\":\"{\\\"text\\\":\\\"喷溅型跳跃药水\\\",\\\"italic\\\":0,\\\"color\\\":\\\"green\\\"}\"}}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"跳跃提升 VII (0:03)\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"CustomPotionEffects\":[{\"Id\":8,\"Amplifier\":6,\"Duration\":60}],\"CustomPotionColor\":2292811,\"display\":{\"Name\":\"{\\\"text\\\":\\\"喷溅型跳跃药水\\\",\\\"italic\\\":0,\\\"color\\\":\\\"green\\\"}\"}}"
         }
     ]
 },
 {
     "type": "minecraft:item",
-    "weight": 4,
+    "weight": 1,
     "name": "minecraft:crossbow",
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"<快速装填 III> 弩, 箭 x15\\\",\\\"color\\\":\\\"green\\\"}\",\"Enchantments\":[{\"id\":\"quick_charge\",\"lvl\":3}],\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"bonus_give_items\":[{\"id\":\"minecraft:arrow\",\"Count\":15,\"tag\":{\"is_bonus\":1b,\"bonus_clear_nbt\":1b}}],\"display\":{\"Name\":\"{\\\"text\\\":\\\"<快速装填 III> 弩\\\",\\\"italic\\\":0,\\\"color\\\":\\\"green\\\"}\"}}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"<快速装填 III> 弩, 箭 x10\\\",\\\"color\\\":\\\"green\\\"}\",\"Enchantments\":[{\"id\":\"quick_charge\",\"lvl\":3}],\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"bonus_give_items\":[{\"id\":\"minecraft:arrow\",\"Count\":10,\"tag\":{\"is_bonus\":1b,\"bonus_clear_nbt\":1b}}],\"display\":{\"Name\":\"{\\\"text\\\":\\\"<快速装填 III> 弩\\\",\\\"italic\\\":0,\\\"color\\\":\\\"green\\\"}\"}}"
         }
     ]
 }

data/item/loot_tables/gameparty/normal/purple.json

@@ -1,85 +1,26 @@
 {"pools": [{"rolls": 1,"entries": [
 
-{
-    "type": "minecraft:item",
-    "weight": 12,
-    "name": "minecraft:nether_star",
-    "functions": [
-        {
-            "function": "minecraft:set_count",
-            "count": 4
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分 +4\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":4}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 1,
-    "name": "minecraft:target",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分随机 +1~6\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":1}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 1,
-    "name": "minecraft:target",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分随机 +1~6\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":2}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 1,
-    "name": "minecraft:target",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分随机 +1~6\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":3}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 1,
-    "name": "minecraft:target",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分随机 +1~6\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":4}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 1,
-    "name": "minecraft:target",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分随机 +1~6\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":5}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 1,
-    "name": "minecraft:target",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分随机 +1~6\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":6}"
-        }
-    ]
-}
+    {
+        "type": "minecraft:item",
+        "weight": 1,
+        "name": "minecraft:netherite_chestplate",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"下界合金胸甲、靴子\\\",\\\"color\\\":\\\"purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"bonus_give_items\":[{\"id\":\"minecraft:netherite_boots\",\"Count\":1,\"tag\":{\"bonus_return\":1b,\"is_bonus\":1b}}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 1,
+        "name": "minecraft:netherite_boots",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"下界合金护腿、靴子\\\",\\\"color\\\":\\\"purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"bonus_give_items\":[{\"id\":\"minecraft:netherite_leggings\",\"Count\":1,\"tag\":{\"bonus_return\":1b,\"is_bonus\":1b}}]}"
+            }
+        ]
+    }
 
 ]}]}

data/item/loot_tables/gameparty/normal/white.json

@@ -1,56 +1,14 @@
 {"pools": [{"rolls": 1,"entries": [
 
+    {
+        "type": "minecraft:loot_table",
+        "weight": 4,
+        "name": "item:gameparty/score/white"
+    },
+
 {
     "type": "minecraft:item",
-    "weight": 80,
-    "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}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 16,
-    "name": "minecraft:paper",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"极小概率得分 +5\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":0}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 4,
-    "name": "minecraft:paper",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"极小概率得分 +5\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":5}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 8,
-    "name": "minecraft:gold_nugget",
-    "functions": [
-        {
-            "function": "minecraft:set_count",
-            "count": 2
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"金粒 +2\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":300}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 8,
+    "weight": 1,
     "name": "minecraft:splash_potion",
     "functions": [
         {
@@ -61,18 +19,18 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 8,
-    "name": "minecraft:iron_axe",
+    "weight": 1,
+    "name": "minecraft:stone_axe",
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"铁斧\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"display\":{\"Name\":\"{\\\"text\\\":\\\"铁斧\\\",\\\"italic\\\":false,\\\"color\\\":\\\"white\\\"}\"}}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"石斧\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"display\":{\"Name\":\"{\\\"text\\\":\\\"石斧\\\",\\\"italic\\\":false,\\\"color\\\":\\\"white\\\"}\"}}"
         }
     ]
 },
 {
     "type": "minecraft:item",
-    "weight": 8,
+    "weight": 1,
     "name": "minecraft:wooden_axe",
     "functions": [
         {
@@ -87,18 +45,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 12,
-    "name": "minecraft:fishing_rod",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"钓鱼竿\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"display\":{\"Name\":\"{\\\"text\\\":\\\"钓鱼竿\\\",\\\"italic\\\":0,\\\"color\\\":\\\"white\\\"}\"}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 12,
+    "weight": 1,
     "name": "minecraft:shield",
     "functions": [
         {
@@ -113,7 +60,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 8,
+    "weight": 1,
     "name": "minecraft:splash_potion",
     "functions": [
         {
@@ -124,7 +71,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 8,
+    "weight": 1,
     "name": "minecraft:splash_potion",
     "functions": [
         {
@@ -135,7 +82,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 8,
+    "weight": 1,
     "name": "minecraft:crossbow",
     "functions": [
         {
@@ -146,44 +93,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 8,
-    "name": "minecraft:bow",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"<冲击 I> 弓\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"Enchantments\":[{\"id\":\"punch\",\"lvl\":1}],\"display\":{\"Name\":\"{\\\"text\\\":\\\"<冲击 I> 弓\\\",\\\"italic\\\":false,\\\"color\\\":\\\"white\\\"}\"}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 8,
-    "name": "minecraft:arrow",
-    "functions": [
-        {
-            "function": "minecraft:set_count",
-            "count": 10
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"箭 x10\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"bonus_clear_nbt\":1b}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 4,
-    "name": "minecraft:netherite_chestplate",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"下界合金胸甲\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 4,
+    "weight": 1,
     "name": "minecraft:netherite_leggings",
     "functions": [
         {
@@ -194,7 +104,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 4,
+    "weight": 1,
     "name": "minecraft:netherite_boots",
     "functions": [
         {

data/item/loot_tables/gameparty/last/blue.json → data/item/loot_tables/gameparty/score/blue.json

@@ -2,7 +2,7 @@
 
 {
     "type": "minecraft:item",
-    "weight": 2,
+    "weight": 3,
     "name": "minecraft:nether_star",
     "functions": [
         {

data/item/loot_tables/gameparty/last/purple.json → data/item/loot_tables/gameparty/score/purple.json

@@ -2,7 +2,7 @@
 
 {
     "type": "minecraft:item",
-    "weight": 12,
+    "weight": 15,
     "name": "minecraft:nether_star",
     "functions": [
         {

data/item/loot_tables/gameparty/last/white.json → data/item/loot_tables/gameparty/score/white.json

@@ -2,7 +2,7 @@
 
 {
     "type": "minecraft:item",
-    "weight": 8,
+    "weight": 12,
     "name": "minecraft:nether_star",
     "functions": [
         {

data/item/tags/items/bonus.json

@@ -12,6 +12,7 @@
         "minecraft:nether_star",
         "minecraft:trident",
         "minecraft:wooden_axe",
+        "minecraft:stone_axe",
         "minecraft:iron_axe",
         "minecraft:fishing_rod",
         "minecraft:shield",

data/ltw/advancements/combat/phantom1.json

@@ -2,7 +2,7 @@
     "parent": "ltw:combat/root",
     "display": {
       "icon": {
-        "item": "minecraft:stick"
+        "item": "minecraft:arrow"
       },
       "title": {
         "text": "狩猎学徒      "

data/ltw/advancements/combat/phantom2.json

@@ -2,10 +2,10 @@
     "parent": "ltw:combat/phantom1",
     "display": {
       "icon": {
-        "item": "minecraft:arrow"
+        "item": "minecraft:phantom_membrane"
       },
       "title": {
-        "text": "狩猎大师      "
+        "text": "怪物猎人      "
       },
       "description": [
         {"text": "在月夜狩猎中击杀 16 只幻翼\n", "color":"gray"},

data/ltw/advancements/combat/phantom3.json

@@ -5,7 +5,7 @@
         "item": "minecraft:spectral_arrow"
       },
       "title": {
-        "text": "狩猎之神      "
+        "text": "不再有梦      "
       },
       "description": [
         {"text": "在月夜狩猎中击杀 24 只幻翼\n", "color":"gray"},

data/ltw/advancements/parkour/colormatch2.json

@@ -1,24 +1,24 @@
 {
-    "parent": "ltw:parkour/colormatch1",
+    "parent": "ltw:parkour/root",
     "display": {
       "icon": {
         "item": "minecraft:yellow_glazed_terracotta"
       },
       "title": {
-        "text": "终局迷阵      "
+        "text": "纷乱迷阵      "
       },
       "description": [
         {"text": "在色彩迷阵中达到最高速度, 并最终获胜\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
-        {"text": "3 绿宝石","color":"white"}
+        {"text": "2 绿宝石","color":"white"}
       ],
-      "frame": "challenge",
+      "frame": "task",
       "show_toast": true,
       "announce_to_chat": true,
       "hidden": false
     },
     "rewards": {
-      "function": "ltw:advancement/bonus_3"
+      "function": "ltw:advancement/bonus_2"
     },
     "criteria": {
       "get_score":{

data/ltw/advancements/parkour/explore1.json

@@ -1,33 +0,0 @@
-{
-    "parent": "ltw:parkour/root",
-    "display": {
-      "icon": {
-        "item": "minecraft:mossy_cobblestone"
-      },
-      "title": {
-        "text": "闲来无事      "
-      },
-      "description": [
-        {"text": "完成大厅中的旅途\n", "color":"gray"},
-        {"text": "奖励: ","color":"green"},
-        {"text": "1 绿宝石","color":"white"}
-      ],
-      "frame": "task",
-      "show_toast": true,
-      "announce_to_chat": true,
-      "hidden": false
-    },
-    "rewards": {
-      "function": "ltw:advancement/bonus_1"
-    },
-    "criteria": {
-      "finish":{
-          "trigger": "minecraft:impossible"
-      }
-    },
-    "requirements": [
-      [
-          "finish"
-      ]
-    ]
-  }

data/ltw/advancements/parkour/explore2.json

@@ -1,33 +0,0 @@
-{
-    "parent": "ltw:parkour/explore1",
-    "display": {
-      "icon": {
-        "item": "minecraft:crimson_hyphae"
-      },
-      "title": {
-        "text": "挑战自我      "
-      },
-      "description": [
-        {"text": "完成大厅中的隐藏跑酷\n", "color":"gray"},
-        {"text": "奖励: ","color":"green"},
-        {"text": "2 绿宝石","color":"white"}
-      ],
-      "frame": "task",
-      "show_toast": true,
-      "announce_to_chat": true,
-      "hidden": false
-    },
-    "rewards": {
-      "function": "ltw:advancement/bonus_2"
-    },
-    "criteria": {
-      "finish":{
-          "trigger": "minecraft:impossible"
-      }
-    },
-    "requirements": [
-      [
-          "finish"
-      ]
-    ]
-  }

data/ltw/advancements/parkour/tnt1.json

@@ -1,33 +0,0 @@
-{
-    "parent": "ltw:parkour/root",
-    "display": {
-      "icon": {
-        "item": "minecraft:dead_horn_coral_block"
-      },
-      "title": {
-        "text": "圣坛之慰      "
-      },
-      "description": [
-        {"text": "在地陷圣坛中获胜\n", "color":"gray"},
-        {"text": "奖励: ","color":"green"},
-        {"text": "1 绿宝石","color":"white"}
-      ],
-      "frame": "task",
-      "show_toast": true,
-      "announce_to_chat": true,
-      "hidden": false
-    },
-    "rewards": {
-      "function": "ltw:advancement/bonus_1"
-    },
-    "criteria": {
-      "get_score":{
-          "trigger": "minecraft:impossible"
-      }
-    },
-    "requirements": [
-      [
-          "get_score"
-      ]
-    ]
-  }

data/ltw/advancements/parkour/tnt2.json

@@ -1,33 +1,33 @@
 {
-    "parent": "ltw:parkour/tnt1",
-    "display": {
-      "icon": {
-        "item": "minecraft:crying_obsidian"
-      },
-      "title": {
-        "text": "圣坛之主      "
-      },
-      "description": [
-        {"text": "在地陷圣坛中获胜, 且位于第 3 或第 4 层\n", "color":"gray"},
-        {"text": "奖励: ","color":"green"},
-        {"text": "3 绿宝石","color":"white"}
-      ],
-      "frame": "challenge",
-      "show_toast": true,
-      "announce_to_chat": true,
-      "hidden": false
+  "parent": "ltw:parkour/root",
+  "display": {
+    "icon": {
+      "item": "minecraft:obsidian"
     },
-    "rewards": {
-      "function": "ltw:advancement/bonus_3"
+    "title": {
+      "text": "俾倪众生      "
     },
-    "criteria": {
-      "get_score":{
-          "trigger": "minecraft:impossible"
-      }
-    },
-    "requirements": [
-      [
-          "get_score"
-      ]
+    "description": [
+      {"text": "在地陷圣坛中获胜, 且位于第 3 或第 4 层\n", "color":"gray"},
+      {"text": "奖励: ","color":"green"},
+      {"text": "2 绿宝石","color":"white"}
+    ],
+    "frame": "task",
+    "show_toast": true,
+    "announce_to_chat": true,
+    "hidden": false
+  },
+  "rewards": {
+    "function": "ltw:advancement/bonus_2"
+  },
+  "criteria": {
+    "get_score":{
+        "trigger": "minecraft:impossible"
+    }
+  },
+  "requirements": [
+    [
+        "get_score"
     ]
-  }
+  ]
+}

data/ltw/advancements/parkour/explore3.json → data/ltw/advancements/parkour/tnt3.json

@@ -1,14 +1,14 @@
 {
-    "parent": "ltw:parkour/explore2",
+    "parent": "ltw:parkour/tnt2",
     "display": {
       "icon": {
-        "item": "minecraft:gilded_blackstone"
+        "item": "minecraft:crying_obsidian"
       },
       "title": {
-        "text": "空手而返      "
+        "text": "来自深渊      "
       },
       "description": [
-        {"text": "到达神秘老板的面前\n", "color":"gray"},
+        {"text": "从地陷圣坛的最底层返回最顶层\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "3 绿宝石","color":"white"}
       ],
@@ -21,13 +21,13 @@
       "function": "ltw:advancement/bonus_3"
     },
     "criteria": {
-      "finish":{
+      "get_score":{
           "trigger": "minecraft:impossible"
       }
     },
     "requirements": [
       [
-          "finish"
+          "get_score"
       ]
     ]
   }

data/ltw/advancements/parkour/treasure3.json

@@ -5,7 +5,7 @@
         "item": "minecraft:ender_chest"
       },
       "title": {
-        "text": "宝藏之神      "
+        "text": "不做选择题    "
       },
       "description": [
         {"text": "在遗迹寻宝中收集全部宝藏\n", "color":"gray"},

data/ltw/advancements/story/score2.json

@@ -5,7 +5,7 @@
         "item": "minecraft:map"
       },
       "title": {
-        "text": "分数狂魔      "
+        "text": "双六          "
       },
       "description": [
         {"text": "在单局游戏中达到 12 分\n", "color":"gray"},

data/ltw/advancements/story/total3.json

@@ -10,7 +10,7 @@
       "description": [
         {"text": "进行 50 场游戏\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
-        {"text": "3 绿宝石","color":"white"}
+        {"text": "4 绿宝石","color":"white"}
       ],
       "frame": "challenge",
       "show_toast": true,
@@ -18,7 +18,7 @@
       "hidden": false
     },
     "rewards": {
-      "function": "ltw:advancement/bonus_3"
+      "function": "ltw:advancement/bonus_4"
     },
     "criteria": {
       "get_score":{

data/ltw/advancements/story/win3.json

@@ -5,12 +5,12 @@
         "item": "minecraft:enchanted_golden_apple"
       },
       "title": {
-        "text": "胜者为王      "
+        "text": "弱者为何要战斗"
       },
       "description": [
         {"text": "获得 20 场游戏的胜利\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
-        {"text": "3 绿宝石","color":"white"}
+        {"text": "4 绿宝石","color":"white"}
       ],
       "frame": "challenge",
       "show_toast": true,
@@ -18,7 +18,7 @@
       "hidden": false
     },
     "rewards": {
-      "function": "ltw:advancement/bonus_3"
+      "function": "ltw:advancement/bonus_4"
     },
     "criteria": {
       "get_score":{

data/ltw/advancements/vs/diamond1.json

@@ -0,0 +1,40 @@
+{
+    "parent": "ltw:vs/root",
+    "display": {
+      "icon": {
+        "item": "minecraft:obsidian"
+      },
+      "title": {
+        "text": "冰桶挑战      "
+      },
+      "description": [
+        {"text": "挖掘一块黑曜石\n", "color":"gray"},
+        {"text": "奖励: ","color":"green"},
+        {"text": "2 绿宝石","color":"white"}
+      ],
+      "frame": "task",
+      "show_toast": true,
+      "announce_to_chat": true,
+      "hidden": false
+    },
+    "rewards": {
+      "function": "ltw:advancement/bonus_2"
+    },
+    "criteria": {
+        "obsidian": {
+          "trigger": "minecraft:inventory_changed",
+          "conditions": {
+            "items": [
+              {
+                "item": "minecraft:obsidian"
+              }
+            ]
+          }
+        }
+    },
+    "requirements": [
+        [
+          "obsidian"
+        ]
+    ]
+}

data/ltw/advancements/vs/diamond2.json

@@ -0,0 +1,40 @@
+{
+    "parent": "ltw:vs/diamond1",
+    "display": {
+      "icon": {
+        "item": "minecraft:enchanting_table"
+      },
+      "title": {
+        "text": "附魔师?!    "
+      },
+      "description": [
+        {"text": "制作一个附魔台\n", "color":"gray"},
+        {"text": "奖励: ","color":"green"},
+        {"text": "4 绿宝石","color":"white"}
+      ],
+      "frame": "challenge",
+      "show_toast": true,
+      "announce_to_chat": true,
+      "hidden": false
+    },
+    "rewards": {
+      "function": "ltw:advancement/bonus_4"
+    },
+    "criteria": {
+        "c": {
+          "trigger": "minecraft:inventory_changed",
+          "conditions": {
+            "items": [
+              {
+                "item": "minecraft:enchanting_table"
+              }
+            ]
+          }
+        }
+    },
+    "requirements": [
+        [
+          "c"
+        ]
+    ]
+}

data/ltw/advancements/vs/potato1.json

@@ -1,33 +0,0 @@
-{
-    "parent": "ltw:vs/root",
-    "display": {
-      "icon": {
-        "item": "minecraft:redstone_torch"
-      },
-      "title": {
-        "text": "幸存者        "
-      },
-      "description": [
-        {"text": "在炸弹狂魔中获胜\n", "color":"gray"},
-        {"text": "奖励: ","color":"green"},
-        {"text": "1 绿宝石","color":"white"}
-      ],
-      "frame": "task",
-      "show_toast": true,
-      "announce_to_chat": true,
-      "hidden": false
-    },
-    "rewards": {
-      "function": "ltw:advancement/bonus_1"
-    },
-    "criteria": {
-      "get_score":{
-          "trigger": "minecraft:impossible"
-      }
-    },
-    "requirements": [
-      [
-          "get_score"
-      ]
-    ]
-  }

data/ltw/advancements/vs/potato2.json

@@ -1,5 +1,5 @@
 {
-    "parent": "ltw:vs/potato1",
+    "parent": "ltw:vs/root",
     "display": {
       "icon": {
         "item": "minecraft:tnt"
@@ -8,17 +8,17 @@
         "text": "炸弹人        "
       },
       "description": [
-        {"text": "在炸弹狂魔中获胜, 且剩余 3 心或更多的生命值\n", "color":"gray"},
+        {"text": "在炸弹狂魔中获胜, 且剩余 2 心或更多的生命值\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
-        {"text": "3 绿宝石","color":"white"}
+        {"text": "2 绿宝石","color":"white"}
       ],
-      "frame": "challenge",
+      "frame": "task",
       "show_toast": true,
       "announce_to_chat": true,
       "hidden": false
     },
     "rewards": {
-      "function": "ltw:advancement/bonus_3"
+      "function": "ltw:advancement/bonus_2"
     },
     "criteria": {
       "get_score":{

data/ltw/advancements/parkour/colormatch1.json → data/ltw/advancements/vs/potato3.json

@@ -1,24 +1,24 @@
 {
-    "parent": "ltw:parkour/root",
+    "parent": "ltw:vs/potato2",
     "display": {
       "icon": {
-        "item": "minecraft:cyan_glazed_terracotta"
+        "item": "minecraft:enchanted_golden_apple"
       },
       "title": {
-        "text": "纷乱迷阵      "
+        "text": "苹果炸弹      "
       },
       "description": [
-        {"text": "在色彩迷阵中达到最高速度\n", "color":"gray"},
+        {"text": "在炸弹狂魔中获胜, 且剩余 5 心或更多的生命值\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
-        {"text": "1 绿宝石","color":"white"}
+        {"text": "3 绿宝石","color":"white"}
       ],
-      "frame": "task",
+      "frame": "challenge",
       "show_toast": true,
       "announce_to_chat": true,
       "hidden": false
     },
     "rewards": {
-      "function": "ltw:advancement/bonus_1"
+      "function": "ltw:advancement/bonus_3"
     },
     "criteria": {
       "get_score":{

data/ltw/functions/advancement/bonus_3.mcfunction

@@ -1,3 +1,4 @@
 scoreboard players add @s green 3
 scoreboard players add @s green_total 3
-execute if score $state mem matches 0 run function item:shop/refresh_green
+execute if score $state mem matches 0 run function item:shop/refresh_green
+# MC 自己会播放完成音效

data/ltw/functions/advancement/bonus_4.mcfunction

@@ -0,0 +1,4 @@
+scoreboard players add @s green 4
+scoreboard players add @s green_total 4
+execute if score $state mem matches 0 run function item:shop/refresh_green
+# MC 自己会播放完成音效

data/ltw/functions/clock/tick2.mcfunction

@@ -27,4 +27,4 @@ scoreboard players remove @e[scores={countdown_fast=1..}] countdown_fast 1
 
 # 死亡触发
 execute as @a[tag=temp_death] at @s run function ltw:main/player_death
-execute as @a[scores={death=1..,health=1..}] run tag @s add temp_death
+execute as @a[scores={death=1..}] run tag @s add temp_death

data/ltw/functions/init.mcfunction

@@ -161,6 +161,9 @@ function lib:bossbar/init
 # 状态
 function ltw:state/0/state_enter
 
-#重置随机数组
+# 重置随机数组
 data modify storage ltw:mini types set value []
-data modify storage ltw:mini colormatch.types set value []
+data modify storage ltw:mini colormatch.types set value []
+
+# 显示提示
+tellraw @a ["",{"text": ">> ","color": "aqua","bold": true}, {"text": "管理员已手动重置游戏!","color": "aqua"}]

data/ltw/functions/main/player_enter.mcfunction

@@ -27,6 +27,6 @@ function lib:bossbar/show
 # FIXME: 旁观者在一轮开始时会被切换为冒险模式又切回去，这会造成游戏模式变更提示，鬼知道为啥
 # FIXME: <! 重要> [010] 如果有人没领取奖励，可以一直站在上面，在奖励领取阶段结束时再拿到一次
 # FIXME: 准备倒计时与 Tooltip 降低不一致
-# FIXME: [LTCat] 初尝胜果 成就的判断似乎存在 Bug
 # FIXME: 修复 钻石风暴 spreadplayers 无效
-# FIXME: <! 重要> [HIM] 修复死亡判定可能失效
+# FIXME: [HIM] 死亡复活后可能会捡到已经在地上待了很久的 “老物品”
+# FIXME: [HIM] <! 重要> 锁定格子的物品会被带进生存小游戏

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

@@ -1,10 +1,10 @@
 # 让无状态玩家变为准备状态
 execute as @a[team=!debugging,team=!playing,team=!watching] run function ltw:state/0/state/join_watch
 
-# 给予进度
-execute as @a at @s if entity @s[x=-1,y=22,z=-29,dx=5,dy=3,dz=3] run advancement grant @s only ltw:parkour/explore1
-execute as @a at @s if entity @s[x=6,y=48,z=-32,dx=4,dy=3,dz=9] run advancement grant @s only ltw:parkour/explore2
-execute as @a at @s if entity @s[x=0,y=28,z=-46,distance=..4] run advancement grant @s only ltw:parkour/explore3
+## 给予主大厅进度
+#execute as @a at @s if entity @s[x=-1,y=22,z=-29,dx=5,dy=3,dz=3] run advancement grant @s only ltw:parkour/explore1
+#execute as @a at @s if entity @s[x=6,y=48,z=-32,dx=4,dy=3,dz=9] run advancement grant @s only ltw:parkour/explore2
+#execute as @a at @s if entity @s[x=0,y=28,z=-46,distance=..4] run advancement grant @s only ltw:parkour/explore3
 
 # 隐藏/显示老板的名片
 execute as @e[type=piglin,tag=shop_piglin_11,tag=lobby_entity] at @s if entity @a[distance=..5] run data modify entity @s CustomNameVisible set value true

data/ltw/functions/state/3/state_enter.mcfunction

@@ -21,11 +21,16 @@ scoreboard players set $tempo_enable mem 0
 # 修改队伍颜色
 team modify playing color white
 
-# 小游戏编号
-# 优化下一次游戏的选择：生成一个 1~[最大游戏编号] 的 randomarray，每次从其中取下一个数。
+# 小游戏编号：生成一个 1~[最大游戏编号] 的 randomarray，每次从其中取下一个数。
 execute unless data storage ltw:mini types[0] run function ltw:state/3/newarray
 execute store result score $mini_type mem run data get storage ltw:mini types[0]
 data remove storage ltw:mini types[0]
 
+# 小游戏编号覆盖：如果为第 5 轮，则有一半概率选用钻石风暴
+scoreboard players set $random_max mem 1
+scoreboard players set $random_min mem 0
+function lib:random
+execute if score $round mem matches 5 if score $random mem matches 1 run scoreboard players set $mini_type mem 6
+
 # 初始化小游戏
 function mini:main/game_init

data/mini/functions/colormatch/game/start_new_round.mcfunction

@@ -28,9 +28,6 @@ scoreboard players set $bossbar_type mem 1
 function lib:bossbar/show
 bossbar set mini:red name "地板消失"
 
-# 给予进度
-execute if score $color_match_time mem matches 10 as @a[team=!debugging,gamemode=adventure] run advancement grant @s only ltw:parkour/colormatch1
-
 # 更新地板方块
 scoreboard players operation $color_match_current mem = $color_match_floor mem
 execute as @a[team=!debugging] run function mini:colormatch/game/show_floor_block

data/mini/functions/diamond/game_init2.mcfunction

@@ -1,4 +1,4 @@
 
 # 矿物生成
 setblock 1028 252 5030 minecraft:redstone_block
-schedule function mini:diamond/game_init3 5t
+schedule function mini:diamond/game_init3 7t

data/mini/functions/main/game_end.mcfunction

@@ -27,11 +27,10 @@ tag @a[tag=max_uncounted] remove max_uncounted
 tag @a[tag=!mini_rank1,tag=!mini_rank2,tag=!mini_rank3,team=playing] add mini_rank4
 
 # 给予进度
-execute if score $mini_type mem matches 2 run advancement grant @a[tag=mini_rank1] only ltw:parkour/tnt1
 execute if score $mini_type mem matches 2 run advancement grant @a[tag=mini_rank1,scores={layer=3..}] only ltw:parkour/tnt2
-execute if score $mini_type mem matches 3 run advancement grant @a[tag=mini_rank1] only ltw:vs/potato1
-execute if score $mini_type mem matches 3 run advancement grant @a[tag=mini_rank1,scores={mini_heart=3..}] only ltw:vs/potato2
-execute if score $mini_type mem matches 4 if score $color_match_time mem matches 10 run advancement grant @a[tag=mini_rank1] only ltw:parkour/colormatch2
+execute if score $mini_type mem matches 3 run advancement grant @a[tag=mini_rank1,scores={mini_heart=2..}] only ltw:vs/potato2
+execute if score $mini_type mem matches 3 run advancement grant @a[tag=mini_rank1,scores={mini_heart=5..}] only ltw:vs/potato3
+execute if score $mini_type mem matches 4 if score $color_match_time mem matches ..13 run advancement grant @a[tag=mini_rank1] only ltw:parkour/colormatch2
 
 # 进入状态 6
 function ltw:state/6/state_enter

data/mini/functions/main/tick5.mcfunction

@@ -1,6 +1,7 @@
 
 # 触发单个模块
 execute if score $mini_type mem matches 1 run function mini:parkour/tick5
+execute if score $mini_type mem matches 2 run function mini:tntrun/tick5
 execute if score $mini_type mem matches 3 run function mini:hotpm/tick5
 execute if score $mini_type mem matches 5 run function mini:phantom/tick5
 execute if score $mini_type mem matches 6 run function mini:diamond/tick5

data/mini/functions/phantom/game/summon2.mcfunction

@@ -5,9 +5,9 @@ execute as @e[tag=new_phantom] at @s run tp @s ~ 30 ~
 scoreboard players set $random_min mem 1
 scoreboard players set $random_max mem 3
 function lib:random
-execute if score $random mem matches 1 run attribute @e[tag=new_phantom,limit=1] generic.max_health base set 3
-execute if score $random mem matches 2 run attribute @e[tag=new_phantom,limit=1] generic.max_health base set 4
-execute if score $random mem matches 3 run attribute @e[tag=new_phantom,limit=1] generic.max_health base set 5
+execute if score $random mem matches 1 run attribute @e[tag=new_phantom,limit=1] generic.max_health base set 2
+execute if score $random mem matches 2 run attribute @e[tag=new_phantom,limit=1] generic.max_health base set 3
+execute if score $random mem matches 3 run attribute @e[tag=new_phantom,limit=1] generic.max_health base set 4
 
 attribute @e[tag=new_phantom,limit=1] generic.attack_damage base set 3
 effect give @e[tag=new_phantom] instant_damage

data/mini/functions/tntrun/player_enter.mcfunction

@@ -14,7 +14,9 @@ attribute @s generic.max_health base set 20
 
 # 传送玩家
 spreadplayers 1019.5 2020.5 2 2 false @s[team=playing,tag=!rejoining]
-# schedule: tp @a ~ ~-3 ~
+
+# 清理 tag
+tag @s remove layer_bottom
 
 # 两秒后才开始 TNT 掉落
 tag @s remove tntrun_pc

data/mini/functions/tntrun/tick2.mcfunction

@@ -9,10 +9,3 @@ execute as @e[tag=tntrun_edge] at @s unless entity @a[tag=tntrun_pc,distance=..1
 # 玩家死亡判断
 execute as @a[tag=mini_running] at @s if block ~ ~-1 ~ magma_block run function mini:tntrun/player_failed
 execute as @a[tag=mini_running] at @s if block ~ ~-2 ~ magma_block run function mini:tntrun/player_failed
-
-# 显示层数
-scoreboard players reset * layer
-execute as @a[tag=mini_running] at @s if entity @s[y=35,dy=10] run scoreboard players set @s layer 4
-execute as @a[tag=mini_running] at @s if entity @s[y=30,dy=3] run scoreboard players set @s layer 3
-execute as @a[tag=mini_running] at @s if entity @s[y=25,dy=3] run scoreboard players set @s layer 2
-execute as @a[tag=mini_running] at @s if entity @s[y=20,dy=3] run scoreboard players set @s layer 1 

data/mini/functions/tntrun/tick5.mcfunction

@@ -0,0 +1,13 @@
+
+# 显示层数
+scoreboard players reset * temp
+execute as @a[tag=mini_running] at @s if entity @s[y=35,dy=10] run scoreboard players set @s temp 4
+execute as @a[tag=mini_running] at @s if entity @s[y=30,dy=3] run scoreboard players set @s temp 3
+execute as @a[tag=mini_running] at @s if entity @s[y=25,dy=3] run scoreboard players set @s temp 2
+execute as @a[tag=mini_running] at @s if entity @s[y=20,dy=3] run scoreboard players set @s temp 1
+scoreboard players reset * layer
+execute as @a[tag=mini_running] run scoreboard players operation @s layer = @s temp
+
+# 进度判断
+tag @a[scores={layer=1}] add layer_bottom
+advancement grant @a[tag=layer_bottom,scores={layer=4}] only ltw:parkour/tnt3

data/mini/loot_tables/diamond.json

@@ -1,8 +1,8 @@
-{"pools": [{"rolls": {"max": 3,"min": 2},"entries": [
+{"pools": [{"rolls": {"max": 4,"min": 2},"entries": [
 
     {
         "type": "minecraft:item",
-        "weight": 2,
+        "weight": 3,
         "name": "minecraft:nether_star",
         "functions": [
             {
@@ -18,14 +18,19 @@
         "functions": [
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分 +2\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":1,\"display\":{\"Name\":'{\"text\":\"得分 +2\",\"italic\":false,\"color\":\"green\"}'}}"
+                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分 +2\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":2,\"display\":{\"Name\":'{\"text\":\"得分 +2\",\"italic\":false,\"color\":\"green\"}'}}"
             }
         ]
     },
     {
         "type": "minecraft:item",
-        "weight": 5,
+        "weight": 6,
         "name": "minecraft:diamond"
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 2,
+        "name": "minecraft:book"
     }
     
     ]}]}