Explorar el Código

新的得分池

龙腾猫跃 hace 3 años
padre
commit
ba8d62a631
Se han modificado 44 ficheros con 471 adiciones y 474 borrados
  1. 2 4
      data/item/functions/bonus_item/add_score.mcfunction
  2. 1 0
      data/item/functions/bonus_item/bonus_item_tag.json
  3. 2 4
      data/item/functions/bonus_item/gameparty/auto/random.mcfunction
  4. 1 1
      data/item/functions/bonus_item/gameparty/mixed/blue.mcfunction
  5. 1 1
      data/item/functions/bonus_item/gameparty/mixed/green.mcfunction
  6. 1 1
      data/item/functions/bonus_item/gameparty/mixed/purple.mcfunction
  7. 9 9
      data/item/functions/bonus_item/gameparty/mixed/random.mcfunction
  8. 1 1
      data/item/functions/bonus_item/gameparty/mixed/white.mcfunction
  9. 1 1
      data/item/functions/bonus_item/gameparty/score/blue.mcfunction
  10. 1 1
      data/item/functions/bonus_item/gameparty/score/green.mcfunction
  11. 1 1
      data/item/functions/bonus_item/gameparty/score/purple.mcfunction
  12. 9 9
      data/item/functions/bonus_item/gameparty/score/random.mcfunction
  13. 1 1
      data/item/functions/bonus_item/gameparty/score/white.mcfunction
  14. 1 1
      data/item/functions/bonus_item/gameparty/wrap/blue.mcfunction
  15. 1 1
      data/item/functions/bonus_item/gameparty/wrap/green.mcfunction
  16. 1 1
      data/item/functions/bonus_item/gameparty/wrap/purple.mcfunction
  17. 9 0
      data/item/functions/bonus_item/gold.mcfunction
  18. 1 1
      data/item/functions/bonus_item/new_array.mcfunction
  19. 4 4
      data/item/functions/bonus_item/random_item.mcfunction
  20. 4 4
      data/item/functions/bonus_item/random_mixed.mcfunction
  21. 4 4
      data/item/functions/bonus_item/random_score.mcfunction
  22. 3 1
      data/item/functions/init.mcfunction
  23. 0 47
      data/item/loot_tables/comment/writable_book.json
  24. 0 53
      data/item/loot_tables/comment/written_book.json
  25. 0 71
      data/item/loot_tables/gameparty/score/blue.json
  26. 0 111
      data/item/loot_tables/gameparty/score/green.json
  27. 0 49
      data/item/loot_tables/gameparty/score/purple.json
  28. 0 78
      data/item/loot_tables/gameparty/score/white.json
  29. 1 1
      data/item/loot_tables/item/blue.json
  30. 0 0
      data/item/loot_tables/item/green.json
  31. 0 0
      data/item/loot_tables/item/purple.json
  32. 0 0
      data/item/loot_tables/item/white.json
  33. 1 1
      data/item/loot_tables/mixed/blue.json
  34. 2 2
      data/item/loot_tables/mixed/green.json
  35. 1 1
      data/item/loot_tables/mixed/purple.json
  36. 2 2
      data/item/loot_tables/mixed/white.json
  37. 112 0
      data/item/loot_tables/score/blue.json
  38. 156 0
      data/item/loot_tables/score/green.json
  39. 64 0
      data/item/loot_tables/score/purple.json
  40. 63 0
      data/item/loot_tables/score/white.json
  41. 3 0
      data/item/tags/items/bonus.json
  42. 1 1
      data/mini/loot_tables/diamond.json
  43. 4 4
      data/mini/loot_tables/trade_e.json
  44. 2 2
      data/mini/loot_tables/trade_s.json

+ 2 - 4
data/item/functions/bonus_item/add_score.mcfunction

@@ -21,10 +21,8 @@ execute if score #bonus_add_score mem matches 101 if score $random mem matches 0
 # 200:偷分
 # 200:偷分
 execute if score #bonus_add_score mem matches 200 run function item:bonus_item/stole_score
 execute if score #bonus_add_score mem matches 200 run function item:bonus_item/stole_score
 
 
-# 300:金粒 +7
-execute if score #bonus_add_score mem matches 300 run scoreboard players add @s gold 7
-execute if score #bonus_add_score mem matches 300 run scoreboard players add @s gold_total 7
-execute if score #bonus_add_score mem matches 300 run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s","color":"aqua"}," 获得了 7 金粒"]
+# 300:金粒
+execute if score #bonus_add_score mem matches 300 run function item:bonus_item/gold
 
 
 # 给予进度
 # 给予进度
 execute if entity @s[scores={total_score=10..}] run advancement grant @s only ltw:story/score1
 execute if entity @s[scores={total_score=10..}] run advancement grant @s only ltw:story/score1

+ 1 - 0
data/item/functions/bonus_item/bonus_item_tag.json

@@ -6,6 +6,7 @@
     "item_name":"{\"text\": \"破损的钓鱼竿\",\"color\": \"green\"}",
     "item_name":"{\"text\": \"破损的钓鱼竿\",\"color\": \"green\"}",
     "bonus_add_score":15,
     "bonus_add_score":15,
     "bonus_stole_score":3,
     "bonus_stole_score":3,
