re-init

data/item/functions/comment/clear_book.mcfunction

@@ -1,3 +0,0 @@
-loot insert 10 6 2 loot item:comment/written_book
-clear @s written_book
-tellraw @s [{"text":">> ","color":"green","bold":true},{"bold":false,"text":"你的反馈已成功提交!","color":"green"}]

data/item/functions/comment/give_book.mcfunction

@@ -1,3 +0,0 @@
-loot give @s loot item:comment/writable_book
-tellraw @s [{"text":">> ","color":"gold","bold":true},{"bold":false,"text":"你获得了一本可以编辑的反馈书!","color":"gold"}]
-tellraw @s [{"text":">> ","color":"gold","bold":true},{"bold":false,"text":"提交前请署名, 书名请写反馈的主题!","color":"gold"}]

data/item/functions/shop/check.mcfunction

@@ -33,7 +33,6 @@ execute if score @s buy_trigger matches 106 if score $state mem matches 0 run fu
 execute if score @s buy_trigger matches 107 if score $state mem matches 0 run function item:shop/buy_particle5
 execute if score @s buy_trigger matches 108 if score $state mem matches 0 run function item:shop/buy_particle6
 execute if score @s buy_trigger matches 999 if score $state mem matches 0 run function item:shop/buy_dice
-execute if score @s buy_trigger matches 85304 if score $state mem matches 0 run function item:shop/puzzle
 execute if score @s buy_trigger matches 114514 if score $state mem matches 0 run function item:shop/buy_easter_egg
 scoreboard players set @s buy_trigger 0
 execute if score $state mem matches 0 run scoreboard players enable @s buy_trigger

data/item/functions/shop/puzzle.mcfunction

@@ -1,24 +0,0 @@
-
-# 为玩家添加 1~15 的随机数
-scoreboard players set $random_max mem 15
-scoreboard players set $random_min mem 1
-function lib:random
-scoreboard players operation @s[tag=!puzzle] puzzle = $random mem
-tag @s add puzzle
-
-# 根据随机数发送情报
-tellraw @s[scores={puzzle=01}] ["",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/11j_yn8l1e02bxDRozakKFw"},"text":"t5zy"}," ",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1-CftPq2vzYtab-YoVuXQYQ"},"text":"ives"}," ",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1n5AOK9EKOKym7TaprLGbKQ"},"text":"jwuj"}]
-tellraw @s[scores={puzzle=02}] ["",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1JIZW4NKXqE8_45QaNiGKaA"},"text":"jxyn"}," ",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1xQx2vkqZYepn0baMwQNL0g"},"text":"3qyr"}," ",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1E6oY2wJUgCVZEp-HgtG1kg"},"text":"36ae"}]
-tellraw @s[scores={puzzle=03}] ["",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1kA5_CLNsZ8yw8aSuhRlhww"},"text":"8iqe"}," ",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1ikASm9KedWUXgYzNjl758w"},"text":"y5gt"}," ",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1vJR2tE221Mz4PVyw71yiww"},"text":"ethd"}]
-tellraw @s[scores={puzzle=04}] ["",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1NvhQCD-tN-peuT_uHkTpxg"},"text":"vyr6"}," ",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1p1OvB3v0T5G1ptYCjOXf3w"},"text":"6xri"}," ",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/18dEMTi_8uIJF9RbpIYjraw"},"text":"5ikk"}]
-tellraw @s[scores={puzzle=05}] ["",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1d9a1IJUlOKzXwRPt-NAYtQ"},"text":"cj33"}," ",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1ffJl_ZaJQ0ZDvVKmdsGTyw"},"text":"5qcc"}," ",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1vSc1eoJ_LiKSSi_2TI-UNg"},"text":"p8u9"}]
-tellraw @s[scores={puzzle=06}] ["",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1SXPXLNqal7BgAAAxvQ15gw"},"text":"vh9c"}," ",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1nPmYBaMW6_TdevWW3i55PQ"},"text":"4jwd"}," ",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/11M0QW1Az4zEiZneGXtO3AA"},"text":"nanb"}]
-tellraw @s[scores={puzzle=07}] ["",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/15KSiwg8eMK4pBqkbo2q_QQ"},"text":"9pe8"}," ",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1aNekoeWoEuy5xmuXzwGn8w"},"text":"r589"}," ",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1Mkpypmejb3AZXkDd8y52ag"},"text":"p9fd"}]
-tellraw @s[scores={puzzle=08}] ["",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1RErlW0dzIpTIUhPjWhEb7w"},"text":"jh5h"}," ",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/10y2xahprPJjfaPzejitBuw"},"text":"6kb5"}," ",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1Qd_F5AHNXIo0yyawpceyXw"},"text":"wi3r"}]
-tellraw @s[scores={puzzle=09}] ["",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1bk5DjPgyinuDhnMiAt6sVQ"},"text":"hv63"}," ",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1QDIpZDsLB5_tW2sBzLjmsA"},"text":"5su5"}," ",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1Qh5-pmJx6bkx4QdYVF6YQA"},"text":"qc3y"}]
-tellraw @s[scores={puzzle=10}] ["",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1RmBcLXyv5ULDZRqPzXo3og"},"text":"ksav"}," ",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1hYoecEj-g5u6wvX1L3UsIA"},"text":"zvmt"}," ",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1g-GGlYy1Sufm6LUxnF2X4w"},"text":"5d29"}]
-tellraw @s[scores={puzzle=11}] ["",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1wEvhLCyaBqnj1OZhHuQy-Q"},"text":"1gtw"}," ",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1sJK_xSTU4gYYqe9r7KaZpg"},"text":"xxgs"}," ",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/147Cw36IKAYfYYnWMMlEf-A"},"text":"r5m4"}]
-tellraw @s[scores={puzzle=12}] ["",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1DKmsrcMIvmL6JffBWjHe6g"},"text":"vizx"}," ",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1rYJ6PKzm1wahoJcy4MjAoA"},"text":"5vt8"}," ",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1XAbdwintJmt1A1CMWfBiGQ"},"text":"g29x"}]
-tellraw @s[scores={puzzle=13}] ["",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1brLgH7vf78-BtGsXjyy7cA"},"text":"w5zq"}," ",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1iQGaz-ECt0N7Q03Ga5RNuw"},"text":"fehz"}," ",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/15DGVU3iKf9i9mr7LT73ykA"},"text":"n17a"}]
-tellraw @s[scores={puzzle=14}] ["",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1RxDBpYDUEoqZ9_s7RlFpSA"},"text":"cygk"}," ",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1qLUIw_0TtDCQyd6fn-As3w"},"text":"agvi"}," ",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1iXI66MPwgCKQ0leFJRQWtQ"},"text":"4yrs"}]
-tellraw @s[scores={puzzle=15}] ["",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1dw-Ue6ZuLN3RZr8w-HLkaw"},"text":"tck1"}," ",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1z7LE8ongD8fbBxrrzV2yvQ"},"text":"jg9f"}," ",{"color":"blue","underlined": true,"clickEvent": {"action":"open_url","value":"https://pan.baidu.com/s/1Uh5MrM8j3N0sa_wSmMWOGQ"},"text":"wdqt"}]

