LTCatt 6 ani în urmă
părinte
comite
01fc1b35ff
29 a modificat fișierele cu 39 adăugiri și 42 ștergeri
  1. 1 1
      data/item/functions/bonus_item/add_score.mcfunction
  2. 0 1
      data/ltw/functions/main/player_leave.mcfunction
  3. 2 2
      data/ltw/functions/state/0/player_enter.mcfunction
  4. 1 1
      data/ltw/functions/state/3/player_enter.mcfunction
  5. 1 1
      data/ltw/functions/state/3/tick2.mcfunction
  6. 1 1
      data/ltw/functions/state/4/player_enter.mcfunction
  7. 1 1
      data/ltw/functions/state/6/player_enter.mcfunction
  8. 2 2
      data/ltw/functions/state/7/player_enter.mcfunction
  9. 1 1
      data/ltw/functions/state/7/tick2.mcfunction
  10. 3 3
      data/mini/functions/colormatch/player_enter.mcfunction
  11. 1 1
      data/mini/functions/colormatch/player_intro.mcfunction
  12. 1 1
      data/mini/functions/colormatch/watcher_limit.mcfunction
  13. 3 3
      data/mini/functions/hotpm/player_enter.mcfunction
  14. 1 1
      data/mini/functions/hotpm/player_intro.mcfunction
  15. 1 1
      data/mini/functions/hotpm/tick5.mcfunction
  16. 1 1
      data/mini/functions/hotpm/watcher_limit.mcfunction
  17. 1 2
      data/mini/functions/main/player_finished.mcfunction
  18. 3 3
      data/mini/functions/parkour/player_enter.mcfunction
  19. 1 1
      data/mini/functions/parkour/player_intro.mcfunction
  20. 1 1
      data/mini/functions/parkour/watcher_limit.mcfunction
  21. 3 3
      data/mini/functions/tntrun/player_enter.mcfunction
  22. 1 1
      data/mini/functions/tntrun/player_enter2.mcfunction
  23. 1 1
      data/mini/functions/tntrun/player_intro.mcfunction
  24. 1 1
      data/mini/functions/tntrun/watcher_limit.mcfunction
  25. 3 3
      data/mini/functions/zombie/player_enter.mcfunction
  26. 1 1
      data/mini/functions/zombie/player_intro.mcfunction
  27. 1 1
      data/mini/functions/zombie/tick20.mcfunction
  28. 1 1
      data/mini/functions/zombie/watcher_limit.mcfunction
  29. 0 1
      data/test/functions/generate_bonus2.mcfunction

+ 1 - 1
data/item/functions/bonus_item/add_score.mcfunction

@@ -30,4 +30,4 @@ execute if score #bonus_add_score mem matches 200 if entity @s[tag=highest] run
 execute if score #bonus_add_score mem matches 200 if entity @s[tag=!highest] run tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@a[tag=highest,limit=1,sort=furthest]","color":"red"}," 被偷取了 ",{"text": "1 分","color":"red"},", 当前共有 ",{"score": {"name": "@a[tag=highest,limit=1,sort=furthest]","objective": "total_score"}}, " 分"]
 execute if score #bonus_add_score mem matches 200 if entity @s[tag=!highest] run tellraw @a ["",{"text": ">> ","color":"green","bold": true},{"selector": "@s","color":"green"}," 偷取了 ",{"text": "1 分","color":"green"},", 当前共有 ",{"score": {"name": "@s","objective": "total_score"}}, " 分"]
 
-# FIXME : [LTCat] 偷分提示存在 Bug
+# FIXME : [LTCat] 偷分可能存在 Bug?

+ 0 - 1
data/ltw/functions/main/player_leave.mcfunction

@@ -9,7 +9,6 @@ execute if score $state mem matches 1.. if score $game_type mem matches 1 if sco
 # 如果携带热土豆的玩家掉线,则重新生成土豆
 execute if score $state mem matches 5 if score $mini_type mem matches 3 run function mini:hotpm/player_leave
 
-# TODO : <! 紧急> [LTCat/HIM] 添加debug的tag,使debug人员不受游戏影响
 # FIXME : [010/HIM] 奖励选择房和跑酷图还有结构方块的线
 # FIXME : <! 紧急> 跑酷中途掉线导致名次判断错误
 # FIXME : <! 紧急> [010] 物品依然可能给不到人

