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

data/item/functions/bonus_item/gameparty/auto/blue.mcfunction

@@ -1,8 +1,8 @@
 # 生成蓝色品质的物品实体
 
-execute if score $round mem matches ..2 run function item:bonus_item/gameparty/normal/blue
+execute if score $round mem matches ..2 run function item:bonus_item/gameparty/mixed/blue
 execute if score $round mem matches 3 run function item:bonus_item/gameparty/score/blue
-execute if score $round mem matches 4 run function item:bonus_item/gameparty/normal/blue
+execute if score $round mem matches 4 run function item:bonus_item/gameparty/mixed/blue
 execute if score $round mem matches 5.. run function item:bonus_item/gameparty/score/blue
 summon item ~ ~ ~ {Tags:["new_item"],Age:-32768,PickupDelay:0,NoGravity:1,Invulnerable:1,CustomNameVisible:1,Glowing:1,Motion:[0,0,0],Item:{id:"gold_nugget",Count:1}}
 data modify entity @e[tag=new_item,limit=1] Item set from entity @e[limit=1,type=item,sort=nearest,tag=!new_item] Item

data/item/functions/bonus_item/gameparty/auto/green.mcfunction

@@ -1,8 +1,8 @@
 # 生成绿色品质的物品实体
 
-execute if score $round mem matches ..2 run function item:bonus_item/gameparty/normal/green
+execute if score $round mem matches ..2 run function item:bonus_item/gameparty/mixed/green
 execute if score $round mem matches 3 run function item:bonus_item/gameparty/score/green
-execute if score $round mem matches 4 run function item:bonus_item/gameparty/normal/green
+execute if score $round mem matches 4 run function item:bonus_item/gameparty/mixed/green
 execute if score $round mem matches 5.. run function item:bonus_item/gameparty/score/green
 summon item ~ ~ ~ {Tags:["new_item"],Age:-32768,PickupDelay:0,NoGravity:1,Invulnerable:1,CustomNameVisible:1,Glowing:1,Motion:[0,0,0],Item:{id:"gold_nugget",Count:1}}
 data modify entity @e[tag=new_item,limit=1] Item set from entity @e[limit=1,type=item,sort=nearest,tag=!new_item] Item

data/item/functions/bonus_item/gameparty/auto/purple.mcfunction

@@ -1,8 +1,8 @@
 # 生成紫色品质的物品实体
 
-execute if score $round mem matches ..2 run function item:bonus_item/gameparty/normal/purple
+execute if score $round mem matches ..2 run function item:bonus_item/gameparty/mixed/purple
 execute if score $round mem matches 3 run function item:bonus_item/gameparty/score/purple
-execute if score $round mem matches 4 run function item:bonus_item/gameparty/normal/purple
+execute if score $round mem matches 4 run function item:bonus_item/gameparty/mixed/purple
 execute if score $round mem matches 5.. run function item:bonus_item/gameparty/score/purple
 summon item ~ ~ ~ {Tags:["new_item"],Age:-32768,PickupDelay:0,NoGravity:1,Invulnerable:1,CustomNameVisible:1,Glowing:1,Motion:[0,0,0],Item:{id:"gold_nugget",Count:1}}
 data modify entity @e[tag=new_item,limit=1] Item set from entity @e[limit=1,type=item,sort=nearest,tag=!new_item] Item

data/item/functions/bonus_item/gameparty/auto/white.mcfunction

@@ -1,8 +1,8 @@
 # 生成白色品质的物品实体
 
-execute if score $round mem matches ..2 run function item:bonus_item/gameparty/normal/white
+execute if score $round mem matches ..2 run function item:bonus_item/gameparty/mixed/white
 execute if score $round mem matches 3 run function item:bonus_item/gameparty/score/white
-execute if score $round mem matches 4 run function item:bonus_item/gameparty/normal/white
+execute if score $round mem matches 4 run function item:bonus_item/gameparty/mixed/white
 execute if score $round mem matches 5.. run function item:bonus_item/gameparty/score/white
 summon item ~ ~ ~ {Tags:["new_item"],Age:-32768,PickupDelay:0,NoGravity:1,Invulnerable:1,CustomNameVisible:1,Glowing:1,Motion:[0,0,0],Item:{id:"gold_nugget",Count:1}}
 data modify entity @e[tag=new_item,limit=1] Item set from entity @e[limit=1,type=item,sort=nearest,tag=!new_item] Item