+    "bonus_gold":3,
     "bonus_give_items":[
     "bonus_give_items":[
         {"id":"minecraft:stone","Count":64,"tag":{"is_bonus":true,"display":{"Name":"\"普通的石头\""}}},
         {"id":"minecraft:stone","Count":64,"tag":{"is_bonus":true,"display":{"Name":"\"普通的石头\""}}},
         {"id":"minecraft:arrow","Count":64,"tag":{"is_bonus":true}}
         {"id":"minecraft:arrow","Count":64,"tag":{"is_bonus":true}}

+ 2 - 4
data/item/functions/bonus_item/gameparty/auto/random.mcfunction

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

+ 1 - 1
data/item/functions/bonus_item/gameparty/mixed/blue.mcfunction

@@ -1,4 +1,4 @@
 # 生成蓝色品质的物品实体
 # 生成蓝色品质的物品实体
 
 
-loot spawn 0 0 0 loot item:gameparty/mixed/blue
+loot spawn 0 0 0 loot item:mixed/blue
 execute as @e[type=item,x=0,y=0,z=0,dx=0,dy=0,dz=0,limit=1] positioned ~ ~ ~ run function item:bonus_item/gameparty/wrap/blue
 execute as @e[type=item,x=0,y=0,z=0,dx=0,dy=0,dz=0,limit=1] positioned ~ ~ ~ run function item:bonus_item/gameparty/wrap/blue

+ 1 - 1
data/item/functions/bonus_item/gameparty/mixed/green.mcfunction

@@ -1,4 +1,4 @@
 # 生成绿色品质的物品实体
 # 生成绿色品质的物品实体
 
 
-loot spawn 0 0 0 loot item:gameparty/mixed/green
+loot spawn 0 0 0 loot item:mixed/green
 execute as @e[type=item,x=0,y=0,z=0,dx=0,dy=0,dz=0,limit=1] positioned ~ ~ ~ run function item:bonus_item/gameparty/wrap/green
 execute as @e[type=item,x=0,y=0,z=0,dx=0,dy=0,dz=0,limit=1] positioned ~ ~ ~ run function item:bonus_item/gameparty/wrap/green

+ 1 - 1
data/item/functions/bonus_item/gameparty/mixed/purple.mcfunction

@@ -1,4 +1,4 @@
 # 生成紫色品质的物品实体
 # 生成紫色品质的物品实体
 
 
-loot spawn 0 0 0 loot item:gameparty/mixed/purple
+loot spawn 0 0 0 loot item:mixed/purple
 execute as @e[type=item,x=0,y=0,z=0,dx=0,dy=0,dz=0,limit=1] positioned ~ ~ ~ run function item:bonus_item/gameparty/wrap/purple
 execute as @e[type=item,x=0,y=0,z=0,dx=0,dy=0,dz=0,limit=1] positioned ~ ~ ~ run function item:bonus_item/gameparty/wrap/purple

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

@@ -1,16 +1,16 @@
 # 生成随机品质的物品
 # 生成随机品质的物品
 
 
-# 品质:生成一个 1~10 的 randomarray,每次从其中取下一个数
+# 品质:生成一个 1~14 的 randomarray,每次从其中取下一个数
 execute unless data storage ltw:mini qualities[0] run function item:bonus_item/new_array
 execute unless data storage ltw:mini qualities[0] run function item:bonus_item/new_array
 execute store result score #quality mem run data get storage ltw:mini qualities[0]
 execute store result score #quality mem run data get storage ltw:mini qualities[0]
 data remove storage ltw:mini qualities[0]
 data remove storage ltw:mini qualities[0]
 
 
 # 根据品质生成不同的物品
 # 根据品质生成不同的物品
-# 白色:40%
-execute if score #quality mem matches ..4 run function item:bonus_item/gameparty/mixed/white
-# 绿色:30%
-execute if score #quality mem matches 5..7 run function item:bonus_item/gameparty/mixed/green
-# 蓝色:20%
-execute if score #quality mem matches 8..9 run function item:bonus_item/gameparty/mixed/blue
-# 紫色:10%
-execute if score #quality mem matches 10.. run function item:bonus_item/gameparty/mixed/purple
+# 白色:5
+execute if score #quality mem matches ..5 run function item:bonus_item/gameparty/mixed/white
+# 绿色:4
+execute if score #quality mem matches 6..9 run function item:bonus_item/gameparty/mixed/green
+# 蓝色:3
+execute if score #quality mem matches 10..12 run function item:bonus_item/gameparty/mixed/blue
+# 紫色:2
+execute if score #quality mem matches 13.. run function item:bonus_item/gameparty/mixed/purple

+ 1 - 1
data/item/functions/bonus_item/gameparty/mixed/white.mcfunction

@@ -1,4 +1,4 @@
 # 生成白色品质的物品实体
 # 生成白色品质的物品实体
 
 
-loot spawn 0 0 0 loot item:gameparty/mixed/white
+loot spawn 0 0 0 loot item:mixed/white
 execute as @e[type=item,x=0,y=0,z=0,dx=0,dy=0,dz=0,limit=1] positioned ~ ~ ~ run function item:bonus_item/gameparty/wrap/white
 execute as @e[type=item,x=0,y=0,z=0,dx=0,dy=0,dz=0,limit=1] positioned ~ ~ ~ run function item:bonus_item/gameparty/wrap/white

+ 1 - 1
data/item/functions/bonus_item/gameparty/score/blue.mcfunction

@@ -1,4 +1,4 @@
 # 生成蓝色品质的物品实体
 # 生成蓝色品质的物品实体
 
 
-loot spawn 0 0 0 loot item:gameparty/score/blue
+loot spawn 0 0 0 loot item:score/blue
 execute as @e[type=item,x=0,y=0,z=0,dx=0,dy=0,dz=0,limit=1] positioned ~ ~ ~ run function item:bonus_item/gameparty/wrap/blue
 execute as @e[type=item,x=0,y=0,z=0,dx=0,dy=0,dz=0,limit=1] positioned ~ ~ ~ run function item:bonus_item/gameparty/wrap/blue

+ 1 - 1
data/item/functions/bonus_item/gameparty/score/green.mcfunction

@@ -1,4 +1,4 @@
 # 生成绿色品质的物品实体
 # 生成绿色品质的物品实体
 
 
-loot spawn 0 0 0 loot item:gameparty/score/green
+loot spawn 0 0 0 loot item:score/green
 execute as @e[type=item,x=0,y=0,z=0,dx=0,dy=0,dz=0,limit=1] positioned ~ ~ ~ run function item:bonus_item/gameparty/wrap/green
 execute as @e[type=item,x=0,y=0,z=0,dx=0,dy=0,dz=0,limit=1] positioned ~ ~ ~ run function item:bonus_item/gameparty/wrap/green

+ 1 - 1
data/item/functions/bonus_item/gameparty/score/purple.mcfunction

@@ -1,4 +1,4 @@
 # 生成紫色品质的物品实体
 # 生成紫色品质的物品实体
 
 
-loot spawn 0 0 0 loot item:gameparty/score/purple
+loot spawn 0 0 0 loot item:score/purple
 execute as @e[type=item,x=0,y=0,z=0,dx=0,dy=0,dz=0,limit=1] positioned ~ ~ ~ run function item:bonus_item/gameparty/wrap/purple
 execute as @e[type=item,x=0,y=0,z=0,dx=0,dy=0,dz=0,limit=1] positioned ~ ~ ~ run function item:bonus_item/gameparty/wrap/purple

+ 9 - 9
data/item/functions/bonus_item/gameparty/score/random.mcfunction

@@ -1,16 +1,16 @@
 # 生成随机品质的物品
 # 生成随机品质的物品
 
 
-# 品质:生成一个 1~10 的 randomarray,每次从其中取下一个数
+# 品质:生成一个 1~14 的 randomarray,每次从其中取下一个数
 execute unless data storage ltw:mini qualities[0] run function item:bonus_item/new_array
 execute unless data storage ltw:mini qualities[0] run function item:bonus_item/new_array
 execute store result score #quality mem run data get storage ltw:mini qualities[0]
 execute store result score #quality mem run data get storage ltw:mini qualities[0]
 data remove storage ltw:mini qualities[0]
 data remove storage ltw:mini qualities[0]
 
 
 # 根据品质生成不同的物品
 # 根据品质生成不同的物品
-# 白色:40%
-execute if score #quality mem matches ..4 run function item:bonus_item/gameparty/score/white
-# 绿色:30%
-execute if score #quality mem matches 5..7 run function item:bonus_item/gameparty/score/green
-# 蓝色:20%
-execute if score #quality mem matches 8..9 run function item:bonus_item/gameparty/score/blue
-# 紫色:10%
-execute if score #quality mem matches 10.. run function item:bonus_item/gameparty/score/purple
+# 白色:5
+execute if score #quality mem matches ..5 run function item:bonus_item/gameparty/score/white
+# 绿色:4
+execute if score #quality mem matches 6..9 run function item:bonus_item/gameparty/score/green
+# 蓝色:3
+execute if score #quality mem matches 10..12 run function item:bonus_item/gameparty/score/blue
+# 紫色:2
+execute if score #quality mem matches 13.. run function item:bonus_item/gameparty/score/purple

+ 1 - 1
data/item/functions/bonus_item/gameparty/score/white.mcfunction

@@ -1,4 +1,4 @@
 # 生成白色品质的物品实体
 # 生成白色品质的物品实体
 
 
-loot spawn 0 0 0 loot item:gameparty/score/white
+loot spawn 0 0 0 loot item:score/white
 execute as @e[type=item,x=0,y=0,z=0,dx=0,dy=0,dz=0,limit=1] positioned ~ ~ ~ run function item:bonus_item/gameparty/wrap/white
 execute as @e[type=item,x=0,y=0,z=0,dx=0,dy=0,dz=0,limit=1] positioned ~ ~ ~ run function item:bonus_item/gameparty/wrap/white

+ 1 - 1
data/item/functions/bonus_item/gameparty/wrap/blue.mcfunction

@@ -1,6 +1,6 @@
 #as item
 #as item
 function item:bonus_item/gameparty/wrap/all
 function item:bonus_item/gameparty/wrap/all
-team join blue @e[tag=new_item_]
+team join purple @e[tag=new_item_]
 tag @e[tag=new_item_] add item_blue
 tag @e[tag=new_item_] add item_blue
 tag @e[tag=new_item_] add item_new
 tag @e[tag=new_item_] add item_new
 tag @e[tag=new_item_] remove new_item_
 tag @e[tag=new_item_] remove new_item_

+ 1 - 1
data/item/functions/bonus_item/gameparty/wrap/green.mcfunction

@@ -1,6 +1,6 @@
 #as item
 #as item
 function item:bonus_item/gameparty/wrap/all
 function item:bonus_item/gameparty/wrap/all
-team join green @e[tag=new_item_]
+team join blue @e[tag=new_item_]
 tag @e[tag=new_item_] add item_green
 tag @e[tag=new_item_] add item_green
 tag @e[tag=new_item_] add item_new
 tag @e[tag=new_item_] add item_new
 tag @e[tag=new_item_] remove new_item_
 tag @e[tag=new_item_] remove new_item_

+ 1 - 1
data/item/functions/bonus_item/gameparty/wrap/purple.mcfunction

@@ -1,6 +1,6 @@
 #as item
 #as item
 function item:bonus_item/gameparty/wrap/all
 function item:bonus_item/gameparty/wrap/all
-team join purple @e[tag=new_item_]
+team join gold @e[tag=new_item_]
 tag @e[tag=new_item_] add item_purple
 tag @e[tag=new_item_] add item_purple
 tag @e[tag=new_item_] add item_new
 tag @e[tag=new_item_] add item_new
 tag @e[tag=new_item_] remove new_item_
 tag @e[tag=new_item_] remove new_item_

+ 9 - 0
data/item/functions/bonus_item/gold.mcfunction

@@ -0,0 +1,9 @@
+# as player
+execute store result score #bonus_gold mem run data get storage item:bonus item.tag.bonus_gold
+
+# 更改积分
+scoreboard players operation @s gold += #bonus_gold mem
+scoreboard players operation @s gold_total += #bonus_gold mem
+
+# 显示提示
+tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s","color":"aqua"}," 获得了 ",{"score": {"name": "#bonus_gold","objective": "mem"},"color":"aqua"},{"text": " 金粒","color":"aqua"}]

+ 1 - 1
data/item/functions/bonus_item/new_array.mcfunction

@@ -1,4 +1,4 @@
-scoreboard players set $randarray_max mem 10
+scoreboard players set $randarray_max mem 14
 scoreboard players set $randarray_last mem 0
 scoreboard players set $randarray_last mem 0
 function lib:randarray/call
 function lib:randarray/call
 data modify storage ltw:mini qualities set from storage lib:randarray out
 data modify storage ltw:mini qualities set from storage lib:randarray out

+ 4 - 4
data/item/functions/bonus_item/random_item.mcfunction

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

+ 4 - 4
data/item/functions/bonus_item/random_mixed.mcfunction

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

+ 4 - 4
data/item/functions/bonus_item/random_score.mcfunction

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

+ 3 - 1
data/item/functions/init.mcfunction

@@ -3,4 +3,6 @@ scoreboard objectives remove UUID
 scoreboard objectives add UUID dummy "UUID"
 scoreboard objectives add UUID dummy "UUID"
 
 
 scoreboard objectives remove item_slot
 scoreboard objectives remove item_slot
-scoreboard objectives add item_slot dummy "item_slot"
+scoreboard objectives add item_slot dummy "item_slot"
+
+function item:bonus_item/new_array

+ 0 - 47
data/item/loot_tables/comment/writable_book.json

@@ -1,47 +0,0 @@
-{
-	"type":"minecraft:generic",
-	"pools":[
-		{
-		"rolls":1,
-		"entries":[
-				{	
-					"type":"item",
-					"name":"minecraft:writable_book",
-					"functions":[
-                        {
-						    "function":"set_name",
-						    "name":{
-                                "text": "",
-                                "color": "white",
-                                "extra": [
-                                    {
-                                        "selector": "@s",
-                                        "italic": false,
-                                        "color": "gold"
-                                    },
-                                    {
-                                        "text":" 的反馈书",
-                                        "italic":false,
-                                        "color":"white"
-                                    }
-                                ]
-                            },
-                            "entity": "this"
-                        },
-                        {
-                            "function": "minecraft:set_lore",
-                            "lore":[
-                                {
-                                    "text":"请认真写反馈, 不然小心被夹哟!",
-                                    "italic":false,
-                                    "color":"gray"
-                                }
-                            ],
-                            "entity":"this"
-                        }
-                    ]
-				}
-			]
-		}
-	]
-}

+ 0 - 53
data/item/loot_tables/comment/written_book.json

@@ -1,53 +0,0 @@
-{
-	"type":"minecraft:generic",
-	"pools":[
-		{
-		"rolls":1,
-		"entries":[
-				{	
-					"type":"item",
-					"name":"minecraft:written_book",
-					"functions":[
-                        {
-						    "function":"copy_nbt",
-                            "source": "this",
-						    "ops":[
-                                {
-                                    "source": "Inventory[{id:\"minecraft:written_book\"}].tag.pages",
-                                    "target": "pages",
-                                    "op":"replace"
-                                },
-                                {
-                                    "source": "Inventory[{id:\"minecraft:written_book\"}].tag.author",
-                                    "target": "author",
-                                    "op":"replace"
-                                },
-                                {
-                                    "source": "Inventory[{id:\"minecraft:written_book\"}].tag.title",
-                                    "target": "title",
-                                    "op":"replace"
-                                }
-                            ]
-                        },
-                        {
-                            "function": "set_name",
-                            "entity": "this",
-                            "name":{
-                                "text":"反馈主题: ",
-                                "color":"aqua",
-                                "italic": false,
-                                "extra": [
-                                    {
-                                        "nbt":"Inventory[{id:\"minecraft:written_book\"}].tag.title",
-                                        "entity":"@s",
-                                        "color":"white"
-                                    }
-                                ]
-                            }
-                        }
-                    ]
-				}
-			]
-		}
-	]
-}

+ 0 - 71
data/item/loot_tables/gameparty/score/blue.json

@@ -1,71 +0,0 @@
-{"pools": [{"rolls": 1,"entries": [
-
-{
-    "type": "minecraft:item",
-    "weight": 4,
-    "name": "minecraft:nether_star",
-    "functions": [
-        {
-            "function": "minecraft:set_count",
-            "count": 7
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分 +7\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":7}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 4,
-    "name": "minecraft:nether_star",
-    "functions": [
-        {
-            "function": "minecraft:set_count",
-            "count": 6
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分 +6\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":6}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 4,
-    "name": "minecraft:nether_star",
-    "functions": [
-        {
-            "function": "minecraft:set_count",
-            "count": 5
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分 +5\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":5}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 2,
-    "name": "minecraft:ender_eye",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"从最高分玩家处偷取 3 积分\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":200,\"bonus_stole_score\":3}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 4,
-    "name": "minecraft:emerald",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分随机翻倍或不变\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":101}"
-        }
-    ]
-}
-
-]}]}

+ 0 - 111
data/item/loot_tables/gameparty/score/green.json

@@ -1,111 +0,0 @@
-{"pools": [{"rolls": 1,"entries": [
-
-{
-    "type": "minecraft:item",
-    "weight": 9,
-    "name": "minecraft:nether_star",
-    "functions": [
-        {
-            "function": "minecraft:set_count",
-            "count": 4
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分 +4\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":4}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 9,
-    "name": "minecraft:nether_star",
-    "functions": [
-        {
-            "function": "minecraft:set_count",
-            "count": 3
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分 +3\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":3}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:emerald",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分随机翻倍或减半\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":100}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 1,
-    "name": "minecraft:target",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分随机 +1~6\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":1}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 1,
-    "name": "minecraft:target",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分随机 +1~6\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":2}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 1,
-    "name": "minecraft:target",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分随机 +1~6\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":3}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 1,
-    "name": "minecraft:target",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分随机 +1~6\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":4}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 1,
-    "name": "minecraft:target",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分随机 +1~6\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":5}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 1,
-    "name": "minecraft:target",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分随机 +1~6\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":6}"
-        }
-    ]
-}
-
-]}]}

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

@@ -1,49 +0,0 @@
-{"pools": [{"rolls": 1,"entries": [
-
-    {
-        "type": "minecraft:item",
-        "weight": 1,
-        "name": "minecraft:nether_star",
-        "functions": [
-            {
-                "function": "minecraft:set_count",
-                "count": 10
-            },
-            {
-                "function": "minecraft:set_nbt",
-                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分 +10\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":10}"
-            }
-        ]
-    },
-{
-    "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\":9}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 1,
-    "name": "minecraft:nether_star",
-    "functions": [
-        {
-            "function": "minecraft:set_count",
-            "count": 8
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分 +8\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":8}"
-        }
-    ]
-}
-
-]}]}

+ 0 - 78
data/item/loot_tables/gameparty/score/white.json

@@ -1,78 +0,0 @@
-{"pools": [{"rolls": 1,"entries": [
-
-{
-    "type": "minecraft:item",
-    "weight": 6,
-    "name": "minecraft:nether_star",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分 +1\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":1}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 6,
-    "name": "minecraft:nether_star",
-    "functions": [
-        {
-            "function": "minecraft:set_count",
-            "count": 2
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分 +2\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":2}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 2,
-    "name": "minecraft:paper",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"小概率积分 +5\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":0}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 1,
-    "name": "minecraft:paper",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"小概率积分 +5\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":5}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 1,
-    "name": "minecraft:gold_nugget",
-    "functions": [
-        {
-            "function": "minecraft:set_count",
-            "count": 7
-        },
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"金粒 +7\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":300}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 2,
-    "name": "minecraft:ender_eye",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"从最高分玩家处偷取 1 积分\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":200,\"bonus_stole_score\":1}"
-        }
-    ]
-}
-
-]}]}

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

@@ -7,7 +7,7 @@
         "functions": [
         "functions": [
             {
             {
                 "function": "minecraft:set_nbt",
                 "function": "minecraft:set_nbt",
-                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"地牢箱子\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"BlockEntityTag\":{\"LootTable\":\"mini:iron\",\"id\":\"minecraft:chest\"}}"
+                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"地牢箱子\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"BlockEntityTag\":{\"LootTable\":\"mini:diamond\",\"id\":\"minecraft:chest\"}}"
             }
             }
         ]
         ]
     },
     },

+ 0 - 0
data/item/loot_tables/gameparty/item/green.json → data/item/loot_tables/item/green.json


+ 0 - 0
data/item/loot_tables/gameparty/item/purple.json → data/item/loot_tables/item/purple.json


+ 0 - 0
data/item/loot_tables/gameparty/item/white.json → data/item/loot_tables/item/white.json


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

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

+ 2 - 2
data/item/loot_tables/gameparty/mixed/green.json → data/item/loot_tables/mixed/green.json

@@ -3,12 +3,12 @@
     {
     {
         "type": "minecraft:loot_table",
         "type": "minecraft:loot_table",
         "weight": 10,
         "weight": 10,
-        "name": "item:gameparty/score/green"
+        "name": "item:score/green"
     },
     },
     {
     {
         "type": "minecraft:loot_table",
         "type": "minecraft:loot_table",
         "weight": 90,
         "weight": 90,
-        "name": "item:gameparty/item/green"
+        "name": "item:item/green"
     },
     },
     {
     {
         "type": "minecraft:item",
         "type": "minecraft:item",

+ 1 - 1
data/item/loot_tables/gameparty/mixed/purple.json → data/item/loot_tables/mixed/purple.json

@@ -3,7 +3,7 @@
     {
     {
         "type": "minecraft:loot_table",
         "type": "minecraft:loot_table",
         "weight": 40,
         "weight": 40,
-        "name": "item:gameparty/item/purple"
+        "name": "item:item/purple"
     },
     },
     {
     {
         "type": "minecraft:item",
         "type": "minecraft:item",

+ 2 - 2
data/item/loot_tables/gameparty/mixed/white.json → data/item/loot_tables/mixed/white.json

@@ -3,12 +3,12 @@
     {
     {
         "type": "minecraft:loot_table",
         "type": "minecraft:loot_table",
         "weight": 20,
         "weight": 20,
-        "name": "item:gameparty/score/white"
+        "name": "item:score/white"
     },
     },
     {
     {
         "type": "minecraft:loot_table",
         "type": "minecraft:loot_table",
         "weight": 80,
         "weight": 80,
-        "name": "item:gameparty/item/white"
+        "name": "item:item/white"
     }
     }
 
 
 ]}]}
 ]}]}

