Explorar el Código

更新规则表

aqupa hace 4 años
padre
commit
f985ceec8d

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

@@ -1,8 +1,10 @@
 # 位置相关
 execute as @e[type=marker,tag=rgb_rule,nbt={data:{enable:1b,conditions:[{type:"on_air"}]}}] run function mini:rgb/game/conditions/on_air
+execute as @e[type=marker,tag=rgb_rule,nbt={data:{enable:1b,conditions:[{type:"in_air"}]}}] run function mini:rgb/game/conditions/in_air
 execute as @e[type=marker,tag=rgb_rule,nbt={data:{enable:1b,conditions:[{type:"on_ground"}]}}] run function mini:rgb/game/conditions/on_ground
 execute as @e[type=marker,tag=rgb_rule,nbt={data:{enable:1b,conditions:[{type:"in_water"}]}}] run function mini:rgb/game/conditions/in_water
 execute as @e[type=marker,tag=rgb_rule,nbt={data:{enable:1b,conditions:[{type:"on_pumpkin"}]}}] run function mini:rgb/game/conditions/on_pumpkin
+execute as @e[type=marker,tag=rgb_rule,nbt={data:{enable:1b,conditions:[{type:"smokey"}]}}] run function mini:rgb/game/conditions/smokey
 
 # 操作相关
 execute as @e[type=marker,tag=rgb_rule,nbt={data:{enable:1b,conditions:[{type:"shift"}]}}] run function mini:rgb/game/conditions/shift
