LTCatt 5 лет назад
Родитель
Сommit
dfe6ccc125

+ 13 - 13
data/test/functions/bonus/normal.mcfunction → data/test/functions/generate/mixed.mcfunction

@@ -1,4 +1,7 @@
-# 生成普通奖励物品
+# 生成混合奖励
+
+# 传送
+tp @a[team=!debugging] 24.5 11.0 1967.5
 
 # 设置轮数
 scoreboard players set $round mem 1
@@ -9,14 +12,14 @@ kill @e[type=arrow]
 kill @e[type=trident]
 
 # 生成奖励
-execute positioned 17.5 10.2 1967.5 run function item:bonus_item/gameparty/random
-execute positioned 19.5 10.2 1962.5 run function item:bonus_item/gameparty/random
-execute positioned 24.5 10.2 1960.5 run function item:bonus_item/gameparty/random
-execute positioned 29.5 10.2 1962.5 run function item:bonus_item/gameparty/random
-execute positioned 31.5 10.2 1967.5 run function item:bonus_item/gameparty/random
-execute positioned 29.5 10.2 1972.5 run function item:bonus_item/gameparty/random
-execute positioned 24.5 10.2 1974.5 run function item:bonus_item/gameparty/random
-execute positioned 19.5 10.2 1972.5 run function item:bonus_item/gameparty/random
+execute positioned 17.5 10.2 1967.5 run function item:bonus_item/gameparty/mixed/random
+execute positioned 19.5 10.2 1962.5 run function item:bonus_item/gameparty/mixed/random
+execute positioned 24.5 10.2 1960.5 run function item:bonus_item/gameparty/mixed/random
+execute positioned 29.5 10.2 1962.5 run function item:bonus_item/gameparty/mixed/random
+execute positioned 31.5 10.2 1967.5 run function item:bonus_item/gameparty/mixed/random
+execute positioned 29.5 10.2 1972.5 run function item:bonus_item/gameparty/mixed/random
+execute positioned 24.5 10.2 1974.5 run function item:bonus_item/gameparty/mixed/random
+execute positioned 19.5 10.2 1972.5 run function item:bonus_item/gameparty/mixed/random
 
 # 生成拾取背景
 execute positioned 17.0 10.0 1967.0 run function ltw:state/6/generate_background
@@ -28,7 +31,4 @@ execute positioned 29.0 10.0 1972.0 run function ltw:state/6/generate_background
 execute positioned 24.0 10.0 1974.0 run function ltw:state/6/generate_background
 execute positioned 19.0 10.0 1972.0 run function ltw:state/6/generate_background
 
-# 传送
-tp @a[team=!debugging] 24.5 11.0 1967.5
-
-tellraw @a ["",{"text": ">> ","color": "aqua","bold": true}, {"text": "已生成测试用奖励物品!","color": "aqua"}]
+tellraw @a ["",{"text": ">> ","color": "aqua","bold": true}, {"text": "已生成测试用混合奖励!","color": "aqua"}]

+ 13 - 13
data/test/functions/bonus/score.mcfunction → data/test/functions/generate/score.mcfunction

@@ -1,4 +1,7 @@
-# 生成分数奖励物品
+# 生成分数奖励
+
+# 传送
+tp @a[team=!debugging] 24.5 11.0 1967.5
 
 # 设置轮数
 scoreboard players set $round mem 5
@@ -9,14 +12,14 @@ kill @e[type=arrow]
 kill @e[type=trident]
 
 # 生成奖励
-execute positioned 17.5 10.2 1967.5 run function item:bonus_item/gameparty/random
-execute positioned 19.5 10.2 1962.5 run function item:bonus_item/gameparty/random
-execute positioned 24.5 10.2 1960.5 run function item:bonus_item/gameparty/random
-execute positioned 29.5 10.2 1962.5 run function item:bonus_item/gameparty/random
-execute positioned 31.5 10.2 1967.5 run function item:bonus_item/gameparty/random
-execute positioned 29.5 10.2 1972.5 run function item:bonus_item/gameparty/random
-execute positioned 24.5 10.2 1974.5 run function item:bonus_item/gameparty/random
-execute positioned 19.5 10.2 1972.5 run function item:bonus_item/gameparty/random
+execute positioned 17.5 10.2 1967.5 run function item:bonus_item/gameparty/score/random
+execute positioned 19.5 10.2 1962.5 run function item:bonus_item/gameparty/score/random
+execute positioned 24.5 10.2 1960.5 run function item:bonus_item/gameparty/score/random
+execute positioned 29.5 10.2 1962.5 run function item:bonus_item/gameparty/score/random
+execute positioned 31.5 10.2 1967.5 run function item:bonus_item/gameparty/score/random
+execute positioned 29.5 10.2 1972.5 run function item:bonus_item/gameparty/score/random
+execute positioned 24.5 10.2 1974.5 run function item:bonus_item/gameparty/score/random
+execute positioned 19.5 10.2 1972.5 run function item:bonus_item/gameparty/score/random
 
 # 生成拾取背景
 execute positioned 17.0 10.0 1967.0 run function ltw:state/6/generate_background