+ 112 - 0
data/item/loot_tables/score/blue.json

@@ -0,0 +1,112 @@
+{"pools": [{"rolls": 1,"entries": [
+
+{
+    "type": "minecraft:item",
+    "weight": 10,
+    "name": "minecraft:nether_star",
+    "functions": [
+        {
+            "function": "minecraft:set_count",
+            "count": 4
+        },
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"4 积分\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":4}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 14,
+    "name": "minecraft:nether_star",
+    "functions": [
+        {
+            "function": "minecraft:set_count",
+            "count": 5
+        },
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"5 积分\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":5}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 3,
+    "name": "minecraft:gold_nugget",
+    "functions": [
+        {
+            "function": "minecraft:set_count",
+            "count": 8
+        },
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"8 金粒\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":300,\"bonus_gold\":8}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 3,
+    "name": "minecraft:gold_nugget",
+    "functions": [
+        {
+            "function": "minecraft:set_count",
+            "count": 10
+        },
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"10 金粒\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":300,\"bonus_gold\":10}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 8,
+    "name": "minecraft:ender_eye",
+    "functions": [
+        {
+            "function": "minecraft:set_count",
+            "count": 3
+        },
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"从最高分玩家处偷取 3 积分\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":200,\"bonus_stole_score\":3}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 6,
+    "name": "minecraft:map",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"1/2 概率获得 10 积分\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":0}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 6,
+    "name": "minecraft:map",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"1/2 概率获得 10 积分\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":10}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 6,
+    "name": "minecraft:magenta_glazed_terracotta",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分随机翻倍或不变\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":101}"
+        }
+    ]
+}
+
+]}]}

