Explorar el Código

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

HerobrineXia hace 6 años
padre
commit
96d1ec4f74

+ 1 - 0
data/ltw/functions/clock/tick20.mcfunction

@@ -4,6 +4,7 @@ schedule function ltw:clock/tick20 20t replace
 # 调用其他模块
 # 调用其他模块
 execute if score $state mem matches 3 run function ltw:state/3/tick20
 execute if score $state mem matches 3 run function ltw:state/3/tick20
 execute if score $state mem matches 4 run function ltw:state/4/tick20
 execute if score $state mem matches 4 run function ltw:state/4/tick20
+execute if score $state mem matches 5 run function ltw:state/5/tick20
 execute if score $state mem matches 6 run function ltw:state/6/tick20
 execute if score $state mem matches 6 run function ltw:state/6/tick20
 
 
 # 全局倒计时
 # 全局倒计时

+ 1 - 0
data/ltw/functions/state/5/tick20.mcfunction

@@ -0,0 +1 @@
+function mini:main/tick20

+ 3 - 1
data/mini/functions/hotpm/init.mcfunction

@@ -1 +1,3 @@
-# 如果要使用记分板,在这里添加
+# 如果要使用记分板,在这里添加
+scoreboard objectives remove hotpm_timer
+scoreboard objectives add hotpm_timer dummy ["土豆计时器"]

+ 0 - 0
data/mini/functions/hotpm/player_failed.mcfuntion → data/mini/functions/hotpm/player_failed.mcfunction


+ 5 - 0
data/mini/functions/hotpm/pm_boom.mcfunction

@@ -0,0 +1,5 @@
+#玩家失败
+function mini:hotpm/player_failed
+
+#选新土豆
+function mini:hotpm/pm_init

+ 8 - 0
data/mini/functions/hotpm/pm_init.mcfunction

@@ -0,0 +1,8 @@
+#清理残余tag
+tag @a[tag=hpm_holding] remove hpm_holding
+
+#刷新土豆
+execute as @r[tag=mini_running] run function mini:hotpm/pm_init_
+
+#初始土豆计分(土豆爆炸时间)
+scoreboard players set $hotpm_timer mem 30

+ 5 - 0
data/mini/functions/hotpm/pm_init_.mcfunction

@@ -0,0 +1,5 @@
+#as holder
+#加tag
+tag @s add hpm_holding
+
+#玩家高亮写这里(吧

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

@@ -0,0 +1,5 @@
+#土豆倒计时
+scoreboard players remove $hotpm_timer mem 1
+title @a subtitle {"score": { "name": "$hotpm_timer","objective": "mem"}}
+#爆炸
+execute if score $hotpm_timer mem matches ..0 as @a[tag=hpm_holding] run function mini:hotpm/pm_boom

+ 1 - 0
data/mini/functions/main/tick20.mcfunction

@@ -0,0 +1 @@
+execute if score $mini_type mem matches 3 run function mini:hotpm/tick20