+ 2 - 2
data/ltw/functions/state/0/player_enter.mcfunction

@@ -21,7 +21,7 @@ effect give @s night_vision 1000000 0 true
 effect give @s resistance 1000000 4 true
 
 # 冒险模式
-gamemode adventure
+gamemode adventure @s[tag=!debug]
 
 # 传送玩家
-tp @s 10 16 10
+tp @s[tag=!debug] 10 16 10

+ 1 - 1
data/ltw/functions/state/3/player_enter.mcfunction

@@ -12,5 +12,5 @@ effect give @s blindness 1000000 0 true
 execute at @s run function lib:sounds/levelup
 
 # 自由旁观
-gamemode spectator @s
+gamemode spectator @s[tag=!debug]
 spectate

+ 1 - 1
data/ltw/functions/state/3/tick2.mcfunction

@@ -1,3 +1,3 @@
 # 固定旁观
 execute as @a run spectate
-tp @a 0 10000 1000 0 0
+tp @a[tag=!debug] 0 10000 1000 0 0

+ 1 - 1
data/ltw/functions/state/4/player_enter.mcfunction

@@ -15,5 +15,5 @@ function mini:main/player_intro
 execute at @s run function lib:sounds/travel
 
 # 自由旁观
-gamemode spectator
+gamemode spectator @s[tag=!debug]
 spectate

+ 1 - 1
data/ltw/functions/state/6/player_enter.mcfunction

@@ -17,5 +17,5 @@ function mini:main/show_result
 execute at @s run function lib:sounds/levelup
 
 # 自由旁观
-gamemode spectator
+gamemode spectator @s[tag=!debug]
 spectate

+ 2 - 2
data/ltw/functions/state/7/player_enter.mcfunction

@@ -10,7 +10,7 @@ gamerule naturalRegeneration true
 effect give @s resistance 1000000 4 true
 
 # 传送玩家
-tp @s 24.5 11.0 1967.5 112.5 25
+tp @s[tag=!debug] 24.5 11.0 1967.5 112.5 25
 execute at @s run function lib:sounds/travel
 
 # 清除 Tag
@@ -25,5 +25,5 @@ tag @s[tag=rejoining] remove mini_rank4
 tag @s remove selecting
 
 # 自由旁观
-gamemode spectator
+gamemode spectator @s[tag=!debug]
 spectate

+ 1 - 1
data/ltw/functions/state/7/tick2.mcfunction

@@ -1,3 +1,3 @@
 # 观察者限制
 execute as @a[gamemode=spectator] run spectate
-execute as @a[gamemode=spectator] run tp @s 24.5 11.0 1967.5
+execute as @a[gamemode=spectator] run tp @s[tag=!debug] 24.5 11.0 1967.5

+ 3 - 3
data/mini/functions/colormatch/player_enter.mcfunction

@@ -11,11 +11,11 @@ effect give @s night_vision 1000000 0 true
 effect give @s resistance 1000000 4 true
 
 # 传送玩家
-tp @s[tag=!watcher,tag=!rejoining] 1062 16.5 4012
+tp @s[tag=!watcher,tag=!rejoining,tag=!debug] 1062 16.5 4012
 
 # 调整模式
-gamemode spectator @s
-gamemode adventure @s[tag=!watcher,tag=!rejoining]
+gamemode spectator @s[tag=!debug]
+gamemode adventure @s[tag=!watcher,tag=!rejoining,tag=!debug]
 
 # 设置玩家生命数量
 scoreboard players set @s[tag=!watcher,tag=!rejoining] mini_heart 3

+ 1 - 1
data/mini/functions/colormatch/player_intro.mcfunction

@@ -1,5 +1,5 @@
 # 向单个玩家展示小游戏介绍
-tp @s 1062 22 4012 20 180
+tp @s[tag=!debug] 1062 22 4012 20 180
 tellraw @s ["",{"text":"\n >> 陷阱迷阵 >>\n\n","color":"gold","bold":true}," 墙壁会显示安全的歇脚方块,\n 在倒计时结束前站在它们上面以躲避陷阱!\n"]
 tellraw @s ["",{"text": " <生命淘汰制> ","color":"red","bold": true}, {"text":"你有 3 条生命, 生命耗尽后即被淘汰。","color":"gray"}]
 tellraw @s ["",{"text": " <PVP 干扰> ","color":"light_purple","bold": true}, {"text":"攻击其他玩家可以造成击退, 但没有伤害。","color":"gray"}]