data/item/functions/shop/refresh_equip.mcfunction

@@ -26,7 +26,7 @@ give @s[scores={shop_arrow=2}] arrow 2
 give @s[scores={shop_arrow=3}] tipped_arrow{Potion:"minecraft:slowness"} 2
 
 clear @s crossbow
-give @s[scores={shop_firework=1}] minecraft:crossbow{display:{Name:'{"text":"烟花弩","italic":false,"color":"gray"}',Lore:['{"text":"发射一个漂亮的烟花!","italic":false,"color":"gray"}']},Damage:465,Charged:1b,ChargedProjectiles:[{id:"firework_rocket",Count:1b,tag:{Fireworks:{Flight:1b,Explosions:[{Type:0b,Colors:[I;11743532,15435844,14602026,4312372,6719955,2437522,8073150]}]}}}]} 1
+give @s[scores={shop_firework=1}] minecraft:crossbow{display:{Name:'{"text":"烟花弩","italic":false,"color":"gray"}',Lore:['{"text":"发射一个漂亮的烟花!","italic":false,"color":"gray"}']},Damage:326,Charged:1b,ChargedProjectiles:[{id:"firework_rocket",Count:1b,tag:{Fireworks:{Flight:1b,Explosions:[{Type:0b,Colors:[I;11743532,15435844,14602026,4312372,6719955,2437522,8073150]}]}}}]} 1
 
 item replace entity @s armor.chest with air
 item replace entity @s[scores={shop_armor=3..}] armor.chest with golden_chestplate{display:{Name:'{"text":"金胸甲","italic":false,"color":"gray"}'}}

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

@@ -84,7 +84,7 @@
 {
     "type": "minecraft:item",
     "weight": 3,
-    "name": "minecraft:iron_ore",
+    "name": "minecraft:raw_iron",
     "functions": [
         {
             "function": "minecraft:set_count",
@@ -92,7 +92,7 @@
         },
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"铁矿石 x5\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"bonus_clear_nbt\":1b}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"粗铁 x5\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"bonus_clear_nbt\":1b}"
         }
     ]
 },

data/item/tags/items/bonus.json

@@ -23,7 +23,7 @@
         "minecraft:shulker_shell",
         "minecraft:heart_of_the_sea",
         "minecraft:cobblestone",
