Merge branch 'master' of github.com:LTCatt/LTW3

data/item/tags/items/bonus.json

@@ -12,6 +12,7 @@
         "minecraft:nether_star",
         "minecraft:trident",
         "minecraft:wooden_axe",
+        "minecraft:iron_axe",
         "minecraft:fishing_rod",
         "minecraft:shield",
         "minecraft:splash_potion",

data/ltw/functions/main/game_end.mcfunction

@@ -18,7 +18,7 @@ execute as @a[tag=!max_uncounted] if score @s total_score = #score_max mem run t
 tag @a[tag=max_uncounted] remove max_uncounted
 
 # 给予进度
-scoreboard players add @a[team=!watching] stat_total 1
+scoreboard players add @a[team=playing] stat_total 1
 advancement grant @a[scores={stat_total=5..}] only ltw:story/total1
 advancement grant @a[scores={stat_total=20..}] only ltw:story/total2
 advancement grant @a[scores={stat_total=50..}] only ltw:story/total3
@@ -29,9 +29,9 @@ advancement grant @a[scores={stat_win=20..}] only ltw:story/win3
 
 # 计算金粒奖励
 scoreboard players set #total_gold mem 0
-execute as @a[team=!watching] run scoreboard players add #total_gold mem 400
+execute as @a[team=playing] run scoreboard players add #total_gold mem 400
 # 无名次
-execute as @a[tag=!total_rank1,tag=!total_rank2,tag=!total_rank3,team=!watching] run scoreboard players remove #total_gold mem 100
+execute as @a[tag=!total_rank1,tag=!total_rank2,tag=!total_rank3,team=playing] run scoreboard players remove #total_gold mem 100
 # 计算总权重与单份奖励
 scoreboard players set #total_weight mem 0
 execute as @a[tag=total_rank1] run scoreboard players add #total_weight mem 3
@@ -49,7 +49,7 @@ scoreboard players set #rank3_gold mem 1
 scoreboard players operation #rank3_gold mem *= #total_gold mem
 scoreboard players operation #rank3_gold mem /= #const_100 mem
 # 如果因为掉线强制结束则无名次奖励
-execute store result score #count mem if entity @a[team=!watching]
+execute store result score #count mem if entity @a[team=playing]
 execute if score #count mem matches ..2 run scoreboard players set #rank1_gold mem 0
 execute if score #count mem matches ..2 run scoreboard players set #rank2_gold mem 0
 execute if score #count mem matches ..2 run scoreboard players set #rank3_gold mem 0