+ 1 - 1
data/mini/functions/colormatch/watcher_limit.mcfunction

@@ -1,3 +1,3 @@
 # 观察者限定范围
 execute as @a[gamemode=spectator] unless entity @s[x=1049,y=10,z=3999,dx=27,dz=27,dy=30] run spectate
-execute as @a[gamemode=spectator] unless entity @s[x=1049,y=10,z=3999,dx=27,dz=27,dy=30] run tp @s 1062 22 4012 20 180
+execute as @a[gamemode=spectator] unless entity @s[x=1049,y=10,z=3999,dx=27,dz=27,dy=30] run tp @s[tag=!debug] 1062 22 4012 20 180

+ 3 - 3
data/mini/functions/hotpm/player_enter.mcfunction

@@ -16,12 +16,12 @@ tag @s remove pm_damage_dealt
 tag @s remove pm_damage_taken
 
 # 传送玩家
-spreadplayers 1023 3021 5 5 false @s[tag=!watcher,tag=!rejoining]
+spreadplayers 1023 3021 5 5 false @s[tag=!watcher,tag=!rejoining,tag=!debug]
 execute if entity @s[tag=!watcher,tag=!rejoining] run schedule function mini:hotpm/player_enter2 1t replace
 
 # 调整模式
-gamemode spectator @s
-gamemode adventure @s[tag=!watcher,tag=!rejoining]
+gamemode spectator @s[tag=!debug]
+gamemode adventure @s[tag=!watcher,tag=!rejoining,tag=!debug]
 
 # 设置玩家生命数量
 scoreboard players set @s[tag=!watcher,tag=!rejoining] mini_heart 2

+ 1 - 1
data/mini/functions/hotpm/player_intro.mcfunction

@@ -1,5 +1,5 @@
 # 向单个玩家展示小游戏介绍
-tp @s 1022 25 3038 180 20
+tp @s[tag=!debug] 1022 25 3038 180 20
 tellraw @s ["",{"text":"\n >> 热土豆 >>\n\n","color":"gold","bold":true}, " 有一个人会获得土豆附身, 在土豆爆炸前攻击他人, 将土豆转移到他人身上!\n"]
 tellraw @s ["",{"text": " <生命淘汰制> ","color":"red","bold": true}, {"text":"你有 2 条生命, 生命耗尽后即被淘汰。","color":"gray"}]
 tellraw @s ["",{"text": " <PVP> ","color":"light_purple","bold": true}, {"text":"攻击其他玩家可以转移土豆, 远程伤害同样有效。","color":"gray"}]

+ 1 - 1
data/mini/functions/hotpm/tick5.mcfunction

@@ -1,5 +1,5 @@
 # 传送
-execute as @a[gamemode=!spectator] at @s if block ~ ~-1 ~ minecraft:barrier run tp ~ ~17.5 ~
+execute as @a[gamemode=!spectator] at @s if block ~ ~-1 ~ minecraft:barrier run tp @s ~ ~17.5 ~
 execute as @a[gamemode=!spectator] at @s if block ~ ~-1 ~ minecraft:barrier run function lib:sounds/teleport
 
 # 给持有者播放音效

+ 1 - 1
data/mini/functions/hotpm/watcher_limit.mcfunction

@@ -1,3 +1,3 @@
 # 观察者限制飞行范围
 execute as @a[gamemode=spectator,x=1022,y=27,z=3022,distance=21..] run spectate
-tp @a[gamemode=spectator,x=1022,y=27,z=3022,distance=21..] 1022 29 3038 180 0
+tp @a[gamemode=spectator,x=1022,y=27,z=3022,distance=21..,tag=!debug] 1022 29 3038 180 0

+ 1 - 2
data/mini/functions/main/player_finished.mcfunction

@@ -12,8 +12,7 @@ execute as @a at @s run function lib:sounds/error
 scoreboard players add @a[tag=!mini_running] mini_score 1
 
 # 进入旁观