data/item/functions/bonus_item/gameparty/normal/blue.mcfunction → data/item/functions/bonus_item/gameparty/mixed/blue.mcfunction

@@ -1,6 +1,6 @@
 # 生成蓝色品质的物品实体
 
-loot spawn ~ ~ ~ loot item:gameparty/normal/blue
+loot spawn ~ ~ ~ loot item:gameparty/mixed/blue
 summon item ~ ~ ~ {Tags:["new_item"],Age:-32768,PickupDelay:0,NoGravity:1,Invulnerable:1,CustomNameVisible:1,Glowing:1,Motion:[0,0,0],Item:{id:"gold_nugget",Count:1}}
 data modify entity @e[tag=new_item,limit=1] Item set from entity @e[limit=1,type=item,sort=nearest,tag=!new_item] Item
 kill @e[limit=1,type=item,sort=nearest,tag=!new_item]

data/item/functions/bonus_item/gameparty/normal/green.mcfunction → data/item/functions/bonus_item/gameparty/mixed/green.mcfunction

@@ -1,6 +1,6 @@
 # 生成绿色品质的物品实体
 
-loot spawn ~ ~ ~ loot item:gameparty/normal/green
+loot spawn ~ ~ ~ loot item:gameparty/mixed/green
 summon item ~ ~ ~ {Tags:["new_item"],Age:-32768,PickupDelay:0,NoGravity:1,Invulnerable:1,CustomNameVisible:1,Glowing:1,Motion:[0,0,0],Item:{id:"gold_nugget",Count:1}}
 data modify entity @e[tag=new_item,limit=1] Item set from entity @e[limit=1,type=item,sort=nearest,tag=!new_item] Item
 kill @e[limit=1,type=item,sort=nearest,tag=!new_item]

data/item/functions/bonus_item/gameparty/normal/purple.mcfunction → data/item/functions/bonus_item/gameparty/mixed/purple.mcfunction

@@ -1,6 +1,6 @@
 # 生成紫色品质的物品实体
 
-loot spawn ~ ~ ~ loot item:gameparty/normal/purple
+loot spawn ~ ~ ~ loot item:gameparty/mixed/purple
 summon item ~ ~ ~ {Tags:["new_item"],Age:-32768,PickupDelay:0,NoGravity:1,Invulnerable:1,CustomNameVisible:1,Glowing:1,Motion:[0,0,0],Item:{id:"gold_nugget",Count:1}}
 data modify entity @e[tag=new_item,limit=1] Item set from entity @e[limit=1,type=item,sort=nearest,tag=!new_item] Item
 kill @e[limit=1,type=item,sort=nearest,tag=!new_item]

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

@@ -8,10 +8,10 @@ scoreboard players operation #quality mem = $random mem
 
 # 根据品质生成不同的物品
 # 白色：55%
-execute if score #quality mem matches ..55 run function item:bonus_item/gameparty/normal/white
+execute if score #quality mem matches ..55 run function item:bonus_item/gameparty/mixed/white
 # 绿色：30%
-execute if score #quality mem matches 56..85 run function item:bonus_item/gameparty/normal/green
-# 蓝色：15%
-execute if score #quality mem matches 86.. run function item:bonus_item/gameparty/normal/blue
-# 紫色：0%
-# execute if score #quality mem matches 95.. run function item:bonus_item/gameparty/normal/purple
+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

data/item/functions/bonus_item/gameparty/normal/white.mcfunction → data/item/functions/bonus_item/gameparty/mixed/white.mcfunction

@@ -1,6 +1,6 @@
 # 生成白色品质的物品实体
 
-loot spawn ~ ~ ~ loot item:gameparty/normal/white
+loot spawn ~ ~ ~ loot item:gameparty/mixed/white
 summon item ~ ~ ~ {Tags:["new_item"],Age:-32768,PickupDelay:0,NoGravity:1,Invulnerable:1,CustomNameVisible:1,Glowing:1,Motion:[0,0,0],Item:{id:"gold_nugget",Count:1}}
 data modify entity @e[tag=new_item,limit=1] Item set from entity @e[limit=1,type=item,sort=nearest,tag=!new_item] Item
 kill @e[limit=1,type=item,sort=nearest,tag=!new_item]

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

