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

+ 4 - 0
data/mini/functions/rgb/game/events/place_fire.mcfunction

@@ -0,0 +1,4 @@
+# as rule marker
+# with rgb_op
+
+execute as @a[tag=rgb_op] at @s run setblock ~ ~ ~ fire

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

@@ -15,6 +15,7 @@ execute if data entity @s data.events[{type:"effect"}] run function mini:rgb/gam
 # 方块事件
 execute if data entity @s data.events[{type:"place_air"}] run function mini:rgb/game/events/place_air
 execute if data entity @s data.events[{type:"place_tnt"}] run function mini:rgb/game/events/place_tnt
+execute if data entity @s data.events[{type:"place_fire"}] run function mini:rgb/game/events/place_fire
 execute if data entity @s data.events[{type:"place_ice_cage"}] run function mini:rgb/game/events/place_ice_cage
 execute if data entity @s data.events[{type:"place_powder_snow"}] run function mini:rgb/game/events/place_powder_snow
 

+ 5 - 1
data/mini/functions/rgb/tick2.mcfunction

@@ -5,4 +5,8 @@ execute as @a[tag=mini_running] unless data entity @s Inventory[{Slot:8b,id:"min
 execute as @e[type=armor_stand,tag=rgb_new_rule] at @s run function mini:rgb/game/add_rule
 
 # 销毁规则
-execute as @e[type=marker,tag=rgb_rule] run function mini:rgb/game/check_rule_exists
+execute as @e[type=marker,tag=rgb_rule] run function mini:rgb/game/check_rule_exists
+
+# TODO 想办法关掉盔甲架掉落
+clear @a[tag=mini_running] armor_stand
+clear @a[tag=mini_running] stone

+ 4 - 4
data/mini/loot_tables/rgb/add_red.json

@@ -21,7 +21,7 @@
                     "functions": [
                         {
                             "function": "minecraft:set_nbt",
-                            "tag": "{conditions:[{name:'{\"text\":\"着火2秒\",\"color\":\"yellow\"}',type:'on_fire',value:4s}],events:[{name:'{\"text\":\"R+3\",\"color\":\"red\"}',type:'add_red',value:3s}]}"
+                            "tag": "{conditions:[{name:'{\"text\":\"着火2秒\",\"color\":\"yellow\"}',type:'on_fire',value:8s}],events:[{name:'{\"text\":\"R+3\",\"color\":\"red\"}',type:'add_red',value:3s}]}"
                         }
                     ]
                 },
@@ -32,7 +32,7 @@
                     "functions": [
                         {
                             "function": "minecraft:set_nbt",
-                            "tag": "{conditions:[{name:'{\"text\":\"着火2秒\",\"color\":\"yellow\"}',type:'on_fire',value:4s}],events:[{name:'{\"text\":\"R+4\",\"color\":\"red\"}',type:'add_red',value:4s}]}"
+                            "tag": "{conditions:[{name:'{\"text\":\"着火2秒\",\"color\":\"yellow\"}',type:'on_fire',value:8s}],events:[{name:'{\"text\":\"R+4\",\"color\":\"red\"}',type:'add_red',value:4s}]}"
                         }
                     ]
                 },
@@ -43,7 +43,7 @@
                     "functions": [
                         {
                             "function": "minecraft:set_nbt",
-                            "tag": "{conditions:[{name:'{\"text\":\"站在火中1秒\",\"color\":\"yellow\"}',type:'in_fire',value:4s}],events:[{name:'{\"text\":\"R+3\",\"color\":\"red\"}',type:'add_red',value:3s}]}"
+                            "tag": "{conditions:[{name:'{\"text\":\"站在火中1秒\",\"color\":\"yellow\"}',type:'in_fire',value:4s}],events:[{name:'{\"text\":\"R+4\",\"color\":\"red\"}',type:'add_red',value:5s}]}"
                         }
                     ]
                 },
