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

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

@@ -7,10 +7,10 @@ data remove storage ltw:mini colormatch.types[0]
 execute positioned 1001 10 4000 run fill ~ ~1 ~ ~20 ~1 ~20 air replace
 execute positioned 1001 10 4000 if score $color_match_floor mem matches 1 run clone ~ ~ ~ ~20 ~ ~20 ~ ~1 ~ filtered acacia_planks
 execute positioned 1001 10 4000 if score $color_match_floor mem matches 2 run clone ~ ~ ~ ~20 ~ ~20 ~ ~1 ~ filtered birch_planks
-execute positioned 1001 10 4000 if score $color_match_floor mem matches 3 run clone ~ ~ ~ ~20 ~ ~20 ~ ~1 ~ filtered bedrock
+execute positioned 1001 10 4000 if score $color_match_floor mem matches 3 run clone ~ ~ ~ ~20 ~ ~20 ~ ~1 ~ filtered soul_soil
 execute positioned 1001 10 4000 if score $color_match_floor mem matches 4 run clone ~ ~ ~ ~20 ~ ~20 ~ ~1 ~ filtered crimson_planks
 execute positioned 1001 10 4000 if score $color_match_floor mem matches 5 run clone ~ ~ ~ ~20 ~ ~20 ~ ~1 ~ filtered warped_planks
-execute positioned 1001 10 4000 if score $color_match_floor mem matches 6 run clone ~ ~ ~ ~20 ~ ~20 ~ ~1 ~ filtered gold_block
+execute positioned 1001 10 4000 if score $color_match_floor mem matches 6 run clone ~ ~ ~ ~20 ~ ~20 ~ ~1 ~ filtered purpur_block
 execute positioned 1001 10 4000 if score $color_match_floor mem matches 7 run clone ~ ~ ~ ~20 ~ ~20 ~ ~1 ~ filtered bricks
 execute positioned 1001 10 4000 if score $color_match_floor mem matches 8 run clone ~ ~ ~ ~20 ~ ~20 ~ ~1 ~ filtered mossy_cobblestone
 # execute positioned 1001 10 4000 if score $color_match_floor mem matches 9 run clone ~ ~ ~ ~20 ~ ~20 ~ ~1 ~ filtered purpur_block

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

@@ -2,7 +2,7 @@
 fill 1049 14 3999 1071 14 4021 air replace #mini:colarmatch_floor
 
 # 替换方块
-execute positioned 1001 11 4000 run clone ~ ~ ~ ~20 ~ ~20 1050 15 4000 filtered #mini:colarmatch_floor
+execute positioned 1001 11 4000 run clone ~ ~ ~ ~20 ~ ~20 1050 14 4000 filtered #mini:colarmatch_floor
 
 # 告知玩家
 execute as @a at @s run function lib:sounds/hit2

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

@@ -6,10 +6,10 @@ execute if score $color_match_floor mem matches 2 run fill 1049 18 4008 1049 22
 execute if score $color_match_floor mem matches 2 run fill 1062 22 4021 1058 18 4021 minecraft:birch_planks
 execute if score $color_match_floor mem matches 2 run fill 1071 18 4012 1071 22 4008 minecraft:birch_planks
 execute if score $color_match_floor mem matches 2 run fill 1058 22 3999 1062 18 3999 minecraft:birch_planks
-execute if score $color_match_floor mem matches 3 run fill 1049 18 4008 1049 22 4012 minecraft:bedrock
-execute if score $color_match_floor mem matches 3 run fill 1062 22 4021 1058 18 4021 minecraft:bedrock
-execute if score $color_match_floor mem matches 3 run fill 1071 18 4012 1071 22 4008 minecraft:bedrock
-execute if score $color_match_floor mem matches 3 run fill 1058 22 3999 1062 18 3999 minecraft:bedrock
+execute if score $color_match_floor mem matches 3 run fill 1049 18 4008 1049 22 4012 minecraft:soul_soil
+execute if score $color_match_floor mem matches 3 run fill 1062 22 4021 1058 18 4021 minecraft:soul_soil
+execute if score $color_match_floor mem matches 3 run fill 1071 18 4012 1071 22 4008 minecraft:soul_soil
+execute if score $color_match_floor mem matches 3 run fill 1058 22 3999 1062 18 3999 minecraft:soul_soil
 execute if score $color_match_floor mem matches 4 run fill 1049 18 4008 1049 22 4012 minecraft:crimson_planks
 execute if score $color_match_floor mem matches 4 run fill 1062 22 4021 1058 18 4021 minecraft:crimson_planks
 execute if score $color_match_floor mem matches 4 run fill 1071 18 4012 1071 22 4008 minecraft:crimson_planks
@@ -18,10 +18,10 @@ execute if score $color_match_floor mem matches 5 run fill 1049 18 4008 1049 22
 execute if score $color_match_floor mem matches 5 run fill 1062 22 4021 1058 18 4021 minecraft:warped_planks
 execute if score $color_match_floor mem matches 5 run fill 1071 18 4012 1071 22 4008 minecraft:warped_planks
 execute if score $color_match_floor mem matches 5 run fill 1058 22 3999 1062 18 3999 minecraft:warped_planks