-        "minecraft:iron_ore",
+        "minecraft:raw_iron",
         "minecraft:iron_ingot",
         "minecraft:elytra",
         "minecraft:oak_log",

data/ltw/advancements/vs/diamond0.json

@@ -26,7 +26,7 @@
           "conditions": {
             "items": [
               {
-                "item": "minecraft:cooked_salmon"
+                "items": ["minecraft:cooked_salmon"]
               }
             ]
           }
@@ -36,7 +36,7 @@
           "conditions": {
             "items": [
               {
-                "item": "minecraft:cooked_cod"
+                "items": ["minecraft:cooked_cod"]
               }
             ]
           }

data/ltw/advancements/vs/diamond1.json

@@ -26,7 +26,7 @@
           "conditions": {
             "items": [
               {
-                "item": "minecraft:obsidian"
+                "items": ["minecraft:obsidian"]
               }
             ]
           }

data/ltw/advancements/vs/diamond2.json

@@ -26,7 +26,7 @@
           "conditions": {
             "items": [
               {
-                "item": "minecraft:enchanting_table"
+                "items": ["minecraft:enchanting_table"]
               }
             ]
           }

data/ltw/functions/init.mcfunction

@@ -94,7 +94,6 @@ scoreboard objectives add particle_type dummy "粒子种类"
 scoreboard objectives add shop_dice dummy "骰子"
 scoreboard objectives add stat_total dummy "总场次"
 scoreboard objectives add stat_win dummy "总胜场"
-scoreboard objectives add puzzle dummy "解密编号"
 
 # 常量与变量初始化
 scoreboard players set #mini_total mem 5

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

@@ -17,6 +17,7 @@ scoreboard players enable @s buy_trigger
 # 状态效果
 effect clear @s
 effect give @s saturation 1000000 0 true
+effect give @s instant_health 1 10 true
 gamerule naturalRegeneration true
 effect give @s resistance 1000000 4 true
 effect give @s weakness 1000000 4 true
@@ -25,7 +26,7 @@ effect give @s weakness 1000000 4 true
 gamemode adventure @s[team=!debugging]
 
 # 传送玩家
-tp @s[team=!debugging] -10 8 -42 68 -20
+tp @s[team=!debugging] -10 8 -32 -113 0
 
 # 刷新物品
 clear @s[team=!debugging]

data/ltw/functions/state/0/roll_dice/lose.mcfunction

@@ -1,2 +1,2 @@
-tellraw @a ["",{"text":">> ","color":"aqua","bold":true},{"selector": "@s","color":"aqua"}," 买了一颗二十面骰, 掷出了 ",{"score": {"name": "$random","objective": "mem"},"color":"aqua"}, ", 无事发生……"]
+tellraw @a ["",{"text":">> ","color":"aqua","bold":true},{"selector": "@s","color":"aqua"}," 买了一颗二十面骰, 掷出了 ",{"score": {"name": "$random","objective": "mem"},"color":"aqua"}, ", 一无所获……"]
 execute at @s run function lib:sounds/error

data/ltw/functions/state/0/roll_dice/roll.mcfunction

@@ -4,14 +4,14 @@ scoreboard players set $random_min mem 1
 scoreboard players set $random_max mem 20
 function lib:random
 
-# 20 大成功：获得 2 金块
+# 20 大成功：获得 1 金块
 execute if score $random mem matches 20 run function ltw:state/0/roll_dice/super_win
 
-# 19-16 / 20% 成功：返还 1 金锭
-execute if score $random mem matches 16..19 run function ltw:state/0/roll_dice/win
+# 19-11 / 45% 成功：获得 2 金锭
+execute if score $random mem matches 11..19 run function ltw:state/0/roll_dice/win
 
-# 15-2 / 70% 失败：不返还
-execute if score $random mem matches 2..15 run function ltw:state/0/roll_dice/lose
+# 10-2 / 45% 失败：不返还
+execute if score $random mem matches 2..10 run function ltw:state/0/roll_dice/lose
 
 # 1 大失败：归零
 execute if score $random mem matches 1 run function ltw:state/0/roll_dice/super_lose

data/ltw/functions/state/0/roll_dice/super_win.mcfunction

@@ -1,3 +1,3 @@
-scoreboard players add @s gold 162
-tellraw @a ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 买了一颗二十面骰, 掷出了 ",{"text": "20, 大成功","color":"green"}, ", 获得了 2 金块!"]
+scoreboard players add @s gold 81
+tellraw @a ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 买了一颗二十面骰, 掷出了 ",{"text": "20, 大成功","color":"green"}, ", 获得了 1 金块!"]
 execute at @s run function lib:sounds/levelup

data/ltw/functions/state/0/roll_dice/win.mcfunction