+ 156 - 0
data/item/loot_tables/score/green.json

@@ -0,0 +1,156 @@
+{"pools": [{"rolls": 1,"entries": [
+
+{
+    "type": "minecraft:item",
+    "weight": 10,
+    "name": "minecraft:nether_star",
+    "functions": [
+        {
+            "function": "minecraft:set_count",
+            "count": 2
+        },
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"2 积分\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":2}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 14,
+    "name": "minecraft:nether_star",
+    "functions": [
+        {
+            "function": "minecraft:set_count",
+            "count": 3
+        },
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"3 积分\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":3}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 3,
+    "name": "minecraft:gold_nugget",
+    "functions": [
+        {
+            "function": "minecraft:set_count",
+            "count": 4
+        },
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"4 金粒\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":300,\"bonus_gold\":4}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 3,
+    "name": "minecraft:gold_nugget",
+    "functions": [
+        {
+            "function": "minecraft:set_count",
+            "count": 6
+        },
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"6 金粒\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":300,\"bonus_gold\":6}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 8,
+    "name": "minecraft:ender_eye",
+    "functions": [
+        {
+            "function": "minecraft:set_count",
+            "count": 2
+        },
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"从最高分玩家处偷取 2 积分\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":200,\"bonus_stole_score\":2}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 2,
+    "name": "minecraft:target",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"随机 1~6 积分\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":1}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 2,
+    "name": "minecraft:target",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"随机 1~6 积分\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":2}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 2,
+    "name": "minecraft:target",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"随机 1~6 积分\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":3}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 2,
+    "name": "minecraft:target",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"随机 1~6 积分\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":4}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 2,
+    "name": "minecraft:target",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"随机 1~6 积分\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":5}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 2,
+    "name": "minecraft:target",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"随机 1~6 积分\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":6}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 6,
+    "name": "minecraft:magenta_glazed_terracotta",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分随机翻倍或减半\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":100}"
+        }
+    ]
+}
+
+]}]}