@@ -1,6 +1,6 @@
 # 根据轮数生成对应的物品
 
-execute if score $round mem matches ..2 run function item:bonus_item/gameparty/normal/random
+execute if score $round mem matches ..2 run function item:bonus_item/gameparty/mixed/random
 execute if score $round mem matches 3 run function item:bonus_item/gameparty/score/random
-execute if score $round mem matches 4 run function item:bonus_item/gameparty/normal/random
+execute if score $round mem matches 4 run function item:bonus_item/gameparty/mixed/random
 execute if score $round mem matches 5.. run function item:bonus_item/gameparty/score/random

data/item/functions/bonus_item/random_bonus.mcfunction

@@ -3,6 +3,7 @@ setblock 0 0 1 shulker_box replace
 data modify storage item:bonus random_bonus set from storage item:bonus item.tag.bonus_random_bonus[0]
 data remove storage item:bonus item.tag.bonus_random_bonus[0]
 execute store result score $item.random.count mem run data get storage item:bonus random_bonus.count
-execute if score $item.random.count mem matches 1.. if data storage item:bonus random_bonus{"type":"normal"} run function item:bonus_item/random_normal
+execute if score $item.random.count mem matches 1.. if data storage item:bonus random_bonus{"type":"item"} run function item:bonus_item/random_item
+execute if score $item.random.count mem matches 1.. if data storage item:bonus random_bonus{"type":"mixed"} run function item:bonus_item/random_mixed
 execute if score $item.random.count mem matches 1.. if data storage item:bonus random_bonus{"type":"score"} run function item:bonus_item/random_score
 execute if data storage item:bonus item.tag.bonus_random_bonus[0] run function item:bonus_item/random_bonus

data/item/functions/bonus_item/random_normal.mcfunction → data/item/functions/bonus_item/random_item.mcfunction

@@ -1,8 +1,8 @@
 #as player
 scoreboard players remove $item.random.count mem 1
-execute if data storage item:bonus random_bonus{"level":"white"} run loot replace block 0 0 1 container.0 loot item:gameparty/normal/white
-execute if data storage item:bonus random_bonus{"level":"green"} run loot replace block 0 0 1 container.0 loot item:gameparty/normal/green
-execute if data storage item:bonus random_bonus{"level":"blue"} run loot replace block 0 0 1 container.0 loot item:gameparty/normal/blue
-execute if data storage item:bonus random_bonus{"level":"purple"} run loot replace block 0 0 1 container.0 loot item:gameparty/normal/purple
+execute if data storage item:bonus random_bonus{"level":"white"} run loot replace block 0 0 1 container.0 loot item:gameparty/item/white
+execute if data storage item:bonus random_bonus{"level":"green"} run loot replace block 0 0 1 container.0 loot item:gameparty/item/green
+execute if data storage item:bonus random_bonus{"level":"blue"} run loot replace block 0 0 1 container.0 loot item:gameparty/item/blue
+execute if data storage item:bonus random_bonus{"level":"purple"} run loot replace block 0 0 1 container.0 loot item:gameparty/item/purple
 data modify storage item:bonus item_buff prepend from block 0 0 1 Items[{"Slot":0b}]
-execute if score $item.random.count mem matches 1.. run function item:bonus_item/random_normal
+execute if score $item.random.count mem matches 1.. run function item:bonus_item/random_item

data/item/functions/bonus_item/random_mixed.mcfunction

@@ -0,0 +1,8 @@
+#as player
+scoreboard players remove $item.random.count mem 1
+execute if data storage item:bonus random_bonus{"level":"white"} run loot replace block 0 0 1 container.0 loot item:gameparty/mixed/white
+execute if data storage item:bonus random_bonus{"level":"green"} run loot replace block 0 0 1 container.0 loot item:gameparty/mixed/green
+execute if data storage item:bonus random_bonus{"level":"blue"} run loot replace block 0 0 1 container.0 loot item:gameparty/mixed/blue
+execute if data storage item:bonus random_bonus{"level":"purple"} run loot replace block 0 0 1 container.0 loot item:gameparty/mixed/purple
+data modify storage item:bonus item_buff prepend from block 0 0 1 Items[{"Slot":0b}]
+execute if score $item.random.count mem matches 1.. run function item:bonus_item/random_mixed