@@ -1,3 +1,3 @@
-scoreboard players add @s gold 9
-tellraw @a ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 买了一颗二十面骰, 掷出了 ",{"score": {"name": "$random","objective": "mem"},"color":"green"}, ", 返还了购买骰子的 1 金锭!"]
+scoreboard players add @s gold 18
+tellraw @a ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 买了一颗二十面骰, 掷出了 ",{"score": {"name": "$random","objective": "mem"},"color":"green"}, ", 获得了 2 金锭!"]
 execute at @s run function lib:sounds/hit

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

@@ -2,6 +2,7 @@
 execute unless entity @e[type=piglin,tag=shop_piglin_1,tag=lobby_entity] run summon piglin 0 22 -60 {Tags:["lobby_entity","shop_piglin_1"],PersistenceRequired:1b,IsImmuneToZombification:1b,CannotHunt:1b,HandItems:[{id:"firework_rocket",Count:1b},{}],HandDropChances:[0.0f,0.0f]}
 execute unless entity @e[type=piglin,tag=shop_piglin_2,tag=lobby_entity] run summon piglin 0 22 -60 {Tags:["lobby_entity","shop_piglin_2"],PersistenceRequired:1b,IsImmuneToZombification:1b,CannotHunt:1b,HandItems:[{id:"music_disc_pigstep",Count:1b},{}],HandDropChances:[0.0f,0.0f]}
 execute unless entity @e[type=piglin,tag=shop_piglin_3,tag=lobby_entity] run summon piglin 1 8 -37 {Tags:["lobby_entity","shop_piglin_3"],PersistenceRequired:1b,IsImmuneToZombification:1b,CannotHunt:1b,HandItems:[{id:"golden_shovel",Count:1b},{}],HandDropChances:[0.0f,0.0f]}
+execute unless entity @e[type=piglin,tag=shop_piglin_4,tag=lobby_entity] run summon pig 9 10 -36 {Tags:["lobby_entity","shop_piglin_4"],PersistenceRequired:1b}
 # execute unless entity @e[type=piglin,tag=shop_piglin_4,tag=lobby_entity] run summon piglin 9 10 -36 {Tags:["lobby_entity","shop_piglin_4"],PersistenceRequired:1b,IsImmuneToZombification:1b,CannotHunt:1b,HandItems:[{id:"orange_dye",Count:1b},{}],HandDropChances:[0.0f,0.0f]}
 execute unless entity @e[type=piglin,tag=shop_piglin_5,tag=lobby_entity] run summon piglin 19 11 -39 {Tags:["lobby_entity","shop_piglin_5"],PersistenceRequired:1b,IsImmuneToZombification:1b,CannotHunt:1b,ArmorItems:[{id:"golden_boots",Count:1b},{id:"golden_leggings",Count:1b},{id:"golden_chestplate",Count:1b},{id:"golden_helmet",Count:1b}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandItems:[{id:"golden_chestplate",Count:1b},{}],HandDropChances:[0.0f,0.0f]}
 execute unless entity @e[type=piglin,tag=shop_piglin_6,tag=lobby_entity] run summon piglin 23 9 -48 {Tags:["lobby_entity","shop_piglin_6"],PersistenceRequired:1b,IsImmuneToZombification:1b,CannotHunt:1b,HandItems:[{id:"tipped_arrow",Count:1b,tag:{Potion:"minecraft:slowness"}},{}],HandDropChances:[0.0f,0.0f]}
@@ -19,7 +20,7 @@ execute unless entity @e[type=armor_stand,tag=shop_particle_7,tag=lobby_entity]
 execute unless entity @e[type=armor_stand,tag=shop_particle_8,tag=lobby_entity] run summon minecraft:armor_stand -14 20.1 -75 {Small:1b,Invisible:1b,Invulnerable:1b,Marker:1b,Tags:["shop_particle_8","show_particle_6","lobby_entity"]}
 execute unless entity @e[type=piglin,tag=shop_piglin_11,tag=lobby_entity] run kill @e[type=minecart,tag=lobby_entity]
 execute unless entity @e[type=minecart,tag=lobby_entity] run kill @e[type=piglin,tag=lobby_entity,tag=shop_piglin_11]
-execute unless entity @e[type=piglin,tag=shop_piglin_11,tag=lobby_entity] run summon minecart 4 28 -47 {Rotation:[0.0f,0.0f],Tags:["lobby_entity"],Passengers:[{id:"minecraft:piglin",Rotation:[90.0f,0.0f],Tags:["lobby_entity","shop_piglin_11"],CustomName:'{"text":"老板"}',ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],PersistenceRequired:1b,IsImmuneToZombification:1b,CannotHunt:1b,HandItems:[{id:"gold_block",Count:1b},{}],HandDropChances:[0.0f,0.0f]}]}
+execute unless entity @e[type=piglin,tag=shop_piglin_11,tag=lobby_entity] run summon minecart 4 28 -47 {Rotation:[0.0f,0.0f],Tags:["lobby_entity"],Passengers:[{id:"minecraft:piglin",Rotation:[90.0f,0.0f],Tags:["lobby_entity","shop_piglin_11"],CustomName:'{"text":"神秘老板"}',ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],PersistenceRequired:1b,IsImmuneToZombification:1b,CannotHunt:1b,HandItems:[{id:"gold_block",Count:1b},{}],HandDropChances:[0.0f,0.0f]}]}
 # execute unless entity @e[type=piglin,tag=shop_piglin_4,tag=lobby_entity] run summon piglin 9 10 -36 {Tags:["lobby_entity","shop_piglin_4"],PersistenceRequired:1b,IsImmuneToZombification:1b,CannotHunt:1b,HandItems:[{id:"orange_dye",Count:1b},{}],HandDropChances:[0.0f,0.0f]}
 # execute unless entity @e[type=piglin,tag=shop_piglin_4,tag=lobby_entity] run summon piglin 9 10 -36 {Tags:["lobby_entity","shop_piglin_4"],PersistenceRequired:1b,IsImmuneToZombification:1b,CannotHunt:1b,HandItems:[{id:"orange_dye",Count:1b},{}],HandDropChances:[0.0f,0.0f]}
 # execute unless entity @e[type=piglin,tag=shop_piglin_4,tag=lobby_entity] run summon piglin 9 10 -36 {Tags:["lobby_entity","shop_piglin_4"],PersistenceRequired:1b,IsImmuneToZombification:1b,CannotHunt:1b,HandItems:[{id:"orange_dye",Count:1b},{}],HandDropChances:[0.0f,0.0f]}

