第三波补丁（2）

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

@@ -6,9 +6,9 @@ execute store result score #quality mem run data get storage ltw:mini qualities[
 data remove storage ltw:mini qualities[0]
 
 # 根据品质生成不同的物品
-# 白色：7x
-execute if score #quality mem matches ..7 run function item:bonus_item/gameparty/score/white
+# 白色：8x
+execute if score #quality mem matches ..8 run function item:bonus_item/gameparty/score/white
 # 蓝色：5x
-execute if score #quality mem matches 8..12 run function item:bonus_item/gameparty/score/green
-# 紫色：2x
-execute if score #quality mem matches 13.. run function item:bonus_item/gameparty/score/blue
+execute if score #quality mem matches 9..13 run function item:bonus_item/gameparty/score/green
+# 紫色：1x
+execute if score #quality mem matches 14.. run function item:bonus_item/gameparty/score/blue

data/item/functions/shop/buy/101_hint_real.mcfunction

@@ -1,14 +1,16 @@
 # 随机
 scoreboard players set $random_min mem 1
-scoreboard players set $random_max mem 8
+scoreboard players set $random_max mem 10
 function lib:random
 
 # 显示提示
-execute if score $random mem matches 1 run tellraw @s "“钓鱼竿可以直接把物品勾过来，鞘翅也能让你一飞冲天嗷。哼唧。”"
+execute if score $random mem matches 1 run tellraw @s "“钓鱼竿可以直接把物品勾过来，用它抢奖励物资可方便了。哼唧。”"
 execute if score $random mem matches 2 run tellraw @s "“哼唧，你可以用钓鱼竿把人勾下悬崖，或者用来钓……哼哼，‘鱼’？”"
-execute if score $random mem matches 3 run tellraw @s "“继续沿着你来时的那条密道走，指不定能找到我隐居的神秘兄弟……？”"
+execute if score $random mem matches 3 run tellraw @s "“继续沿着你来时的那条密道，抬头望望，能找到一位神秘老板……”"
 execute if score $random mem matches 4 run tellraw @s "“从蛛网密布的密道尽头，沿灰色珊瑚指引，就能窥见创世的秘密。”"
 execute if score $random mem matches 5 run tellraw @s "“听说用指令之力‘造访’商店，似乎会发生奇怪的事情……哼唧。”"
 execute if score $random mem matches 6 run tellraw @s "“我听说，商店的旗帜和遗迹的立柱似乎藏着什么秘密来着，哼唧。”"
 execute if score $random mem matches 7 run tellraw @s "“哼唧，如果在踏上钻石块的同时起跳，可以让你飞得更高！”"
-execute if score $random mem matches 8 run tellraw @s "“我不知道为什么商店里有一只猪……哼唧！难道猪灵是猪变的？”"
+execute if score $random mem matches 8 run tellraw @s "“我不知道为什么商店里有一只猪……哼唧！难道猪灵是猪变的？”"
+execute if score $random mem matches 9 run tellraw @s "“哼唧，我记得似乎有个能快速上到商店二楼的方法……哼唧，忘了。”"
+execute if score $random mem matches 10 run tellraw @s "“那两只村民没法像我们一样从柜台上翻出去，那是怎么下班的？”"

data/item/loot_tables/item/blue.json

@@ -15,6 +15,32 @@
             }
         ]
     },