-gamemode spectator @s
-# spectate @r[tag=mini_running]
+gamemode spectator
 
 # 检查游戏是否结束
 function mini:main/check_game_end

+ 3 - 3
data/mini/functions/parkour/player_enter.mcfunction

@@ -10,11 +10,11 @@ gamerule naturalRegeneration true
 effect give @s resistance 1000000 4 true
 
 # 传送玩家
-tp @s[tag=!watcher,tag=!rejoining] 1010.07 7.50 1006.98 -1518.69 -10.62
+tp @s[tag=!watcher,tag=!rejoining,tag=!debug] 1010.07 7.50 1006.98 -1518.69 -10.62
 
 # 调整模式
-gamemode spectator @s
-gamemode adventure @s[tag=!watcher,tag=!rejoining]
+gamemode spectator @s[tag=!debug]
+gamemode adventure @s[tag=!watcher,tag=!rejoining,tag=!debug]
 
 # 修改 Tag
 tag @s add parkour_portal

+ 1 - 1
data/mini/functions/parkour/player_intro.mcfunction

@@ -1,5 +1,5 @@
 # 向单个玩家展示小游戏介绍
-tp @s 1010.96 26.83 1032.37 -385.24 16.67
+tp @s[tag=!debug] 1010.96 26.83 1032.37 -385.24 16.67
 tellraw @s ["",{"text":"\n >> 旅途 >>\n\n","color":"red","bold":true}," 沿途前进, 到达终点, 获得胜利!\n"]
 tellraw @s ["",{"text": " <完成制> ","color":"red","bold": true}, {"text":"根据完成跑酷的速度快慢决定排名。","color":"gray"}]
 tellraw @s ["",{"text": " <和平环境> ","color":"light_purple","bold": true}, {"text":"无法攻击其他玩家。","color":"gray"}]

+ 1 - 1
data/mini/functions/parkour/watcher_limit.mcfunction

@@ -1,3 +1,3 @@
 # 观察者限制飞行范围
 execute as @a[gamemode=spectator] unless entity @s[x=1001,y=7,z=1001,dx=30,dy=30,dz=62] run spectate
-execute as @a[gamemode=spectator] unless entity @s[x=1001,y=7,z=1001,dx=30,dy=30,dz=62] run tp @s 1027.56 18.03 1046.89 13.48 4.84
+execute as @a[gamemode=spectator] unless entity @s[x=1001,y=7,z=1001,dx=30,dy=30,dz=62] run tp @s[tag=!debug] 1027.56 18.03 1046.89 13.48 4.84

+ 3 - 3
data/mini/functions/tntrun/player_enter.mcfunction

@@ -11,7 +11,7 @@ effect give @s night_vision 1000000 0 true
 effect give @s resistance 1000000 4 true
 
 # 传送玩家
-spreadplayers 1011.5 2011.5 4 4 false @s[tag=!watcher,tag=!rejoining]
+spreadplayers 1011.5 2011.5 4 4 false @s[tag=!watcher,tag=!rejoining,tag=!debug]
 # schedule: tp @a ~ ~-3 ~
 
 # 两秒后才开始 TNT 掉落
@@ -19,8 +19,8 @@ tag @s remove tntrun_pc
 # schedule: tag @a add tntrun_pc
 
 # 调整模式
-gamemode spectator @s
-gamemode adventure @s[tag=!watcher,tag=!rejoining]
+gamemode spectator @s[tag=!debug]
+gamemode adventure @s[tag=!watcher,tag=!rejoining,tag=!debug]
 
 # 重新加入处理
 execute if entity @s[tag=rejoining] run function mini:tntrun/player_failed

+ 1 - 1
data/mini/functions/tntrun/player_enter2.mcfunction

@@ -1,2 +1,2 @@
 # spreadplayer 后不能立即传送,所以延迟 1tick
-execute as @a[tag=!watcher,tag=!rejoining] at @s run tp @s ~ ~-3 ~
+execute as @a[tag=!watcher,tag=!rejoining] at @s run tp @s[tag=!debug] ~ ~-3 ~

+ 1 - 1
data/mini/functions/tntrun/player_intro.mcfunction

@@ -1,5 +1,5 @@
 # 向单个玩家展示小游戏介绍