data/mini/functions/ass/player_intro.mcfunction

@@ -4,5 +4,4 @@ effect give @s night_vision 1000000 0 true
 tellraw @s ["",{"text":"\n >> 核爆刺客 >>\n\n","color":"gold","bold":true}," 在躲避苦力怕的同时，召唤苦力怕炸死对方！\n"]
 tellraw @s ["",{"text": " <淘汰制> ","color":"red","bold": true}, {"text":"被苦力怕炸死的玩家即被淘汰。","color":"gray"}]
 tellraw @s ["",{"text": " <间接 PVP> ","color":"light_purple","bold": true}, {"text":"攻击没有伤害，但可以召唤、击退苦力怕。","color":"gray"}]
-tellraw @s ["",{"text": " <原型> ","color":"gold","bold": true}, {"text":"此游戏目前仅用于玩法测试, 尚未进行修缮。","color":"gray"}]
 tellraw @s ""

data/mini/functions/diamond/game/respawn.mcfunction

@@ -6,5 +6,5 @@ effect give @s weakness 5 10 true
 effect give @s resistance 5 10 true
 
 # 传送玩家
-tp @s[team=playing] 1016 344 5016
-tp @s[team=watching] 1016 319 5016
+tp @s[team=playing] 1016 280 5016
+tp @s[team=watching] 1016 255 5016

data/mini/functions/diamond/game_init.mcfunction

@@ -9,8 +9,8 @@ scoreboard players set $survival mem 1
 time set 8600t
 
 # 生成地图
-setblock 1000 319 5000 minecraft:structure_block[mode=load]{metadata:"",mirror:"NONE",ignoreEntities:1b,powered:0b,seed:0L,author:"LTCat",rotation:"NONE",posX:0,mode:"LOAD",posY:-24,sizeX:32,posZ:0,integrity:1.0f,showair:0b,name:"mini:diamond_base",sizeY:25,sizeZ:32,showboundingbox:1b}
-setblock 1000 319 5001 redstone_block
+setblock 1000 255 5000 minecraft:structure_block[mode=load]{metadata:"",mirror:"NONE",ignoreEntities:1b,powered:0b,seed:0L,author:"LTCat",rotation:"NONE",posX:0,mode:"LOAD",posY:-24,sizeX:32,posZ:0,integrity:1.0f,showair:0b,name:"mini:diamond_base",sizeY:25,sizeZ:32,showboundingbox:1b}
+setblock 1000 255 5001 redstone_block
 schedule function mini:diamond/game_init2 1t append
 
 # 清理残余实体

data/mini/functions/diamond/game_init2.mcfunction

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

data/mini/functions/diamond/game_init3.mcfunction

@@ -3,22 +3,25 @@
 scoreboard players set $random_max mem 4
 scoreboard players set $random_min mem 1
 function lib:random