+ 64 - 0
data/item/loot_tables/score/purple.json

@@ -0,0 +1,64 @@
+{"pools": [{"rolls": 1,"entries": [
+
+{
+    "type": "minecraft:item",
+    "weight": 14,
+    "name": "minecraft:nether_star",
+    "functions": [
+        {
+            "function": "minecraft:set_count",
+            "count": 6
+        },
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"6 积分\\\",\\\"color\\\":\\\"gold\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":6}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 10,
+    "name": "minecraft:nether_star",
+    "functions": [
+        {
+            "function": "minecraft:set_count",
+            "count": 7
+        },
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"7 积分\\\",\\\"color\\\":\\\"gold\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":7}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 3,
+    "name": "minecraft:gold_nugget",
+    "functions": [
+        {
+            "function": "minecraft:set_count",
+            "count": 12
+        },
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"12 金粒\\\",\\\"color\\\":\\\"gold\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":300,\"bonus_gold\":12}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 3,
+    "name": "minecraft:gold_nugget",
+    "functions": [
+        {
+            "function": "minecraft:set_count",
+            "count": 14
+        },
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"14 金粒\\\",\\\"color\\\":\\\"gold\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":300,\"bonus_gold\":14}"
+        }
+    ]
+}
+
+]}]}

+ 63 - 0
data/item/loot_tables/score/white.json