-tp @s 1011.5 18.0 2019.0 180 15
+tp @s[tag=!debug] 1011.5 18.0 2019.0 180 15
 tellraw @s ["",{"text":"\n >> TNT Run >>\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"}]

+ 1 - 1
data/mini/functions/tntrun/watcher_limit.mcfunction

@@ -1,3 +1,3 @@
 # 观察者限制飞行范围
 execute as @a[gamemode=spectator] unless entity @s[x=1000,y=10,z=2000,dx=22,dz=22,dy=22] run spectate
-execute as @a[gamemode=spectator] unless entity @s[x=1000,y=10,z=2000,dx=22,dz=22,dy=22] run tp @s 1011.5 27.5 2011.5
+execute as @a[gamemode=spectator] unless entity @s[x=1000,y=10,z=2000,dx=22,dz=22,dy=22] run tp @s[tag=!debug] 1011.5 27.5 2011.5

+ 3 - 3
data/mini/functions/zombie/player_enter.mcfunction

@@ -11,11 +11,11 @@ gamerule naturalRegeneration false
 effect give @s night_vision 1000000 0 true
 
 # 传送玩家
-tp @s 1010.5 12 5013.0
+tp @s[tag=!debug] 1010.5 12 5013.0
 
 # 调整模式
-gamemode spectator @s
-gamemode adventure @s[tag=!watcher,tag=!rejoining]
+gamemode spectator @s[tag=!debug]
+gamemode adventure @s[tag=!watcher,tag=!rejoining,tag=!debug]
 
 # 重新加入处理
 execute if entity @s[tag=rejoining] run function mini:zombie/player_failed

+ 1 - 1
data/mini/functions/zombie/player_intro.mcfunction

@@ -1,5 +1,5 @@
 # 向单个玩家展示小游戏介绍
-tp @s 1010.5 20 5006.0 0 25
+tp @s[tag=!debug] 1010.5 20 5006.0 0 25
 tellraw @s ["",{"text":"\n >> 猪海寻路 >>\n\n","color":"red","bold":true}," 猪灵正不断地涌现……努力生存, 成为最后的幸存者吧!\n"]
 tellraw @s ["",{"text": " <死亡淘汰制> ","color":"red","bold": true}, {"text":"生命无法自然恢复, 被猪灵杀死时即被淘汰。","color":"gray"}]
 tellraw @s ["",{"text": " <PVE> ","color":"light_purple","bold": true}, {"text":"无法攻击其他玩家, 但可以杀死猪灵。","color":"gray"}]

+ 1 - 1
data/mini/functions/zombie/tick20.mcfunction

@@ -12,7 +12,7 @@ execute if score $countdown mem matches ..105 run effect give @e[tag=mini_mob,li
 execute if score $countdown mem matches 131..170 run effect give @e[tag=mini_mob,limit=3,sort=random] slowness 2 0
 
 # 显示提示
-execute if score $countdown mem matches 150 run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"text": "补给物资已经送达!","color":"aqua"}]
+execute if score $countdown mem matches 155 run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"text": "补给物资已经送达!","color":"aqua"}]
 execute if score $countdown mem matches 130 run tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"text": "猪灵开始摆脱缓慢的束缚了!","color":"red"}]
 execute if score $countdown mem matches 105 run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"text": "补给物资已经送达!","color":"aqua"}]
 execute if score $countdown mem matches 80 run tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"text": "猪灵开始取回他们的装备了!","color":"red"}]

+ 1 - 1
data/mini/functions/zombie/watcher_limit.mcfunction

@@ -1,3 +1,3 @@
 # 观察者限制飞行范围
 execute as @a[gamemode=spectator] unless entity @s[x=1001,y=11,z=5001,dx=18,dy=11,dz=23] run spectate
-execute as @a[gamemode=spectator] unless entity @s[x=1001,y=11,z=5001,dx=18,dy=11,dz=23] run tp @s 1010.5 20 5006.0 0 25
+execute as @a[gamemode=spectator] unless entity @s[x=1001,y=11,z=5001,dx=18,dy=11,dz=23] run tp @s[tag=!debug] 1010.5 20 5006.0 0 25

+ 0 - 1
data/test/functions/generate_bonus2.mcfunction

@@ -1,4 +1,3 @@
 
 function ltw:state/7/state_enter
 scoreboard players set $state mem 0
-gamemode creative @a