-execute if score $random mem matches 1 run setblock 1028 318 5030 redstone_block
-execute if score $random mem matches 2 run setblock 1028 318 5029 redstone_block
-execute if score $random mem matches 3 run setblock 1028 318 5028 redstone_block
-execute if score $random mem matches 4 run setblock 1028 318 5027 redstone_block
+execute if score $random mem matches 1 run setblock 1028 254 5030 redstone_block
+execute if score $random mem matches 2 run setblock 1028 254 5029 redstone_block
+execute if score $random mem matches 3 run setblock 1028 254 5028 redstone_block
+execute if score $random mem matches 4 run setblock 1028 254 5027 redstone_block
 
 # 地牢 2 生成
 scoreboard players set $random_max mem 4
 scoreboard players set $random_min mem 1
 function lib:random
-execute if score $random mem matches 1 run setblock 1027 318 5030 redstone_block
-execute if score $random mem matches 2 run setblock 1027 318 5029 redstone_block
-execute if score $random mem matches 3 run setblock 1027 318 5028 redstone_block
-execute if score $random mem matches 4 run setblock 1027 318 5027 redstone_block
+execute if score $random mem matches 1 run setblock 1027 254 5030 redstone_block
+execute if score $random mem matches 2 run setblock 1027 254 5029 redstone_block
+execute if score $random mem matches 3 run setblock 1027 254 5028 redstone_block
+execute if score $random mem matches 4 run setblock 1027 254 5027 redstone_block
 
 # 清理区域
-fill 1025 319 5031 1029 315 5025 air
+fill 1025 251 5025 1029 255 5031 air
+fill 1000 319 5000 1032 290 5032 air
+fill 1000 289 5000 1032 271 5032 air
+fill 1000 270 5000 1032 255 5032 air
 
 # 清理箱子重叠时产生的物品
 kill @e[type=item]

data/mini/functions/diamond/player_intro.mcfunction

@@ -1,9 +1,8 @@
 # 向单个玩家展示小游戏介绍
-tp @s[team=!debugging] 1013.47 311.63 5045.62 -178.86 17.18
+tp @s[team=!debugging] 1013.47 247.63 5045.62 -178.86 17.18
 worldborder set 1000000
 effect give @s[team=!debugging] night_vision 1000000 0 true
 tellraw @s ["",{"text":"\n >> 钻石风暴 >>\n\n","color":"gold","bold":true}," 制作铁镐, 挖取钻石, 然后保住自己的小命!\n 不过, 或许也可以去地牢碰碰运气……\n"]
 tellraw @s ["",{"text": " <积分制> ","color":"red","bold": true}, {"text":"太阳落山时游戏即会结束, 然后根据持有的钻石数排名。","color":"gray"}]
 tellraw @s ["",{"text": " <PVP> ","color":"light_purple","bold": true}, {"text":"死亡会掉落一半物品, 被击杀后能立即复活。","color":"gray"}]
-tellraw @s ["",{"text": " <原型> ","color":"gold","bold": true}, {"text":"此游戏目前仅用于玩法测试, 尚未进行修缮。","color":"gray"}]
 tellraw @s ""

data/mini/functions/diamond/tick5.mcfunction

@@ -5,8 +5,8 @@ execute if score $countdown mem matches ..60 run effect give @a[team=playing] gl
 # effect give @a[scores={diamond=1..}] glowing 5 0 true
 
 # 显示提示
-execute as @a[scores={diamond=1..},tag=!diamond_got,x=1000,y=0,z=5000,dx=32,dy=317,dz=32] run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s"},{"text":" 获得了闪闪发光的钻石","color":"aqua"}]
-execute as @a[scores={diamond=1..},tag=!diamond_got,x=1000,y=0,z=5000,dx=32,dy=317,dz=32] as @a run function lib:sounds/hit
+execute as @a[scores={diamond=1..},tag=!diamond_got,x=1000,y=0,z=5000,dx=32,dy=253,dz=32] run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s"},{"text":" 获得了闪闪发光的钻石","color":"aqua"}]
+execute as @a[scores={diamond=1..},tag=!diamond_got,x=1000,y=0,z=5000,dx=32,dy=253,dz=32] as @a run function lib:sounds/hit
 tag @a remove diamond_got
 tag @a[scores={diamond=1..}] add diamond_got
 

data/mini/functions/diamond/watcher_limit.mcfunction

@@ -1,3 +1,3 @@
 # 观察者限制飞行范围
-execute as @a[gamemode=spectator,x=1016,y=304,z=5016,distance=70..] run spectate
-tp @a[gamemode=spectator,x=1016,y=304,z=5016,distance=70..,team=!debugging] 1016 319 5016
+execute as @a[gamemode=spectator,x=1016,y=240,z=5016,distance=70..] run spectate
+tp @a[gamemode=spectator,x=1016,y=240,z=5016,distance=70..,team=!debugging] 1016 255 5016

