aqupa 4 лет назад
Родитель
Сommit
543a5ca577

+ 1 - 0
data/mini/functions/rgb/game/check_conditions.mcfunction

@@ -15,6 +15,7 @@ execute as @e[type=marker,tag=rgb_rule,nbt={data:{enable:1b,conditions:[{type:"o
 execute as @e[type=marker,tag=rgb_rule,nbt={data:{enable:1b,conditions:[{type:"place_rule"}]}}] run function mini:rgb/game/conditions/place_rule
 execute as @e[type=marker,tag=rgb_rule,nbt={data:{enable:1b,conditions:[{type:"destroy_rule"}]}}] run function mini:rgb/game/conditions/destroy_rule
 execute as @e[type=marker,tag=rgb_rule,nbt={data:{enable:1b,conditions:[{type:"dig_ice"}]}}] run function mini:rgb/game/conditions/dig_ice
+execute as @e[type=marker,tag=rgb_rule,nbt={data:{enable:1b,conditions:[{type:"take_damage"}]}}] run function mini:rgb/game/conditions/take_damage
 
 # 分数相关
 execute as @e[type=marker,tag=rgb_rule,nbt={data:{enable:1b,conditions:[{type:"red_ge"}]}}] run function mini:rgb/game/conditions/red_ge

+ 4 - 4
data/mini/functions/rgb/game_init.mcfunction

@@ -14,10 +14,10 @@ setblock 1008 8 8000 minecraft:redstone_block destroy
 setblock 1040 8 8000 minecraft:redstone_block destroy
 setblock 1008 8 8032 minecraft:redstone_block destroy
 setblock 1040 8 8032 minecraft:redstone_block destroy
-setblock 1008 7 8000 minecraft:structure_block[mode=load]{author:"?",ignoreEntities:1b,integrity:0.01f,metadata:"",mirror:"NONE",mode:"LOAD",name:"mini:rgb_000_p",posX:0,posY:0,posZ:0,powered:0b,rotation:"NONE",seed:0L,showair:0b,showboundingbox:0b,sizeX:32,sizeY:32,sizeZ:32} destroy
-setblock 1040 7 8000 minecraft:structure_block[mode=load]{author:"?",ignoreEntities:1b,integrity:0.01f,metadata:"",mirror:"NONE",mode:"LOAD",name:"mini:rgb_100_p",posX:0,posY:0,posZ:0,powered:0b,rotation:"NONE",seed:0L,showair:0b,showboundingbox:0b,sizeX:32,sizeY:32,sizeZ:32} destroy
-setblock 1008 7 8032 minecraft:structure_block[mode=load]{author:"?",ignoreEntities:1b,integrity:0.01f,metadata:"",mirror:"NONE",mode:"LOAD",name:"mini:rgb_001_p",posX:0,posY:0,posZ:0,powered:0b,rotation:"NONE",seed:0L,showair:0b,showboundingbox:0b,sizeX:32,sizeY:32,sizeZ:32} destroy
-setblock 1040 7 8032 minecraft:structure_block[mode=load]{author:"?",ignoreEntities:1b,integrity:0.01f,metadata:"",mirror:"NONE",mode:"LOAD",name:"mini:rgb_101_p",posX:0,posY:0,posZ:0,powered:0b,rotation:"NONE",seed:0L,showair:0b,showboundingbox:0b,sizeX:32,sizeY:32,sizeZ:32} destroy
+setblock 1008 7 8000 minecraft:structure_block[mode=load]{author:"?",ignoreEntities:1b,integrity:0.001f,metadata:"",mirror:"NONE",mode:"LOAD",name:"mini:rgb_000_p",posX:0,posY:0,posZ:0,powered:0b,rotation:"NONE",seed:0L,showair:0b,showboundingbox:0b,sizeX:32,sizeY:32,sizeZ:32} destroy
+setblock 1040 7 8000 minecraft:structure_block[mode=load]{author:"?",ignoreEntities:1b,integrity:0.001f,metadata:"",mirror:"NONE",mode:"LOAD",name:"mini:rgb_100_p",posX:0,posY:0,posZ:0,powered:0b,rotation:"NONE",seed:0L,showair:0b,showboundingbox:0b,sizeX:32,sizeY:32,sizeZ:32} destroy
+setblock 1008 7 8032 minecraft:structure_block[mode=load]{author:"?",ignoreEntities:1b,integrity:0.001f,metadata:"",mirror:"NONE",mode:"LOAD",name:"mini:rgb_001_p",posX:0,posY:0,posZ:0,powered:0b,rotation:"NONE",seed:0L,showair:0b,showboundingbox:0b,sizeX:32,sizeY:32,sizeZ:32} destroy
+setblock 1040 7 8032 minecraft:structure_block[mode=load]{author:"?",ignoreEntities:1b,integrity:0.001f,metadata:"",mirror:"NONE",mode:"LOAD",name:"mini:rgb_101_p",posX:0,posY:0,posZ:0,powered:0b,rotation:"NONE",seed:0L,showair:0b,showboundingbox:0b,sizeX:32,sizeY:32,sizeZ:32} destroy
 setblock 1008 8 8000 minecraft:redstone_block destroy
 setblock 1040 8 8000 minecraft:redstone_block destroy
 setblock 1008 8 8032 minecraft:redstone_block destroy