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

data/item/functions/lobby_state/join_game.mcfunction

@@ -3,7 +3,7 @@ clear @s lime_dye{lobby_item:1b,lobby_ready:1b}
 clear @s gray_dye{lobby_item:1b,lobby_watch:1b}
 kill @e[type=item,nbt={Item:{id:"minecraft:gray_dye",tag:{lobby_item:1b,lobby_watch:1b}}}]
 execute if data entity @s Inventory[{Slot:8b}] unless data entity @s Inventory[{Slot:8b,tag:{lobby_item:1b,lobby_watch:1b}}] at @s run function item:disable_slot/disable_slot_8
-replaceitem entity @s hotbar.8 lime_dye{lobby_item:1b,lobby_ready:1b,display:{Name:'{"text":"已准备 (按 Q 切换)","color":"green","italic":false}',Lore:['{"text":"你将在下一局参与游戏","color":"gray","italic":false}']}}
+replaceitem entity @s hotbar.8 lime_dye{lobby_item:1b,lobby_ready:1b,display:{Name:'[{"text":"已准备 (按 ","color":"green","italic":false},{"keybind":"key.drop","color":"green","italic":false},{"text":" 切换)","color":"green","italic":false}]',Lore:['{"text":"你将在下一局参与游戏","color":"gray","italic":false}']}}
 execute at @s run function lib:sounds/hit
 
 # 处理数据

data/item/functions/lobby_state/join_watch.mcfunction

@@ -3,7 +3,7 @@ clear @s lime_dye{lobby_item:1b,lobby_ready:1b}
 clear @s gray_dye{lobby_item:1b,lobby_watch:1b}
 kill @e[type=item,nbt={Item:{id:"minecraft:lime_dye",tag:{lobby_item:1b,lobby_ready:1b}}}]
 execute if data entity @s Inventory[{Slot:8b}] unless data entity @s Inventory[{Slot:8b,tag:{lobby_item:1b,lobby_ready:1b}}] at @s run function item:disable_slot/disable_slot_8
-replaceitem entity @s hotbar.8 gray_dye{lobby_item:1b,lobby_watch:1b,display:{Name:'{"text":"旁观 (按 Q 切换)","color":"white","italic":false}',Lore:['{"text":"你将在下一局旁观游戏","color":"gray","italic":false}']}}
+replaceitem entity @s hotbar.8 gray_dye{lobby_item:1b,lobby_watch:1b,display:{Name:'[{"text":"旁观 (按 ","color":"white","italic":false},{"keybind":"key.drop","color":"white","italic":false},{"text":" 切换)","color":"white","italic":false}]',Lore:['{"text":"你将在下一局旁观游戏","color":"gray","italic":false}']}}
 execute at @s run function lib:sounds/hit2
 
 # 处理数据

data/mini/functions/colormatch/game/generate_parts.mcfunction

@@ -11,8 +11,8 @@ execute if score $floor_generate_part mem matches 7 positioned 1000 10 4000 run
 execute if score $floor_generate_part mem matches 8 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_8",integrity:0.125f}
 execute if score $floor_generate_part mem matches 9 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_9",integrity:0.1111111111111111f}
 execute if score $floor_generate_part mem matches 10 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_10",integrity:0.1f}
-execute if score $floor_generate_part mem matches 11 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_11",integrity:0.09090909090909091f}
-execute if score $floor_generate_part mem matches 12 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_12",integrity:0.08333333333333333f}
+# execute if score $floor_generate_part mem matches 11 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_11",integrity:0.09090909090909091f}
+# execute if score $floor_generate_part mem matches 12 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_12",integrity:0.08333333333333333f}
 # execute if score $floor_generate_part mem matches 13 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_13",integrity:0.07692307692307693f}
 # execute if score $floor_generate_part mem matches 14 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_14",integrity:0.07142857142857142f}
 # execute if score $floor_generate_part mem matches 15 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_15",integrity:0.06666666666666667f}

data/mini/functions/colormatch/game/get_random_floor.mcfunction

@@ -1,8 +1,9 @@
+# 抽取随机地板值
 execute unless data storage ltw:mini colormatch.types[0] run function mini:colormatch/game/newarray
 execute store result score $color_match_floor mem run data get storage ltw:mini colormatch.types[0]
 data remove storage ltw:mini colormatch.types[0]
 
-# 随机选择不消失的方块
+# 随机选择不消失的方块 # prismarine
 execute positioned 1001 10 4000 run fill ~ ~1 ~ ~24 ~1 ~24 air replace
 execute positioned 1001 10 4000 if score $color_match_floor mem matches 1 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered acacia_planks
 execute positioned 1001 10 4000 if score $color_match_floor mem matches 2 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered birch_planks