data/mini/functions/hotpm/player_intro.mcfunction

@@ -3,7 +3,6 @@ tp @s[team=!debugging] 1029 15 3007.77 -290.29 32.65
 tellraw @s ["",{"text":"\n >> 炸弹狂魔 >>\n\n","color":"gold","bold":true}, " 在炸弹爆炸前攻击他人, 将炸弹扔到其他人身上!\n"]
 tellraw @s ["",{"text": " <生命淘汰制> ","color":"red","bold": true}, {"text":"你有 3 条生命, 生命耗尽后即被淘汰。","color":"gray"}]
 tellraw @s ["",{"text": " <PVP> ","color":"light_purple","bold": true}, {"text":"攻击其他玩家可以转移炸弹, 远程伤害同样有效。","color":"gray"}]
-tellraw @s ["",{"text": " <原型> ","color":"gold","bold": true}, {"text":"此游戏目前仅用于玩法测试, 尚未进行修缮。","color":"gray"}]
 tellraw @s ""
 
 effect give @s night_vision 1000000 0 true

data/mini/functions/main/player_max_health.mcfunction

@@ -14,3 +14,11 @@ execute if score @s mini_heart matches 4 run attribute @s generic.max_health bas
 execute if score @s mini_heart matches 3 run attribute @s generic.max_health base set 6
 execute if score @s mini_heart matches 2 run attribute @s generic.max_health base set 4
 execute if score @s mini_heart matches 1 run attribute @s generic.max_health base set 2
+
+# 如果玩家血量比最大血量高，则给个瞬间治疗
+scoreboard players operation @s temp = @s mini_heart
+scoreboard players operation @s temp += @s mini_heart
+scoreboard players operation @s temp2 = @s health_disp
+scoreboard players operation @s[scores={health=1..}] temp2 = @s health
+scoreboard players set @s[scores={temp2=0}] temp2 20
+execute if score @s temp2 > @s temp run effect give @s instant_health 1 0 true

data/mini/functions/phantom/player_intro.mcfunction