@@ -13,4 +15,7 @@ execute as @e[type=marker,tag=rgb_rule,nbt={data:{enable:1b,conditions:[{type:"d
 # 分数相关
 execute as @e[type=marker,tag=rgb_rule,nbt={data:{enable:1b,conditions:[{type:"red_ge"}]}}] run function mini:rgb/game/conditions/red_ge
 execute as @e[type=marker,tag=rgb_rule,nbt={data:{enable:1b,conditions:[{type:"green_ge"}]}}] run function mini:rgb/game/conditions/green_ge
-execute as @e[type=marker,tag=rgb_rule,nbt={data:{enable:1b,conditions:[{type:"blue_ge"}]}}] run function mini:rgb/game/conditions/blue_ge
+execute as @e[type=marker,tag=rgb_rule,nbt={data:{enable:1b,conditions:[{type:"blue_ge"}]}}] run function mini:rgb/game/conditions/blue_ge
+execute as @e[type=marker,tag=rgb_rule,nbt={data:{enable:1b,conditions:[{type:"red_l"}]}}] run function mini:rgb/game/conditions/red_l
+execute as @e[type=marker,tag=rgb_rule,nbt={data:{enable:1b,conditions:[{type:"green_l"}]}}] run function mini:rgb/game/conditions/green_l
+execute as @e[type=marker,tag=rgb_rule,nbt={data:{enable:1b,conditions:[{type:"blue_l"}]}}] run function mini:rgb/game/conditions/blue_l

+ 13 - 0
data/mini/functions/rgb/game/conditions/in_air.mcfunction

@@ -0,0 +1,13 @@
+# as rule marker
+# 眼在空气中 value/4 秒
+# 不在空气中自动归零
+
+execute store result score #temp_scr rgb_sys run data get entity @s data.player.conditions.in_air
+scoreboard players set #temp rgb_sys 0
+execute store success score #temp rgb_sys as @a[tag=rgb_op,limit=1] at @s anchored eyes if block ~ ~ ~ air run scoreboard players add #temp_scr rgb_sys 1
+execute if score #temp rgb_sys matches 0 run scoreboard players set #temp_scr rgb_sys 0
+
+execute store result score #temp rgb_sys run data get entity @s data.conditions[{type:"in_air"}].value
+execute if score #temp_scr rgb_sys < #temp rgb_sys run data modify entity @s data.enable set value 0
+
+execute store result entity @s data.player.conditions.in_air short 1 run scoreboard players get #temp_scr rgb_sys

+ 3 - 0
data/mini/functions/rgb/game/events/effect.mcfunction

@@ -1,3 +1,6 @@
 # as rule marker
 # with rgb_op
 
+data modify entity @s data.effect set from entity @s data.events[{type:"effect"}].value
+
+execute if entity @s[nbt={data:{effect:"levitation_1_10"}}] run effect give @a[tag=rgb_op] minecraft:levitation 1 10

+ 1 - 1
data/mini/functions/rgb/game/events/place_air.mcfunction

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

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

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

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

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

+ 1 - 1
data/mini/functions/rgb/game/events/place_tnt.mcfunction

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

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

@@ -0,0 +1,4 @@
+# as rule marker
+# with rgb_op
+
+execute at @a[tag=rgb_op] run summon creeper

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

@@ -0,0 +1,4 @@
+# as rule marker
+# with rgb_op
+
+execute at @a[tag=rgb_op] run summon tnt ~ ~ ~ {Fuse:10}

+ 7 - 0
data/mini/functions/rgb/game/events/tp.mcfunction

@@ -0,0 +1,7 @@
+# as rule marker
+# with rgb_op
+
+execute store result score #rgb_tp rgb_sys run data get entity @s data.event[{type:'tp'}].value
+data modify entity @s data.tp set from entity @s data.event[{type:'tp'}].value
+
+execute if entity @s[nbt={data:{tp:'up'}}] as @a[tag=rgb_op] at @s run function mini:rgb/game/events/tp_up

+ 6 - 0
data/mini/functions/rgb/game/events/tp_up.mcfunction

@@ -0,0 +1,6 @@
+# as rgb_op at @s
+# input: score #rgb_tp rgb_sys
+
+tp @s ~ ~1 ~
+scoreboard players remove #rgb_tp rgb_sys 1
+execute if score #rgb_tp rgb_sys matches 1.. positioned ~ ~1 ~ run function mini:rgb/game/events/tp_up

+ 4 - 4
data/mini/functions/rgb/game/give_random_rule.mcfunction

@@ -5,10 +5,10 @@ scoreboard players set $random_min mem 0
 scoreboard players set $random_max mem 13
 function lib:random
 
-execute if score $random mem matches 0..2 run loot replace block 0 0 1 container.0 loot mini:rgb/red
-execute if score $random mem matches 3..5 run loot replace block 0 0 1 container.0 loot mini:rgb/green
-execute if score $random mem matches 6..8 run loot replace block 0 0 1 container.0 loot mini:rgb/blue
-execute if score $random mem matches 9..12 run loot replace block 0 0 1 container.0 loot mini:rgb/effect
+execute if score $random mem matches 0..2 run loot replace block 0 0 1 container.0 loot mini:rgb/add_red
+execute if score $random mem matches 3..5 run loot replace block 0 0 1 container.0 loot mini:rgb/add_green
+execute if score $random mem matches 6..8 run loot replace block 0 0 1 container.0 loot mini:rgb/add_blue
+execute if score $random mem matches 9..12 run loot replace block 0 0 1 container.0 loot mini:rgb/harmful
 execute if score $random mem matches 13 run loot replace block 0 0 1 container.0 loot mini:rgb/finish
 
 # 生成文本

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

@@ -15,6 +15,8 @@ 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_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
 
 # 完成游戏
 execute if data entity @s data.events[{type:"finish"}] run function mini:rgb/game/events/finish

+ 174 - 0
data/mini/loot_tables/rgb/add_blue.json

@@ -0,0 +1,174 @@
+{
+    "pools": [
+        {
+            "rolls": 1,
+            "entries": [
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 1,
+                    "functions": [
+                        {
+                            "function": "minecraft:set_nbt",
+                            "tag": "{conditions:[{name:'{\"text\":\"站在水中3秒\",\"color\":\"yellow\"}',type:'in_water',value:12s}],events:[{name:'{\"text\":\"B+1\",\"color\":\"blue\"}',type:'add_blue',value:1s}]}"
+                        }
+                    ]
+                },
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 1,
+                    "functions": [
+                        {
+                            "function": "minecraft:set_nbt",
+                            "tag": "{conditions:[{name:'{\"text\":\"站在水中3秒\",\"color\":\"yellow\"}',type:'in_water',value:12s}],events:[{name:'{\"text\":\"B+2\",\"color\":\"blue\"}',type:'add_blue',value:2s}]}"
+                        }
+                    ]
+                },
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 15,
+                    "functions": [
+                        {
+                            "function": "minecraft:set_nbt",
+                            "tag": "{conditions:[{name:'{\"text\":\"站在水中4秒\",\"color\":\"yellow\"}',type:'in_water',value:16s}],events:[{name:'{\"text\":\"B+2\",\"color\":\"blue\"}',type:'add_blue',value:2s}]}"
+                        }
+                    ]
+                },
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 1,
+                    "functions": [
+                        {
+                            "function": "minecraft:set_nbt",
+                            "tag": "{conditions:[{name:'{\"text\":\"站在水中5秒\",\"color\":\"yellow\"}',type:'in_water',value:20s}],events:[{name:'{\"text\":\"B+2\",\"color\":\"blue\"}',type:'add_blue',value:2s}]}"
+                        }
+                    ]
+                },
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 1,
+                    "functions": [
+                        {
+                            "function": "minecraft:set_nbt",
+                            "tag": "{conditions:[{name:'{\"text\":\"站在水中3秒\",\"color\":\"yellow\"}',type:'in_water',value:12s}],events:[{name:'{\"text\":\"B+3\",\"color\":\"blue\"}',type:'add_blue',value:3s}]}"
+                        }
+                    ]
+                },
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 1,
+                    "functions": [
+                        {
+                            "function": "minecraft:set_nbt",
+                            "tag": "{conditions:[{name:'{\"text\":\"站在水中10秒\",\"color\":\"yellow\"}',type:'in_water',value:40s},{name:'{\"text\":\"保持下蹲\",\"color\":\"yellow\"}',type:'shift',value:40s}],events:[{name:'{\"text\":\"B=10\",\"color\":\"blue\"}',type:'set_blue',value:10s}]}"
+                        }
+                    ]
+                },
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 1,
+                    "functions": [
+                        {
+                            "function": "minecraft:set_nbt",
+                            "tag": "{conditions:[{name:'{\"text\":\"站在冰上2秒\",\"color\":\"yellow\"}',type:'on_ice',value:8s}],events:[{name:'{\"text\":\"B+1\",\"color\":\"blue\"}',type:'add_blue',value:1s}]}"
+                        }
+                    ]
+                },
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 15,
+                    "functions": [
+                        {
+                            "function": "minecraft:set_nbt",
+                            "tag": "{conditions:[{name:'{\"text\":\"站在冰上3秒\",\"color\":\"yellow\"}',type:'on_ice',value:12s}],events:[{name:'{\"text\":\"B+2\",\"color\":\"blue\"}',type:'add_blue',value:2s}]}"
+                        }
+                    ]
+                },
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 1,
+                    "functions": [
+                        {
+                            "function": "minecraft:set_nbt",
+                            "tag": "{conditions:[{name:'{\"text\":\"站在冰上3秒\",\"color\":\"yellow\"}',type:'on_ice',value:12s}],events:[{name:'{\"text\":\"B+3\",\"color\":\"blue\"}',type:'add_blue',value:3s}]}"
+                        }
+                    ]
+                },
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 1,
+                    "functions": [
+                        {
+                            "function": "minecraft:set_nbt",
+                            "tag": "{conditions:[{name:'{\"text\":\"站在冰上5秒\",\"color\":\"yellow\"}',type:'on_ice',value:20s}],events:[{name:'{\"text\":\"B+3\",\"color\":\"blue\"}',type:'add_blue',value:5s}]}"
+                        }
+                    ]
+                },
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 1,
+                    "functions": [
+                        {
+                            "function": "minecraft:set_nbt",
+                            "tag": "{conditions:[{name:'{\"text\":\"挖掘1个冰块\",\"color\":\"yellow\"}',type:'dig_ice',value:1s}],events:[{name:'{\"text\":\"B+2\",\"color\":\"blue\"}',type:'add_blue',value:2s}]}"
+                        }
+                    ]
+                },
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 1,
+                    "functions": [
+                        {
+                            "function": "minecraft:set_nbt",
+                            "tag": "{conditions:[{name:'{\"text\":\"挖掘1个冰块\",\"color\":\"yellow\"}',type:'dig_ice',value:1s}],events:[{name:'{\"text\":\"B+3\",\"color\":\"blue\"}',type:'add_blue',value:3s}]}"
+                        }
+                    ]
+                },
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 15,
+                    "functions": [
+                        {
+                            "function": "minecraft:set_nbt",
+                            "tag": "{conditions:[{name:'{\"text\":\"挖掘2个冰块\",\"color\":\"yellow\"}',type:'dig_ice',value:2s}],events:[{name:'{\"text\":\"B+4\",\"color\":\"blue\"}',type:'add_blue',value:4s}]}"
+                        }
+                    ]
+                },
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 1,
+                    "functions": [
+                        {
+                            "function": "minecraft:set_nbt",
+                            "tag": "{conditions:[{name:'{\"text\":\"挖掘3个冰块\",\"color\":\"yellow\"}',type:'dig_ice',value:3s}],events:[{name:'{\"text\":\"B+4\",\"color\":\"blue\"}',type:'add_blue',value:4s}]}"
+                        }
+                    ]
+                },
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 1,
+                    "functions": [
+                        {
+                            "function": "minecraft:set_nbt",
+                            "tag": "{conditions:[{name:'{\"text\":\"挖掘3个冰块\",\"color\":\"yellow\"}',type:'dig_ice',value:3s}],events:[{name:'{\"text\":\"B+5\",\"color\":\"blue\"}',type:'add_blue',value:5s}]}"
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}

+ 9 - 9
data/mini/loot_tables/rgb/red.json → data/mini/loot_tables/rgb/add_green.json

@@ -6,44 +6,44 @@
                 {
                     "type": "minecraft:item",
                     "name": "minecraft:armor_stand",
-                    "weight": 1,
+                    "weight": 15,
                     "functions": [
                         {
                             "function": "minecraft:set_nbt",
-                            "tag": "{conditions:[{name:'{\"text\":\"下蹲1秒\",\"color\":\"yellow\"}',type:'shift',value:4s}],events:[{name:'{\"text\":\"R+1\",\"color\":\"red\"}',type:'add_red',value:1s}]}"
+                            "tag": "{conditions:[{name:'{\"text\":\"站在草方块上3秒\",\"color\":\"yellow\"}',type:'on_grass_block',value:12s}],events:[{name:'{\"text\":\"G+1\",\"color\":\"green\"}',type:'add_green',value:1s}]}"
                         }
                     ]
                 },
                 {
                     "type": "minecraft:item",
                     "name": "minecraft:armor_stand",
-                    "weight": 1,
+                    "weight": 15,
                     "functions": [
                         {
                             "function": "minecraft:set_nbt",
-                            "tag": "{conditions:[{name:'{\"text\":\"在水中3秒\",\"color\":\"yellow\"}',type:'in_water',value:12s}],events:[{name:'{\"text\":\"R+1\",\"color\":\"red\"}',type:'add_red',value:1s}]}"
+                            "tag": "{conditions:[{name:'{\"text\":\"站在草方块上4秒\",\"color\":\"yellow\"}',type:'on_grass_block',value:16s}],events:[{name:'{\"text\":\"G+1\",\"color\":\"green\"}',type:'add_green',value:1s}]}"
                         }
                     ]
                 },
                 {
                     "type": "minecraft:item",
                     "name": "minecraft:armor_stand",
-                    "weight": 1,
+                    "weight": 15,
                     "functions": [
                         {
                             "function": "minecraft:set_nbt",
-                            "tag": "{conditions:[{name:'{\"text\":\"离开地面1秒\",\"color\":\"yellow\"}',type:'on_air',value:4s}],events:[{name:'{\"text\":\"R+2\",\"color\":\"red\"}',type:'add_red',value:2s}]}"
+                            "tag": "{conditions:[{name:'{\"text\":\"站在草方块上5秒\",\"color\":\"yellow\"}',type:'on_grass_block',value:20s}],events:[{name:'{\"text\":\"G+1\",\"color\":\"green\"}',type:'add_green',value:1s}]}"
                         }
                     ]
                 },
                 {
                     "type": "minecraft:item",
                     "name": "minecraft:armor_stand",
-                    "weight": 1,
+                    "weight": 15,
                     "functions": [
                         {
                             "function": "minecraft:set_nbt",
-                            "tag": "{conditions:[{name:'{\"text\":\"站在黑曜石上3秒\",\"color\":\"yellow\"}',type:'on_obsidian',value:12s}],events:[{name:'{\"text\":\"R+1\",\"color\":\"red\"}',type:'add_red',value:1s}]}"
+                            "tag": "{conditions:[{name:'{\"text\":\"放置1条规则\",\"color\":\"yellow\"}',type:'place_rule',value:1s}],events:[{name:'{\"text\":\"G+3\",\"color\":\"green\"}',type:'add_green',value:3s}]}"
                         }
                     ]
                 },
@@ -54,7 +54,7 @@
                     "functions": [
                         {
                             "function": "minecraft:set_nbt",
-                            "tag": "{conditions:[{name:'{\"text\":\"站在南瓜上\",\"color\":\"yellow\"}',type:'on_pumpkin',value:1s}],events:[{name:'{\"text\":\"R=30\",\"color\":\"red\"}',type:'set_red',value:30s},{name:'{\"text\":\"清除下方的南瓜\",\"color\":\"yellow\"}',type:'place_air'}]}"
+                            "tag": "{conditions:[{name:'{\"text\":\"放置3条规则\",\"color\":\"yellow\"}',type:'place_rule',value:3s}],events:[{name:'{\"text\":\"G=15\",\"color\":\"green\"}',type:'set_green',value:15s}]}"
                         }
                     ]
                 }

