Преглед изворни кода

刺客 50% 在第一轮出现

LTCatt пре 5 година
родитељ
комит
196403d3cb

+ 1 - 1
data/ltw/functions/init.mcfunction

@@ -94,7 +94,7 @@ scoreboard objectives add stat_win dummy "总胜场"
 scoreboard objectives add puzzle dummy "解密编号"
 
 # 常量与变量初始化
-scoreboard players set #mini_total mem 6
+scoreboard players set #mini_total mem 5
 scoreboard players set #const_2 mem 2
 scoreboard players set #const_4 mem 4
 scoreboard players set #const_5 mem 5

+ 4 - 1
data/ltw/functions/state/3/state_enter.mcfunction

@@ -26,10 +26,13 @@ execute unless data storage ltw:mini types[0] run function ltw:state/3/newarray
 execute store result score $mini_type mem run data get storage ltw:mini types[0]
 execute if score $round mem matches ..4 run data remove storage ltw:mini types[0]
 
-# 小游戏编号覆盖:如果为第 5 轮,则有一半概率选用钻石,一半概率选用贸易
+# 前置/后置小游戏
+# 如果为第 1 轮,则有一半概率选用刺客,一半概率不变
+# 如果为第 5 轮,则有一半概率选用钻石,一半概率选用贸易
 scoreboard players set $random_max mem 1
 scoreboard players set $random_min mem 0
 function lib:random
+execute if score $round mem matches 1 if score $random mem matches 0 run scoreboard players set $mini_type mem 201
 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
 

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

@@ -4,7 +4,7 @@ execute if score $mini_type mem matches 2 run function mini:tntrun/game_end
 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 201 run function mini:ass/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
 

+ 1 - 1
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 6 run function mini:ass/game_init
+execute if score $mini_type mem matches 201 run function mini:ass/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
 

+ 1 - 1
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 6 run function mini:ass/game_start
+execute if score $mini_type mem matches 201 run function mini:ass/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

+ 1 - 1
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 6 run function mini:ass/player_death
+execute if score $mini_type mem matches 201 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

+ 1 - 1
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 6 run function mini:ass/player_enter
+execute if score $mini_type mem matches 201 run function mini:ass/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

+ 1 - 1
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 6 run function mini:ass/player_intro
+execute if score $mini_type mem matches 201 run function mini:ass/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

+ 1 - 1
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 6 run function mini:ass/tick2
+execute if score $mini_type mem matches 201 run function mini:ass/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

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

@@ -2,7 +2,7 @@
 # 触发单个模块
 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 6 run function mini:ass/tick20
+execute if score $mini_type mem matches 201 run function mini:ass/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
 

+ 1 - 1
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 6 run function mini:ass/watcher_limit
+execute if score $mini_type mem matches 201 run function mini:ass/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 - 1
data/test/functions/mini/ass.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 6
+scoreboard players set $mini_type mem 201
 function mini:main/game_init
 function ltw:state/4/state_enter
 say 已开始单个测试游戏!