@@ -4,5 +4,4 @@ tellraw @s ["",{"text":"\n >> 月夜狩猎 >>\n\n","color":"gold","bold":true},"
 tellraw @s ["",{"text": " <积分制> ","color":"red","bold": true}, {"text":"太阳升起时游戏即会结束, 然后根据击杀数决定排名。","color":"gray"}]
 tellraw @s ["",{"text": " <PVE> ","color":"light_purple","bold": true}, {"text":"无法攻击其他玩家, 但可以杀死幻翼。","color":"gray"}]
 tellraw @s ["",{"text": " <提供补给> ","color":"aqua","bold": true}, {"text":"快捷栏的最后一格将提供带冷却时间的三叉戟。","color":"gray"}]
-tellraw @s ["",{"text": " <原型> ","color":"gold","bold": true}, {"text":"此游戏目前仅用于玩法测试, 尚未进行修缮。","color":"gray"}]
 tellraw @s ""

data/mini/functions/trade/game/respawn.mcfunction

@@ -6,5 +6,5 @@ effect give @s weakness 5 10 true
 effect give @s resistance 5 10 true
 
 # 传送玩家
-tp @s[team=playing] 1016 344 5016
-tp @s[team=watching] 1016 319 5016
+tp @s[team=playing] 1016 280 5016
+tp @s[team=watching] 1016 255 5016

data/mini/functions/trade/game_init.mcfunction

@@ -10,8 +10,8 @@ scoreboard players set $survival mem 1
 time set day
 
 # 生成地图
-setblock 1000 319 5000 minecraft:structure_block[mode=load]{metadata:"",mirror:"NONE",ignoreEntities:1b,powered:0b,seed:0L,author:"LTCat",rotation:"NONE",posX:0,mode:"LOAD",posY:-24,sizeX:32,posZ:0,integrity:1.0f,showair:0b,name:"mini:diamond_base",sizeY:25,sizeZ:32,showboundingbox:1b}
-setblock 1000 319 5001 redstone_block
+setblock 1000 255 5000 minecraft:structure_block[mode=load]{metadata:"",mirror:"NONE",ignoreEntities:1b,powered:0b,seed:0L,author:"LTCat",rotation:"NONE",posX:0,mode:"LOAD",posY:-24,sizeX:32,posZ:0,integrity:1.0f,showair:0b,name:"mini:diamond_base",sizeY:25,sizeZ:32,showboundingbox:1b}
+setblock 1000 255 5001 redstone_block
 schedule function mini:trade/game_init2 1t append
 
 # 清理残余实体

data/mini/functions/trade/game_init2.mcfunction

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

data/mini/functions/trade/game_init3.mcfunction

@@ -3,22 +3,25 @@
 scoreboard players set $random_max mem 4
 scoreboard players set $random_min mem 1
 function lib:random
-execute if score $random mem matches 1 run setblock 1028 318 5030 redstone_block
-execute if score $random mem matches 2 run setblock 1028 318 5029 redstone_block
-execute if score $random mem matches 3 run setblock 1028 318 5028 redstone_block
-execute if score $random mem matches 4 run setblock 1028 318 5027 redstone_block
+execute if score $random mem matches 1 run setblock 1028 254 5030 redstone_block
+execute if score $random mem matches 2 run setblock 1028 254 5029 redstone_block
+execute if score $random mem matches 3 run setblock 1028 254 5028 redstone_block
+execute if score $random mem matches 4 run setblock 1028 254 5027 redstone_block
 
 # 地牢 2 生成
 scoreboard players set $random_max mem 4
 scoreboard players set $random_min mem 1
 function lib:random
-execute if score $random mem matches 1 run setblock 1027 318 5030 redstone_block
-execute if score $random mem matches 2 run setblock 1027 318 5029 redstone_block
-execute if score $random mem matches 3 run setblock 1027 318 5028 redstone_block
-execute if score $random mem matches 4 run setblock 1027 318 5027 redstone_block
+execute if score $random mem matches 1 run setblock 1027 254 5030 redstone_block
+execute if score $random mem matches 2 run setblock 1027 254 5029 redstone_block
+execute if score $random mem matches 3 run setblock 1027 254 5028 redstone_block
+execute if score $random mem matches 4 run setblock 1027 254 5027 redstone_block
 
 # 清理区域
-fill 1025 319 5031 1029 315 5025 air
+fill 1025 251 5025 1029 255 5031 air
+fill 1000 319 5000 1032 290 5032 air
+fill 1000 289 5000 1032 271 5032 air
+fill 1000 270 5000 1032 255 5032 air
 
 # 清理箱子重叠时产生的物品
 kill @e[type=item]

data/mini/functions/trade/player_intro.mcfunction

@@ -1,9 +1,8 @@
 # 向单个玩家展示小游戏介绍
-tp @s[team=!debugging] 1013.47 311.63 5045.62 -178.86 17.18
+tp @s[team=!debugging] 1013.47 247.63 5045.62 -178.86 17.18
 worldborder set 1000000
 effect give @s[team=!debugging] night_vision 1000000 0 true
 tellraw @s ["",{"text":"\n >> 贸易专家 >>\n\n","color":"gold","bold":true}," 手持交易契约唤出村民, 与村民交易, 尽快获取绿宝石!\n 每项交易都可以进行 2 次， 进行交易可以增加经验值， 解锁更多交易!\n"]
 tellraw @s ["",{"text": " <积分制> ","color":"red","bold": true}, {"text":"太阳落山时游戏即会结束, 然后根据持有的绿宝石数排名。","color":"gray"}]
 tellraw @s ["",{"text": " <PVE> ","color":"light_purple","bold": true}, {"text":"无法攻击其他玩家, 死亡不掉落且能立即复活。","color":"gray"}]
-tellraw @s ["",{"text": " <原型> ","color":"gold","bold": true}, {"text":"此游戏目前仅用于玩法测试, 尚未进行修缮。","color":"gray"}]
 tellraw @s ""

data/mini/functions/trade/watcher_limit.mcfunction

@@ -1,3 +1,3 @@
 # 观察者限制飞行范围
-execute as @a[gamemode=spectator,x=1016,y=304,z=5016,distance=70..] run spectate
-tp @a[gamemode=spectator,x=1016,y=304,z=5016,distance=70..,team=!debugging] 1016 319 5016
+execute as @a[gamemode=spectator,x=1016,y=240,z=5016,distance=70..] run spectate
+tp @a[gamemode=spectator,x=1016,y=240,z=5016,distance=70..,team=!debugging] 1016 255 5016

data/mini/loot_tables/diamond.json

@@ -40,25 +40,6 @@
             }
           }
         ]
-    },
-    {
-        "type": "minecraft:item",
-        "weight": 1,
-        "name": "minecraft:book",
-        "functions": [
-          {
-            "function": "minecraft:set_count",
-            "count": {
-              "min": 1.0,
-              "max": 3.0,
-              "type": "minecraft:uniform"
-            }
-          },
-          {
-              "function": "minecraft:set_nbt",
-              "tag": "{\"display\":{\"Name\":'{\"text\":\"书\",\"italic\":false,\"color\":\"white\"}',\"Lore\":['{\"text\":\"K{16 capitals, sort A to Z.}\",\"italic\":false,\"color\":\"gray\"}']}}"
-          }
-        ]
     }
     
 ]}]}