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

data/item/tags/items/bonus.json

@@ -13,6 +13,10 @@
         "minecraft:iron_chestplate",
         "minecraft:iron_leggings",
         "minecraft:iron_boots",
+        "minecraft:netherite_helmet",
+        "minecraft:netherite_chestplate",
+        "minecraft:netherite_leggings",
+        "minecraft:netherite_boots",
         "minecraft:fishing_rod",
         "minecraft:shield",
         "minecraft:bow"

data/ltw/functions/clock/tick2.mcfunction

@@ -7,7 +7,7 @@ execute if score $state mem matches 3 run function ltw:state/3/tick2
 execute if score $state mem matches 4 run function ltw:state/4/tick2
 execute if score $state mem matches 5 run function ltw:state/5/tick2
 execute if score $state mem matches 6 run function ltw:state/6/tick2
-execute if score $state mem matches 7 run function ltw:state/7/tick2
+execute if score $state mem matches 8 run function ltw:state/8/tick2
 
 # 全局倒计时
 execute if score $countdown_fast mem matches 1.. run scoreboard players remove $countdown_fast mem 1

data/ltw/functions/main/player_enter_rejoin.mcfunction

@@ -15,5 +15,5 @@ execute if score $state mem matches 3 run function ltw:state/3/player_enter
 execute if score $state mem matches 4 run function ltw:state/4/player_enter
 execute if score $state mem matches 5 run function ltw:state/5/player_enter
 execute if score $state mem matches 6 run function ltw:state/6/player_enter
-execute if score $state mem matches 7 run function ltw:state/7/player_enter
+execute if score $state mem matches 8 run function ltw:state/8/player_enter
 tag @s remove rejoining

data/ltw/functions/main/player_enter_watcher.mcfunction

@@ -18,5 +18,5 @@ execute if score $state mem matches 3 run function ltw:state/3/player_enter
 execute if score $state mem matches 4 run function ltw:state/4/player_enter
 execute if score $state mem matches 5 run function ltw:state/5/player_enter
 execute if score $state mem matches 6 run function ltw:state/6/player_enter
-execute if score $state mem matches 7 run function ltw:state/7/player_enter
+execute if score $state mem matches 8 run function ltw:state/8/player_enter
 tag @s remove rejoining

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

@@ -4,4 +4,4 @@ title @a subtitle {"score":{"name":"$countdown","objective":"mem"}}
 title @a title [""]
 
 # 退出状态
-execute if score $countdown mem matches ..11 run function ltw:state/7/state_enter
+execute if score $countdown mem matches ..12 run function ltw:state/7/state_enter

data/ltw/functions/state/7/state_enter.mcfunction → data/ltw/functions/state/8/state_enter.mcfunction

@@ -17,7 +17,7 @@ setblock 0 11 2000 minecraft:redstone_block
 
 # 生成奖励物品
 execute store result score $t_player_count mem if entity @a[tag=!watcher]
-scoreboard players set $t_player_count mem 8
+# scoreboard players set $t_player_count mem 8
 execute if score $t_player_count mem matches 1.. positioned 9.0 12.5 2012.5 run function item:bonus_item/rank/random
 execute if score $t_player_count mem matches 2.. positioned 5.0 12.5 2012.5 run function item:bonus_item/rank/random
 execute if score $t_player_count mem matches 3.. positioned 1.5 12.5 2009.0 run function item:bonus_item/rank/random
@@ -32,7 +32,7 @@ execute as @e[type=item] at @s run fill ~-0.2 ~ ~-0.2 ~0.2 ~ ~0.2 air
 execute as @e[type=item] at @s run fill ~-0.2 ~1 ~-0.2 ~0.2 ~1 ~0.2 barrier
 
 # 防止幽灵实体，分 tick 执行
-schedule function ltw:state/7/state_enter2 1t
+schedule function ltw:state/8/state_enter2 1t
 
 # 判断进入下一轮小游戏或结束
 # execute if score $game_type mem matches 1 if score $round mem matches ..5 run function ltw:state/7/continue_gameparty

data/mini/functions/main/game_start.mcfunction

@@ -18,4 +18,4 @@ execute if score $mini_type mem matches 3 run function mini:hotpm/game_start
 execute if score $mini_type mem matches 4 run function mini:colormatch/game_start
 execute if score $mini_type mem matches 5 run function mini:zombie/game_start
 
-# FIXME : 从状态 7 转到游戏结束的时候触发了状态 3
+# FIXME : 从状态 8 转到游戏结束的时候触发了状态 3

data/test/functions/generate_bonus.mcfunction

@@ -1,6 +1,6 @@
 # 刷新奖励房间
 
 scoreboard players set $round mem 4
-function ltw:state/7/state_enter
+function ltw:state/8/state_enter
 scoreboard players set $state mem 0
 gamemode creative @a