@@ -62,22 +62,22 @@ execute if entity @a[tag=total_rank3] run tellraw @a [" ",{"text": "第三名 -
 tellraw @a ""
 
 # 得分金粒奖励
-execute as @a[team=!watching] run scoreboard players operation @s gold += @s total_score
-execute as @a[team=!watching] run scoreboard players operation @s gold_total += @s total_score
-tellraw @a[team=!watching] [" ",{"text": "得分奖励: ","color":"gold"},{"score":{"name": "*","objective": "total_score"}}," 金粒"]
+execute as @a[team=playing] run scoreboard players operation @s gold += @s total_score
+execute as @a[team=playing] run scoreboard players operation @s gold_total += @s total_score
+tellraw @a[team=playing] [" ",{"text": "得分奖励: ","color":"gold"},{"score":{"name": "*","objective": "total_score"}}," 金粒"]
 
 # 名次金粒奖励
 scoreboard players set @a temp 0
 execute as @a[tag=total_rank1] run scoreboard players operation @s temp = #rank1_gold mem
 execute as @a[tag=total_rank2] run scoreboard players operation @s temp = #rank2_gold mem
 execute as @a[tag=total_rank3] run scoreboard players operation @s temp = #rank3_gold mem
-scoreboard players set @a[tag=!total_rank1,tag=!total_rank2,tag=!total_rank3,team=!watching] temp 1
+scoreboard players set @a[tag=!total_rank1,tag=!total_rank2,tag=!total_rank3,team=playing] temp 1
 execute as @a run scoreboard players operation @s gold += @s temp
 execute as @a run scoreboard players operation @s gold_total += @s temp
-tellraw @a[team=!watching] [" ",{"text": "名次奖励: ","color":"gold"},{"score":{"name": "*","objective": "temp"}}," 金粒"]
+tellraw @a[team=playing] [" ",{"text": "名次奖励: ","color":"gold"},{"score":{"name": "*","objective": "temp"}}," 金粒"]
 
 # 奖励结束
-tellraw @a[team=!watching] ""
+tellraw @a[team=playing] ""
 
 # 返回主大厅
 schedule function ltw:state/0/state_enter 2t replace

data/ltw/functions/main/get_max_score.mcfunction

@@ -1,6 +1,6 @@
 #> ltw:main/get_max_score
-# @input score @a[tag=!max_uncounted,team=!watching] total_score 进行统计的分数
+# @input score @a[tag=!max_uncounted,team=playing] total_score 进行统计的分数
 # @output score #score_max mem 最高分
 
 scoreboard players set #score_max mem -2147483648
-scoreboard players operation #score_max mem > @a[tag=!max_uncounted,team=!watching] total_score
+scoreboard players operation #score_max mem > @a[tag=!max_uncounted,team=playing] total_score

data/ltw/functions/main/player_enter.mcfunction

@@ -13,9 +13,9 @@ execute store result score @s UUID run data get entity @s UUID[0]
 
 # 如果是旁观者或局号不对头：开始旁观
 execute if entity @s[team=watching] run function ltw:main/player_enter_watcher
-execute if entity @s[team=!watching] unless score @s game_id = $ game_id run function ltw:main/player_enter_watcher
+execute if entity @s[team=playing] unless score @s game_id = $ game_id run function ltw:main/player_enter_watcher
 # 如果不是旁观且局号正确：游戏中掉线
-execute if entity @s[team=!watching] if score @s game_id = $ game_id run function ltw:main/player_enter_rejoin
+execute if entity @s[team=playing] if score @s game_id = $ game_id run function ltw:main/player_enter_rejoin
 
 # 更新 Bossbar
 bossbar set ltw:notice players @a
@@ -29,4 +29,4 @@ function lib:bossbar/show
 # FIXME: 准备倒计时与 Tooltip 降低不一致
 # FIXME: [LTCat] 初尝胜果 成就的判断似乎存在 Bug
 # FIXME: 修复 钻石风暴 spreadplayers 无效
-# FIXME: 修复 钻石风暴 刚开始在空中可以把人打飞
+# FIXME: [HIM] 修复死亡判定可能失效

data/ltw/functions/main/player_leave.mcfunction

@@ -2,7 +2,7 @@
 execute as @a at @s run function lib:sounds/error
 
 # 由于玩家人数不足，强制结束游戏
-execute store result score #count mem if entity @a[team=!watching]
+execute store result score #count mem if entity @a[team=playing]
 execute if score $state mem matches 1.. if score #count mem matches ..2 run function ltw:main/game_end
 execute if score $state mem matches 1.. if score #count mem matches ..2 run tellraw @a ["",{"text":">> ","color":"red","bold":true},{"text": "由于玩家不足, 游戏强制结束, 无名次金粒奖励……","color":"red","bold":false}]
 

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

@@ -13,9 +13,9 @@ tellraw @a[team=debugging] ["",{"text": ">> ","color": "blue","bold": true},{"te
 
 # 设置数据
 scoreboard players reset * total_score
-scoreboard players set @a[team=!watching] total_score 0
+scoreboard players set @a[team=playing] total_score 0
 scoreboard players reset * total_score_disp
-scoreboard players set @a[team=!watching] total_score_disp 0
+scoreboard players set @a[team=playing] total_score_disp 0
 scoreboard players set $round mem 1
 scoreboard players add $ game_id 1
 scoreboard players operation @a game_id = $ game_id

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

@@ -6,8 +6,8 @@ kill @e[type=arrow]
 kill @e[type=trident]
 
 # 生成 玩家数+2 个奖励
-execute store result score #bonus_count mem if entity @a[team=!watching]
-scoreboard players add #bonus_count mem 2
+execute store result score #bonus_count mem if entity @a[team=playing]
+scoreboard players add #bonus_count mem 1
 execute if score #bonus_count mem matches 1.. positioned 17.5 10.2 1967.5 run function item:bonus_item/gameparty/random
 execute if score #bonus_count mem matches 2.. positioned 19.5 10.2 1962.5 run function item:bonus_item/gameparty/random
 execute if score #bonus_count mem matches 3.. positioned 24.5 10.2 1960.5 run function item:bonus_item/gameparty/random

data/mini/functions/colormatch/player_enter.mcfunction

@@ -11,7 +11,7 @@ effect give @s night_vision 1000000 0 true
 effect give @s resistance 1000000 4 true
 
 # 设置玩家生命
-scoreboard players set @s[team=!watching,tag=!rejoining] mini_heart 3
+scoreboard players set @s[team=playing,tag=!rejoining] mini_heart 3
 function mini:main/player_max_health
 
 # 传送玩家

data/mini/functions/diamond/player_death.mcfunction

@@ -3,7 +3,7 @@ function mini:diamond/game/respawn1
 
 # 复活特效
 execute as @a at @s run function lib:sounds/error
-effect give @s blindness 3 5 true
+effect give @s blindness 3 0 true
 
 # 处理玩家掉落物品
 execute at @s as @e[type=item,distance=..100] store result score @s temp run data get entity @s Age

data/mini/functions/diamond/tick20.mcfunction

@@ -9,10 +9,10 @@ execute if score $countdown mem matches ..10 as @a at @s run function lib:sounds
 execute if score $countdown mem matches 170 run scoreboard players set @a music_time 999
 
 # 90s / 60s：雷达提示
-execute if score $countdown mem matches 90 run tellraw @a ["",{"text": ">> ","color": "gold","bold": true},"玩家雷达将在 ",{"text": "30 秒 ","color": "gold"}, "后开启!"]
+execute if score $countdown mem matches 90 run tellraw @a ["",{"text": ">> ","color": "gold","bold": true},{"text":"玩家雷达将在 ","color": "gold"}, "30 秒 ",{"text": "后开启!","color": "gold"}]
 execute if score $countdown mem matches 90 run scoreboard players set $bossbar_color mem 2
 execute if score $countdown mem matches 90 run function lib:bossbar/show
-execute if score $countdown mem matches 60 run tellraw @a ["",{"text": ">> ","color": "gold","bold": true},"玩家雷达已开启, 游戏将在 ",{"text": "60 秒 ","color": "gold"}, "后结束!"]
+execute if score $countdown mem matches 60 run tellraw @a ["",{"text": ">> ","color": "gold","bold": true},{"text": "玩家雷达已开启, 游戏将在 ","color": "gold"},"60 秒 ", {"text": "后结束!","color": "gold"}]
 execute if score $countdown mem matches 60 as @a run function lib:sounds/music/mini_fast
 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

data/mini/functions/diamond/tick5.mcfunction

@@ -1,11 +1,11 @@
 
 # 更新钻石数量
 execute as @a[team=playing] store result score @s diamond run clear @s diamond 0
-execute if score $countdown mem matches ..40 run effect give @a glowing 1000000 0 true
+execute if score $countdown mem matches ..60 run effect give @a glowing 1000000 0 true
 # effect give @a[scores={diamond=1..}] glowing 5 0 true
 
 # 显示提示
-execute as @a[scores={diamond=1..},tag=!diamond_got,x=1000,y=0,z=1000,dx=32,dy=252,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=1000,dx=32,dy=252,dz=32] as @a[distance=1..] 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=240,z=5016,distance=70..] run spectate
-tp @a[gamemode=spectator,x=1016,y=240,z=5016,distance=70..,team=!debugging] 1016 255 1016
+tp @a[gamemode=spectator,x=1016,y=240,z=5016,distance=70..,team=!debugging] 1016 255 5016

data/mini/functions/hotpm/player_enter.mcfunction

@@ -11,7 +11,7 @@ effect give @s night_vision 1000000 0 true
 effect give @s resistance 1000000 4 true
 
 # 设置玩家生命
-scoreboard players set @s[team=!watching,tag=!rejoining] mini_heart 3
+scoreboard players set @s[team=playing,tag=!rejoining] mini_heart 3
 function mini:main/player_max_health
 
 # 清理 Tag

data/mini/functions/main/game_end.mcfunction

@@ -13,18 +13,18 @@ tag @a remove mini_rank3
 tag @a remove mini_rank4
 # 1
 function mini:main/get_max_score
-execute as @a if score @s mini_score = #score_max mem run tag @s[team=!watching] add mini_rank1
+execute as @a if score @s mini_score = #score_max mem run tag @s[team=playing] add mini_rank1
 tag @a[tag=mini_rank1] add max_uncounted
 # 2
 function mini:main/get_max_score
-execute as @a[tag=!max_uncounted] if score @s mini_score = #score_max mem run tag @s[team=!watching] add mini_rank2
+execute as @a[tag=!max_uncounted] if score @s mini_score = #score_max mem run tag @s[team=playing] add mini_rank2
 tag @a[tag=mini_rank2] add max_uncounted
 # 3
 function mini:main/get_max_score
-execute as @a[tag=!max_uncounted] if score @s mini_score = #score_max mem run tag @s[team=!watching] add mini_rank3
+execute as @a[tag=!max_uncounted] if score @s mini_score = #score_max mem run tag @s[team=playing] add mini_rank3
 tag @a[tag=max_uncounted] remove max_uncounted
 # 4
-tag @a[tag=!mini_rank1,tag=!mini_rank2,tag=!mini_rank3,team=!watching] add mini_rank4
+tag @a[tag=!mini_rank1,tag=!mini_rank2,tag=!mini_rank3,team=playing] add mini_rank4
 
 # 给予进度
 execute if score $mini_type mem matches 2 run advancement grant @a[tag=mini_rank1] only ltw:parkour/tnt1

data/mini/functions/main/get_max_score.mcfunction

@@ -1,5 +1,5 @@
 #> mini:main/get_max_score
-# @input score @a[tag=!max_uncounted,team=!watching] mini_score 进行统计的分数
+# @input score @a[tag=!max_uncounted,team=playing] mini_score 进行统计的分数
 # @output score #score_max mem 最高分
 scoreboard players set #score_max mem -2147483648
-scoreboard players operation #score_max mem > @a[tag=!max_uncounted,team=!watching] mini_score
+scoreboard players operation #score_max mem > @a[tag=!max_uncounted,team=playing] mini_score

data/mini/functions/main/get_max_temp.mcfunction

@@ -1,6 +1,6 @@
 #> mini:main/get_max_temp
-# @input score @a[tag=!max_uncounted,team=!watching] temp 进行统计的分数
+# @input score @a[tag=!max_uncounted,team=playing] temp 进行统计的分数
 # @output score #score_max mem 最高分
 
 scoreboard players set #score_max mem -2147483648
-scoreboard players operation #score_max mem > @a[tag=!max_uncounted,team=!watching] temp
+scoreboard players operation #score_max mem > @a[tag=!max_uncounted,team=playing] temp

data/mini/functions/main/player_enter.mcfunction

@@ -1,7 +1,7 @@
 # 单个玩家开始小游戏时执行
 
 tag @s remove mini_running
-tag @s[tag=!rejoining,team=!watching] add mini_running
+tag @s[tag=!rejoining,team=playing] add mini_running
 scoreboard players set @s mini_score 0
 scoreboard players set @s[tag=rejoining] mini_score -1000
 scoreboard players set @s[team=watching] mini_score -1000000

data/mini/functions/main/update_player_count.mcfunction

@@ -1,6 +1,6 @@
 # 更新存活与结束的玩家数量
 
 scoreboard players set $player_alive mem 0
-execute as @a[tag=mini_running,team=!watching,scores={mini_score=-10..}] run scoreboard players add $player_alive mem 1
+execute as @a[tag=mini_running,team=playing,scores={mini_score=-10..}] run scoreboard players add $player_alive mem 1
 scoreboard players set $player_finish mem 0
-execute as @a[tag=!mini_running,team=!watching,scores={mini_score=-10..}] run scoreboard players add $player_finish mem 1
+execute as @a[tag=!mini_running,team=playing,scores={mini_score=-10..}] run scoreboard players add $player_finish mem 1

data/mini/functions/parkour/player_enter.mcfunction

@@ -36,4 +36,4 @@ gamemode adventure @s[team=playing,tag=!rejoining]
 
 # 修改 Tag
 tag @s add parkour_portal
-tag @s[team=!watching,tag=!rejoining] remove parkour_portal
+tag @s[team=playing,tag=!rejoining] remove parkour_portal

data/mini/functions/phantom/tick5.mcfunction

@@ -1,15 +1,15 @@
 
 # 击杀音效与提示
-execute as @a[team=!watching] run scoreboard players operation @s temp = @s kill_phantom
-execute as @a[team=!watching] run scoreboard players operation @s temp -= @s kill_phantom2
-execute as @a[team=!watching] run scoreboard players operation @s kill_phantom2 = @s kill_phantom
-execute as @a[team=!watching] run scoreboard players operation @s kill_phantom2 %= #const_5 mem
-execute as @a[team=!watching,scores={temp=1..,kill_phantom2=1..}] run function lib:sounds/hit
-execute as @a[team=!watching,scores={temp=1..,kill_phantom2=0}] run function lib:sounds/levelup
-execute as @a[team=!watching,scores={temp=1..,kill_phantom2=0}] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"}," 已击杀 ",{"score": { "name": "@s","objective": "kill_phantom"},"color":"gold"}," 只幻翼!"]
-execute as @a[team=!watching] run scoreboard players operation @s kill_phantom2 = @s kill_phantom
+execute as @a[team=playing] run scoreboard players operation @s temp = @s kill_phantom
+execute as @a[team=playing] run scoreboard players operation @s temp -= @s kill_phantom2
+execute as @a[team=playing] run scoreboard players operation @s kill_phantom2 = @s kill_phantom
+execute as @a[team=playing] run scoreboard players operation @s kill_phantom2 %= #const_5 mem
+execute as @a[team=playing,scores={temp=1..,kill_phantom2=1..}] run function lib:sounds/hit
+execute as @a[team=playing,scores={temp=1..,kill_phantom2=0}] run function lib:sounds/levelup
+execute as @a[team=playing,scores={temp=1..,kill_phantom2=0}] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"}," 已击杀 ",{"score": { "name": "@s","objective": "kill_phantom"},"color":"gold"}," 只幻翼!"]
+execute as @a[team=playing] run scoreboard players operation @s kill_phantom2 = @s kill_phantom
 
 # 给予进度
-execute as @a[team=!watching,scores={temp=1..,kill_phantom=8}] run advancement grant @s only ltw:combat/phantom1
-execute as @a[team=!watching,scores={temp=1..,kill_phantom=16}] run advancement grant @s only ltw:combat/phantom2
-execute as @a[team=!watching,scores={temp=1..,kill_phantom=24}] run advancement grant @s only ltw:combat/phantom3
+execute as @a[team=playing,scores={temp=1..,kill_phantom=8}] run advancement grant @s only ltw:combat/phantom1
+execute as @a[team=playing,scores={temp=1..,kill_phantom=16}] run advancement grant @s only ltw:combat/phantom2
+execute as @a[team=playing,scores={temp=1..,kill_phantom=24}] run advancement grant @s only ltw:combat/phantom3

data/mini/functions/tntrun/player_enter2.mcfunction

@@ -1,2 +1,2 @@
 # spreadplayer 后不能立即传送，所以延迟 1tick
-execute as @a[team=!watching,tag=!rejoining] at @s run tp @s[team=!debugging] ~ 34.5 ~
+execute as @a[team=playing,tag=!rejoining] at @s run tp @s[team=!debugging] ~ 34.5 ~

data/test/functions/mini/colormatch.mcfunction

@@ -1,5 +1,5 @@
 # 测试用：快速开始 Color Match
-team join playing @a
+team join playing @a[team=watching]
 function ltw:state/0/start_game
 scoreboard players set $round mem 5
 scoreboard players set $mini_type mem 4

data/test/functions/mini/diamond.mcfunction

@@ -1,5 +1,5 @@
 # 测试用：快速开始钻石风暴
-team join playing @a
+team join playing @a[team=watching]
 clear @a
 function ltw:state/0/start_game
 scoreboard players set $round mem 5

data/test/functions/mini/hotpm.mcfunction

@@ -1,5 +1,5 @@
 # 测试用：快速开始 Hot Potato
-team join playing @a
+team join playing @a[team=watching]
 function ltw:state/0/start_game
 scoreboard players set $round mem 5
 scoreboard players set $mini_type mem 3

data/test/functions/mini/parkour.mcfunction

@@ -1,5 +1,5 @@
 # 测试用：快速开始跑酷
-team join playing @a
+team join playing @a[team=watching]
 function ltw:state/0/start_game
 scoreboard players set $round mem 5
 scoreboard players set $mini_type mem 1

data/test/functions/mini/phantom.mcfunction

@@ -1,5 +1,5 @@
 # 测试用：快速开始幻翼
-team join playing @a
+team join playing @a[team=watching]
 function ltw:state/0/start_game
 scoreboard players set $round mem 5
 scoreboard players set $mini_type mem 5

data/test/functions/mini/tntrun.mcfunction

@@ -1,5 +1,5 @@
 # 测试用：快速开始 TNT Run
-team join playing @a
+team join playing @a[team=watching]
 function ltw:state/0/start_game
 scoreboard players set $round mem 5
 scoreboard players set $mini_type mem 2