Procházet zdrojové kódy

修改 TNT Run 场地

LTCatt před 5 roky
rodič
revize
507d53d2e2

+ 2 - 2
data/mini/functions/colormatch/game/remove_ground.mcfunction

@@ -1,8 +1,8 @@
 # 去除地板
-fill 1049 16 3999 1071 16 4021 air replace #mini:colarmatch_floor
+fill 1049 16 3999 1071 16 4021 air replace #mini:colormatch_floor
 
 # 替换方块
-execute positioned 1001 11 4000 run clone ~ ~ ~ ~20 ~ ~20 1050 16 4000 filtered #mini:colarmatch_floor
+execute positioned 1001 11 4000 run clone ~ ~ ~ ~20 ~ ~20 1050 16 4000 filtered #mini:colormatch_floor
 
 # 告知玩家
 execute as @a at @s run function lib:sounds/hit2

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

@@ -1,32 +1,32 @@
-execute if score $color_match_floor mem matches 1 run fill 1049 18 4008 1049 22 4012 minecraft:acacia_planks replace #mini:colarmatch_floor
-execute if score $color_match_floor mem matches 1 run fill 1062 22 4021 1058 18 4021 minecraft:acacia_planks replace #mini:colarmatch_floor
-execute if score $color_match_floor mem matches 1 run fill 1071 18 4012 1071 22 4008 minecraft:acacia_planks replace #mini:colarmatch_floor
-execute if score $color_match_floor mem matches 1 run fill 1058 22 3999 1062 18 3999 minecraft:acacia_planks replace #mini:colarmatch_floor
-execute if score $color_match_floor mem matches 2 run fill 1049 18 4008 1049 22 4012 minecraft:birch_planks replace #mini:colarmatch_floor
-execute if score $color_match_floor mem matches 2 run fill 1062 22 4021 1058 18 4021 minecraft:birch_planks replace #mini:colarmatch_floor
-execute if score $color_match_floor mem matches 2 run fill 1071 18 4012 1071 22 4008 minecraft:birch_planks replace #mini:colarmatch_floor
-execute if score $color_match_floor mem matches 2 run fill 1058 22 3999 1062 18 3999 minecraft:birch_planks replace #mini:colarmatch_floor
-execute if score $color_match_floor mem matches 3 run fill 1049 18 4008 1049 22 4012 minecraft:soul_soil replace #mini:colarmatch_floor
-execute if score $color_match_floor mem matches 3 run fill 1062 22 4021 1058 18 4021 minecraft:soul_soil replace #mini:colarmatch_floor
-execute if score $color_match_floor mem matches 3 run fill 1071 18 4012 1071 22 4008 minecraft:soul_soil replace #mini:colarmatch_floor
-execute if score $color_match_floor mem matches 3 run fill 1058 22 3999 1062 18 3999 minecraft:soul_soil replace #mini:colarmatch_floor
-execute if score $color_match_floor mem matches 4 run fill 1049 18 4008 1049 22 4012 minecraft:crimson_planks replace #mini:colarmatch_floor
-execute if score $color_match_floor mem matches 4 run fill 1062 22 4021 1058 18 4021 minecraft:crimson_planks replace #mini:colarmatch_floor
-execute if score $color_match_floor mem matches 4 run fill 1071 18 4012 1071 22 4008 minecraft:crimson_planks replace #mini:colarmatch_floor
-execute if score $color_match_floor mem matches 4 run fill 1058 22 3999 1062 18 3999 minecraft:crimson_planks replace #mini:colarmatch_floor
-execute if score $color_match_floor mem matches 5 run fill 1049 18 4008 1049 22 4012 minecraft:warped_planks replace #mini:colarmatch_floor
-execute if score $color_match_floor mem matches 5 run fill 1062 22 4021 1058 18 4021 minecraft:warped_planks replace #mini:colarmatch_floor
-execute if score $color_match_floor mem matches 5 run fill 1071 18 4012 1071 22 4008 minecraft:warped_planks replace #mini:colarmatch_floor
-execute if score $color_match_floor mem matches 5 run fill 1058 22 3999 1062 18 3999 minecraft:warped_planks replace #mini:colarmatch_floor
-execute if score $color_match_floor mem matches 6 run fill 1049 18 4008 1049 22 4012 minecraft:purpur_block replace #mini:colarmatch_floor
-execute if score $color_match_floor mem matches 6 run fill 1062 22 4021 1058 18 4021 minecraft:purpur_block replace #mini:colarmatch_floor
-execute if score $color_match_floor mem matches 6 run fill 1071 18 4012 1071 22 4008 minecraft:purpur_block replace #mini:colarmatch_floor
-execute if score $color_match_floor mem matches 6 run fill 1058 22 3999 1062 18 3999 minecraft:purpur_block replace #mini:colarmatch_floor
-execute if score $color_match_floor mem matches 7 run fill 1049 18 4008 1049 22 4012 minecraft:bricks replace #mini:colarmatch_floor
-execute if score $color_match_floor mem matches 7 run fill 1062 22 4021 1058 18 4021 minecraft:bricks replace #mini:colarmatch_floor
-execute if score $color_match_floor mem matches 7 run fill 1071 18 4012 1071 22 4008 minecraft:bricks replace #mini:colarmatch_floor
-execute if score $color_match_floor mem matches 7 run fill 1058 22 3999 1062 18 3999 minecraft:bricks replace #mini:colarmatch_floor
-execute if score $color_match_floor mem matches 8 run fill 1049 18 4008 1049 22 4012 minecraft:mossy_cobblestone replace #mini:colarmatch_floor
-execute if score $color_match_floor mem matches 8 run fill 1062 22 4021 1058 18 4021 minecraft:mossy_cobblestone replace #mini:colarmatch_floor
-execute if score $color_match_floor mem matches 8 run fill 1071 18 4012 1071 22 4008 minecraft:mossy_cobblestone replace #mini:colarmatch_floor
-execute if score $color_match_floor mem matches 8 run fill 1058 22 3999 1062 18 3999 minecraft:mossy_cobblestone replace #mini:colarmatch_floor
+execute if score $color_match_floor mem matches 1 run fill 1049 18 4008 1049 22 4012 minecraft:acacia_planks replace #mini:colormatch_floor
+execute if score $color_match_floor mem matches 1 run fill 1062 22 4021 1058 18 4021 minecraft:acacia_planks replace #mini:colormatch_floor
+execute if score $color_match_floor mem matches 1 run fill 1071 18 4012 1071 22 4008 minecraft:acacia_planks replace #mini:colormatch_floor
+execute if score $color_match_floor mem matches 1 run fill 1058 22 3999 1062 18 3999 minecraft:acacia_planks replace #mini:colormatch_floor
+execute if score $color_match_floor mem matches 2 run fill 1049 18 4008 1049 22 4012 minecraft:birch_planks replace #mini:colormatch_floor
+execute if score $color_match_floor mem matches 2 run fill 1062 22 4021 1058 18 4021 minecraft:birch_planks replace #mini:colormatch_floor
+execute if score $color_match_floor mem matches 2 run fill 1071 18 4012 1071 22 4008 minecraft:birch_planks replace #mini:colormatch_floor
+execute if score $color_match_floor mem matches 2 run fill 1058 22 3999 1062 18 3999 minecraft:birch_planks replace #mini:colormatch_floor
+execute if score $color_match_floor mem matches 3 run fill 1049 18 4008 1049 22 4012 minecraft:soul_soil replace #mini:colormatch_floor
+execute if score $color_match_floor mem matches 3 run fill 1062 22 4021 1058 18 4021 minecraft:soul_soil replace #mini:colormatch_floor
+execute if score $color_match_floor mem matches 3 run fill 1071 18 4012 1071 22 4008 minecraft:soul_soil replace #mini:colormatch_floor
+execute if score $color_match_floor mem matches 3 run fill 1058 22 3999 1062 18 3999 minecraft:soul_soil replace #mini:colormatch_floor
+execute if score $color_match_floor mem matches 4 run fill 1049 18 4008 1049 22 4012 minecraft:crimson_planks replace #mini:colormatch_floor
+execute if score $color_match_floor mem matches 4 run fill 1062 22 4021 1058 18 4021 minecraft:crimson_planks replace #mini:colormatch_floor
+execute if score $color_match_floor mem matches 4 run fill 1071 18 4012 1071 22 4008 minecraft:crimson_planks replace #mini:colormatch_floor
+execute if score $color_match_floor mem matches 4 run fill 1058 22 3999 1062 18 3999 minecraft:crimson_planks replace #mini:colormatch_floor
+execute if score $color_match_floor mem matches 5 run fill 1049 18 4008 1049 22 4012 minecraft:warped_planks replace #mini:colormatch_floor
+execute if score $color_match_floor mem matches 5 run fill 1062 22 4021 1058 18 4021 minecraft:warped_planks replace #mini:colormatch_floor
+execute if score $color_match_floor mem matches 5 run fill 1071 18 4012 1071 22 4008 minecraft:warped_planks replace #mini:colormatch_floor
+execute if score $color_match_floor mem matches 5 run fill 1058 22 3999 1062 18 3999 minecraft:warped_planks replace #mini:colormatch_floor
+execute if score $color_match_floor mem matches 6 run fill 1049 18 4008 1049 22 4012 minecraft:purpur_block replace #mini:colormatch_floor
+execute if score $color_match_floor mem matches 6 run fill 1062 22 4021 1058 18 4021 minecraft:purpur_block replace #mini:colormatch_floor
+execute if score $color_match_floor mem matches 6 run fill 1071 18 4012 1071 22 4008 minecraft:purpur_block replace #mini:colormatch_floor
+execute if score $color_match_floor mem matches 6 run fill 1058 22 3999 1062 18 3999 minecraft:purpur_block replace #mini:colormatch_floor
+execute if score $color_match_floor mem matches 7 run fill 1049 18 4008 1049 22 4012 minecraft:bricks replace #mini:colormatch_floor
+execute if score $color_match_floor mem matches 7 run fill 1062 22 4021 1058 18 4021 minecraft:bricks replace #mini:colormatch_floor
+execute if score $color_match_floor mem matches 7 run fill 1071 18 4012 1071 22 4008 minecraft:bricks replace #mini:colormatch_floor
+execute if score $color_match_floor mem matches 7 run fill 1058 22 3999 1062 18 3999 minecraft:bricks replace #mini:colormatch_floor
+execute if score $color_match_floor mem matches 8 run fill 1049 18 4008 1049 22 4012 minecraft:mossy_cobblestone replace #mini:colormatch_floor
+execute if score $color_match_floor mem matches 8 run fill 1062 22 4021 1058 18 4021 minecraft:mossy_cobblestone replace #mini:colormatch_floor
+execute if score $color_match_floor mem matches 8 run fill 1071 18 4012 1071 22 4008 minecraft:mossy_cobblestone replace #mini:colormatch_floor
+execute if score $color_match_floor mem matches 8 run fill 1058 22 3999 1062 18 3999 minecraft:mossy_cobblestone replace #mini:colormatch_floor

