Explorar el Código

修复怪物互殴的 Bug

LTCatt hace 6 años
padre
commit
89098b5121

+ 11 - 4
data/ltw/functions/init.mcfunction

@@ -45,19 +45,26 @@ scoreboard players set $ game_id 0
 scoreboard players set $global_mini_count mem 5
 
 # 队伍
-team remove ltw
-team add ltw "玩家"
-team modify ltw color white
-team modify ltw collisionRule never
+team remove player
+team add player "玩家"
+team modify player color white
+team modify player collisionRule never
+team modify player deathMessageVisibility never
+team remove white
+team add white "白色"
+team modify white friendlyFire false
 team remove green
 team add green "绿色"
 team modify green color green
+team modify green friendlyFire false
 team remove blue
 team add blue "蓝色"
 team modify blue color aqua
+team modify blue friendlyFire false
 team remove purple
 team add purple "紫色"
 team modify purple color light_purple
+team modify purple friendlyFire false
 
 # 进度
 advancement revoke @a everything

+ 1 - 1
data/ltw/functions/main/player_enter.mcfunction

@@ -1,5 +1,5 @@
 # 当玩家加入游戏时触发
-team join ltw @s
+team join player @s
 advancement revoke @s everything
 execute as @a at @s run function lib:sounds/error
 

+ 1 - 1
data/ltw/functions/state/0/state_enter.mcfunction

@@ -8,7 +8,7 @@ scoreboard objectives setdisplay sidebar
 scoreboard objectives setdisplay list
 
 # 伤害管理
-team modify ltw friendlyFire false
+team modify player friendlyFire false
 gamerule fallDamage false
 
 # 清理加载区域

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

@@ -19,5 +19,5 @@ function mini:colormatch/game/prepare_round
 schedule function mini:colormatch/game_init2 18t replace
 
 # 伤害管理
-team modify ltw friendlyFire true
+team modify player friendlyFire true
 gamerule fallDamage false

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

@@ -4,7 +4,7 @@ forceload add 1000 3000 1100 3100
 scoreboard players set $finish_mode mem 0
 
 # 伤害管理
-team modify ltw friendlyFire true
+team modify player friendlyFire true
 gamerule fallDamage false
 
 # 生成地图

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

@@ -8,5 +8,5 @@ setblock 1000 10 1000 minecraft:structure_block{mode:"LOAD",name:"mini:parkour"}
 setblock 1000 11 1000 minecraft:redstone_block
 
 # 伤害管理
-team modify ltw friendlyFire true
+team modify player friendlyFire true
 gamerule fallDamage false

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

@@ -11,5 +11,5 @@ setblock 1000 11 2000 minecraft:redstone_block
 kill @e[tag=tntrun_block]
 
 # 伤害管理
-team modify ltw friendlyFire true
+team modify player friendlyFire true
 gamerule fallDamage false

+ 7 - 2
data/mini/functions/zombie/game/summon_evoker.mcfunction

@@ -4,11 +4,16 @@ scoreboard players set $random_min mem 0
 scoreboard players set $random_max mem 4
 function lib:random
 
-# 尸壳
 execute if score $random mem matches 0 positioned 1019.0 20.1 5002.0 unless entity @e[tag=mini_mob,distance=..1] run summon evoker ~ ~ ~ {Tags:["mini_mob"]}
 execute if score $random mem matches 1 positioned 1002.0 19.1 5016.0 unless entity @e[tag=mini_mob,distance=..1] run summon evoker ~ ~ ~ {Tags:["mini_mob"]}
 execute if score $random mem matches 2 positioned 1019.0 13.1 5013.0 unless entity @e[tag=mini_mob,distance=..1] run summon evoker ~ ~ ~ {Tags:["mini_mob"]}
 execute if score $random mem matches 3 positioned 1002.0 13.1 5024.0 unless entity @e[tag=mini_mob,distance=..1] run summon evoker ~ ~ ~ {Tags:["mini_mob"]}
 execute if score $random mem matches 4 positioned 1002.0 13.1 5002.0 unless entity @e[tag=mini_mob,distance=..1] run summon evoker ~ ~ ~ {Tags:["mini_mob"]}
 
-tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"text": "唤魔者 ","color":"gold"},"已出现!"]
+tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"text": "唤魔者 ","color":"gold"},"已出现!"]
+
+# 提高追踪范围
+execute as @e[type=evoker] run attribute @s generic.follow_range base set 35
+
+# 关闭怪物间友伤
+team join white @e[tag=mini_mob]

+ 3 - 0
data/mini/functions/zombie/game/summon_zombie.mcfunction

@@ -16,3 +16,6 @@ execute if score $random mem matches 7..8 positioned 1002.0 19.1 5016.0 unless e
 execute if score $random mem matches 9..10 positioned 1019.0 13.1 5013.0 unless entity @e[tag=mini_mob,distance=..1] run summon zombie ~ ~ ~ {Tags:["mini_mob"]}
 execute if score $random mem matches 11..12 positioned 1002.0 13.1 5024.0 unless entity @e[tag=mini_mob,distance=..1] run summon zombie ~ ~ ~ {Tags:["mini_mob"]}
 execute if score $random mem matches 13..14 positioned 1002.0 13.1 5002.0 unless entity @e[tag=mini_mob,distance=..1] run summon zombie ~ ~ ~ {Tags:["mini_mob"]}
+
+# 关闭怪物间友伤
+team join white @e[tag=mini_mob]

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

@@ -1,3 +1,3 @@
 # 结束僵尸
 forceload remove 1000 5000 1050 5050
-team modify ltw friendlyFire true
+team modify player friendlyFire true

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

@@ -15,7 +15,7 @@ tp @e[type=vex] ~ -100 ~
 scoreboard players set $zombie_luck mem 0
 
 # 伤害管理
-team modify ltw friendlyFire false
+team modify player friendlyFire false
 gamerule fallDamage false
 
 # FIXME [LTCat] 玩家生命值显示存在问题

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

@@ -14,11 +14,11 @@ execute if score $random mem matches 60.. run tp @e[type=vex,limit=1,sort=random
 # 赋予随机效果
 effect give @e[type=husk,limit=1,sort=random] speed 1 1
 effect give @e[type=husk,limit=1,sort=random] speed 4
-effect give @e[type=zombie,limit=2,sort=random] slowness 4 1
-effect give @e[type=zombie,limit=1,sort=random] slowness 2 2
+effect give @e[type=zombie,limit=1,sort=random] slowness 4
+effect give @e[type=zombie,limit=1,sort=random] slowness 2 1
 
 # 召唤怪物
 execute if score $random mem matches -5..5 run function mini:zombie/game/summon_zombie
-execute if score $random mem matches ..-10 run function mini:zombie/game/summon_evoker
+execute if score $random mem matches ..-12 run function mini:zombie/game/summon_evoker
 
 # FIXME [010/HIM] 连续小游戏过程中侧边栏得分会显示出 $t_score_max