-execute if score $color_match_floor mem matches 6 run fill 1049 18 4008 1049 22 4012 minecraft:gold_block
-execute if score $color_match_floor mem matches 6 run fill 1062 22 4021 1058 18 4021 minecraft:gold_block
-execute if score $color_match_floor mem matches 6 run fill 1071 18 4012 1071 22 4008 minecraft:gold_block
-execute if score $color_match_floor mem matches 6 run fill 1058 22 3999 1062 18 3999 minecraft:gold_block
+execute if score $color_match_floor mem matches 6 run fill 1049 18 4008 1049 22 4012 minecraft:purpur_block
+execute if score $color_match_floor mem matches 6 run fill 1062 22 4021 1058 18 4021 minecraft:purpur_block
+execute if score $color_match_floor mem matches 6 run fill 1071 18 4012 1071 22 4008 minecraft:purpur_block
+execute if score $color_match_floor mem matches 6 run fill 1058 22 3999 1062 18 3999 minecraft:purpur_block
 execute if score $color_match_floor mem matches 7 run fill 1049 18 4008 1049 22 4012 minecraft:bricks
 execute if score $color_match_floor mem matches 7 run fill 1062 22 4021 1058 18 4021 minecraft:bricks
 execute if score $color_match_floor mem matches 7 run fill 1071 18 4012 1071 22 4008 minecraft:bricks

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

@@ -8,10 +8,10 @@ execute if data entity @s Inventory[{Slot:8b}] at @s run function item:pop_slot/
 # 物品栏显示
 execute if score $color_match_current mem matches 1 run replaceitem entity @s hotbar.8 acacia_planks{game_item:1b,display:{Name:'[{"text":"本轮的地板方块","color":"white","italic":false}]'}}
 execute if score $color_match_current mem matches 2 run replaceitem entity @s hotbar.8 birch_planks{game_item:1b,display:{Name:'[{"text":"本轮的地板方块","color":"white","italic":false}]'}}
-execute if score $color_match_current mem matches 3 run replaceitem entity @s hotbar.8 bedrock{game_item:1b,display:{Name:'[{"text":"本轮的地板方块","color":"white","italic":false}]'}}
+execute if score $color_match_current mem matches 3 run replaceitem entity @s hotbar.8 soul_soil{game_item:1b,display:{Name:'[{"text":"本轮的地板方块","color":"white","italic":false}]'}}
 execute if score $color_match_current mem matches 4 run replaceitem entity @s hotbar.8 crimson_planks{game_item:1b,display:{Name:'[{"text":"本轮的地板方块","color":"white","italic":false}]'}}
 execute if score $color_match_current mem matches 5 run replaceitem entity @s hotbar.8 warped_planks{game_item:1b,display:{Name:'[{"text":"本轮的地板方块","color":"white","italic":false}]'}}
-execute if score $color_match_current mem matches 6 run replaceitem entity @s hotbar.8 gold_block{game_item:1b,display:{Name:'[{"text":"本轮的地板方块","color":"white","italic":false}]'}}
+execute if score $color_match_current mem matches 6 run replaceitem entity @s hotbar.8 purpur_block{game_item:1b,display:{Name:'[{"text":"本轮的地板方块","color":"white","italic":false}]'}}
 execute if score $color_match_current mem matches 7 run replaceitem entity @s hotbar.8 bricks{game_item:1b,display:{Name:'[{"text":"本轮的地板方块","color":"white","italic":false}]'}}
 execute if score $color_match_current mem matches 8 run replaceitem entity @s hotbar.8 mossy_cobblestone{game_item:1b,display:{Name:'[{"text":"本轮的地板方块","color":"white","italic":false}]'}}
 # execute if score $color_match_current mem matches 9 run replaceitem entity @s hotbar.8 purpur_block{game_item:1b,display:{Name:'[{"text":"本轮的地板方块","color":"white","italic":false}]'}}

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

@@ -1,7 +1,7 @@
 # 替换墙壁
 function mini:colormatch/game/replace_wall
 # 复制地板
-execute positioned 1001 10 4000 run clone ~ ~ ~ ~20 ~ ~20 1050 15 4000 filtered #mini:colarmatch_floor
+execute positioned 1001 10 4000 run clone ~ ~ ~ ~20 ~ ~20 1050 14 4000 filtered #mini:colarmatch_floor
 
 # 设置倒计时
 scoreboard players remove $color_match_time mem 3

data/mini/functions/colormatch/game_init2.mcfunction

@@ -1,4 +1,4 @@
 # 替换墙壁
 function mini:colormatch/game/replace_wall
 # 复制地板
-execute positioned 1001 10 4000 run clone ~ ~ ~ ~24 ~ ~24 1050 15 4000
+execute positioned 1001 10 4000 run clone ~ ~ ~ ~20 ~ ~20 1050 14 4000 filtered #mini:colarmatch_floor

data/mini/functions/colormatch/player_lose_heart.mcfunction

@@ -5,5 +5,5 @@ tellraw @a ["",{"text":">> ","color":"gold","bold": true},{"selector":"@s","colo
 function mini:main/player_lose_heart
 
 # 拉上屏障
-execute if entity @s[tag=mini_running] run tp @s ~ 27 ~
+execute if entity @s[tag=mini_running] run tp @s 1060 29 4010
 tag @s add color_match_fall

data/mini/tags/blocks/colarmatch_floor.json

@@ -2,10 +2,10 @@
     "values": [
         "minecraft:acacia_planks",
         "minecraft:birch_planks",
-        "minecraft:bedrock",
+        "minecraft:soul_soil",
         "minecraft:crimson_planks",
         "minecraft:warped_planks",
-        "minecraft:gold_block",
+        "minecraft:purpur_block",
         "minecraft:bricks",
         "minecraft:mossy_cobblestone"
     ]