@@ -28,7 +31,4 @@ execute positioned 29.0 10.0 1972.0 run function ltw:state/6/generate_background
 execute positioned 24.0 10.0 1974.0 run function ltw:state/6/generate_background
 execute positioned 19.0 10.0 1972.0 run function ltw:state/6/generate_background
 
-# 传送
-tp @a[team=!debugging] 24.5 11.0 1967.5
-
-tellraw @a ["",{"text": ">> ","color": "aqua","bold": true}, {"text": "已生成测试用奖励分数!","color": "aqua"}]
+tellraw @a ["",{"text": ">> ","color": "aqua","bold": true}, {"text": "已生成测试用分数奖励!","color": "aqua"}]

+ 3 - 1
data/test/functions/mini/colormatch.mcfunction

@@ -5,4 +5,6 @@ scoreboard players set $round mem 5
 scoreboard players set $mini_type mem 4
 function mini:main/game_init
 function ltw:state/4/state_enter
-say 已开始单个测试游戏!
+say 已开始单个测试游戏!
+
+schedule function test:time/quick 20t

+ 3 - 1
data/test/functions/mini/diamond.mcfunction

@@ -6,4 +6,6 @@ scoreboard players set $round mem 5
 scoreboard players set $mini_type mem 6
 function mini:main/game_init
 function ltw:state/4/state_enter
-say 已开始单个测试游戏!
+say 已开始单个测试游戏!
+
+schedule function test:time/quick 20t

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

@@ -5,4 +5,6 @@ scoreboard players set $round mem 5
 scoreboard players set $mini_type mem 3
 function mini:main/game_init
 function ltw:state/4/state_enter
-say 已开始单个测试游戏!
+say 已开始单个测试游戏!
+
+schedule function test:time/quick 20t

+ 3 - 1
data/test/functions/mini/parkour.mcfunction

@@ -5,4 +5,6 @@ scoreboard players set $round mem 5
 scoreboard players set $mini_type mem 1
 function mini:main/game_init
 function ltw:state/4/state_enter
-say 已开始单个测试游戏!
+say 已开始单个测试游戏!
+
+schedule function test:time/quick 20t

+ 3 - 1
data/test/functions/mini/phantom.mcfunction

@@ -5,4 +5,6 @@ scoreboard players set $round mem 5
 scoreboard players set $mini_type mem 5
 function mini:main/game_init
 function ltw:state/4/state_enter
-say 已开始单个测试游戏!
+say 已开始单个测试游戏!
+
+schedule function test:time/quick 20t

+ 3 - 1
data/test/functions/mini/tntrun.mcfunction

@@ -5,4 +5,6 @@ scoreboard players set $round mem 5
 scoreboard players set $mini_type mem 2
 function mini:main/game_init
 function ltw:state/4/state_enter
-say 已开始单个测试游戏!
+say 已开始单个测试游戏!
+
+schedule function test:time/quick 20t

+ 3 - 1
data/test/functions/mini/trade.mcfunction

@@ -6,4 +6,6 @@ scoreboard players set $round mem 5
 scoreboard players set $mini_type mem 8
 function mini:main/game_init
 function ltw:state/4/state_enter
-say 已开始单个测试游戏!
+say 已开始单个测试游戏!
+
+schedule function test:time/quick 20t

+ 0 - 15
data/test/functions/reset/emerald.mcfunction

@@ -1,15 +0,0 @@
-
-scoreboard objectives remove green
-scoreboard objectives remove green_total
-scoreboard objectives remove shop_particle_s
-scoreboard objectives remove shop_particle_2
-scoreboard objectives remove shop_particle_3
-scoreboard objectives remove shop_particle_4
-scoreboard objectives remove shop_particle_5
-scoreboard objectives remove shop_particle_6
-scoreboard objectives remove particle_type
-scoreboard objectives remove stat_total
-scoreboard objectives remove stat_win
-advancement revoke @a everything
-function ltw:init
-tellraw @a ["",{"text": ">> ","color": "red","bold":true},{"text":"已重置绿宝石记分板记录!","color":"red"}]

+ 5 - 0
data/test/functions/start_game.mcfunction

@@ -0,0 +1,5 @@
+# 强制让所有非调试者开始正常游戏
+execute as @a[team=!debugging] run function ltw:state/0/state/join_game
+function ltw:state/0/start_game
+
+tellraw @a ["",{"text": ">> ","color": "aqua","bold": true}, {"text": "管理员已强制开始游戏!","color": "aqua"}]

+ 0 - 0
data/test/functions/fast_countdown.mcfunction → data/test/functions/time/quick.mcfunction


+ 6 - 0
data/test/functions/time/slow.mcfunction

@@ -0,0 +1,6 @@
+# 测试用:将倒计时修改为永不结束
+
+scoreboard players set #start_countdown mem 999999
+scoreboard players set $countdown mem 999999
+scoreboard players set $countdown_fast mem 999999
+tellraw @a ["",{"text": ">> ","color": "aqua","bold": true}, {"text": "管理员将倒计时延长到了无限期!","color": "aqua"}]