完全改用新版奖励树

data/item/functions/bonus_item/rank/blue.mcfunction → data/item/functions/bonus_item/gameparty/normal/blue.mcfunction

@@ -1,6 +1,6 @@
 # 生成蓝色品质的物品实体
 
-loot spawn ~ ~ ~ loot item:gameparty/blue
+loot spawn ~ ~ ~ loot item:gameparty/normal/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/rank/purple.mcfunction → data/item/functions/bonus_item/gameparty/normal/purple.mcfunction

@@ -1,6 +1,6 @@
 # 生成紫色品质的物品实体
 
-loot spawn ~ ~ ~ loot item:gameparty/purple
+loot spawn ~ ~ ~ loot item:gameparty/normal/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/rank/random.mcfunction → data/item/functions/bonus_item/gameparty/normal/random.mcfunction

@@ -9,7 +9,10 @@ scoreboard players operation $t_quality mem *= $c_10 mem
 scoreboard players operation $t_quality mem += $random mem
 
 # 根据品质生成不同的物品
-execute if score $t_quality mem matches ..24 run function item:bonus_item/rank/white
-execute if score $t_quality mem matches 25..54 run function item:bonus_item/rank/green
-execute if score $t_quality mem matches 55..79 run function item:bonus_item/rank/blue
-execute if score $t_quality mem matches 80.. run function item:bonus_item/rank/purple
+execute if score $t_quality mem matches ..24 run function item:bonus_item/gameparty/normal/white
+# 绿色：35%
+execute if score $t_quality mem matches 25..59 run function item:bonus_item/gameparty/normal/green
+# 蓝色：25%
+execute if score $t_quality mem matches 60..84 run function item:bonus_item/gameparty/normal/blue
+# 紫色：15%
+execute if score $t_quality mem matches 85.. run function item:bonus_item/gameparty/normal/purple

data/item/functions/bonus_item/rank/green.mcfunction

@@ -1,11 +0,0 @@
-# 生成绿色品质的物品实体
-
-loot spawn ~ ~ ~ loot item:gameparty/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]
-execute as @e[tag=new_item] run data modify entity @s CustomName set from entity @s Item.tag.item_name
-team join green @e[tag=new_item]
-tag @e[tag=new_item] add item_green
-tag @e[tag=new_item] add item_new
-tag @e[tag=new_item] remove new_item

data/item/functions/bonus_item/rank/white.mcfunction

@@ -1,11 +0,0 @@
-# 生成白色品质的物品实体
-
-loot spawn ~ ~ ~ loot item:gameparty/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]
-execute as @e[tag=new_item] run data modify entity @s CustomName set from entity @s Item.tag.item_name
-team join white @e[tag=new_item]
-tag @e[tag=new_item] add item_white
-tag @e[tag=new_item] add item_new
-tag @e[tag=new_item] remove new_item

data/item/functions/special/enchanted_apple.mcfunction

@@ -16,3 +16,5 @@ execute if score $state mem matches 5 if score $mini_type mem matches 5 run scor
 # 去除buff
 execute if score $state mem matches 5 run tag @s add consume_apple
 schedule function item:special/clear_effect 1t replace
+
+# TODO : [LTCat] 让 list 显示生命

data/item/loot_tables/gameparty/blue.json

@@ -1,41 +0,0 @@
-{"pools": [{"rolls": 1,"entries": [
-
-{
-    "type": "minecraft:item",
-    "weight": 4,
-    "name": "minecraft:nether_star",
-    "functions": [
-        {
-            "function": "minecraft:set_count",
-            "count": 4
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分 +4\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":4}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 1,
-    "name": "minecraft:iron_axe",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"击退铁斧\\\",\\\"color\\\":\\\"aqua\\\"}\",\"Enchantments\":[{\"id\":\"knockback\",\"lvl\":2}],\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 1,
-    "name": "minecraft:enchanted_golden_apple",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"附魔生命果\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"display\":{\"Lore\":[\"{\\\"text\\\":\\\"小游戏中生命值加倍\\\",\\\"italic\\\":0,\\\"color\\\":\\\"gray\\\"}\"],\"Name\":\"{\\\"text\\\":\\\"附魔生命果\\\",\\\"italic\\\":0}\"}}"
-        }
-    ]
-}
-
-]}]}

data/item/loot_tables/gameparty/green.json