@@ -54,7 +54,7 @@
                     "functions": [
                         {
                             "function": "minecraft:set_nbt",
-                            "tag": "{conditions:[{name:'{\"text\":\"站在火中2秒\",\"color\":\"yellow\"}',type:'in_fire',value:8s}],events:[{name:'{\"text\":\"R+5\",\"color\":\"red\"}',type:'add_red',value:5s}]}"
+                            "tag": "{conditions:[{name:'{\"text\":\"站在火中2秒\",\"color\":\"yellow\"}',type:'in_fire',value:8s}],events:[{name:'{\"text\":\"R=10\",\"color\":\"red\"}',type:'set_red',value:10s}]}"
                         }
                     ]
                 },

+ 3 - 3
data/mini/loot_tables/rgb/harmful.json

@@ -10,7 +10,7 @@
                     "functions": [
                         {
                             "function": "minecraft:set_nbt",
-                            "tag": "{conditions:[{name:'{\"text\":\"R≥10\",\"color\":\"red\"}',type:'red_ge',value:10s}],events:[{name:'{\"text\":\"生成点燃的TNT\",\"color\":\"yellow\"}',type:'summon_tnt'},{name:'{\"text\":\"R-1\",\"color\":\"red\"}',type:'add_red',value:-1s}]}"
+                            "tag": "{conditions:[{name:'{\"text\":\"R≥10\",\"color\":\"red\"}',type:'red_ge',value:10s},{name:'{\"text\":\"站在地上\",\"color\":\"yellow\"}',type:'on_ground',value:1s}],events:[{name:'{\"text\":\"生成点燃的TNT\",\"color\":\"yellow\"}',type:'summon_tnt'},{name:'{\"text\":\"R-1\",\"color\":\"red\"}',type:'add_red',value:-1s}]}"
                         }
                     ]
                 },
@@ -43,7 +43,7 @@
                     "functions": [
                         {
                             "function": "minecraft:set_nbt",
-                            "tag": "{conditions:[{name:'{\"text\":\"B≥10\",\"color\":\"blue\"}',type:'blue_ge',value:10s},{name:'{\"text\":\"在空气中\",\"color\":\"yellow\"}',type:'in_air',value:1s}],events:[{name:'{\"text\":\"生成冰牢\",\"color\":\"yellow\"}',type:'place_ice_cage'},{name:'{\"text\":\"B-1\",\"color\":\"blue\"}',type:'add_blue',value:-1s}]}"
+                            "tag": "{conditions:[{name:'{\"text\":\"B≥10\",\"color\":\"blue\"}',type:'blue_ge',value:10s},{name:'{\"text\":\"在空气中\",\"color\":\"yellow\"}',type:'in_air',value:1s}],events:[{name:'{\"text\":\"生成冰牢\",\"color\":\"yellow\"}',type:'place_ice_cage'},{name:'{\"text\":\"B-5\",\"color\":\"blue\"}',type:'add_blue',value:-5s}]}"
                         }
                     ]
                 },
@@ -65,7 +65,7 @@
                     "functions": [
                         {
                             "function": "minecraft:set_nbt",
-                            "tag": "{conditions:[{name:'{\"text\":\"G≥10\",\"color\":\"blue\"}',type:'green_ge',value:10s},{name:'{\"text\":\"站在地上\",\"color\":\"yellow\"}',type:'on_ground',value:1s}],events:[{name:'{\"text\":\"原地起飞\",\"color\":\"yellow\"}',type:'effect',value:'levitation_1_10'},{name:'{\"text\":\"G-2\",\"color\":\"blue\"}',type:'add_green',value:-2s}]}"
+                            "tag": "{conditions:[{name:'{\"text\":\"G≥10\",\"color\":\"green\"}',type:'green_ge',value:10s},{name:'{\"text\":\"站在地上\",\"color\":\"yellow\"}',type:'on_ground',value:1s}],events:[{name:'{\"text\":\"原地起飞\",\"color\":\"yellow\"}',type:'effect',value:'levitation_1_10'},{name:'{\"text\":\"G-2\",\"color\":\"green\"}',type:'add_green',value:-2s}]}"
                         }
                     ]
                 },