Merge branch 'master' of github.com:00ll00/LTW3

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

@@ -12,6 +12,6 @@ execute if score #quality mem matches ..55 run function item:bonus_item/gamepart
 # 绿色：30%
 execute if score #quality mem matches 56..85 run function item:bonus_item/gameparty/mixed/green
 # 蓝色：10%
-execute if score #quality mem matches 86..95 run function item:bonus_item/gameparty/mixed/blue
-# 紫色：5%
-execute if score #quality mem matches 96.. run function item:bonus_item/gameparty/mixed/purple
+execute if score #quality mem matches 86..98 run function item:bonus_item/gameparty/mixed/blue
+# 紫色：2%
+execute if score #quality mem matches 99.. run function item:bonus_item/gameparty/mixed/purple

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

@@ -8,8 +8,8 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 20,
-        "name": "minecraft:chest",
+        "weight": 25,
+        "name": "minecraft:heart_of_the_sea",
         "functions": [
             {
                 "function": "minecraft:set_nbt",

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

@@ -12,8 +12,8 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 11,
-        "name": "minecraft:chest",
+        "weight": 13,
+        "name": "minecraft:heart_of_the_sea",
         "functions": [
             {
                 "function": "minecraft:set_nbt",
@@ -23,8 +23,8 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 3,
-        "name": "minecraft:chest",
+        "weight": 4,
+        "name": "minecraft:heart_of_the_sea",
         "functions": [
             {
                 "function": "minecraft:set_nbt",
@@ -34,8 +34,8 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 3,
-        "name": "minecraft:chest",
+        "weight": 4,
+        "name": "minecraft:heart_of_the_sea",
         "functions": [
             {
                 "function": "minecraft:set_nbt",
@@ -45,8 +45,8 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 3,
-        "name": "minecraft:chest",
+        "weight": 4,
+        "name": "minecraft:heart_of_the_sea",
         "functions": [
             {
                 "function": "minecraft:set_nbt",

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

@@ -1,15 +1,9 @@
 {"pools": [{"rolls": 1,"entries": [
 
-
-    {
-        "type": "minecraft:loot_table",
-        "weight": 100,
-        "name": "item:gameparty/item/purple"
-    },
     {
         "type": "minecraft:item",
-        "weight": 10,
-        "name": "minecraft:chest",
+        "weight": 1,
+        "name": "minecraft:heart_of_the_sea",
         "functions": [
             {
                 "function": "minecraft:set_nbt",
@@ -19,8 +13,8 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 10,
-        "name": "minecraft:chest",
+        "weight": 1,
+        "name": "minecraft:heart_of_the_sea",
         "functions": [
             {
                 "function": "minecraft:set_nbt",

data/item/tags/items/bonus.json

@@ -13,7 +13,7 @@
         "minecraft:nether_star",
         "minecraft:trident",
         "minecraft:stick",
-        "minecraft:chest",
+        "minecraft:heart_of_the_sea",
         "minecraft:elytra",
         "minecraft:firework_rocket",
         "minecraft:wooden_axe",

data/ltw/functions/main/player_enter.mcfunction

@@ -33,10 +33,6 @@ function lib:bossbar/show
 # TODO: {土豆} 按存活回合数记分（两个炸弹同时爆炸把两个人炸死可以并列）
 # TODO: {TNTRun} 有多人汇报存在严重卡顿，检查是否是场地的粒子造成，或者是游戏中的光照更新、实体、方块变化
 
-# HIM
-# FIXME: {色彩} 钻石刷新不出来，变成了洞
-# FIXME: {交易} 在缓慢旋转视角时能观察到村民前后抽搐
-
 # 010
 # TODO: 升级 1.16.5（不过得先等 OptiFine 更新）
 # TODO: {幻翼} 制作幻翼的成品地图

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

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

data/mini/functions/hotpm/game_end.mcfunction

@@ -1,2 +1,4 @@
+scoreboard players add @a[tag=mini_running] surviveRound 1
+execute as @a[team=playing] run scoreboard players operation @s mini_score = @s surviveRound
 # 结束热土豆
 forceload remove 1000 3000 1100 3100

data/mini/functions/hotpm/game_init.mcfunction

@@ -3,6 +3,7 @@ forceload add 1000 3000 1100 3100
 
 scoreboard players set $finish_mode mem 0
 scoreboard players set $survival mem 0
+scoreboard players reset * surviveRound
 
 # 伤害管理
 scoreboard players set $remove_resistance mem 0

data/mini/functions/hotpm/init.mcfunction

@@ -0,0 +1,2 @@
+scoreboard objectives remove surviveRound
+scoreboard objectives add surviveRound dummy "存活轮数"

data/mini/functions/hotpm/tick2.mcfunction

@@ -9,6 +9,9 @@ execute if score $countdown_fast mem matches ..0 run scoreboard players set $cou
 # 爆炸
 execute if score $countdown_fast mem matches 0 if entity @a[tag=pm_holding] run function mini:hotpm/player_lose_heart
 
+# 存活加分
+execute if score $countdown_fast mem matches 0 run scoreboard players add @a[tag=mini_running] surviveRound 1
+
 # 检测土豆
 function mini:hotpm/game/pm_check
 

data/mini/functions/main/init.mcfunction

@@ -1,6 +1,7 @@
 # 初始化
 function mini:tntrun/init
 function mini:parkour/init
+function mini:hotpm/init
 function mini:phantom/init
 function mini:diamond/init
 function mini:koth/init