@@ -0,0 +1,63 @@
+{"pools": [{"rolls": 1,"entries": [
+
+{
+    "type": "minecraft:item",
+    "weight": 24,
+    "name": "minecraft:nether_star",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"1 积分\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":1}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 6,
+    "name": "minecraft:gold_nugget",
+    "functions": [
+        {
+            "function": "minecraft:set_count",
+            "count": 2
+        },
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"2 金粒\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":300,\"bonus_gold\":2}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 8,
+    "name": "minecraft:ender_pearl",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"从最高分玩家处偷取 1 积分\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":200,\"bonus_stole_score\":1}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 9,
+    "name": "minecraft:paper",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"1/4 概率获得 5 积分\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":0}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 3,
+    "name": "minecraft:paper",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"1/4 概率获得 5 积分\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":5}"
+        }
+    ]
+}
+
+]}]}

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

@@ -18,6 +18,9 @@
         "minecraft:chest",
         "minecraft:chest",
         "minecraft:lava_bucket",
         "minecraft:lava_bucket",
         "minecraft:blast_furnace",
         "minecraft:blast_furnace",
+        "minecraft:ender_pearl",
+        "minecraft:magenta_glazed_terracotta",
+        "minecraft:map",
         "minecraft:diamond",
         "minecraft:diamond",
         "minecraft:diamond_sword",
         "minecraft:diamond_sword",
         "minecraft:shulker_shell",
         "minecraft:shulker_shell",