+ 86 - 0
data/mini/loot_tables/rgb/add_red.json

@@ -0,0 +1,86 @@
+{
+    "pools": [
+        {
+            "rolls": 1,
+            "entries": [
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 15,
+                    "functions": [
+                        {
+                            "function": "minecraft:set_nbt",
+                            "tag": "{conditions:[{name:'{\"text\":\"着火1秒\",\"color\":\"yellow\"}',type:'on_fire',value:4s}],events:[{name:'{\"text\":\"R+3\",\"color\":\"red\"}',type:'add_red',value:3s}]}"
+                        }
+                    ]
+                },
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 1,
+                    "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}]}"
+                        }
+                    ]
+                },
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 1,
+                    "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}]}"
+                        }
+                    ]
+                },
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 15,
+                    "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}]}"
+                        }
+                    ]
+                },
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 1,
+                    "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}]}"
+                        }
+                    ]
+                },
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 15,
+                    "functions": [
+                        {
+                            "function": "minecraft:set_nbt",
+                            "tag": "{conditions:[{name:'[{\"text\":\"失去\",\"color\":\"yellow\"},{\"text\":\"❤\",\"color\":\"red\"},{\"text\":\"x1\",\"color\":\"yellow\"}]',type:'get_damage',value:2s}],events:[{name:'{\"text\":\"R+3\",\"color\":\"red\"}',type:'add_red',value:3s}]}"
+                        }
+                    ]
+                },
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 1,
+                    "functions": [
+                        {
+                            "function": "minecraft:set_nbt",
+                            "tag": "{conditions:[{name:'[{\"text\":\"失去\",\"color\":\"yellow\"},{\"text\":\"❤\",\"color\":\"red\"},{\"text\":\"x3\",\"color\":\"yellow\"}]',type:'get_damage',value:6s}],events:[{name:'{\"text\":\"R=15\",\"color\":\"red\"}',type:'set_red',value:15s}]}"
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}

+ 0 - 20
data/mini/loot_tables/rgb/blue.json

@@ -1,20 +0,0 @@
-{
-    "pools": [
-        {
-            "rolls": 1,
-            "entries": [
-                {
-                    "type": "minecraft:item",
-                    "name": "minecraft:armor_stand",
-                    "weight": 1,
-                    "functions": [
-                        {
-                            "function": "minecraft:set_nbt",
-                            "tag": "{conditions:[{name:'{\"text\":\"下蹲20秒\",\"color\":\"yellow\"}',type:'shift',value:80s}],events:[{name:'{\"text\":\"B+1\",\"color\":\"blue\"}',type:'add_blue',value:1s}]}"
-                        }
-                    ]
-                }
-            ]
-        }
-    ]
-}

+ 22 - 0
data/mini/loot_tables/rgb/danger.json

@@ -3,6 +3,28 @@
         {
             "rolls": 1,
             "entries": [
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 15,
+                    "functions": [
+                        {
+                            "function": "minecraft:set_nbt",
+                            "tag": "{conditions:[{name:'{\"text\":\"R<6\",\"color\":\"red\"}',type:'red_l',value:10s}],events:[{name:'{\"text\":\"清除脚下方块\",\"color\":\"yellow\"}',type:'place_air'}]}"
+                        }
+                    ]
+                },
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 1,
+                    "functions": [
+                        {
+                            "function": "minecraft:set_nbt",
+                            "tag": "{conditions:[{name:'{\"text\":\"R<8\",\"color\":\"red\"}',type:'red_l',value:10s}],events:[{name:'{\"text\":\"清除脚下方块\",\"color\":\"yellow\"}',type:'place_air'}]}"
+                        }
+                    ]
+                },
                 {
                     "type": "minecraft:item",
                     "name": "minecraft:armor_stand",

+ 35 - 2
data/mini/loot_tables/rgb/finish.json

@@ -6,11 +6,44 @@
                 {
                     "type": "minecraft:item",
                     "name": "minecraft:armor_stand",
-                    "weight": 1,
+                    "weight": 15,
                     "functions": [
                         {
                             "function": "minecraft:set_nbt",
-                            "tag": "{conditions:[{name:'{\"text\":\"R≥50\",\"color\":\"red\"}',type:'red_ge',value:50s}],events:[{name:'{\"text\":\"完成游戏!\",\"color\":\"yellow\"}',type:'finish'}]}"
+                            "tag": "{conditions:[{name:'{\"text\":\"R≥10\",\"color\":\"red\"}',type:'red_ge',value:10s},{name:'{\"text\":\"G≥10\",\"color\":\"green\"}',type:'green_ge',value:10s},{name:'{\"text\":\"B≥10\",\"color\":\"blue\"}',type:'blue_ge',value:10s}],events:[{name:'{\"text\":\"完成游戏!\",\"color\":\"yellow\"}',type:'finish'}]}"
+                        }
+                    ]
+                },
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 5,
+                    "functions": [
+                        {
+                            "function": "minecraft:set_nbt",
+                            "tag": "{conditions:[{name:'{\"text\":\"R≥20\",\"color\":\"red\"}',type:'red_ge',value:20s}],events:[{name:'{\"text\":\"完成游戏!\",\"color\":\"yellow\"}',type:'finish'}]}"
+                        }
+                    ]
+                },
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 5,
+                    "functions": [
+                        {
+                            "function": "minecraft:set_nbt",
+                            "tag": "{conditions:[{name:'{\"text\":\"G≥20\",\"color\":\"green\"}',type:'green_ge',value:20s}],events:[{name:'{\"text\":\"完成游戏!\",\"color\":\"yellow\"}',type:'finish'}]}"
+                        }
+                    ]
+                },
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 5,
+                    "functions": [
+                        {
+                            "function": "minecraft:set_nbt",
+                            "tag": "{conditions:[{name:'{\"text\":\"B≥20\",\"color\":\"blue\"}',type:'blue_ge',value:20s}],events:[{name:'{\"text\":\"完成游戏!\",\"color\":\"yellow\"}',type:'finish'}]}"
                         }
                     ]
                 }

