Merge branches 'master' and 'master' of github.com:00ll00/LTW3

data/item/loot_tables/gameparty/ranks/blue.json

@@ -2,7 +2,7 @@
 
 {
     "type": "minecraft:item",
-    "weight": 2,
+    "weight": 3,
     "name": "minecraft:nether_star",
     "functions": [
         {

data/item/loot_tables/gameparty/ranks/green.json

@@ -2,7 +2,7 @@
 
 {
     "type": "minecraft:item",
-    "weight": 6,
+    "weight": 24,
     "name": "minecraft:nether_star",
     "functions": [
         {
@@ -13,7 +13,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 1,
+    "weight": 4,
     "name": "minecraft:ender_pearl",
     "functions": [
         {
@@ -24,7 +24,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 1,
+    "weight": 4,
     "name": "minecraft:netherite_sword",
     "functions": [
         {
@@ -35,7 +35,18 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 1,
+    "weight": 4,
+    "name": "minecraft:shield",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"盾牌\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 4,
     "name": "minecraft:bow",
     "functions": [
         {

data/item/loot_tables/gameparty/ranks/purple.json

@@ -2,7 +2,7 @@
 
 {
     "type": "minecraft:item",
-    "weight": 2,
+    "weight": 3,
     "name": "minecraft:nether_star",
     "functions": [
         {

data/item/loot_tables/gameparty/ranks/white.json

@@ -2,7 +2,7 @@
 
 {
     "type": "minecraft:item",
-    "weight": 1,
+    "weight": 4,
     "name": "minecraft:arrow",
     "functions": [
         {
@@ -17,7 +17,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 1,
+    "weight": 4,
     "name": "minecraft:stone_sword",
     "functions": [
         {
@@ -25,6 +25,50 @@
             "tag": "{\"item_name\":\"{\\\"text\\\":\\\"石剑\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b}"
         }
     ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 1,
+    "name": "minecraft:iron_helmet",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"铁头盔\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 1,
+    "name": "minecraft:iron_chestplate",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"铁胸甲\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 1,
+    "name": "minecraft:iron_leggings",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"铁护腿\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 1,
+    "name": "minecraft:iron_boots",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"铁靴子\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b}"
+        }
+    ]
 }
 
 ]}]}

data/item/tags/items/bonus.json

@@ -7,6 +7,11 @@
         "minecraft:arrow",
         "minecraft:nether_star",
         "minecraft:fishing_rod",
+        "minecraft:iron_helmet",
+        "minecraft:iron_chestplate",
+        "minecraft:iron_leggings",
+        "minecraft:iron_boots",
+        "minecraft:shield",
         "minecraft:bow"
     ]
 }

data/lib/functions/randarray/call.mcfunction

@@ -8,4 +8,4 @@ execute if score $randarray_max mem matches 1.. run function lib:randarray/recu
 execute as @e[tag=randarray_marker] if score @s mem = $randarray_last mem run kill @s
 execute as @e[tag=randarray_marker,sort=random] run function lib:randarray/add
 
-tellraw @a ["新随机数组已生成：",{"nbt": "out","storage": "lib:randarray"},"，去重：",{"score": {"name": "$randarray_last","objective": "mem"}}]
+# tellraw @a ["新随机数组已生成：",{"nbt": "out","storage": "lib:randarray"},"，去重：",{"score": {"name": "$randarray_last","objective": "mem"}}]

data/ltw/functions/state/7/state_enter.mcfunction

@@ -31,7 +31,7 @@ execute if score $t_player_count mem matches 8.. positioned 12.5 12.5 2009.0 run
 execute as @e[type=item] at @s run fill ~-0.2 ~ ~-0.2 ~0.2 ~ ~0.2 air
 execute as @e[type=item] at @s run fill ~-0.2 ~1 ~-0.2 ~0.2 ~1 ~0.2 barrier
 
-# 防止幽灵实体分 tick 执行
+# 防止幽灵实体，分 tick 执行
 schedule function ltw:state/7/state_enter2 1t
 
 # 判断进入下一轮小游戏或结束