重构：随机

data/lib/functions/random_array/add.mcfunction

@@ -0,0 +1,3 @@
+execute store result storage lib:random_array cache int 1 run scoreboard players get @s mem
+data modify storage lib:random_array out append from storage lib:random_array cache
+kill @s

data/lib/functions/random_array/call.mcfunction

@@ -0,0 +1,11 @@
+#inputs:
+#   $array_max mem   生成 1~max 的随机数列（如果有去重则不包含 $array_last）
+#   $array_last mem  上一个数列的末尾，如果不需要去重则为0
+#output: storage lib:random_array out
+
+data modify storage lib:random_array out set value []
+execute if score $array_max mem matches 1.. run function lib:random_array/recu
+execute as @e[tag=randarray_marker] if score @s mem = $array_last mem run kill @s
+execute as @e[tag=randarray_marker,sort=random] run function lib:random_array/add
+
+# tellraw @a ["新随机数组已生成：",{"nbt": "out","storage": "lib:random_array"},"，去重：",{"score": {"name": "$array_last","objective": "mem"}}]

data/lib/functions/random_array/recu.mcfunction

@@ -0,0 +1,5 @@
+summon minecraft:area_effect_cloud ~ ~ ~ {Age: -2147483648, Duration: -1, WaitTime: -2147483648, Tags: ["randarray_marker","randarray_marker_"]}
+scoreboard players operation @e[tag=randarray_marker_] mem = $array_max mem
+tag @e[tag=randarray_marker_] remove randarray_marker_
+scoreboard players remove $array_max mem 1
+execute if score $array_max mem matches 1.. run function lib:random_array/recu

data/lib/functions/tempo_block/tempo_red.mcfunction

@@ -2,4 +2,4 @@
 execute if score $state mem matches 0 run function ltw:state/0/sp/tempo_block/tempo_red
 
 # TODO: 未完成的重构
-execute if score $state mem matches 5 if score $mini_type mem matches 1 run function mini:parkour/game/tempo_red
+# execute if score $state mem matches 5 if score $mini_type mem matches 1 run function mini:parkour/game/tempo_red

data/lib/functions/tempo_block/tempo_sound.mcfunction

@@ -2,4 +2,4 @@
 execute if score $state mem matches 0 run function ltw:state/0/sp/tempo_block/tempo_sound
 
 # TODO: 未完成的重构
-execute if score $state mem matches 5 if score $mini_type mem matches 1 run function mini:parkour/game/tempo_sound
+# execute if score $state mem matches 5 if score $mini_type mem matches 1 run function mini:parkour/game/tempo_sound

data/ltw/functions/clock/tick2.mcfunction

@@ -15,7 +15,6 @@ execute if score $state mem matches 0 run function ltw:state/0/tick2
 # 物品模块必须最后调用，以清理弹出的临时物品
 function item:tick2
 
-
 # TODO: 未完成的重构
 
 # # 特殊方块给予效果

data/ltw/functions/init/player.mcfunction

@@ -1,8 +0,0 @@
-# 重置玩家状态
-
-# HUD
-title @s clear
-title @s actionbar ""
-
-# 状态效果
-effect clear @s

data/ltw/functions/main/player_enter.mcfunction

@@ -26,6 +26,5 @@ execute if score $state mem matches 0 run function ltw:state/0/player_enter
 # 处理进度
 #advancement revoke @s only lib:damage_dealt
 #advancement revoke @s only lib:damage_taken
-#advancement revoke @s only item:container/place
 #advancement revoke @s only item:special/consume_enchanted_apple
 #advancement revoke @s only item:special/consume_golden_apple

data/ltw/functions/state/0/player_enter.mcfunction

@@ -1,5 +1,8 @@
 # 对单个玩家的处理（如果玩家中途加入就会执行此函数）
-function ltw:init/player
+
+# HUD
+title @s clear
+title @s actionbar ""
 
 # BGM
 scoreboard players set @s music_now 1
@@ -7,6 +10,7 @@ function lib:music/refresh
 scoreboard players set @s music_now 2
 
 # 状态效果
+effect clear @s
 
 # 位置与模式
 tp @s -14 10 -40 218 0

data/old/item/functions/bonus_item/new_array.mcfunction

@@ -1,4 +1,4 @@
-scoreboard players set $randarray_max mem 10
-scoreboard players set $randarray_last mem 0
-function lib:randarray/call
-data modify storage ltw:mini qualities set from storage lib:randarray out
+scoreboard players set $array_max mem 10
+scoreboard players set $array_last mem 0
+function lib:random_array/call
+data modify storage ltw:mini qualities set from storage lib:random_array out

data/old/lib/functions/randarray/add.mcfunction

@@ -1,3 +0,0 @@
-execute store result storage lib:randarray cache int 1 run scoreboard players get @s mem
-data modify storage lib:randarray out append from storage lib:randarray cache
-kill @s

data/old/lib/functions/randarray/call.mcfunction

@@ -1,11 +0,0 @@
-#inputs:
-#   $randarray_max mem   生成1~max的随机数列,如果有去重则没有last
-#   $randarray_last mem  上一个数列的末尾，如果不需要去重则为0
-#output: storage lib:randarray out
-
-data modify storage lib:randarray out set value []
-execute if score $randarray_max mem matches 1.. run function lib:randarray/recu
-execute as @e[tag=randarray_marker] if score @s mem = $randarray_last mem run kill @s
-execute as @e[tag=randarray_marker,sort=random] run function lib:randarray/add
-
-# tellraw @a ["新随机数组已生成：",{"nbt": "out","storage": "lib:randarray"},"，去重：",{"score": {"name": "$randarray_last","objective": "mem"}}]

data/old/lib/functions/randarray/recu.mcfunction

@@ -1,5 +0,0 @@
-summon minecraft:area_effect_cloud ~ ~ ~ {Age: -2147483648, Duration: -1, WaitTime: -2147483648, Tags: ["randarray_marker","randarray_marker_"]}
-scoreboard players operation @e[tag=randarray_marker_] mem = $randarray_max mem
-tag @e[tag=randarray_marker_] remove randarray_marker_
-scoreboard players remove $randarray_max mem 1
-execute if score $randarray_max mem matches 1.. run function lib:randarray/recu

data/old/ltw/functions/state/3/newarray.mcfunction

@@ -1,4 +1,4 @@
-scoreboard players operation $randarray_max mem = #mini_total mem
-scoreboard players operation $randarray_last mem = $mini_type mem
-function lib:randarray/call
-data modify storage ltw:mini types set from storage lib:randarray out
+scoreboard players operation $array_max mem = #mini_total mem
+scoreboard players operation $array_last mem = $mini_type mem
+function lib:random_array/call
+data modify storage ltw:mini types set from storage lib:random_array out

data/old/mini/functions/colormatch/game/newarray.mcfunction

@@ -1,4 +1,4 @@
-scoreboard players set $randarray_max mem 8
-scoreboard players operation $randarray_last mem = $color_match_floor mem
-function lib:randarray/call
-data modify storage ltw:mini colormatch.types set from storage lib:randarray out
+scoreboard players set $array_max mem 8
+scoreboard players operation $array_last mem = $color_match_floor mem
+function lib:random_array/call
+data modify storage ltw:mini colormatch.types set from storage lib:random_array out