+ 1 - 1
data/mini/loot_tables/diamond.json

@@ -7,7 +7,7 @@
         "functions": [
         "functions": [
             {
             {
                 "function": "minecraft:set_nbt",
                 "function": "minecraft:set_nbt",
-                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"积分 +1\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":1,\"display\":{\"Name\":'{\"text\":\"积分 +1\",\"italic\":false,\"color\":\"white\"}'}}"
+                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"1 积分\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":1,\"display\":{\"Name\":'{\"text\":\"1 积分\",\"italic\":false,\"color\":\"white\"}'}}"
             }
             }
         ]
         ]
     },
     },

+ 4 - 4
data/mini/loot_tables/trade_e.json

@@ -47,7 +47,7 @@
             "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
             "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
                 "tag": "{buy:{id:\"stone\",Count:64}}"
                 "tag": "{buy:{id:\"stone\",Count:64}}"
             }, { "function": "set_nbt",
             }, { "function": "set_nbt",
-                "tag":"{sell:{id:\"nether_star\",Count:1,tag:{display:{Name:'{\"text\":\"积分 +1\",\"color\":\"white\",\"italic\":false}'}}}}"
+                "tag":"{sell:{id:\"nether_star\",Count:1,tag:{display:{Name:'{\"text\":\"1 积分\",\"color\":\"white\",\"italic\":false}'}}}}"
             }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
             }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
                 "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:stone\"}}]}}"
                 "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:stone\"}}]}}"
             }}}]
             }}}]
