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

+ 2 - 2
data/ltw/functions/state/3/state_enter.mcfunction

@@ -30,8 +30,8 @@ execute if score $round mem matches ..4 run data remove storage ltw:mini types[0
 scoreboard players set $random_max mem 1
 scoreboard players set $random_min mem 0
 function lib:random
-execute if score $round mem matches 5 if score $random mem matches 0 run scoreboard players set $mini_type mem -1
-execute if score $round mem matches 5 if score $random mem matches 1 run scoreboard players set $mini_type mem -2
+execute if score $round mem matches 5 if score $random mem matches 0 run scoreboard players set $mini_type mem 101
+execute if score $round mem matches 5 if score $random mem matches 1 run scoreboard players set $mini_type mem 102
 
 # 初始化小游戏
 function mini:main/game_init

+ 0 - 0
data/mini/functions/ass/player_failed.mcfunction → data/mini/functions/ass/player_death.mcfunction


+ 2 - 3
data/mini/functions/main/game_end.mcfunction

@@ -5,9 +5,8 @@ execute if score $mini_type mem matches 3 run function mini:hotpm/game_end
 execute if score $mini_type mem matches 4 run function mini:colormatch/game_end
 execute if score $mini_type mem matches 5 run function mini:phantom/game_end
 execute if score $mini_type mem matches 6 run function mini:ass/game_end
-
-execute if score $mini_type mem matches -1 run function mini:diamond/game_end
-execute if score $mini_type mem matches -2 run function mini:trade/game_end
+execute if score $mini_type mem matches 101 run function mini:diamond/game_end
+execute if score $mini_type mem matches 102 run function mini:trade/game_end
 
 # 计算排名
 tag @a remove mini_rank1

+ 2 - 2
data/mini/functions/main/game_init.mcfunction

@@ -9,7 +9,7 @@ execute if score $mini_type mem matches 2 run function mini:tntrun/game_init
 execute if score $mini_type mem matches 3 run function mini:hotpm/game_init
 execute if score $mini_type mem matches 4 run function mini:colormatch/game_init
 execute if score $mini_type mem matches 5 run function mini:phantom/game_init
-execute if score $mini_type mem matches -1 run function mini:diamond/game_init
 execute if score $mini_type mem matches 6 run function mini:ass/game_init
-execute if score $mini_type mem matches -2 run function mini:trade/game_init
+execute if score $mini_type mem matches 101 run function mini:diamond/game_init
+execute if score $mini_type mem matches 102 run function mini:trade/game_init
 

+ 2 - 2
data/mini/functions/main/game_start.mcfunction

@@ -3,6 +3,6 @@ execute if score $mini_type mem matches 2 run function mini:tntrun/game_start
 execute if score $mini_type mem matches 3 run function mini:hotpm/game_start
 execute if score $mini_type mem matches 4 run function mini:colormatch/game_start
 execute if score $mini_type mem matches 5 run function mini:phantom/game_start
-execute if score $mini_type mem matches -1 run function mini:diamond/game_start
 execute if score $mini_type mem matches 6 run function mini:ass/game_start
-execute if score $mini_type mem matches -2 run function mini:trade/game_start
+execute if score $mini_type mem matches 101 run function mini:diamond/game_start
+execute if score $mini_type mem matches 102 run function mini:trade/game_start

+ 2 - 2
data/mini/functions/main/give_effect.mcfunction

@@ -3,5 +3,5 @@ execute if score $mini_type mem matches 2 run function mini:tntrun/give_effect
 execute if score $mini_type mem matches 3 run function mini:hotpm/give_effect
 execute if score $mini_type mem matches 4 run function mini:colormatch/give_effect
 execute if score $mini_type mem matches 5 run function mini:phantom/give_effect
-execute if score $mini_type mem matches -1 run function mini:diamond/give_effect
-execute if score $mini_type mem matches -2 run function mini:trade/give_effect
+execute if score $mini_type mem matches 101 run function mini:diamond/give_effect
+execute if score $mini_type mem matches 102 run function mini:trade/give_effect

+ 3 - 3
data/mini/functions/main/player_death.mcfunction

@@ -1,5 +1,5 @@
 # 玩家死亡后触发
 execute if score $mini_type mem matches 5 run function mini:phantom/player_failed
-execute if score $mini_type mem matches -1 run function mini:diamond/player_death
-execute if score $mini_type mem matches 6 run function mini:main/player_failed
-execute if score $mini_type mem matches -2 run function mini:trade/player_death
+execute if score $mini_type mem matches 6 run function mini:ass/player_death
+execute if score $mini_type mem matches 101 run function mini:diamond/player_death
+execute if score $mini_type mem matches 102 run function mini:trade/player_death

+ 2 - 2
data/mini/functions/main/player_enter.mcfunction

@@ -16,6 +16,6 @@ execute if score $mini_type mem matches 2 run function mini:tntrun/player_enter
 execute if score $mini_type mem matches 3 run function mini:hotpm/player_enter
 execute if score $mini_type mem matches 4 run function mini:colormatch/player_enter
 execute if score $mini_type mem matches 5 run function mini:phantom/player_enter
-execute if score $mini_type mem matches -1 run function mini:diamond/player_enter
 execute if score $mini_type mem matches 6 run function mini:ass/player_enter
-execute if score $mini_type mem matches -2 run function mini:trade/player_enter
+execute if score $mini_type mem matches 101 run function mini:diamond/player_enter
+execute if score $mini_type mem matches 102 run function mini:trade/player_enter

+ 2 - 2
data/mini/functions/main/player_intro.mcfunction

@@ -4,6 +4,6 @@ execute if score $mini_type mem matches 2 run function mini:tntrun/player_intro
 execute if score $mini_type mem matches 3 run function mini:hotpm/player_intro
 execute if score $mini_type mem matches 4 run function mini:colormatch/player_intro
 execute if score $mini_type mem matches 5 run function mini:phantom/player_intro
-execute if score $mini_type mem matches -1 run function mini:diamond/player_intro
 execute if score $mini_type mem matches 6 run function mini:ass/player_intro
-execute if score $mini_type mem matches -2 run function mini:trade/player_intro
+execute if score $mini_type mem matches 101 run function mini:diamond/player_intro
+execute if score $mini_type mem matches 102 run function mini:trade/player_intro

+ 2 - 2
data/mini/functions/main/tick2.mcfunction

@@ -4,6 +4,6 @@ execute if score $mini_type mem matches 2 run function mini:tntrun/tick2
 execute if score $mini_type mem matches 3 run function mini:hotpm/tick2
 execute if score $mini_type mem matches 4 run function mini:colormatch/tick2
 execute if score $mini_type mem matches 5 run function mini:phantom/tick2
-execute if score $mini_type mem matches -1 run function mini:diamond/tick2
 execute if score $mini_type mem matches 6 run function mini:ass/tick2
-execute if score $mini_type mem matches -2 run function mini:trade/tick2
+execute if score $mini_type mem matches 101 run function mini:diamond/tick2
+execute if score $mini_type mem matches 102 run function mini:trade/tick2

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

@@ -2,9 +2,9 @@
 # 触发单个模块
 execute if score $mini_type mem matches 1 run function mini:parkour/tick20
 execute if score $mini_type mem matches 5 run function mini:phantom/tick20
-execute if score $mini_type mem matches -1 run function mini:diamond/tick20
 execute if score $mini_type mem matches 6 run function mini:ass/tick20
-execute if score $mini_type mem matches -2 run function mini:trade/tick20
+execute if score $mini_type mem matches 101 run function mini:diamond/tick20
+execute if score $mini_type mem matches 102 run function mini:trade/tick20
 
 # 结束游戏判定
 function mini:main/check_game_end

+ 1 - 1
data/mini/functions/main/tick5.mcfunction

@@ -4,7 +4,7 @@ execute if score $mini_type mem matches 1 run function mini:parkour/tick5
 execute if score $mini_type mem matches 2 run function mini:tntrun/tick5
 execute if score $mini_type mem matches 3 run function mini:hotpm/tick5
 execute if score $mini_type mem matches 5 run function mini:phantom/tick5
-execute if score $mini_type mem matches -1 run function mini:diamond/tick5
+execute if score $mini_type mem matches 101 run function mini:diamond/tick5
 
 # 同步生命值
 scoreboard players reset * temp

+ 2 - 2
data/mini/functions/main/watcher_limit.mcfunction

@@ -4,6 +4,6 @@ execute if score $mini_type mem matches 2 run function mini:tntrun/watcher_limit
 execute if score $mini_type mem matches 3 run function mini:hotpm/watcher_limit
 execute if score $mini_type mem matches 4 run function mini:colormatch/watcher_limit
 execute if score $mini_type mem matches 5 run function mini:phantom/watcher_limit
-execute if score $mini_type mem matches -1 run function mini:diamond/watcher_limit
 execute if score $mini_type mem matches 6 run function mini:ass/watcher_limit
-execute if score $mini_type mem matches -2 run function mini:trade/watcher_limit
+execute if score $mini_type mem matches 101 run function mini:diamond/watcher_limit
+execute if score $mini_type mem matches 102 run function mini:trade/watcher_limit

+ 1 - 0
data/test/functions/mini/ass.mcfunction

@@ -1,5 +1,6 @@
 # 测试用:快速开始 Assassinate
 team join playing @a[team=watching]
+clear @a[team=!debugging]
 function ltw:state/0/start_game
 scoreboard players set $round mem 5
 scoreboard players set $mini_type mem 6

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

@@ -3,7 +3,7 @@ team join playing @a[team=watching]
 clear @a[team=!debugging]
 function ltw:state/0/start_game
 scoreboard players set $round mem 5
-scoreboard players set $mini_type mem -1
+scoreboard players set $mini_type mem 101
 function mini:main/game_init
 function ltw:state/4/state_enter
 say 已开始单个测试游戏!

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

@@ -3,7 +3,7 @@ team join playing @a[team=watching]
 clear @a[team=!debugging]
 function ltw:state/0/start_game
 scoreboard players set $round mem 5
-scoreboard players set $mini_type mem -2
+scoreboard players set $mini_type mem 102
 function mini:main/game_init
 function ltw:state/4/state_enter
 say 已开始单个测试游戏!