Просмотр исходного кода

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

LTCatt 5 лет назад
Родитель
Сommit
da65a9f719

+ 1 - 1
data/item/functions/disable_slot/check_slot.mcfunction

@@ -1,5 +1,5 @@
 # 第八格
-execute unless data entity @s Inventory[{Slot:7b,tag:{game_item:1b}}] unless data entity @s Inventory[{Slot:7b,tag:{LockItem:1b,LockSlot:7b},Count:1b}] run function item:disable_slot/disable_slot_7
+# execute unless data entity @s Inventory[{Slot:7b,tag:{game_item:1b}}] unless data entity @s Inventory[{Slot:7b,tag:{LockItem:1b,LockSlot:7b},Count:1b}] run function item:disable_slot/disable_slot_7
 
 # 第九格
 execute unless data entity @s Inventory[{Slot:8b,tag:{game_item:1b}}] unless data entity @s Inventory[{Slot:8b,tag:{LockItem:1b,LockSlot:8b},Count:1b}] run function item:disable_slot/disable_slot_8

+ 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
-execute if score $color_match_floor mem matches 1 run fill 1062 22 4021 1058 18 4021 minecraft:acacia_planks
-execute if score $color_match_floor mem matches 1 run fill 1071 18 4012 1071 22 4008 minecraft:acacia_planks
-execute if score $color_match_floor mem matches 1 run fill 1058 22 3999 1062 18 3999 minecraft:acacia_planks
-execute if score $color_match_floor mem matches 2 run fill 1049 18 4008 1049 22 4012 minecraft:birch_planks
-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: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
-execute if score $color_match_floor mem matches 4 run fill 1058 22 3999 1062 18 3999 minecraft:crimson_planks
-execute if score $color_match_floor mem matches 5 run fill 1049 18 4008 1049 22 4012 minecraft:warped_planks
-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: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
-execute if score $color_match_floor mem matches 7 run fill 1058 22 3999 1062 18 3999 minecraft:bricks
-execute if score $color_match_floor mem matches 8 run fill 1049 18 4008 1049 22 4012 minecraft:mossy_cobblestone
-execute if score $color_match_floor mem matches 8 run fill 1062 22 4021 1058 18 4021 minecraft:mossy_cobblestone
-execute if score $color_match_floor mem matches 8 run fill 1071 18 4012 1071 22 4008 minecraft:mossy_cobblestone
-execute if score $color_match_floor mem matches 8 run fill 1058 22 3999 1062 18 3999 minecraft:mossy_cobblestone
+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

+ 0 - 6
data/mini/functions/colormatch/game_init.mcfunction

@@ -3,12 +3,6 @@ forceload add 1001 4000 1075 4025
 setblock 1049 10 3999 minecraft:structure_block[mode=load]{metadata:"",mirror:"NONE",ignoreEntities:1b,powered:0b,seed:0L,rotation:"NONE",posX:0,mode:"LOAD",integrity:1.0f,showair:0b,name:"mini:color_match"}
 setblock 1049 11 3999 redstone_block
 
-# 初始化墙壁
-fill 1049 18 4008 1049 22 4012 stone
-fill 1062 22 4021 1058 18 4021 stone
-fill 1071 18 4012 1071 22 4008 stone
-fill 1058 22 3999 1062 18 3999 stone
-
 # 初始化
 scoreboard players set $finish_mode mem 0
 scoreboard players set $survival mem 0

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

@@ -15,7 +15,7 @@ scoreboard players set @s[team=playing,tag=!rejoining] mini_heart 3
 function mini:main/player_max_health
 
 # 传送玩家
-tp @s[team=playing,tag=!rejoining] 1062 16.5 4012
+tp @s[team=playing,tag=!rejoining] 1062 19 4012
 
 # 调整模式
 gamemode spectator @s[team=!debugging]

+ 0 - 16
data/mini/functions/hotpm/game_init.mcfunction

@@ -18,22 +18,6 @@ kill @e[type=trident]
 
 # 生成地图
 
-#   111
-setblock 1023 27 3022 minecraft:structure_block[mode=load]{metadata:"",mirror:"NONE",ignoreEntities:1b,powered:0b,seed:0L,author:"?",rotation:"NONE",posX:0,mode:"LOAD",posY:1,sizeX:22,posZ:0,integrity:1.0f,showair:0b,name:"mini:hotpm111",sizeY:23,sizeZ:22,showboundingbox:0b}
-setblock 1023 28 3022 minecraft:redstone_block
-
-#   110
-setblock 1023 27 2999 minecraft:structure_block[mode=load]{metadata:"",mirror:"NONE",ignoreEntities:1b,powered:0b,seed:0L,author:"?",rotation:"NONE",posX:0,mode:"LOAD",posY:1,sizeX:22,posZ:0,integrity:1.0f,showair:0b,name:"mini:hotpm110",sizeY:23,sizeZ:23,showboundingbox:0b}
-setblock 1023 28 2999 minecraft:redstone_block
-
-#   011
-setblock 1000 27 3022 minecraft:structure_block[mode=load]{metadata:"",mirror:"NONE",ignoreEntities:1b,powered:0b,seed:0L,author:"?",rotation:"NONE",posX:0,mode:"LOAD",posY:1,sizeX:23,posZ:0,integrity:1.0f,showair:0b,name:"mini:hotpm011",sizeY:23,sizeZ:22,showboundingbox:0b}
-setblock 1000 28 3022 minecraft:redstone_block
-
-#   010
-setblock 1000 27 2999 minecraft:structure_block[mode=load]{metadata:"",mirror:"NONE",ignoreEntities:1b,powered:0b,seed:0L,author:"?",rotation:"NONE",posX:0,mode:"LOAD",posY:1,sizeX:23,posZ:0,integrity:1.0f,showair:0b,name:"mini:hotpm010",sizeY:24,sizeZ:23,showboundingbox:0b}
-setblock 1000 28 2999 minecraft:redstone_block
-
 #   101
 setblock 1023 4 3022 minecraft:structure_block[mode=load]{metadata:"",mirror:"NONE",ignoreEntities:1b,powered:0b,seed:0L,author:"!",rotation:"NONE",posX:0,mode:"LOAD",posY:1,sizeX:23,posZ:0,integrity:1.0f,showair:0b,name:"mini:hotpm101",sizeY:24,sizeZ:23,showboundingbox:0b}
 setblock 1023 5 3022 minecraft:redstone_block

+ 2 - 1
data/mini/tags/blocks/colarmatch_floor.json

@@ -7,6 +7,7 @@
         "minecraft:warped_planks",
         "minecraft:purpur_block",
         "minecraft:bricks",
-        "minecraft:mossy_cobblestone"
+        "minecraft:mossy_cobblestone",
+        "minecraft:stone"
     ]
 }