@@ -56,7 +56,7 @@
             "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
             "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
                 "tag": "{buy:{id:\"diamond_leggings\",Count:1}}"
                 "tag": "{buy:{id:\"diamond_leggings\",Count:1}}"
             }, { "function": "set_nbt",
             }, { "function": "set_nbt",
-                "tag":"{sell:{id:\"nether_star\",Count:1,tag:{display:{Name:'{\"text\":\"积分 +1\",\"color\":\"white\",\"italic\":false}'}}}}"
+                "tag":"{sell:{id:\"nether_star\",Count:1,tag:{display:{Name:'{\"text\":\"1 积分\",\"color\":\"white\",\"italic\":false}'}}}}"
             }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
             }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
                 "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:diamond_leggings\"}}]}}"
                 "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:diamond_leggings\"}}]}}"
             }}}]
             }}}]
@@ -65,7 +65,7 @@
             "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
             "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
                 "tag": "{buy:{id:\"mossy_cobblestone\",Count:32}}"
                 "tag": "{buy:{id:\"mossy_cobblestone\",Count:32}}"
             }, { "function": "set_nbt",
             }, { "function": "set_nbt",
-                "tag":"{sell:{id:\"nether_star\",Count:1,tag:{display:{Name:'{\"text\":\"积分 +1\",\"color\":\"white\",\"italic\":false}'}}}}"
+                "tag":"{sell:{id:\"nether_star\",Count:1,tag:{display:{Name:'{\"text\":\"1 积分\",\"color\":\"white\",\"italic\":false}'}}}}"
             }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
             }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
                 "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:mossy_cobblestone\"}}]}}"
                 "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:mossy_cobblestone\"}}]}}"
             }}}]
             }}}]
@@ -74,7 +74,7 @@
             "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
             "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
                 "tag": "{buy:{id:\"obsidian\",Count:1}}"
                 "tag": "{buy:{id:\"obsidian\",Count:1}}"
             }, { "function": "set_nbt",
             }, { "function": "set_nbt",
-                "tag":"{sell:{id:\"nether_star\",Count:1,tag:{display:{Name:'{\"text\":\"积分 +1\",\"color\":\"white\",\"italic\":false}'}}}}"
+                "tag":"{sell:{id:\"nether_star\",Count:1,tag:{display:{Name:'{\"text\":\"1 积分\",\"color\":\"white\",\"italic\":false}'}}}}"
             }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
             }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
                 "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:obsidian\"}}]}}"
                 "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:obsidian\"}}]}}"
             }}}]
             }}}]

+ 2 - 2
data/mini/loot_tables/trade_s.json

@@ -65,7 +65,7 @@
             "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
             "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
                 "tag": "{buy:{id:\"emerald\",Count:2}}"
                 "tag": "{buy:{id:\"emerald\",Count:2}}"
             }, { "function": "set_nbt",
             }, { "function": "set_nbt",
-                "tag":"{sell:{id:\"nether_star\",Count:1,tag:{display:{Name:'{\"text\":\"积分 +1\",\"color\":\"white\",\"italic\":false}'}}}}"
+                "tag":"{sell:{id:\"nether_star\",Count:1,tag:{display:{Name:'{\"text\":\"1 积分\",\"color\":\"white\",\"italic\":false}'}}}}"
             }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
             }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
                 "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:emerald\"},sell:{id:\"minecraft:nether_star\"}}]}}"
                 "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:emerald\"},sell:{id:\"minecraft:nether_star\"}}]}}"
             }}}]
             }}}]
@@ -74,7 +74,7 @@
             "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
             "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
                 "tag": "{buy:{id:\"emerald\",Count:3}}"
                 "tag": "{buy:{id:\"emerald\",Count:3}}"
             }, { "function": "set_nbt",
             }, { "function": "set_nbt",
-                "tag":"{sell:{id:\"chest\",Count:1,tag:{BlockEntityTag:{LootTable:\"mini:iron\",id:\"minecraft:chest\"},display:{Name:'{\"text\":\"地牢箱子\",\"color\":\"aqua\",\"italic\":false}'}}}}"
+                "tag":"{sell:{id:\"chest\",Count:1,tag:{BlockEntityTag:{LootTable:\"mini:diamond\",id:\"minecraft:chest\"},display:{Name:'{\"text\":\"地牢箱子\",\"color\":\"aqua\",\"italic\":false}'}}}}"
             }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
             }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
                 "nbt": "{Offers:{Recipes:[{sell:{id:\"minecraft:chest\"}}]}}"
                 "nbt": "{Offers:{Recipes:[{sell:{id:\"minecraft:chest\"}}]}}"
             }}}]
             }}}]