@@ -13,9 +14,9 @@ execute positioned 1001 10 4000 if score $color_match_floor mem matches 6 run cl
 execute positioned 1001 10 4000 if score $color_match_floor mem matches 7 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered bricks
 execute positioned 1001 10 4000 if score $color_match_floor mem matches 8 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered mossy_cobblestone
 execute positioned 1001 10 4000 if score $color_match_floor mem matches 9 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered purpur_block
-execute positioned 1001 10 4000 if score $color_match_floor mem matches 10 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered emerald_block
-execute positioned 1001 10 4000 if score $color_match_floor mem matches 11 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered prismarine
-execute positioned 1001 10 4000 if score $color_match_floor mem matches 12 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered soul_soil
+execute positioned 1001 10 4000 if score $color_match_floor mem matches 10 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered prismarine
+# execute positioned 1001 10 4000 if score $color_match_floor mem matches 11 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered emerald_block
+# execute positioned 1001 10 4000 if score $color_match_floor mem matches 12 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered soul_soil
 # execute positioned 1001 10 4000 if score $color_match_floor mem matches 13 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered packed_ice
 # execute positioned 1001 10 4000 if score $color_match_floor mem matches 14 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered white_wool
 # execute positioned 1001 10 4000 if score $color_match_floor mem matches 15 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered diamond_block

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

@@ -1,4 +1,4 @@
-scoreboard players set $randarray_max mem 12
+scoreboard players set $randarray_max mem 10
 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

data/mini/functions/colormatch/game/prepare_round.mcfunction

@@ -1,5 +1,5 @@
 # 刷新地板
 function mini:colormatch/game/generate_floor
 
-# 获取保留地板
+# 复制要保留的地板
 schedule function mini:colormatch/game/get_random_floor 13t replace

data/mini/functions/colormatch/game/replace_wall.mcfunction

@@ -34,18 +34,18 @@ execute if score $color_match_floor mem matches 9 run fill 1075 11 3999 1075 40
 execute if score $color_match_floor mem matches 9 run fill 1075 11 3999 1049 40 3999 purpur_block
 execute if score $color_match_floor mem matches 9 run fill 1049 11 3999 1049 40 4025 purpur_block
 execute if score $color_match_floor mem matches 9 run fill 1049 11 4025 1075 40 4025 purpur_block
-execute if score $color_match_floor mem matches 10 run fill 1075 11 3999 1075 40 4025 emerald_block
-execute if score $color_match_floor mem matches 10 run fill 1075 11 3999 1049 40 3999 emerald_block
-execute if score $color_match_floor mem matches 10 run fill 1049 11 3999 1049 40 4025 emerald_block
-execute if score $color_match_floor mem matches 10 run fill 1049 11 4025 1075 40 4025 emerald_block
-execute if score $color_match_floor mem matches 11 run fill 1075 11 3999 1075 40 4025 prismarine
-execute if score $color_match_floor mem matches 11 run fill 1075 11 3999 1049 40 3999 prismarine
-execute if score $color_match_floor mem matches 11 run fill 1049 11 3999 1049 40 4025 prismarine
-execute if score $color_match_floor mem matches 11 run fill 1049 11 4025 1075 40 4025 prismarine
-execute if score $color_match_floor mem matches 12 run fill 1075 11 3999 1075 40 4025 soul_soil
-execute if score $color_match_floor mem matches 12 run fill 1075 11 3999 1049 40 3999 soul_soil
-execute if score $color_match_floor mem matches 12 run fill 1049 11 3999 1049 40 4025 soul_soil
-execute if score $color_match_floor mem matches 12 run fill 1049 11 4025 1075 40 4025 soul_soil
+execute if score $color_match_floor mem matches 10 run fill 1075 11 3999 1075 40 4025 prismarine
+execute if score $color_match_floor mem matches 10 run fill 1075 11 3999 1049 40 3999 prismarine
+execute if score $color_match_floor mem matches 10 run fill 1049 11 3999 1049 40 4025 prismarine
+execute if score $color_match_floor mem matches 10 run fill 1049 11 4025 1075 40 4025 prismarine
+# execute if score $color_match_floor mem matches 11 run fill 1075 11 3999 1075 40 4025 prismarine
+# execute if score $color_match_floor mem matches 11 run fill 1075 11 3999 1049 40 3999 prismarine
+# execute if score $color_match_floor mem matches 11 run fill 1049 11 3999 1049 40 4025 prismarine
+# execute if score $color_match_floor mem matches 11 run fill 1049 11 4025 1075 40 4025 prismarine
+# execute if score $color_match_floor mem matches 12 run fill 1075 11 3999 1075 40 4025 soul_soil
+# execute if score $color_match_floor mem matches 12 run fill 1075 11 3999 1049 40 3999 soul_soil
+# execute if score $color_match_floor mem matches 12 run fill 1049 11 3999 1049 40 4025 soul_soil
+# execute if score $color_match_floor mem matches 12 run fill 1049 11 4025 1075 40 4025 soul_soil
 # execute if score $color_match_floor mem matches 13 run fill 1075 11 3999 1075 40 4025 packed_ice
 # execute if score $color_match_floor mem matches 13 run fill 1075 11 3999 1049 40 3999 packed_ice
 # execute if score $color_match_floor mem matches 13 run fill 1049 11 3999 1049 40 4025 packed_ice