+ 1 - 1
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 16 4000 filtered #mini:colarmatch_floor
+execute positioned 1001 10 4000 run clone ~ ~ ~ ~20 ~ ~20 1050 16 4000 filtered #mini:colormatch_floor
 
 # 设置倒计时
 execute if score $color_match_time mem matches 20.. run scoreboard players remove $color_match_time mem 4

+ 1 - 1
data/mini/functions/colormatch/game_init2.mcfunction

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

+ 2 - 1
data/mini/functions/tntrun/player_enter.mcfunction

@@ -6,8 +6,9 @@ title @s actionbar ""
 # 状态效果
 effect clear @s
 effect give @s saturation 1000000 0 true
-gamerule naturalRegeneration true
 effect give @s resistance 1000000 4 true
+effect give @s night_vision 1000000 0 true
+gamerule naturalRegeneration true
 
 # 设置玩家生命
 attribute @s generic.max_health base set 20

+ 0 - 1
data/mini/functions/trade/game/villager_tp2.mcfunction

@@ -5,5 +5,4 @@ data modify entity @s Rotation[1] set value 0f
 tag @s add tpTemp
 scoreboard players set @s temp 0
 execute at @s run function mini:trade/game/villager_tp3
-execute if entity @a[tag=noVillager,tag=tempPlayerTp] at @s run function lib:sounds/teleport
 execute if entity @a[tag=noVillager,tag=tempPlayerTp] at @s run function mini:trade/game/villager_rebirth

+ 0 - 0
data/mini/tags/blocks/colarmatch_floor.json → data/mini/tags/blocks/colormatch_floor.json


+ 3 - 0
data/mini/tags/blocks/tntrun_floor.json

@@ -2,6 +2,9 @@
     "values": [
         "minecraft:dead_horn_coral_block",
         "minecraft:crying_obsidian",
+        "minecraft:crimson_hyphae",
+        "minecraft:warped_hyphae",
+        "minecraft:crying_obsidian",
         "minecraft:diamond_block"
     ]
 }