Merge branch 'master' of github.com:LTCatt/LTW3

data/item/functions/bonus_item/gameparty/mixed/random.mcfunction

@@ -12,6 +12,6 @@ execute if score #quality mem matches ..55 run function item:bonus_item/gamepart
 # 绿色：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..95 run function item:bonus_item/gameparty/mixed/blue
-# 紫色：5%
-execute if score #quality mem matches 96.. run function item:bonus_item/gameparty/mixed/purple
+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

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

@@ -8,8 +8,8 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 20,
-        "name": "minecraft:chest",
+        "weight": 25,
+        "name": "minecraft:heart_of_the_sea",
         "functions": [
             {
                 "function": "minecraft:set_nbt",

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

@@ -12,8 +12,8 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 11,
-        "name": "minecraft:chest",
+        "weight": 13,
+        "name": "minecraft:heart_of_the_sea",
         "functions": [
             {
                 "function": "minecraft:set_nbt",
@@ -23,8 +23,8 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 3,
-        "name": "minecraft:chest",
+        "weight": 4,
+        "name": "minecraft:heart_of_the_sea",
         "functions": [
             {
                 "function": "minecraft:set_nbt",
@@ -34,8 +34,8 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 3,
-        "name": "minecraft:chest",
+        "weight": 4,
+        "name": "minecraft:heart_of_the_sea",
         "functions": [
             {
                 "function": "minecraft:set_nbt",
@@ -45,8 +45,8 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 3,
-        "name": "minecraft:chest",
+        "weight": 4,
+        "name": "minecraft:heart_of_the_sea",
         "functions": [
             {
                 "function": "minecraft:set_nbt",

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

@@ -1,15 +1,9 @@
 {"pools": [{"rolls": 1,"entries": [
 
-
-    {
-        "type": "minecraft:loot_table",
-        "weight": 100,
-        "name": "item:gameparty/item/purple"
-    },
     {
         "type": "minecraft:item",
-        "weight": 10,
-        "name": "minecraft:chest",
+        "weight": 1,
+        "name": "minecraft:heart_of_the_sea",
         "functions": [
             {
                 "function": "minecraft:set_nbt",
@@ -19,8 +13,8 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 10,
-        "name": "minecraft:chest",
+        "weight": 1,
+        "name": "minecraft:heart_of_the_sea",
         "functions": [
             {
                 "function": "minecraft:set_nbt",

data/item/tags/items/bonus.json

@@ -13,7 +13,7 @@
         "minecraft:nether_star",
         "minecraft:trident",
         "minecraft:stick",
-        "minecraft:chest",
+        "minecraft:heart_of_the_sea",
         "minecraft:elytra",
         "minecraft:firework_rocket",
         "minecraft:wooden_axe",

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

@@ -24,13 +24,14 @@ team modify playing color reset
 # 小游戏编号：生成一个 1~[最大游戏编号] 的 randomarray，每次从其中取下一个数。
 execute unless data storage ltw:mini types[0] run function ltw:state/3/newarray
 execute store result score $mini_type mem run data get storage ltw:mini types[0]
-data remove storage ltw:mini types[0]
+execute if score $round mem matches ..4 run data remove storage ltw:mini types[0]
 
-# 小游戏编号覆盖：如果为第 5 轮，则有一半概率选用钻石风暴
+# 小游戏编号覆盖：如果为第 5 轮，则有一半概率选用钻石，一半概率选用贸易
 scoreboard players set $random_max mem 1
 scoreboard players set $random_min mem 0
 function lib:random
-execute if score $round mem matches 5 if score $random mem matches 1 run scoreboard players set $mini_type mem 6
+execute if score $round mem matches 5 if score $random mem matches 0 run scoreboard players set $mini_type mem 6
+execute if score $round mem matches 5 if score $random mem matches 1 run scoreboard players set $mini_type mem 8
 
 # 初始化小游戏
 function mini:main/game_init