LTCatt пре 5 година
родитељ
комит
68478dfcd8

+ 7 - 7
data/item/functions/bonus_item/gameparty/mixed/random.mcfunction

@@ -7,11 +7,11 @@ function lib:random
 scoreboard players operation #quality mem = $random mem
 
 # 根据品质生成不同的物品
-# 白色:55%
-execute if score #quality mem matches ..55 run function item:bonus_item/gameparty/mixed/white
+# 白色:53%
+execute if score #quality mem matches ..53 run function item:bonus_item/gameparty/mixed/white
 # 绿色:30%
-execute if score #quality mem matches 56..85 run function item:bonus_item/gameparty/mixed/green
-# 蓝色:10%
-execute if score #quality mem matches 86..98 run function item:bonus_item/gameparty/mixed/blue
-# 紫色:2%
-execute if score #quality mem matches 99.. run function item:bonus_item/gameparty/mixed/purple
+execute if score #quality mem matches 54..83 run function item:bonus_item/gameparty/mixed/green
+# 蓝色:13%
+execute if score #quality mem matches 84..96 run function item:bonus_item/gameparty/mixed/blue
+# 紫色:4%
+execute if score #quality mem matches 97.. run function item:bonus_item/gameparty/mixed/purple

+ 1 - 1
data/item/loot_tables/gameparty/item/green.json

@@ -92,7 +92,7 @@
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"急迫 IV (饮用, 2:00)\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"CustomPotionEffects\":[{\"Id\":3,\"Amplifier\":3,\"Duration\":2400}],\"CustomPotionColor\":16578599,\"display\":{\"Name\":\"{\\\"text\\\":\\\"速掘药水\\\",\\\"italic\\\":0,\\\"color\\\":\\\"green\\\"}\"}}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"急迫 V (饮用, 3:00)\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"CustomPotionEffects\":[{\"Id\":3,\"Amplifier\":4,\"Duration\":3600}],\"CustomPotionColor\":16578599,\"display\":{\"Name\":\"{\\\"text\\\":\\\"速掘药水\\\",\\\"italic\\\":0,\\\"color\\\":\\\"green\\\"}\"}}"
         }
     ]
 },

+ 38 - 3
data/item/loot_tables/gameparty/item/purple.json

@@ -1,10 +1,45 @@
 {"pools": [{"rolls": 1,"entries": [
 
-
     {
-        "type": "minecraft:loot_table",
+        "type": "minecraft:item",
+        "weight": 6,
+        "name": "minecraft:shulker_shell",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"铁镐, 铁斧, 铁剑, 铁锹\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_give_items\":[{\"id\":\"minecraft:iron_pickaxe\",\"Count\":1,\"tag\":{\"bonus_return\":1b,\"is_bonus\":1b}},{\"id\":\"minecraft:iron_axe\",\"Count\":1,\"tag\":{\"bonus_return\":1b,\"is_bonus\":1b}},{\"id\":\"minecraft:iron_sword\",\"Count\":1,\"tag\":{\"bonus_return\":1b,\"is_bonus\":1b}},{\"id\":\"minecraft:iron_shovel\",\"Count\":1,\"tag\":{\"bonus_return\":1b,\"is_bonus\":1b}}]}"
+            }
+        ]
+},
+    {
+        "type": "minecraft:item",
+        "weight": 3,
+        "name": "minecraft:iron_ingot",
+        "functions": [
+            {
+                "function": "minecraft:set_count",
+                "count": 9
+            },
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"铁锭 x9\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"bonus_clear_nbt\":1b}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
         "weight": 3,
-        "name": "item:gameparty/item/blue"
+        "name": "minecraft:diamond",
+        "functions": [
+            {
+                "function": "minecraft:set_count",
+                "count": 4
+            },
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"钻石 x4\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"bonus_clear_nbt\":1b}"
+            }
+        ]
     }
 
 

+ 1 - 1
data/item/loot_tables/gameparty/mixed/blue.json

@@ -8,7 +8,7 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 25,
+        "weight": 30,
         "name": "minecraft:heart_of_the_sea",
         "functions": [
             {

+ 7 - 2
data/item/loot_tables/gameparty/mixed/purple.json

@@ -1,8 +1,13 @@
 {"pools": [{"rolls": 1,"entries": [
 
+    {
+        "type": "minecraft:loot_table",
+        "weight": 50,
+        "name": "item:gameparty/item/purple"
+    },
     {
         "type": "minecraft:item",
-        "weight": 1,
+        "weight": 30,
         "name": "minecraft:heart_of_the_sea",
         "functions": [
             {
@@ -13,7 +18,7 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 1,
+        "weight": 20,
         "name": "minecraft:heart_of_the_sea",
         "functions": [
             {

+ 15 - 0
data/item/loot_tables/gameparty/score/purple.json

@@ -1,5 +1,20 @@
 {"pools": [{"rolls": 1,"entries": [
 
+    {
+        "type": "minecraft:item",
+        "weight": 1,
+        "name": "minecraft:nether_star",
+        "functions": [
+            {
+                "function": "minecraft:set_count",
+                "count": 9
+            },
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分 +9\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":8}"
+            }
+        ]
+    },
 {
     "type": "minecraft:item",
     "weight": 1,

+ 2 - 0
data/item/tags/items/bonus.json

@@ -13,6 +13,8 @@
         "minecraft:nether_star",
         "minecraft:trident",
         "minecraft:stick",
+        "minecraft:diamond",
+        "minecraft:shulker_shell",
         "minecraft:heart_of_the_sea",
         "minecraft:cobblestone",
         "minecraft:iron_ore",

+ 3 - 0
data/ltw/functions/init.mcfunction

@@ -108,16 +108,19 @@ team add debugging "调试者"
 team modify debugging color red
 team modify debugging collisionRule never
 team modify debugging deathMessageVisibility never
+team modify debugging seeFriendlyInvisibles false
 team remove playing
 team add playing "玩家"
 team modify playing color green
 team modify playing collisionRule never
 team modify playing deathMessageVisibility never
+team modify playing seeFriendlyInvisibles false
 team remove watching
 team add watching "旁观者"
 team modify watching color gray
 team modify watching collisionRule never
 team modify watching deathMessageVisibility never
+team modify watching seeFriendlyInvisibles false
 
 # 非玩家队伍
 team remove white

+ 0 - 1
data/mini/functions/trade/game_init.mcfunction

@@ -21,7 +21,6 @@ kill @e[type=!player,x=950,y=-200,z=4950,dx=100,dy=600,dz=100]
 # 伤害管理
 scoreboard players set $remove_resistance mem 1
 team modify playing friendlyFire false
-team modify playing seeFriendlyInvisibles false
 team modify playing collisionRule never
 team modify playing deathMessageVisibility always
 gamerule fallDamage false