+ 0 - 31
data/mini/loot_tables/rgb/green.json

@@ -1,31 +0,0 @@
-{
-    "pools": [
-        {
-            "rolls": 1,
-            "entries": [
-                {
-                    "type": "minecraft:item",
-                    "name": "minecraft:armor_stand",
-                    "weight": 1,
-                    "functions": [
-                        {
-                            "function": "minecraft:set_nbt",
-                            "tag": "{conditions:[{name:'{\"text\":\"R≥10\",\"color\":\"red\"}',type:'red_ge',value:10s}],events:[{name:'{\"text\":\"G+1\",\"color\":\"green\"}',type:'add_green',value:1s},{name:'{\"text\":\"R-5\",\"color\":\"red\"}',type:'add_red',value:-5s}]}"
-                        }
-                    ]
-                },
-                {
-                    "type": "minecraft:item",
-                    "name": "minecraft:armor_stand",
-                    "weight": 1,
-                    "functions": [
-                        {
-                            "function": "minecraft:set_nbt",
-                            "tag": "{conditions:[{name:'{\"text\":\"放置两条规则\",\"color\":\"yellow\"}',type:'place_rule',value:2s}],events:[{name:'{\"text\":\"G+2\",\"color\":\"green\"}',type:'add_green',value:2s},{name:'{\"text\":\"R-8\",\"color\":\"red\"}',type:'add_red',value:-8s}]}"
-                        }
-                    ]
-                }
-            ]
-        }
-    ]
-}