data/mini/functions/colormatch/game/start_new_round.mcfunction

@@ -25,3 +25,15 @@ scoreboard players operation $countdown_max mem = $countdown_fast mem
 scoreboard players set $bossbar_type mem 1
 function lib:bossbar/show
 bossbar set mini:red name "地板消失"
+
+# 物品栏显示
+execute if score $color_match_floor mem matches 1 run replaceitem entity @a hotbar.7 acacia_planks{game_item:1b,display:{Name:'[{"text":"这一轮的地板方块为:","color":"white","italic":false},{"translate": "block.minecraft.acacia_planks","bold":true,"color":"gold"}]'}}
+execute if score $color_match_floor mem matches 2 run replaceitem entity @a hotbar.7 birch_planks{game_item:1b,display:{Name:'[{"text":"这一轮的地板方块为:","color":"white","italic":false},{"translate": "block.minecraft.birch_planks","bold":true,"color":"gold"}]'}}
+execute if score $color_match_floor mem matches 3 run replaceitem entity @a hotbar.7 bedrock{game_item:1b,display:{Name:'[{"text":"这一轮的地板方块为:","color":"white","italic":false},{"translate": "block.minecraft.bedrock","bold":true,"color":"gold"}]'}}
+execute if score $color_match_floor mem matches 4 run replaceitem entity @a hotbar.7 crimson_planks{game_item:1b,display:{Name:'[{"text":"这一轮的地板方块为:","color":"white","italic":false},{"translate": "block.minecraft.crimson_planks","bold":true,"color":"gold"}]'}}
+execute if score $color_match_floor mem matches 5 run replaceitem entity @a hotbar.7 warped_planks{game_item:1b,display:{Name:'[{"text":"这一轮的地板方块为:","color":"white","italic":false},{"translate": "block.minecraft.warped_planks","bold":true,"color":"gold"}]'}}
+execute if score $color_match_floor mem matches 6 run replaceitem entity @a hotbar.7 gold_block{game_item:1b,display:{Name:'[{"text":"这一轮的地板方块为:","color":"white","italic":false},{"translate": "block.minecraft.gold_block","bold":true,"color":"gold"}]'}}
+execute if score $color_match_floor mem matches 7 run replaceitem entity @a hotbar.7 bricks{game_item:1b,display:{Name:'[{"text":"这一轮的地板方块为:","color":"white","italic":false},{"translate": "block.minecraft.bricks","bold":true,"color":"gold"}]'}}
+execute if score $color_match_floor mem matches 8 run replaceitem entity @a hotbar.7 mossy_cobblestone{game_item:1b,display:{Name:'[{"text":"这一轮的地板方块为:","color":"white","italic":false},{"translate": "block.minecraft.mossy_cobblestone","bold":true,"color":"gold"}]'}}
+execute if score $color_match_floor mem matches 9 run replaceitem entity @a hotbar.7 purpur_block{game_item:1b,display:{Name:'[{"text":"这一轮的地板方块为:","color":"white","italic":false},{"translate": "block.minecraft.purpur_block","bold":true,"color":"gold"}]'}}
+execute if score $color_match_floor mem matches 10 run replaceitem entity @a hotbar.7 prismarine{game_item:1b,display:{Name:'[{"text":"这一轮的地板方块为:","color":"white","italic":false},{"translate": "block.minecraft.prismarine","bold":true,"color":"gold"}]'}}

data/mini/functions/parkour/player_enter.mcfunction

@@ -27,7 +27,8 @@ tag @s remove treasure9
 tag @s remove treasure10
 
 # 传送玩家
-tp @s[tag=!watcher,tag=!rejoining,tag=!debug] 1010.07 7.50 1006.98 -1518.69 -10.62
+spreadplayers 1018 1007 4 6 under 9 false @s[tag=!watcher,tag=!rejoining,tag=!debug]
+# tp @s[tag=!watcher,tag=!rejoining,tag=!debug] 1010.07 7.50 1006.98 -1518.69 -10.62
 
 # 调整模式
 gamemode spectator @s[tag=!debug]