LTCatt 6 年 前
親
コミット
67c9f9d817

+ 1 - 15
data/lib/functions/bossbar/init.mcfunction

@@ -1,18 +1,4 @@
-# 初始化bossbar
-bossbar remove mini:red
-bossbar remove mini:yellow
-bossbar remove mini:blue
-bossbar remove mini:green
-
-bossbar add mini:red "红"
-bossbar add mini:yellow "黄"
-bossbar add mini:blue "蓝"
-bossbar add mini:green "绿"
-
-bossbar set mini:red color red
-bossbar set mini:yellow color yellow
-bossbar set mini:blue color blue
-bossbar set mini:green color green
+function lib:bossbar/reset
 
 # 重置计分板
 scoreboard objectives remove bossbar_color

+ 15 - 0
data/lib/functions/bossbar/reset.mcfunction

@@ -0,0 +1,15 @@
+# 初始化bossbar
+bossbar remove mini:red
+bossbar remove mini:yellow
+bossbar remove mini:blue
+bossbar remove mini:green
+
+bossbar add mini:red "红"
+bossbar add mini:yellow "黄"
+bossbar add mini:blue "蓝"
+bossbar add mini:green "绿"
+
+bossbar set mini:red color red
+bossbar set mini:yellow color yellow
+bossbar set mini:blue color blue
+bossbar set mini:green color green

+ 1 - 0
data/lib/functions/bossbar/show.mcfunction

@@ -1,3 +1,4 @@
+function lib:bossbar/reset
 
 # 计算最大值
 scoreboard players operation #temp mem = $countdown_max mem

+ 12 - 0
data/mini/functions/hotpm/tick2.mcfunction

@@ -1,2 +1,14 @@
 # 爆炸
 execute if score $countdown_fast mem matches 0 as @a[tag=pm_holding] at @s run function mini:hotpm/player_lose_heart
+
+# HUD
+scoreboard players set $bossbar_color mem 0
+scoreboard players set @a[tag=pm_holding] bossbar_color 1
+scoreboard players set @a[tag=!pm_holding,distance=..15] bossbar_color 2
+scoreboard players set @a[tag=!pm_holding,distance=15..] bossbar_color 3
+scoreboard players operation $countdown_max mem = $countdown_fast mem
+scoreboard players set $bossbar_type mem 1
+bossbar set mini:green name "土豆爆炸"
+bossbar set mini:yellow name "土豆爆炸"
+bossbar set mini:red name "土豆爆炸"
+function lib:bossbar/show

+ 0 - 12
data/mini/functions/hotpm/tick5.mcfunction

@@ -4,15 +4,3 @@ execute as @a[gamemode=!spectator] at @s if block ~ ~-1 ~ minecraft:barrier run
 
 # 给持有者播放音效
 execute as @a[tag=pm_holding] at @s run function lib:sounds/creeper
-
-# HUD
-scoreboard players set $bossbar_color mem 0
-scoreboard players set @a[tag=pm_holding] bossbar_color 1
-scoreboard players set @a[tag=!pm_holding,distance=..15] bossbar_color 2
-scoreboard players set @a[tag=!pm_holding,distance=15..] bossbar_color 3
-scoreboard players operation $countdown_max mem = $countdown_fast mem
-scoreboard players set $bossbar_type mem 1
-bossbar set mini:green name "土豆爆炸"
-bossbar set mini:yellow name "土豆爆炸"
-bossbar set mini:red name "土豆爆炸"
-function lib:bossbar/show