@@ -1,144 +0,0 @@
-{"pools": [{"rolls": 1,"entries": [
-
-{
-    "type": "minecraft:item",
-    "weight": 13,
-    "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": 13,
-    "name": "minecraft:nether_star",
-    "functions": [
-        {
-            "function": "minecraft:set_count",
-            "count": 3
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分 +3\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":3}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 4,
-    "name": "minecraft:splash_potion",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"喷溅型浮空药水 (0:15)\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"CustomPotionEffects\":[{\"Id\":25,\"Amplifier\":0,\"Duration\":300}],\"CustomPotionColor\":11458519,\"display\":{\"Name\":\"{\\\"text\\\":\\\"喷溅型浮空药水\\\",\\\"italic\\\":0}\"}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 4,
-    "name": "minecraft:ender_pearl",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"末影珍珠\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 4,
-    "name": "minecraft:netherite_sword",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"下界合金剑\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 4,
-    "name": "minecraft:shield",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"盾牌\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:crossbow",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"弩, 箭 x3\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"bonus_give_items\":[{\"id\":\"minecraft:arrow\",\"Count\":3,\"tag\":{\"is_bonus\":1b,\"bonus_clear_nbt\":1b}}]}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:bow",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"弓, 箭 x5\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"bonus_give_items\":[{\"id\":\"minecraft:arrow\",\"Count\":5,\"tag\":{\"is_bonus\":1b,\"bonus_clear_nbt\":1b}}]}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 1,
-    "name": "minecraft:netherite_helmet",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"下界合金头盔\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 1,
-    "name": "minecraft:netherite_chestplate",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"下界合金胸甲\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 1,
-    "name": "minecraft:netherite_leggings",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"下界合金护腿\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 1,
-    "name": "minecraft:netherite_boots",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"下界合金靴子\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b}"
-        }
-    ]
-}
-
-]}]}

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

@@ -0,0 +1,85 @@
+{"pools": [{"rolls": 1,"entries": [
+
+{
+    "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": 4,
+    "name": "minecraft:enchanted_golden_apple",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"附魔生命果\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"display\":{\"Lore\":[\"{\\\"text\\\":\\\"恢复到满血或生命加倍\\\",\\\"italic\\\":0,\\\"color\\\":\\\"gray\\\"}\"],\"Name\":\"{\\\"text\\\":\\\"附魔生命果\\\",\\\"italic\\\":0,\\\"color\\\":\\\"aqua\\\"}\"}}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 3,
+    "name": "minecraft:shield",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "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": 1,
+    "name": "minecraft:netherite_helmet",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"下界合金头盔、胸甲\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"bonus_give_items\":[{\"id\":\"minecraft:netherite_chestplate\",\"tag\":{\"is_bonus\":1b}}]}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 1,
+    "name": "minecraft:netherite_chestplate",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"下界合金胸甲、靴子\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"bonus_give_items\":[{\"id\":\"minecraft:netherite_boots\",\"tag\":{\"is_bonus\":1b}}]}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 1,
+    "name": "minecraft:netherite_leggings",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"下界合金头盔、护腿\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"bonus_give_items\":[{\"id\":\"minecraft:netherite_helmet\",\"tag\":{\"is_bonus\":1b}}]}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 1,
+    "name": "minecraft:netherite_boots",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"下界合金护腿、靴子\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"bonus_give_items\":[{\"id\":\"minecraft:netherite_leggings\",\"tag\":{\"is_bonus\":1b}}]}"
+        }
+    ]
+}
+
+]}]}

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

@@ -22,7 +22,7 @@
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"生命果\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"display\":{\"Lore\":[\"{\\\"text\\\":\\\"恢复 4 颗心或生命值 +1\\\",\\\"italic\\\":0,\\\"color\\\":\\\"gray\\\"}\"],\"Name\":\"{\\\"text\\\":\\\"生命果\\\",\\\"italic\\\":0,\\\"color\\\":\\\"green\\\"}\"}}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"生命果\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"display\":{\"Lore\":[\"{\\\"text\\\":\\\"恢复 4 颗心或生命 +1\\\",\\\"italic\\\":0,\\\"color\\\":\\\"gray\\\"}\"],\"Name\":\"{\\\"text\\\":\\\"生命果\\\",\\\"italic\\\":0,\\\"color\\\":\\\"green\\\"}\"}}"
         }
     ]
 },

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

@@ -0,0 +1,19 @@
+{"pools": [{"rolls": 1,"entries": [
+
+{
+    "type": "minecraft:item",
+    "weight": 3,
+    "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}"
+        }
+    ]
+}
+
+]}]}

data/item/loot_tables/gameparty/purple.json

@@ -1,30 +0,0 @@
-{"pools": [{"rolls": 1,"entries": [
-
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:nether_star",
-    "functions": [
-        {
-            "function": "minecraft:set_count",
-            "count": 5
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分 +5\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":5}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 1,
-    "name": "minecraft:crossbow",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"快速装填弩, 箭 x32\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"Enchantments\":[{\"id\":\"quick_charge\",\"lvl\":3}],\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"bonus_give_items\":[{\"id\":\"minecraft:arrow\",\"Count\":32,\"tag\":{\"is_bonus\":1b,\"bonus_clear_nbt\":1b}}]}"
-        }
-    ]
-}
-
-]}]}