+    {
+        "type": "minecraft:item",
+        "weight": 10,
+        "name": "minecraft:golden_apple",
+        "functions": [
+            {
+                "function": "minecraft:set_count",
+                "count": 3
+            },
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{item_name:'{\"text\":\"金苹果 x3\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Lore:['{\"text\":\"在部分小游戏中食用能使生命 +1\",\"italic\":false,\"color\":\"gray\"}'],Name:'{\"text\":\"金苹果\",\"italic\":false,\"color\":\"white\"}'}}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 10,
+        "name": "minecraft:potion",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{CustomPotionColor:2752294,item_name:'{\"text\":\"跳跃提升 V 药水 (5:00)\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:8,Amplifier:4,Duration:6000}],CustomPotionColor:2752294,display:{Name:'{\"text\":\"跳跃提升 V 药水\",\"italic\":false,\"color\":\"light_purple\"}'}}}]}"
+            }
+        ]
+    },
     {
         "type": "minecraft:item",
         "weight": 10,
@@ -28,7 +54,29 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 15,
+        "weight": 10,
+        "name": "minecraft:netherite_axe",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{item_name:'{\"text\":\"下界合金镐\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Name:'{\"text\":\"下界合金镐\",\"italic\":false,\"color\":\"light_purple\"}'}}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 10,
+        "name": "minecraft:elytra",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{display:{Name:'{\"text\":\"鞘翅\",\"italic\":false,\"color\":\"aqua\"}'},item_name:'{\"text\":\"鞘翅, 烟花火箭 x4\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,bonus_give_items:[{id:\"minecraft:firework_rocket\",Count:4,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b}}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 10,
         "name": "minecraft:fishing_rod",
         "functions": [
             {
@@ -77,17 +125,6 @@
     {
         "type": "minecraft:item",
         "weight": 10,
-        "name": "minecraft:golden_apple",
-        "functions": [
-            {
-                "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"金苹果 + 9 金粒\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Lore:['{\"text\":\"在部分小游戏中食用能使生命 +1\",\"italic\":false,\"color\":\"gray\"}'],Name:'{\"text\":\"金苹果\",\"italic\":false,\"color\":\"white\"}'},bonus_gold:9}"
-            }
-        ]
-    },
-    {
-        "type": "minecraft:item",
-        "weight": 15,
         "name": "minecraft:potion",
         "functions": [
             {

data/item/loot_tables/item/green.json

@@ -2,12 +2,23 @@
 
     {
         "type": "minecraft:item",
-        "weight": 15,
+        "weight": 10,
         "name": "minecraft:potion",
         "functions": [
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{CustomPotionColor:16777215,item_name:'{\"text\":\"万能药 (2:00)\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:10,Amplifier:0,Duration:2400},{Id:12,Amplifier:0,Duration:2400},{Id:11,Amplifier:1,Duration:2400},{Id:1,Amplifier:1,Duration:2400},{Id:3,Amplifier:4,Duration:2400}],CustomPotionColor:16777215,display:{Name:'{\"text\":\"万能药\",\"italic\":false,\"color\":\"aqua\"}'}}}]}"
+                "tag": "{CustomPotionColor:16777215,item_name:'{\"text\":\"万能药 (2:00)\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:10,Amplifier:0,Duration:2400},{Id:12,Amplifier:0,Duration:2400},{Id:11,Amplifier:1,Duration:2400},{Id:1,Amplifier:0,Duration:2400},{Id:8,Amplifier:0,Duration:2400},{Id:3,Amplifier:4,Duration:2400}],CustomPotionColor:16777215,display:{Name:'{\"text\":\"万能药\",\"italic\":false,\"color\":\"aqua\"}'}}}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 10,
+        "name": "minecraft:potion",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{CustomPotionColor:2752294,item_name:'{\"text\":\"跳跃提升 III 药水 (3:00)\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:8,Amplifier:2,Duration:3600}],CustomPotionColor:2752294,display:{Name:'{\"text\":\"跳跃提升 III 药水\",\"italic\":false,\"color\":\"aqua\"}'}}}]}"
             }
         ]
     },
@@ -59,6 +70,17 @@
             }
         ]
     },
+    {
+        "type": "minecraft:item",
+        "weight": 10,
+        "name": "minecraft:raw_iron_block",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{item_name:'{\"text\":\"粗铁块\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,bonus_clear_nbt:1b}"
+            }
+        ]
+    },
     {
         "type": "minecraft:item",
         "weight": 15,
@@ -76,7 +98,7 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 15,
+        "weight": 10,
         "name": "minecraft:crossbow",
         "functions": [
             {
@@ -120,7 +142,7 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 15,
+        "weight": 10,
         "name": "minecraft:potion",
         "functions": [
             {
@@ -129,6 +151,17 @@
             }
         ]
     },
+    {
+        "type": "minecraft:item",
+        "weight": 10,
+        "name": "minecraft:potion",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{CustomPotionColor:8267585,item_name:'{\"text\":\"力量 & 隐身药水 (0:30)\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:14,Amplifier:0,Duration:600},{Id:5,Amplifier:0,Duration:600}],CustomPotionColor:8267585,display:{Name:'{\"text\":\"力量 & 隐身药水\",\"italic\":false,\"color\":\"aqua\"}'}}}]}"
+            }
+        ]
+    },
     {
         "type": "minecraft:item",
         "weight": 10,
@@ -142,7 +175,7 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 15,
+        "weight": 10,
         "name": "minecraft:stick",
         "functions": [
             {

data/item/loot_tables/item/purple.json

@@ -66,7 +66,18 @@
         "functions": [
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{CustomPotionColor:16777215,item_name:'{\"text\":\"万能药 (2:00) x4\",\"color\":\"gold\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:10,Amplifier:0,Duration:2400},{Id:12,Amplifier:0,Duration:2400},{Id:11,Amplifier:1,Duration:2400},{Id:1,Amplifier:1,Duration:2400},{Id:3,Amplifier:4,Duration:2400}],CustomPotionColor:16777215,display:{Name:'{\"text\":\"万能药\",\"italic\":false,\"color\":\"aqua\"}'}}},{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:10,Amplifier:0,Duration:2400},{Id:12,Amplifier:0,Duration:2400},{Id:11,Amplifier:1,Duration:2400},{Id:1,Amplifier:1,Duration:2400},{Id:3,Amplifier:4,Duration:2400}],CustomPotionColor:16777215,display:{Name:'{\"text\":\"万能药\",\"italic\":false,\"color\":\"aqua\"}'}}},{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:10,Amplifier:0,Duration:2400},{Id:12,Amplifier:0,Duration:2400},{Id:11,Amplifier:1,Duration:2400},{Id:1,Amplifier:1,Duration:2400},{Id:3,Amplifier:4,Duration:2400}],CustomPotionColor:16777215,display:{Name:'{\"text\":\"万能药\",\"italic\":false,\"color\":\"aqua\"}'}}},{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:10,Amplifier:0,Duration:2400},{Id:12,Amplifier:0,Duration:2400},{Id:11,Amplifier:1,Duration:2400},{Id:1,Amplifier:1,Duration:2400},{Id:3,Amplifier:4,Duration:2400}],CustomPotionColor:16777215,display:{Name:'{\"text\":\"万能药\",\"italic\":false,\"color\":\"aqua\"}'}}}]}"
+                "tag": "{CustomPotionColor:16777215,item_name:'{\"text\":\"万能药 (2:00) x4\",\"color\":\"gold\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:10,Amplifier:0,Duration:2400},{Id:12,Amplifier:0,Duration:2400},{Id:11,Amplifier:1,Duration:2400},{Id:1,Amplifier:0,Duration:2400},{Id:8,Amplifier:0,Duration:2400},{Id:3,Amplifier:4,Duration:2400}],CustomPotionColor:16777215,display:{Name:'{\"text\":\"万能药\",\"italic\":false,\"color\":\"aqua\"}'}}},{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:10,Amplifier:0,Duration:2400},{Id:12,Amplifier:0,Duration:2400},{Id:11,Amplifier:1,Duration:2400},{Id:1,Amplifier:0,Duration:2400},{Id:8,Amplifier:0,Duration:2400},{Id:3,Amplifier:4,Duration:2400}],CustomPotionColor:16777215,display:{Name:'{\"text\":\"万能药\",\"italic\":false,\"color\":\"aqua\"}'}}},{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:10,Amplifier:0,Duration:2400},{Id:12,Amplifier:0,Duration:2400},{Id:11,Amplifier:1,Duration:2400},{Id:1,Amplifier:0,Duration:2400},{Id:8,Amplifier:0,Duration:2400},{Id:3,Amplifier:4,Duration:2400}],CustomPotionColor:16777215,display:{Name:'{\"text\":\"万能药\",\"italic\":false,\"color\":\"aqua\"}'}}},{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:10,Amplifier:0,Duration:2400},{Id:12,Amplifier:0,Duration:2400},{Id:11,Amplifier:1,Duration:2400},{Id:1,Amplifier:0,Duration:2400},{Id:8,Amplifier:0,Duration:2400},{Id:3,Amplifier:4,Duration:2400}],CustomPotionColor:16777215,display:{Name:'{\"text\":\"万能药\",\"italic\":false,\"color\":\"aqua\"}'}}}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 10,
+        "name": "minecraft:raw_iron_block",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{item_name:'{\"text\":\"铁镐、铁锹、铁斧、铁剑\",\"color\":\"gold\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:iron_pickaxe\",Count:1,tag:{is_bonus:1b,bonus_return:1b,display:{Name:'{\"text\":\"铁斧\",\"italic\":false,\"color\":\"aqua\"}'}}},{id:\"minecraft:iron_axe\",Count:1,tag:{is_bonus:1b,bonus_return:1b,display:{Name:'{\"text\":\"铁镐\",\"italic\":false,\"color\":\"aqua\"}'}}},{id:\"minecraft:iron_sword\",Count:1,tag:{is_bonus:1b,bonus_return:1b,display:{Name:'{\"text\":\"铁剑\",\"italic\":false,\"color\":\"aqua\"}'}}},{id:\"minecraft:iron_shovel\",Count:1,tag:{is_bonus:1b,bonus_return:1b,display:{Name:'{\"text\":\"铁锹\",\"italic\":false,\"color\":\"white\"}'}}}]}"
             }
         ]
     }

data/item/loot_tables/item/white.json

@@ -143,7 +143,7 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 15,
+        "weight": 10,
         "name": "minecraft:potion",
         "functions": [
             {
@@ -152,6 +152,17 @@
             }
         ]
     },
+    {
+        "type": "minecraft:item",
+        "weight": 10,
+        "name": "minecraft:potion",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{CustomPotionColor:2752294,item_name:'{\"text\":\"跳跃提升 II 药水 (0:40)\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:8,Amplifier:1,Duration:800}],CustomPotionColor:2752294,display:{Name:'{\"text\":\"跳跃提升 II 药水\",\"italic\":false,\"color\":\"white\"}'}}}]}"
+            }
+        ]
+    },
     {
         "type": "minecraft:item",
         "weight": 15,
@@ -187,7 +198,7 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 10,
+        "weight": 8,
         "name": "minecraft:diamond_leggings",
         "functions": [
             {
@@ -209,7 +220,7 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 10,
+        "weight": 8,
         "name": "minecraft:raw_gold_block",
         "functions": [
             {
@@ -220,7 +231,7 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 10,
+        "weight": 8,
         "name": "minecraft:raw_iron_block",
         "functions": [
             {
@@ -228,6 +239,17 @@
                 "tag": "{item_name:'{\"text\":\"铁头盔、胸甲\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:iron_helmet\",Count:1,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b}},{id:\"minecraft:iron_chestplate\",Count:1,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b}}]}"
             }
         ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 8,
+        "name": "minecraft:raw_iron_block",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{item_name:'{\"text\":\"<绑定诅咒> 全身铁甲\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:iron_helmet\",Count:1,tag:{is_bonus:1b,display:{Name:'{\"text\":\"<绑定诅咒> 铁头盔\",\"italic\":false,\"color\":\"white\"}'},bonus_return:1b,Enchantments:[{id:\"binding_curse\",lvl:1}]}},{id:\"minecraft:iron_chestplate\",Count:1,tag:{is_bonus:1b,display:{Name:'{\"text\":\"<绑定诅咒> 铁胸甲\",\"italic\":false,\"color\":\"white\"}'},bonus_return:1b,Enchantments:[{id:\"binding_curse\",lvl:1}]}},{id:\"minecraft:iron_leggings\",Count:1,tag:{is_bonus:1b,display:{Name:'{\"text\":\"<绑定诅咒> 铁护腿\",\"italic\":false,\"color\":\"white\"}'},bonus_return:1b,Enchantments:[{id:\"binding_curse\",lvl:1}]}},{id:\"minecraft:iron_boots\",Count:1,tag:{is_bonus:1b,display:{Name:'{\"text\":\"<绑定诅咒> 铁靴子\",\"italic\":false,\"color\":\"white\"}'},bonus_return:1b,Enchantments:[{id:\"binding_curse\",lvl:1}]}}]}"
+            }
+        ]
     }
 
 ]}]}

data/item/loot_tables/score/purple.json

@@ -66,6 +66,21 @@
             "tag": "{item_name:'{\"text\":\"80% 概率获得 10 积分\",\"color\":\"gold\"}',is_bonus:1b,bonus_new:1b,bonus_add_score:10}"
         }
     ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 3,
+    "name": "minecraft:ender_eye",
+    "functions": [
+        {
+            "function": "minecraft:set_count",
+            "count": 4
+        },
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{item_name:'{\"text\":\"从最高分玩家处偷取 4 积分\",\"color\":\"gold\"}',is_bonus:1b,bonus_new:1b,\"bonus_stole_score\":4}"
+        }
+    ]
 }
 
 ]}]}

data/item/tags/items/bonus.json

@@ -48,14 +48,11 @@
         "firework_rocket",
         "wooden_axe",
         "stone_axe",
-        "iron_axe",
         "iron_pickaxe",
         "fishing_rod",
         "shield",
         "potion",
         "splash_potion",
-        "iron_helmet",
-        "iron_chestplate",
         "raw_gold_block",
         "raw_iron_block",
         "leather_chestplate",
@@ -68,10 +65,15 @@
         "bow",
         "stone_pickaxe",
         "arrow",
+        "netherite_pickaxe",
         "netherite_helmet",
         "netherite_chestplate",
         "netherite_leggings",
         "netherite_boots",
+        "iron_helmet",
+        "iron_chestplate",
+        "iron_leggings",
+        "iron_boots",
         "golden_helmet",
         "golden_chestplate",
         "golden_leggings",

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

@@ -4,48 +4,20 @@ scoreboard players set $random_min mem 1
 scoreboard players set $random_max mem 20
 function lib:random
 
-# 20 大成功：获得 1 金块
+# 20 / 5% 大成功：获得 1 金块
 execute if score $random mem matches 20 run function ltw:state/0/roll_dice/super_win
 
-# 19-11 / 45% 成功：获得 2 金锭
-execute if score $random mem matches 11..19 run function ltw:state/0/roll_dice/win
+# 18-19 / 10%：获得 3 金锭
+execute if score $random mem matches 18..19 run function ltw:state/0/roll_dice/win3
 
-# 10-2 / 45% 失败：不返还
-execute if score $random mem matches 2..10 run function ltw:state/0/roll_dice/lose
+# 15-17 / 15%：获得 2 金锭
+execute if score $random mem matches 15..17 run function ltw:state/0/roll_dice/win2
 
-# 1 大失败：归零
-execute if score $random mem matches 1 run function ltw:state/0/roll_dice/super_lose
-
-
-
-
-
-# 老板大成功，玩家非大成功/玩家大失败，老板非大失败：玩家失去所有金粒，被丢出赌博房
-# execute if score $random mem matches 20 if score @s temp matches 1 run tellraw @s ["",{"text":">> ","color":"dark_purple","bold":true},"老板丢出了 ",{"text":"大成功","color":"dark_purple","bold":true}," ，你丢出了 ",{"text":"大失败","color":"dark_purple","bold":true}," ，你是超级非酋，你失去了所有金粒，被丢出了赌博房！"]
-# execute if score $random mem matches 20 if score @s temp matches 2..19 run tellraw @s ["",{"text":">> ","color":"dark_purple","bold":true},"老板丢出了 ",{"text":"大成功","color":"dark_purple","bold":true}," ，你失去了所有金粒，被丢出了赌博房！"]
-# execute if score $random mem matches 2..19 if score @s temp matches 1 run tellraw @s ["",{"text":">> ","color":"dark_purple","bold":true},"你丢出了 ",{"text":"大失败","color":"dark_purple","bold":true}," ，你失去了所有金粒，被丢出了赌博房！"]
+# 10-14 / 25%：返还 1 金锭
+execute if score $random mem matches 10..14 run function ltw:state/0/roll_dice/win1
 
-# execute if score $random mem matches 20 if score @s temp matches 1..19 run function ltw:state/0/roll_dice/super_lose
-# execute if score $random mem matches 2..19 if score @s temp matches 1 run function ltw:state/0/roll_dice/super_lose
+# 2-9 / 40%：不返还
+execute if score $random mem matches 2..9 run function ltw:state/0/roll_dice/lose
 
-# 玩家大成功，老板非大成功/老板大失败，玩家非大失败：玩家获得3金块
-# execute if score $random mem matches 1 if score @s temp matches 20 run tellraw @s ["",{"text":">> ","color":"gold","bold":true},"你丢出了 ",{"text":"大成功","color":"gold","bold":true}," ，老板丢出了 ",{"text":"大失败","color":"gold","bold":true}," ，你是超级欧皇，你获得了 ",{"text":"3金块","color":"gold","bold":true} ," ！"]
-# execute if score $random mem matches 2..19 if score @s temp matches 20 run tellraw @s ["",{"text":">> ","color":"gold","bold":true},"你丢出了 ",{"text":"大成功","color":"gold","bold":true}," ，你获得了 ",{"text":"3金块","color":"gold","bold":true} ," ！"]
-# execute if score $random mem matches 1 if score @s temp matches 2..19 run tellraw @s ["",{"text":">> ","color":"gold","bold":true},"老板丢出了 ",{"text":"大失败","color":"gold","bold":true}," ，你获得了 ",{"text":"3金块","color":"gold","bold":true} ," ！"]
-
-# execute if score $random mem matches 1 if score @s temp matches 2..20 run function ltw:state/0/roll_dice/super_win
-# execute if score $random mem matches 2..19 if score @s temp matches 20 run function ltw:state/0/roll_dice/super_win
-
-# 老板比玩家大：无事发生
-# execute if score $random mem matches 2..19 if score @s temp matches 2..19 if score $random mem > @s temp run tellraw @s ["",{"text":">> ","color":"dark_red","bold":true},"老板的点数比你大，你输了，你失去了 ",{"text":"1金锭","color":"dark_red","bold":true} ," ！"]
-# execute if score $random mem matches 2..19 if score @s temp matches 2..19 if score $random mem > @s temp run function ltw:state/0/roll_dice/lose
-
-# 玩家比老板大：获得18金粒
-# execute if score $random mem matches 2..19 if score @s temp matches 2..19 if score $random mem < @s temp run tellraw @s ["",{"text":">> ","color":"dark_green","bold":true},"你的点数比老板大，你赢了，你获得了",{"text":"1金锭","color":"dark_green","bold":true} ," ！"]
-# execute if score $random mem matches 2..19 if score @s temp matches 2..19 if score $random mem < @s temp run function ltw:state/0/roll_dice/win
-
-# 老板和玩家一样大：玩家获得9金粒
-# execute if score $random mem matches 20 if score @s temp matches 20 run tellraw @s ["",{"text":">> ","color":"green","bold":true},"你和老板一样欧，你们平局了，你拿回了 ",{"text":"1金锭","color":"green","bold":true} ," ！"]
-# execute if score $random mem matches 2..19 if score @s temp matches 2..19 if score $random mem = @s temp run tellraw @s ["",{"text":">> ","color":"green","bold":true},"你的点数和老板一样大，你们平局了，你拿回了 ",{"text":"1金锭","color":"green","bold":true} ," ！"]
-# execute if score $random mem matches 1 if score @s temp matches 1 run tellraw @s ["",{"text":">> ","color":"green","bold":true},"你和老板一样非，你们平局了，你拿回了 ",{"text":"1金锭","color":"green","bold":true} ," ！"]
-# execute if score $random mem = @s temp run function ltw:state/0/roll_dice/draw
+# 1 / 5% 大失败：归零
+execute if score $random mem matches 1 run function ltw:state/0/roll_dice/super_lose

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

@@ -1,4 +1,5 @@
 scoreboard players set @s gold 0
 tellraw @a ["",{"text":">> ","color":"red","bold":true},{"selector": "@s","color":"red"}," 买了一颗二十面骰, 掷出了 ",{"text": "1, 大失败","color":"red"}, ", 倾家荡产, 被丢了出去!"]
-tp @s 20 23 -58
+tp @s -0.5 27.5 -49.5 0 -11
+effect give @s slow_falling 1 0 true
 execute at @s run function lib:sounds/error

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

@@ -0,0 +1,3 @@
+scoreboard players add @s gold 9
+tellraw @a ["",{"text":">> ","color":"aqua","bold":true},{"selector": "@s","color":"green"}," 买了一颗二十面骰, 掷出了 ",{"score": {"name": "$random","objective": "mem"},"color":"aqua"}, ", 拿回了自己的 1 金锭!"]
+execute at @s run function lib:sounds/hit2

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

@@ -1,3 +1,3 @@
 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 金锭!"]
+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/roll_dice/win3.mcfunction

@@ -0,0 +1,3 @@
+scoreboard players add @s gold 27
+tellraw @a ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 买了一颗二十面骰, 掷出了 ",{"score": {"name": "$random","objective": "mem"},"color":"green"}, ", 运气绝佳, 获得了 3 金锭!"]
+execute at @s run function lib:sounds/hit

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

@@ -1,5 +1,5 @@
 # 召唤老板
-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:"paper",Count:1b},{}],HandDropChances:[0.0f,0.0f]}
+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:"paper",Count:1b},{}],HandDropChances:[0.0f,0.0f],CustomName:'{"text":"使用生物雷达是作弊行为哦！","color":"red"}'}
 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 9 -37 {Tags:["lobby_entity","shop_piglin_3"],PersistenceRequired:1b,IsImmuneToZombification:1b,CannotHunt:1b,HandItems:[{id:"fishing_rod",Count:1b},{}],HandDropChances:[0.0f,0.0f]}
 execute unless entity @e[type=pig,tag=shop_piglin_4,tag=lobby_entity] run summon pig 9 11 -36 {Tags:["lobby_entity","shop_piglin_4"],PersistenceRequired:1b}
@@ -11,7 +11,7 @@ execute unless entity @e[type=piglin,tag=shop_piglin_9,tag=lobby_entity] run sum
 execute unless entity @e[type=piglin,tag=shop_piglin_10,tag=lobby_entity] run summon piglin 0 9 -55 {Tags:["lobby_entity","shop_piglin_10"],PersistenceRequired:1b,IsImmuneToZombification:1b,CannotHunt:1b,HandItems:[{id:"bow",Count:1b},{}],HandDropChances:[0.0f,0.0f]}
 
 # 召唤粒子房实体
-execute unless entity @e[type=villager,tag=shop_particle_1,tag=lobby_entity] run summon minecraft:villager -23 20 -73 {Tags:["lobby_entity","shop_particle_1"],CustomName:'{"text":"使用生物雷达是作弊行为哦！","color":"red"}'}
+execute unless entity @e[type=villager,tag=shop_particle_1,tag=lobby_entity] run summon minecraft:villager -23 20 -73 {Tags:["lobby_entity","shop_particle_1"]}
 execute unless entity @e[type=villager,tag=shop_particle_2,tag=lobby_entity] run summon minecraft:villager -17 20 -76 {Tags:["lobby_entity","shop_particle_2"]}
 execute unless entity @e[type=armor_stand,tag=show_particle_1,tag=lobby_entity] run summon minecraft:armor_stand -19 20.1 -75 {Small:1b,Invisible:1b,Invulnerable:1b,Marker:1b,Tags:["show_particle_1","lobby_entity"]}
 execute unless entity @e[type=armor_stand,tag=show_particle_2,tag=lobby_entity] run summon minecraft:armor_stand -18 20.1 -75 {Small:1b,Invisible:1b,Invulnerable:1b,Marker:1b,Tags:["show_particle_2","lobby_entity"]}

data/mini/functions/ass/tick20.mcfunction

@@ -1,4 +1,7 @@
 
+# 60s：教学
+execute if score $countdown mem matches 60 run tellraw @a[team=playing,scores={green_total=..10}] [{"text":"\n>> ","color":"light_purple","bold": true},{"text":"提示：在召唤苦力怕后稍等一下再击退，能让它在飞到目标时立即爆炸！","bold":false},"\n"]
+
 # 强制死亡机制
 execute if score $countdown mem matches 21 run tellraw @a ["",{"text": ">> ","color": "gold","bold": true},{"text": "强制死亡将在 20 秒后开启！","color": "gold"}]
 execute if score $countdown mem matches 1 run scoreboard players set $bossbar_color mem 1

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

@@ -4,15 +4,15 @@ function mini:colormatch/game/replace_wall
 execute positioned 1001 10 4000 run clone ~ ~ ~ ~20 ~ ~20 1050 16 4000 filtered #mini:colormatch_floor
 
 # 设置倒计时
-execute if score #max_speed mem matches 0 if entity @a[tag=color_match_fall] run scoreboard players add $color_match_time mem 5
-execute if score #max_speed mem matches 1 if entity @a[tag=color_match_fall] run scoreboard players add $color_match_time mem 3
-execute if score $color_match_time mem matches 11..14 run scoreboard players remove $color_match_time mem 1
-execute if score $color_match_time mem matches 15..19 run scoreboard players remove $color_match_time mem 2
-execute if score $color_match_time mem matches 20..29 run scoreboard players remove $color_match_time mem 3
-execute if score $color_match_time mem matches 30..39 run scoreboard players remove $color_match_time mem 4
+execute if score $player_alive mem matches 3.. if entity @a[tag=color_match_fall] run scoreboard players add $color_match_time mem 5
+execute if score $player_alive mem matches ..2 if entity @a[tag=color_match_fall] run scoreboard players add $color_match_time mem 3
+execute if score $color_match_time mem matches 9..13 run scoreboard players remove $color_match_time mem 1
+execute if score $color_match_time mem matches 14..18 run scoreboard players remove $color_match_time mem 2
+execute if score $color_match_time mem matches 19..28 run scoreboard players remove $color_match_time mem 3
+execute if score $color_match_time mem matches 29..39 run scoreboard players remove $color_match_time mem 4
 execute if score $color_match_time mem matches 40.. run scoreboard players remove $color_match_time mem 5
 scoreboard players operation $countdown_fast mem = $color_match_time mem
-execute if score $color_match_time mem matches ..10 if score #max_speed mem matches 0 run function mini:colormatch/game/reach_max_speed
+execute if score $color_match_time mem matches ..8 if score #max_speed mem matches 0 run function mini:colormatch/game/reach_max_speed
 
 # 重置分数
 scoreboard players set $color_match_type mem 0

data/mini/functions/hotpm/game/pm_give.mcfunction

@@ -1,7 +1,7 @@
 # 计算权重
 scoreboard players reset @a temp
 execute as @a[team=!debugging] run scoreboard players operation @s temp = @s mini_heart
-execute as @a[team=!debugging] run scoreboard players operation @s temp *= #100 mem
+execute as @a[team=!debugging] run scoreboard players operation @s temp *= #5 mem
 execute as @a[team=!debugging] run scoreboard players operation @s temp += @s total_score_disp
 scoreboard players add @a[tag=!pm_explode_last] temp 10000
 

data/mini/functions/hotpm/game/pm_init.mcfunction

@@ -5,7 +5,7 @@ tag @a[tag=pm_explode_last] remove pm_explode_last
 # 告知玩家
 tellraw @a ["",{"text":">> ","color":"gold","bold": true},{"selector":"@a[tag=pm_holding]","color":"gold"}," 获得了炸弹!"]
 
-# 土豆爆炸时间 = 存活人数 * 2.5 + 3（秒）
-scoreboard players set $countdown_fast mem 30
+# 土豆爆炸时间 = 存活人数 * 2.5 + 1（秒）
+scoreboard players set $countdown_fast mem 10
 execute as @a[tag=mini_running] run scoreboard players add $countdown_fast mem 25
 scoreboard players operation $countdown_max mem = $countdown_fast mem

data/mini/functions/iron/tick20.mcfunction

@@ -6,29 +6,32 @@ execute if score $countdown mem matches ..10 run title @a subtitle {"score":{"na
 execute if score $countdown mem matches ..10 run title @a title [""]
 execute if score $countdown mem matches ..10 as @a at @s run function lib:sounds/hit2
 
-# 120s：时间提示
-execute if score $countdown mem matches 120 run title @a subtitle {"text":"⚠ 还剩两分钟！ ⚠","color":"yellow"}
-execute if score $countdown mem matches 120 run title @a times 1 50 3
+# 180s：教学
+execute if score $countdown mem matches 180 run tellraw @a[team=playing,scores={green_total=..10}] [{"text":"\n>> ","color":"light_purple","bold": true},{"text":"提示：就算是为了小命，制作盾牌与武器也是很有必要的！","bold":false},"\n"]
+
+# 120s：雷达提示
+execute if score $countdown mem matches 120 run title @a subtitle {"text":"⚠ 玩家雷达将在三十秒后开启！ ⚠","color":"yellow"}
+execute if score $countdown mem matches 120 run title @a times 1 100 3
 execute if score $countdown mem matches 120 run title @a title ""
+execute if score $countdown mem matches 120 run scoreboard players set $bossbar_color mem 2
+execute if score $countdown mem matches 120 run function lib:bossbar/show
 
-# 90s：雷达提示
-execute if score $countdown mem matches 90 run title @a subtitle {"text":"⚠ 玩家雷达将在三十秒后开启！ ⚠","color":"yellow"}
-execute if score $countdown mem matches 90 run title @a times 1 100 3
+# 90s：雷达开启
+execute if score $countdown mem matches 91 as @a run function lib:sounds/music/mini_fast
+execute if score $countdown mem matches 90 run title @a subtitle {"text":"⚠ 玩家雷达已开启！ ⚠","color":"red"}
+execute if score $countdown mem matches 90 run title @a times 1 120 3
 execute if score $countdown mem matches 90 run title @a title ""
-execute if score $countdown mem matches 90 run scoreboard players set $bossbar_color mem 2
+execute if score $countdown mem matches 90 run scoreboard players set $bossbar_color mem 1
 execute if score $countdown mem matches 90 run function lib:bossbar/show
+execute if score $countdown mem matches 90 run playsound minecraft:entity.ender_dragon.growl player @a 0 1000000 0 1000000 1.5
 
-# 60s：雷达开启
-execute if score $countdown mem matches 61 as @a run function lib:sounds/music/mini_fast
-execute if score $countdown mem matches 60 run title @a subtitle {"text":"⚠ 玩家雷达已开启！还剩一分钟！ ⚠","color":"red"}
-execute if score $countdown mem matches 60 run title @a times 1 120 3
+# 60s：时间提示
+execute if score $countdown mem matches 60 run title @a subtitle {"text":"⚠ 最后一分钟！ ⚠","color":"yellow"}
+execute if score $countdown mem matches 60 run title @a times 1 50 3
 execute if score $countdown mem matches 60 run title @a title ""
-execute if score $countdown mem matches 60 run scoreboard players set $bossbar_color mem 1
-execute if score $countdown mem matches 60 run function lib:bossbar/show
-execute if score $countdown mem matches 60 run playsound minecraft:entity.ender_dragon.growl player @a 0 1000000 0 1000000 1.5
 
 # 30s：时间提示
-execute if score $countdown mem matches 30 run title @a subtitle {"text":"⚠ 还剩三十秒！ ⚠","color":"yellow"}
+execute if score $countdown mem matches 30 run title @a subtitle {"text":"⚠ 最后三十秒！ ⚠","color":"yellow"}
 execute if score $countdown mem matches 30 run title @a times 1 50 3
 execute if score $countdown mem matches 30 run title @a title ""
 

data/mini/functions/parkour/tick20.mcfunction

@@ -1,3 +1,7 @@
+
+# 100s：教学
+execute if score $countdown mem matches 100 run tellraw @a[team=playing,scores={green_total=..10}] [{"text":"\n>> ","color":"light_purple","bold": true},{"text":"提示：留意隐蔽的角落与奇怪的地方，指不定里面就藏着宝藏……","bold":false},"\n"]
+
 # 地狱门音效
 scoreboard players set $random_max mem 3
 scoreboard players set $random_min mem 1

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

@@ -2,7 +2,7 @@
 execute as @e[tag=new_phantom] at @s run tp @s ~ 33 ~
 
 # 设置攻击力与随机生命值
-attribute @e[tag=new_phantom,limit=1] generic.attack_damage base set 4
+attribute @e[tag=new_phantom,limit=1] generic.attack_damage base set 5
 scoreboard players set $random_min mem 1
 scoreboard players set $random_max mem 2
 function lib:random
@@ -21,7 +21,7 @@ execute if score #new_item mem matches 0 run scoreboard players set $new_item_cd
 team join red @e[tag=bonus_phantom,tag=new_phantom,limit=1]
 effect give @e[tag=bonus_phantom,tag=new_phantom,limit=1] glowing 1000000 0 true
 data merge entity @e[tag=bonus_phantom,tag=new_phantom,limit=1] {Size:7,DeathLootTable:"mini:phantom"}
-attribute @e[tag=bonus_phantom,tag=new_phantom,limit=1] generic.attack_damage base set 8
+attribute @e[tag=bonus_phantom,tag=new_phantom,limit=1] generic.attack_damage base set 9
 attribute @e[tag=bonus_phantom,tag=new_phantom,limit=1] generic.max_health base set 20
 
 # 确认属性修改

data/mini/functions/phantom/tick20.mcfunction

@@ -1,3 +1,7 @@
+
+# 60s：教学
+execute if score $countdown mem matches 60 run tellraw @a[team=playing,scores={green_total=..10}] [{"text":"\n>> ","color":"light_purple","bold": true},{"text":"提示：如果有近战武器，或许可以冲进幻翼群里直接近战……","bold":false},"\n"]
+
 # 给予进度
 execute as @a[team=playing,scores={temp=1..,kill_phantom=7..9}] run advancement grant @s only ltw:blood/phantom1
 execute as @a[team=playing,scores={temp=1..,kill_phantom=14..16}] run advancement grant @s only ltw:blood/phantom2

data/mini/functions/trade/tick20.mcfunction

@@ -9,6 +9,10 @@ execute if score $countdown mem matches ..10 run title @a subtitle {"score":{"na
 execute if score $countdown mem matches ..10 run title @a title [""]
 execute if score $countdown mem matches ..10 as @a at @s run function lib:sounds/hit2
 
+# 180s：教学
+execute if score $countdown mem matches 180 run tellraw @s[team=playing,scores={green_total=..10,emerald=0}] [{"text":"\n>> ","color":"light_purple","bold": true},{"text":"提示：手持最后一格的交易契约召唤村民，与村民交易，尽量获取绿宝石！","bold":false},"\n"]
+execute if score $countdown mem matches 180 run tellraw @s[team=playing,scores={green_total=..10,emerald=1..}] [{"text":"\n>> ","color":"light_purple","bold": true},{"text":"提示：地牢的箱子中有积分与不少资源，寻找地牢也是不错的选择！","bold":false},"\n"]
+
 # 120s：时间提示
 execute if score $countdown mem matches 120 run title @a subtitle {"text":"⚠ 还剩两分钟！ ⚠","color":"yellow"}
 execute if score $countdown mem matches 120 run title @a times 1 50 3