LTCatt 6 лет назад
Родитель
Сommit
f942dadf40

+ 2 - 2
data/ltw/functions/main/game_end.mcfunction

@@ -19,8 +19,8 @@ execute as @a[tag=!total_rank1,tag=!total_rank2] unless entity @a[tag=total_rank
 
 # 显示排名
 execute if entity @a[tag=total_rank2] if entity @a[tag=total_rank3] run tellraw @a ["",{"text":"\n\n----- 游戏结束 -----\n\n","color":"gold","bold":true},{"text": "第一名 - ","color":"green"},{"selector": "@a[tag=total_rank1]","color":"white"},{"text":" (","color":"gray"},{"score":{"name": "@p[tag=total_rank1]","objective": "total_score"},"color":"gray"},{"text":")","color":"gray"},{"text": "\n第二名 - ","color":"green"},{"selector": "@a[tag=total_rank2]","color":"white"},{"text":" (","color":"gray"},{"score":{"name": "@p[tag=total_rank2]","objective": "total_score"},"color":"gray"},{"text":")","color":"gray"},{"text": "\n第三名 - ","color":"green"},{"selector": "@a[tag=total_rank3]","color":"white"},{"text":" (","color":"gray"},{"score":{"name": "@p[tag=total_rank3]","objective": "total_score"},"color":"gray"},{"text":")","color":"gray"},"\n\n"]
-execute if entity @a[tag=total_rank2] unless entity @a[tag=total_rank3] run tellraw @a ["",{"text":"\n\n----- 游戏结束 -----\n\n","color":"gold","bold":true},{"text": "第一名 - ","color":"green"},{"selector": "@a[tag=total_rank1]","color":"white"},{"text":" (","color":"gray"},{"score":{"name": "@p[tag=total_rank1]","objective": "total_score"},"color":"gray"},{"text":")","color":"gray"},{"text": "\n第二名 - ","color":"green"},{"selector": "@a[tag=total_rank2]","color":"white"},{"text":" (","color":"gray"},{"score":{"name": "@p[tag=total_rank2]","objective": "total_score"},"color":"gray"},{"text":")","color":"gray"},"\n\n\n"]
-execute unless entity @a[tag=total_rank2] run tellraw @a ["",{"text":"\n\n\n----- 游戏结束 -----\n\n","color":"gold","bold":true},{"text": "第一名 - ","color":"green"},{"selector": "@a[tag=total_rank1]","color":"white"},{"text":" (","color":"gray"},{"score":{"name": "@p[tag=total_rank1]","objective": "total_score"},"color":"gray"},{"text":")","color":"gray"},"\n\n\n"]
+execute if entity @a[tag=total_rank2] unless entity @a[tag=total_rank3] run tellraw @a ["",{"text":"\n\n\n----- 游戏结束 -----\n\n","color":"gold","bold":true},{"text": "第一名 - ","color":"green"},{"selector": "@a[tag=total_rank1]","color":"white"},{"text":" (","color":"gray"},{"score":{"name": "@p[tag=total_rank1]","objective": "total_score"},"color":"gray"},{"text":")","color":"gray"},{"text": "\n第二名 - ","color":"green"},{"selector": "@a[tag=total_rank2]","color":"white"},{"text":" (","color":"gray"},{"score":{"name": "@p[tag=total_rank2]","objective": "total_score"},"color":"gray"},{"text":")","color":"gray"},"\n\n\n"]
+execute unless entity @a[tag=total_rank2] run tellraw @a ["",{"text":"\n\n\n\n----- 游戏结束 -----\n\n","color":"gold","bold":true},{"text": "第一名 - ","color":"green"},{"selector": "@a[tag=total_rank1]","color":"white"},{"text":" (","color":"gray"},{"score":{"name": "@p[tag=total_rank1]","objective": "total_score"},"color":"gray"},{"text":")","color":"gray"},"\n\n\n"]
 
 # 返回主大厅
 schedule function ltw:state/0/state_enter 2t replace

+ 1 - 1
data/mini/functions/colormatch/game/get_random_floor.mcfunction

@@ -15,7 +15,7 @@ execute positioned 1001 10 4000 if score $random mem matches 8 run clone ~ ~ ~ ~
 execute positioned 1001 10 4000 if score $random mem matches 9 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered purpur_block
 execute positioned 1001 10 4000 if score $random mem matches 10 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered granite
 execute positioned 1001 10 4000 if score $random mem matches 11 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered prismarine
-execute positioned 1001 10 4000 if score $random mem matches 12 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered soul_sand
+execute positioned 1001 10 4000 if score $random mem matches 12 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered soul_soil
 execute positioned 1001 10 4000 if score $random mem matches 13 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered packed_ice
 execute positioned 1001 10 4000 if score $random mem matches 14 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered white_wool
 execute positioned 1001 10 4000 if score $random mem matches 15 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered honey_block

+ 4 - 4
data/mini/functions/colormatch/game/replace_wall.mcfunction

@@ -42,10 +42,10 @@ execute if score $color_match_floor mem matches 11 run fill 1075 11 3999 1075 40
 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_sand
-execute if score $color_match_floor mem matches 12 run fill 1075 11 3999 1049 40 3999 soul_sand
-execute if score $color_match_floor mem matches 12 run fill 1049 11 3999 1049 40 4025 soul_sand
-execute if score $color_match_floor mem matches 12 run fill 1049 11 4025 1075 40 4025 soul_sand
+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