data/item/loot_tables/gameparty/white.json

@@ -1,178 +0,0 @@
-{"pools": [{"rolls": 1,"entries": [
-
-{
-    "type": "minecraft:item",
-    "weight": 36,
-    "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": 3,
-    "name": "minecraft:splash_potion",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"喷溅型跳跃药水 VII (0:02)\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"CustomPotionEffects\":[{\"Id\":8,\"Amplifier\":6,\"Duration\":40}],\"CustomPotionColor\":2292811,\"display\":{\"Name\":\"{\\\"text\\\":\\\"喷溅型跳跃药水\\\",\\\"italic\\\":0}\"}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:potion",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"跳跃药水 II (0:15)\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"CustomPotionEffects\":[{\"Id\":8,\"Amplifier\":1,\"Duration\":300}],\"CustomPotionColor\":2292811,\"display\":{\"Name\":\"{\\\"text\\\":\\\"跳跃药水\\\",\\\"italic\\\":0}\"}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 4,
-    "name": "minecraft:golden_apple",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"生命果\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"display\":{\"Lore\":[\"{\\\"text\\\":\\\"小游戏中生命值 +1\\\",\\\"italic\\\":0,\\\"color\\\":\\\"gray\\\"}\"],\"Name\":\"{\\\"text\\\":\\\"生命果\\\",\\\"italic\\\":0}\"}}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:arrow",
-    "functions": [
-        {
-            "function": "minecraft:set_count",
-            "count": 3
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"箭 x3\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"bonus_clear_nbt\":1b}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:bow",
-    "functions": [
-        {
-            "function": "minecraft:set_damage",
-            "damage":{"min": 0.01, "max": 0.02}
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"破损的弓\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"bonus_clear_nbt\":1b}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 4,
-    "name": "minecraft:fishing_rod",
-    "functions": [
-        {
-            "function": "minecraft:set_damage",
-            "damage":{"min": 0.07, "max": 0.11}
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"破损的钓鱼竿\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 4,
-    "name": "minecraft:shield",
-    "functions": [
-        {
-            "function": "minecraft:set_damage",
-            "damage":{"min": 0.05, "max": 0.11}
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"破损的盾牌\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 4,
-    "name": "minecraft:wooden_sword",
-    "functions": [
-        {
-            "function": "minecraft:set_damage",
-            "damage":{"min": 0.04, "max": 0.07}
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"破损的击退木剑\\\",\\\"color\\\":\\\"white\\\"}\",\"Enchantments\":[{\"id\":\"knockback\",\"lvl\":2}],\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 4,
-    "name": "minecraft:stone_sword",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"石剑\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 1,
-    "name": "minecraft:iron_helmet",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"铁头盔\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 1,
-    "name": "minecraft:iron_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": 1,
-    "name": "minecraft:iron_leggings",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"铁护腿\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 1,
-    "name": "minecraft:iron_boots",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"铁靴子\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b}"
-        }
-    ]
-}
-
-]}]}

data/item/tags/items/bonus.json

@@ -1,6 +1,7 @@
 {
     "values": [
         "minecraft:ender_pearl",
+        "minecraft:enchanted_golden_apple",
         "minecraft:golden_apple",
         "minecraft:iron_sword",
         "minecraft:nether_star",

data/ltw/functions/state/6/generate_bonus.mcfunction

@@ -3,14 +3,14 @@ kill @e[type=item]
 
 execute store result score $t_bonus_count mem if entity @a[tag=!watcher]
 # scoreboard players add $t_bonus_count mem 1
-execute if score $t_bonus_count mem matches 1.. positioned 17.5 10.2 1967.5 run function item:bonus_item/rank/random
-execute if score $t_bonus_count mem matches 2.. positioned 19.5 10.2 1962.5 run function item:bonus_item/rank/random
-execute if score $t_bonus_count mem matches 3.. positioned 24.5 10.2 1960.5 run function item:bonus_item/rank/random
-execute if score $t_bonus_count mem matches 4.. positioned 29.5 10.2 1962.5 run function item:bonus_item/rank/random
-execute if score $t_bonus_count mem matches 5.. positioned 31.5 10.2 1967.5 run function item:bonus_item/rank/random
-execute if score $t_bonus_count mem matches 6.. positioned 29.5 10.2 1972.5 run function item:bonus_item/rank/random
-execute if score $t_bonus_count mem matches 7.. positioned 24.5 10.2 1974.5 run function item:bonus_item/rank/random
-execute if score $t_bonus_count mem matches 8.. positioned 19.5 10.2 1972.5 run function item:bonus_item/rank/random
+execute if score $t_bonus_count mem matches 1.. positioned 17.5 10.2 1967.5 run function item:bonus_item/gameparty/normal/random
+execute if score $t_bonus_count mem matches 2.. positioned 19.5 10.2 1962.5 run function item:bonus_item/gameparty/normal/random
+execute if score $t_bonus_count mem matches 3.. positioned 24.5 10.2 1960.5 run function item:bonus_item/gameparty/normal/random
+execute if score $t_bonus_count mem matches 4.. positioned 29.5 10.2 1962.5 run function item:bonus_item/gameparty/normal/random
+execute if score $t_bonus_count mem matches 5.. positioned 31.5 10.2 1967.5 run function item:bonus_item/gameparty/normal/random
+execute if score $t_bonus_count mem matches 6.. positioned 29.5 10.2 1972.5 run function item:bonus_item/gameparty/normal/random
+execute if score $t_bonus_count mem matches 7.. positioned 24.5 10.2 1974.5 run function item:bonus_item/gameparty/normal/random
+execute if score $t_bonus_count mem matches 8.. positioned 19.5 10.2 1972.5 run function item:bonus_item/gameparty/normal/random
 
 # 生成拾取背景
 execute positioned 17.0 10.0 1967.0 run function ltw:state/6/generate_background

data/mini/functions/hotpm/game_init.mcfunction

@@ -47,6 +47,6 @@ setblock 1000 4 2999 minecraft:structure_block[mode=load]{metadata:"",mirror:"NO
 setblock 1000 5 2999 minecraft:redstone_block
 
 # 生成物品
-execute positioned 1022.0 17.0 3009.0 run function item:bonus_item/rank/white
-execute positioned 1022.5 32.0 3038.0 run function item:bonus_item/rank/white
-# execute positioned 1022.5 43.5 3012.5 run function item:bonus_item/rank/white
+execute positioned 1022.0 17.0 3009.0 run function item:bonus_item/gameparty/normal/white
+execute positioned 1022.5 32.0 3038.0 run function item:bonus_item/gameparty/normal/white
+# execute positioned 1022.5 43.5 3012.5 run function item:bonus_item/gameparty/normal/white

data/mini/functions/main/init.mcfunction

@@ -5,4 +5,7 @@ function mini:tntrun/init
 scoreboard objectives remove mini_score
 scoreboard objectives add mini_score dummy "小游戏得分"
 scoreboard objectives remove mini_heart
-scoreboard objectives add mini_heart dummy "生命值"
+scoreboard objectives add mini_heart dummy "生命"
+scoreboard objectives remove mini_heart_disp
+scoreboard objectives add mini_heart_disp dummy "生命"
+scoreboard objectives modify mini_heart rendertype hearts

data/mini/functions/parkour/game_init.mcfunction

@@ -15,8 +15,8 @@ kill @e[type=item]
 kill @e[type=falling_block,tag=parkour_block]
 
 # 生成奖励物品
-execute positioned 1004.5 18.5 1043.5 run function item:bonus_item/rank/white
-execute positioned 1024.5 30.5 1038.5 run function item:bonus_item/rank/green
+execute positioned 1004.5 18.5 1043.5 run function item:bonus_item/gameparty/normal/white
+execute positioned 1024.5 30.5 1038.5 run function item:bonus_item/gameparty/normal/green
 
 # 初始化开门变量
 scoreboard players set $parkour_door mem 0

data/mini/functions/tntrun/game_init.mcfunction

@@ -13,7 +13,7 @@ kill @e[type=item]
 kill @e[tag=tntrun_block]
 
 # 生成奖励
-execute positioned 1011.5 15.5 2011.5 run function item:bonus_item/rank/white
+execute positioned 1011.5 15.5 2011.5 run function item:bonus_item/gameparty/normal/white
 
 # 伤害管理
 team modify player friendlyFire true

data/mini/functions/zombie/tick20.mcfunction

@@ -26,5 +26,5 @@ execute if score $random mem matches ..20 if score $countdown mem matches ..80 u
 execute if score $random mem matches ..20 if score $countdown mem matches ..80 as @e[tag=empty_pig,limit=1,sort=random] run function mini:zombie/game/give_equip
 
 # 生成奖励
-execute if score $countdown mem matches 155 run execute positioned 1015.5 11.0 5022.0 run function item:bonus_item/rank/white
-execute if score $countdown mem matches 105 run execute positioned 1005.5 11.0 5004.0 run function item:bonus_item/rank/white
+execute if score $countdown mem matches 155 run execute positioned 1015.5 11.0 5022.0 run function item:bonus_item/gameparty/normal/white
+execute if score $countdown mem matches 105 run execute positioned 1005.5 11.0 5004.0 run function item:bonus_item/gameparty/normal/white