data/item/loot_tables/gameparty/normal/green.json → data/item/loot_tables/gameparty/item/green.json

@@ -1,11 +1,5 @@
 {"pools": [{"rolls": 1,"entries": [
 
-    {
-        "type": "minecraft:loot_table",
-        "weight": 2,
-        "name": "item:gameparty/score/green"
-    },
-
 {
         "type": "minecraft:item",
         "weight": 2,

data/item/loot_tables/gameparty/normal/purple.json → data/item/loot_tables/gameparty/item/purple.json

@@ -4,7 +4,7 @@
     {
         "type": "minecraft:loot_table",
         "weight": 3,
-        "name": "item:gameparty/normal/blue"
+        "name": "item:gameparty/item/blue"
     }
 
 

data/item/loot_tables/gameparty/normal/white.json → data/item/loot_tables/gameparty/item/white.json

@@ -1,11 +1,5 @@
 {"pools": [{"rolls": 1,"entries": [
 
-    {
-        "type": "minecraft:loot_table",
-        "weight": 3,
-        "name": "item:gameparty/score/white"
-    },
-
 {
     "type": "minecraft:item",
     "weight": 1,

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

@@ -0,0 +1,22 @@
+{"pools": [{"rolls": 1,"entries": [
+
+
+    {
+        "type": "minecraft:loot_table",
+        "weight": 100,
+        "name": "item:gameparty/item/blue"
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 20,
+        "name": "minecraft:chest",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"2 件随机绿色道具\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_random_bonus\":[{\"type\":\"item\",\"level\":\"green\",\"count\":2}]}"
+            }
+        ]
+    }
+
+
+]}]}

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

@@ -0,0 +1,58 @@
+{"pools": [{"rolls": 1,"entries": [
+
+    {
+        "type": "minecraft:loot_table",
+        "weight": 10,
+        "name": "item:gameparty/score/green"
+    },
+    {
+        "type": "minecraft:loot_table",
+        "weight": 90,
+        "name": "item:gameparty/item/green"
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 11,
+        "name": "minecraft:chest",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"3 件随机白色道具\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_random_bonus\":[{\"type\":\"item\",\"level\":\"white\",\"count\":3}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 3,
+        "name": "minecraft:chest",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"1 件随机品质道具\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_random_bonus\":[{\"type\":\"item\",\"level\":\"white\",\"count\":1}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 3,
+        "name": "minecraft:chest",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"1 件随机品质道具\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_random_bonus\":[{\"type\":\"item\",\"level\":\"green\",\"count\":1}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 3,
+        "name": "minecraft:chest",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"1 件随机品质道具\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_random_bonus\":[{\"type\":\"item\",\"level\":\"blue\",\"count\":1}]}"
+            }
+        ]
+    }
+
+]}]}

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

@@ -0,0 +1,33 @@
+{"pools": [{"rolls": 1,"entries": [
+
+
+    {
+        "type": "minecraft:loot_table",
+        "weight": 100,
+        "name": "item:gameparty/item/purple"
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 10,
+        "name": "minecraft:chest",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"2 件随机蓝色道具\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_random_bonus\":[{\"type\":\"item\",\"level\":\"blue\",\"count\":2}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 10,
+        "name": "minecraft:chest",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"3 件随机绿色道具\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_random_bonus\":[{\"type\":\"item\",\"level\":\"green\",\"count\":3}]}"
+            }
+        ]
+    }
+
+
+]}]}

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

@@ -0,0 +1,14 @@
+{"pools": [{"rolls": 1,"entries": [
+
+    {
+        "type": "minecraft:loot_table",
+        "weight": 20,
+        "name": "item:gameparty/score/white"
+    },
+    {
+        "type": "minecraft:loot_table",
+        "weight": 80,
+        "name": "item:gameparty/item/white"
+    }
+
+]}]}

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

@@ -2,7 +2,7 @@
 
 {
     "type": "minecraft:item",
-    "weight": 5,
+    "weight": 6,
     "name": "minecraft:nether_star",
     "functions": [
         {
@@ -17,7 +17,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 5,
+    "weight": 6,
     "name": "minecraft:nether_star",
     "functions": [
         {

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

@@ -2,7 +2,7 @@
 
 {
     "type": "minecraft:item",
-    "weight": 5,
+    "weight": 9,
     "name": "minecraft:nether_star",
     "functions": [
         {
@@ -17,7 +17,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 5,
+    "weight": 9,
     "name": "minecraft:nether_star",
     "functions": [
         {

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

@@ -2,7 +2,7 @@
 
 {
     "type": "minecraft:item",
-    "weight": 5,
+    "weight": 6,
     "name": "minecraft:nether_star",
     "functions": [
         {
@@ -13,7 +13,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 5,
+    "weight": 6,
     "name": "minecraft:nether_star",
     "functions": [
         {

data/item/tags/items/bonus.json

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

data/minecraft/loot_tables/gameplay/fishing.json

@@ -8,13 +8,13 @@
           "type": "minecraft:loot_table",
           "weight": 10,
           "quality": 5,
-          "name": "item:gameparty/normal/green"
+          "name": "item:gameparty/item/green"
         },
         {
           "type": "minecraft:loot_table",
           "weight": 40,
           "quality": 10,
-          "name": "item:gameparty/normal/white"
+          "name": "item:gameparty/item/white"
         },
         {
           "type": "minecraft:loot_table",

data/mini/functions/trade/game/announce_upgrade.mcfunction

@@ -5,9 +5,9 @@ execute if entity @e[type=villager,limit=1,tag=upgradeVillager,nbt={VillagerData
 execute if entity @e[type=villager,limit=1,tag=upgradeVillager,nbt={VillagerData:{level:5}}] run tellraw @a[tag=!self] ["",{"text":">> ","color":"gold","bold":true},{"selector":"@s","color":"gold"}," 的村民到达了 ",{"text":"大师级","color":"gold"}]
 execute as @a[tag=!self] at @s run function lib:sounds/error
 
-execute if entity @e[type=villager,limit=1,tag=upgradeVillager,nbt={VillagerData:{level:3}}] run tellraw @s ["",{"text":">> ","color":"green","bold":true},"你的村民到达了 ",{"text":"老手级","color":"green"}]
-execute if entity @e[type=villager,limit=1,tag=upgradeVillager,nbt={VillagerData:{level:4}}] run tellraw @s ["",{"text":">> ","color":"green","bold":true},"你的村民到达了 ",{"text":"专家级","color":"green"}]
-execute if entity @e[type=villager,limit=1,tag=upgradeVillager,nbt={VillagerData:{level:5}}] run tellraw @s ["",{"text":">> ","color":"green","bold":true},"你的村民到达了 ",{"text":"大师级","color":"green"}]
+execute if entity @e[type=villager,limit=1,tag=upgradeVillager,nbt={VillagerData:{level:3}}] run tellraw @s ["",{"text":">> ","color":"green","bold":true},"你的村民到达了 ",{"text":"老手级， 重新开启交易页面以查看新的交易!","color":"green"}]
+execute if entity @e[type=villager,limit=1,tag=upgradeVillager,nbt={VillagerData:{level:4}}] run tellraw @s ["",{"text":">> ","color":"green","bold":true},"你的村民到达了 ",{"text":"专家级， 重新开启交易页面以查看新的交易!","color":"green"}]
+execute if entity @e[type=villager,limit=1,tag=upgradeVillager,nbt={VillagerData:{level:5}}] run tellraw @s ["",{"text":">> ","color":"green","bold":true},"你的村民到达了 ",{"text":"大师级， 重新开启交易页面以查看新的交易!","color":"green"}]
 execute at @s run function lib:sounds/levelup
 
 tag @s remove self

data/mini/functions/trade/game_start.mcfunction

@@ -4,8 +4,8 @@ scoreboard objectives setdisplay list total_score_disp
 scoreboard objectives setdisplay belowName emerald
 scoreboard objectives setdisplay sidebar emerald
 scoreboard players set $bossbar_color mem 4
-scoreboard players set $countdown_max mem 270
-scoreboard players set $countdown mem 270
+scoreboard players set $countdown_max mem 330
+scoreboard players set $countdown mem 330
 scoreboard players set $bossbar_type mem 2
 function lib:bossbar/show
 bossbar set mini:red name "剩余时间"