LTCatt 5 rokov pred
rodič
commit
0ef5c5dbe1

+ 3 - 3
data/ltw/functions/clock/tick20.mcfunction

@@ -17,9 +17,9 @@ function lib:effect/regen
 # 全局倒计时
 execute if score $countdown mem matches 1.. run scoreboard players remove $countdown mem 1
 scoreboard players remove @e[scores={countdown=1..}] countdown 1
-# 两秒一次
-scoreboard players add $twice mem 1
-execute if score $twice mem matches 2.. run scoreboard players set $twice mem 0
+# 4 秒一次
+scoreboard players add $foursec mem 1
+execute if score $foursec mem matches 4.. run scoreboard players set $foursec mem 0
 
 # 掐死原版 BGM
 stopsound @a music music.game

+ 1 - 1
data/mini/functions/diamond/game/respawn1.mcfunction

@@ -3,7 +3,7 @@
 effect clear @s
 effect give @s saturation 1000000 0 true
 effect give @s haste 1000000 1 true
-effect give @s levitation 8 253
+effect give @s levitation 6 253
 gamerule naturalRegeneration false
 
 # 传送玩家

+ 1 - 1
data/mini/functions/diamond/game/respawn2.mcfunction

@@ -1,2 +1,2 @@
-tp @a[tag=respawning] ~ 259 ~
+tp @a[tag=respawning] ~ 262 ~
 tag @a remove respawning

+ 1 - 1
data/mini/functions/diamond/game_start.mcfunction

@@ -3,7 +3,7 @@ scoreboard players set $countdown mem 260
 
 # HUD
 scoreboard objectives setdisplay list health_disp
-scoreboard objectives setdisplay belowName diamond
+scoreboard objectives setdisplay belowName health_disp
 scoreboard objectives setdisplay sidebar diamond
 scoreboard players set $bossbar_color mem 4
 scoreboard players set $countdown_max mem 260

+ 2 - 2
data/mini/functions/diamond/tick20.mcfunction

@@ -9,5 +9,5 @@ execute if score $countdown mem matches ..10 as @a at @s run function lib:sounds
 execute if score $countdown mem matches 0 run function mini:main/game_end
 
 # 回复生命值
-execute if score $twice mem matches 1 run effect give @a[team=playing] regeneration 1 10 true
-execute if score $twice mem matches 1 run schedule function mini:diamond/game/clear_effect 1t replace
+execute if score $foursec mem matches 1 run effect give @a[team=playing] regeneration 1 10 true
+execute if score $foursec mem matches 1 run schedule function mini:diamond/game/clear_effect 1t replace

+ 0 - 5
data/mini/functions/phantom/tick20.mcfunction

@@ -10,8 +10,3 @@ execute if score $countdown mem matches ..10 as @a at @s run function lib:sounds
 
 # 0s:游戏结束
 execute if score $countdown mem matches 0 run function mini:main/game_end
-
-# 回复生命值
-# execute if score $twice mem matches 1 run effect give @a regeneration 1 10 true
-# execute if score $twice mem matches 1 run schedule function mini:phantom/game/clear_effect 1t replace
-# effect clear @a regeneration