+ 78 - 1
data/mini/loot_tables/rgb/harmful.json

@@ -10,7 +10,84 @@
                     "functions": [
                         {
                             "function": "minecraft:set_nbt",
-                            "tag": "{conditions:[{name:'{\"text\":\"B<5\",\"color\":\"red\"}',type:'green_l',value:5s}],events:[{name:'{\"text\":\"生成点燃的TNT\",\"color\":\"yellow\"}',type:'summon_tnt'},{name:'{\"text\":\"B+1\",\"color\":\"blue\"}',type:'add_blue',value:1s}]}"
+                            "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}]}"
+                        }
+                    ]
+                },
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 1,
+                    "functions": [
+                        {
+                            "function": "minecraft:set_nbt",
+                            "tag": "{conditions:[{name:'{\"text\":\"R≥10\",\"color\":\"red\"}',type:'red_ge',value:10s},{name:'{\"text\":\"站在地上1秒\",\"color\":\"yellow\"}',type:'on_ground',value:4s}],events:[{name:'{\"text\":\"生成点燃的TNT\",\"color\":\"yellow\"}',type:'summon_tnt'}]}"
+                        }
+                    ]
+                },
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 1,
+                    "functions": [
+                        {
+                            "function": "minecraft:set_nbt",
+                            "tag": "{conditions:[{name:'{\"text\":\"R≥10\",\"color\":\"red\"}',type:'red_ge',value:10s},{name:'{\"text\":\"站在地上1秒\",\"color\":\"yellow\"}',type:'on_ground',value:4s}],events:[{name:'{\"text\":\"生成火\",\"color\":\"yellow\"}',type:'place_fire'}]}"
+                        }
+                    ]
+                },
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 1,
+                    "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}]}"
+                        }
+                    ]
+                },
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 1,
+                    "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_powder_snow'},{name:'{\"text\":\"B-1\",\"color\":\"blue\"}',type:'add_blue',value:-1s}]}"
+                        }
+                    ]
+                },
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 1,
+                    "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}]}"
+                        }
+                    ]
+                },
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 1,
+                    "functions": [
+                        {
+                            "function": "minecraft:set_nbt",
+                            "tag": "{conditions:[{name:'{\"text\":\"G≥10\",\"color\":\"green\"}',type:'green_ge',value:10s}],events:[{name:'{\"text\":\"上升5米\",\"color\":\"yellow\"}',type:'tp',direction:'up',value:2s},{name:'{\"text\":\"G-2\",\"color\":\"blue\"}',type:'add_green',value:-2s}]}"
+                        }
+                    ]
+                },
+                {
+                    "type": "minecraft:item",
+                    "name": "minecraft:armor_stand",
+                    "weight": 1,
+                    "functions": [
+                        {
+                            "function": "minecraft:set_nbt",
+                            "tag": "{conditions:[{name:'{\"text\":\"G≥10\",\"color\":\"green\"}',type:'green_ge',value:10s}],events:[{name:'{\"text\":\"生成苦力怕\",\"color\":\"yellow\"}',type:'summon_creeper'},{name:'{\"text\":\"G-2\",\"color\":\"blue\"}',type:'add_green',value:-2s}]}"
                         }
                     ]
                 }