Explorar o código

新的商店系统

龙腾猫跃 %!s(int64=3) %!d(string=hai) anos
pai
achega
d86e965459
Modificáronse 93 ficheiros con 701 adicións e 624 borrados
  1. 3 3
      data/item/functions/bonus_item/add_score.mcfunction
  2. 1 1
      data/item/functions/disable_slot/check_slot.mcfunction
  3. 2 2
      data/item/functions/disable_slot/disable_slot_7.mcfunction
  4. 2 2
      data/item/functions/disable_slot/disable_slot_8.mcfunction
  5. 3 1
      data/item/functions/init.mcfunction
  6. 2 2
      data/item/functions/pop_slot/pop_item.mcfunction
  7. 2 2
      data/item/functions/pop_slot/return_item.mcfunction
  8. BIN=BIN
      data/item/functions/shop/__pycache__/sendcmd.cpython-37.pyc
  9. 9 10
      data/item/functions/shop/buy/011_bow.mcfunction
  10. 15 0
      data/item/functions/shop/buy/012_bow.mcfunction
  11. 15 0
      data/item/functions/shop/buy/013_bow.mcfunction
  12. 15 0
      data/item/functions/shop/buy/021_arrow.mcfunction
  13. 15 0
      data/item/functions/shop/buy/022_arrow.mcfunction
  14. 15 0
      data/item/functions/shop/buy/023_arrow.mcfunction
  15. 15 0
      data/item/functions/shop/buy/031_apple.mcfunction
  16. 15 0
      data/item/functions/shop/buy/032_apple.mcfunction
  17. 15 0
      data/item/functions/shop/buy/041_float.mcfunction
  18. 15 0
      data/item/functions/shop/buy/042_float.mcfunction
  19. 15 0
      data/item/functions/shop/buy/051_axe.mcfunction
  20. 9 10
      data/item/functions/shop/buy/052_axe.mcfunction
  21. 15 0
      data/item/functions/shop/buy/053_axe.mcfunction
  22. 15 0
      data/item/functions/shop/buy/061_armor.mcfunction
  23. 15 0
      data/item/functions/shop/buy/062_armor.mcfunction
  24. 15 0
      data/item/functions/shop/buy/063_armor.mcfunction
  25. 15 0
      data/item/functions/shop/buy/064_armor.mcfunction
  26. 15 0
      data/item/functions/shop/buy/071_fish.mcfunction
  27. 15 0
      data/item/functions/shop/buy/072_fish.mcfunction
  28. 15 0
      data/item/functions/shop/buy/073_fish.mcfunction
  29. 15 0
      data/item/functions/shop/buy/074_fish.mcfunction
  30. 10 0
      data/item/functions/shop/buy/101_hint.mcfunction
  31. 14 0
      data/item/functions/shop/buy/101_hint_real.mcfunction
  32. 12 0
      data/item/functions/shop/buy/102_bgm.mcfunction
  33. 10 0
      data/item/functions/shop/buy/103_pig.mcfunction
  34. 5 6
      data/item/functions/shop/buy/201_particle_system.mcfunction
  35. 10 0
      data/item/functions/shop/buy/210_particle_close.mcfunction
  36. 10 0
      data/item/functions/shop/buy/211_particle1.mcfunction
  37. 24 0
      data/item/functions/shop/buy/212_particle2.mcfunction
  38. 24 0
      data/item/functions/shop/buy/213_particle3.mcfunction
  39. 24 0
      data/item/functions/shop/buy/214_particle4.mcfunction
  40. 24 0
      data/item/functions/shop/buy/215_particle5.mcfunction
  41. 24 0
      data/item/functions/shop/buy/216_particle6.mcfunction
  42. 9 0
      data/item/functions/shop/buy/999_dice.mcfunction
  43. 13 0
      data/item/functions/shop/buy/easter_egg.mcfunction
  44. 0 16
      data/item/functions/shop/buy_apple1.mcfunction
  45. 0 16
      data/item/functions/shop/buy_apple2.mcfunction
  46. 0 16
      data/item/functions/shop/buy_armor1.mcfunction
  47. 0 16
      data/item/functions/shop/buy_armor2.mcfunction
  48. 0 16
      data/item/functions/shop/buy_armor3.mcfunction
  49. 0 16
      data/item/functions/shop/buy_arrow1.mcfunction
  50. 0 16
      data/item/functions/shop/buy_arrow2.mcfunction
  51. 0 16
      data/item/functions/shop/buy_arrow3.mcfunction
  52. 0 16
      data/item/functions/shop/buy_bgm.mcfunction
  53. 0 16
      data/item/functions/shop/buy_bow.mcfunction
  54. 0 15
      data/item/functions/shop/buy_dice.mcfunction
  55. 0 16
      data/item/functions/shop/buy_easter_egg.mcfunction
  56. 0 16
      data/item/functions/shop/buy_firework.mcfunction
  57. 0 16
      data/item/functions/shop/buy_orange.mcfunction
  58. 0 11
      data/item/functions/shop/buy_particle0.mcfunction
  59. 0 11
      data/item/functions/shop/buy_particle1.mcfunction
  60. 0 25
      data/item/functions/shop/buy_particle2.mcfunction
  61. 0 25
      data/item/functions/shop/buy_particle3.mcfunction
  62. 0 25
      data/item/functions/shop/buy_particle4.mcfunction
  63. 0 25
      data/item/functions/shop/buy_particle5.mcfunction
  64. 0 25
      data/item/functions/shop/buy_particle6.mcfunction
  65. 0 15
      data/item/functions/shop/buy_pig.mcfunction
  66. 0 16
      data/item/functions/shop/buy_potion_resist.mcfunction
  67. 0 16
      data/item/functions/shop/buy_potion_speed1.mcfunction
  68. 0 16
      data/item/functions/shop/buy_potion_speed2.mcfunction
  69. 0 16
      data/item/functions/shop/buy_weapon3.mcfunction
  70. 0 16
      data/item/functions/shop/buy_weapon4.mcfunction
  71. 0 10
      data/item/functions/shop/charity.mcfunction
  72. 46 35
      data/item/functions/shop/check.mcfunction
  73. 37 0
      data/item/functions/shop/document.txt
  74. 6 0
      data/item/functions/shop/error/dice.mcfunction
  75. 6 0
      data/item/functions/shop/error/piglin.mcfunction
  76. 1 3
      data/item/functions/shop/error/villager.mcfunction
  77. 23 0
      data/item/functions/shop/init.mcfunction
  78. 36 25
      data/item/functions/shop/refresh_equip.mcfunction
  79. 2 2
      data/item/functions/shop/refresh_gold.mcfunction
  80. 2 2
      data/item/functions/shop/refresh_green.mcfunction
  81. 0 1
      data/item/functions/shop/special_bgm.mcfunction
  82. 0 1
      data/item/functions/shop/special_easter_egg.mcfunction
  83. 0 1
      data/item/functions/shop/special_pig.mcfunction
  84. 3 30
      data/ltw/functions/init.mcfunction
  85. 1 0
      data/ltw/functions/main/game_end.mcfunction
  86. 1 1
      data/ltw/functions/state/0/state/check_slot.mcfunction
  87. 1 0
      data/ltw/functions/state/0/state_enter.mcfunction
  88. 1 1
      data/ltw/functions/state/0/summon_entity.mcfunction
  89. 1 1
      data/ltw/functions/state/6/player_enter.mcfunction
  90. 0 3
      data/ltw/functions/state/6/state_enter.mcfunction
  91. 1 2
      data/ltw/functions/state/7/continue_gameparty.mcfunction
  92. 1 1
      data/mini/functions/colormatch/game/start_new_round.mcfunction
  93. 1 1
      data/mini/functions/main/player_enter.mcfunction

+ 3 - 3
data/item/functions/bonus_item/add_score.mcfunction

@@ -13,11 +13,11 @@ scoreboard players set $random_min mem 0
 function lib:random
 execute if score #bonus_add_score mem matches 100..101 if score $random mem matches 1 run scoreboard players operation @s total_score *= #2 mem
 execute if score #bonus_add_score mem matches 100..101 if score $random mem matches 1 run scoreboard players operation @s total_score_disp *= #2 mem
-execute if score #bonus_add_score mem matches 100..101 if score $random mem matches 1 run tellraw @a ["",{"text": ">> ","color":"green","bold": true},{"selector": "@s","color":"green"}," 的硬币投出了正面, 积分加倍, 当前共有 ",{"score": {"name": "@s","objective": "total_score"},"color":"green"},{"text": " 积分", "color":"green"}]
+execute if score #bonus_add_score mem matches 100..101 if score $random mem matches 1 run tellraw @a ["",{"text": ">> ","color":"green","bold": true},{"selector": "@s","color":"green"}," 投出了正面, 积分加倍, 当前共有 ",{"score": {"name": "@s","objective": "total_score"},"color":"green"},{"text": " 积分", "color":"green"}]
 execute if score #bonus_add_score mem matches 100 if score $random mem matches 0 run scoreboard players operation @s total_score /= #2 mem
 execute if score #bonus_add_score mem matches 100 if score $random mem matches 0 run scoreboard players operation @s total_score_disp /= #2 mem
-execute if score #bonus_add_score mem matches 100 if score $random mem matches 0 run tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@s","color":"red"}," 的硬币投出了反面, 积分减半, 当前共有 ",{"score": {"name": "@s","objective": "total_score"},"color":"red"},{"text": " 积分", "color":"red"}]
-execute if score #bonus_add_score mem matches 101 if score $random mem matches 0 run tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@s","color":"red"}," 的硬币投出了反面, 积分不变, 当前共有 ",{"score": {"name": "@s","objective": "total_score"},"color":"red"},{"text": " 积分", "color":"red"}]
+execute if score #bonus_add_score mem matches 100 if score $random mem matches 0 run tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@s","color":"red"}," 投出了反面, 积分减半, 当前共有 ",{"score": {"name": "@s","objective": "total_score"},"color":"red"},{"text": " 积分", "color":"red"}]
+execute if score #bonus_add_score mem matches 101 if score $random mem matches 0 run tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@s","color":"red"}," 投出了反面, 积分不变, 当前共有 ",{"score": {"name": "@s","objective": "total_score"},"color":"red"},{"text": " 积分", "color":"red"}]
 
 # 给予进度
 execute if entity @s[scores={total_score=10..}] run advancement grant @s only ltw:story/score1

+ 1 - 1
data/item/functions/disable_slot/check_slot.mcfunction

@@ -5,4 +5,4 @@
 execute unless data entity @s Inventory[{Slot:8b,tag:{game_item:1b}}] unless data entity @s Inventory[{Slot:8b,tag:{LockItem:1b,LockSlot:8b},Count:1b}] run function item:disable_slot/disable_slot_8
 
 # 清除临时物品
-clear @a red_dye{LockTempItem:1b}
+clear @a crimson_button{LockTempItem:1b}

+ 2 - 2
data/item/functions/disable_slot/disable_slot_7.mcfunction

@@ -1,4 +1,4 @@
-clear @s red_dye{LockItem:1b,LockSlot:7b}
+clear @s crimson_button{LockItem:1b,LockSlot:7b}
 execute if data entity @s Inventory[{Slot:7b}] run scoreboard players set @s item_slot 7
 execute if data entity @s Inventory[{Slot:7b}] at @s run function item:pop_slot/return_item
-item replace entity @s hotbar.7 with red_dye{LockItem:1b,LockSlot:7b,display:{Name:'{"text":"已锁定","color":"red","italic":false}'}}
+item replace entity @s hotbar.7 with crimson_button{LockItem:1b,LockSlot:7b,display:{Name:'{"text":"已锁定","color":"red","italic":false}'}}

+ 2 - 2
data/item/functions/disable_slot/disable_slot_8.mcfunction

@@ -1,4 +1,4 @@
-clear @s red_dye{LockItem:1b,LockSlot:8b}
+clear @s crimson_button{LockItem:1b,LockSlot:8b}
 execute if data entity @s Inventory[{Slot:8b}] run scoreboard players set @s item_slot 8
 execute if data entity @s Inventory[{Slot:8b}] at @s run function item:pop_slot/return_item
-item replace entity @s hotbar.8 with red_dye{LockItem:1b,LockSlot:8b,display:{Name:'{"text":"已锁定","color":"red","italic":false}'}}
+item replace entity @s hotbar.8 with crimson_button{LockItem:1b,LockSlot:8b,display:{Name:'{"text":"已锁定","color":"red","italic":false}'}}

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

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

+ 2 - 2
data/item/functions/pop_slot/pop_item.mcfunction

@@ -1,6 +1,6 @@
-summon item ~ ~ ~ {Item:{id:"minecraft:red_dye",Count:1b,tag:{LockTempItem:1b,display:{Name:'{"text":"非法物品","color":"red"}'}}},Tags:["LockTempItem","PopItem"]}
+summon item ~ ~ ~ {Item:{id:"minecraft:crimson_button",Count:1b,tag:{LockTempItem:1b,display:{Name:'{"text":"非法物品","color":"red"}'}}},Tags:["LockTempItem","PopItem"]}
 function item:pop_slot/select_item
-kill @e[type=item,nbt={Item:{id:"minecraft:red_dye"}},tag=LockTempItem]
+kill @e[type=item,nbt={Item:{id:"minecraft:crimson_button"}},tag=LockTempItem]
 # 不返还奇怪的东西
 kill @e[type=item,nbt={Item:{tag:{game_item:1b}}}]
 kill @e[type=item,nbt={Item:{tag:{lobby_item:1b}}}]

+ 2 - 2
data/item/functions/pop_slot/return_item.mcfunction

@@ -1,6 +1,6 @@
-summon item ~ ~ ~ {Item:{id:"minecraft:red_dye",Count:1b,tag:{LockTempItem:1b,display:{Name:'{"text":"非法物品","color":"red"}'}}},Tags:["LockTempItem","ReturnItem"]}
+summon item ~ ~ ~ {Item:{id:"minecraft:crimson_button",Count:1b,tag:{LockTempItem:1b,display:{Name:'{"text":"非法物品","color":"red"}'}}},Tags:["LockTempItem","ReturnItem"]}
 function item:pop_slot/select_item
-kill @e[type=item,nbt={Item:{id:"minecraft:red_dye"}},tag=LockTempItem]
+kill @e[type=item,nbt={Item:{id:"minecraft:crimson_button"}},tag=LockTempItem]
 # 不返还奇怪的东西
 kill @e[type=item,nbt={Item:{tag:{game_item:1b}}}]
 kill @e[type=item,nbt={Item:{tag:{lobby_item:1b}}}]

BIN=BIN
data/item/functions/shop/__pycache__/sendcmd.cpython-37.pyc


+ 9 - 10
data/item/functions/shop/buy_weapon1.mcfunction → data/item/functions/shop/buy/011_bow.mcfunction

@@ -1,14 +1,13 @@
-# 木锹 (1 gi)
-# 触发器ID 11
-execute unless entity @s[scores={shop_weapon=0..}] run scoreboard players set @s shop_weapon 0
+# 单发弓 (1g)
+scoreboard players add @s shop_01_bow 0
 tag @s remove canbuy
-tag @s[scores={shop_weapon=0,gold=9..}] add canbuy
-tellraw @s[scores={shop_weapon=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-tellraw @s[scores={shop_weapon=0,gold=..8}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
-tellraw @s[scores={shop_weapon=..-1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
-tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"木锹","color":"green"}]
-execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"木锹","color":"green"}]
-scoreboard players add @s[tag=canbuy] shop_weapon 1
+tag @s[scores={shop_01_bow=0,gold=9..}] add canbuy
+tellraw @s[scores={shop_01_bow=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
+tellraw @s[scores={shop_01_bow=0,gold=..8}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+tellraw @s[scores={shop_01_bow=..-1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"单发弓","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"单发弓","color":"green"}]
+scoreboard players add @s[tag=canbuy] shop_01_bow 1
 scoreboard players remove @s[tag=canbuy] gold 9
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error
 execute as @s[tag=canbuy] at @s run function lib:sounds/levelup

+ 15 - 0
data/item/functions/shop/buy/012_bow.mcfunction

@@ -0,0 +1,15 @@
+# 弓耐久度升级 (2g)
+scoreboard players add @s shop_01_bow 0
+tag @s remove canbuy
+tag @s[scores={shop_01_bow=1,gold=18..}] add canbuy
+tellraw @s[scores={shop_01_bow=2..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
+tellraw @s[scores={shop_01_bow=1,gold=..17}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+tellraw @s[scores={shop_01_bow=..0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"弓耐久度升级","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"弓耐久度升级","color":"green"}]
+scoreboard players add @s[tag=canbuy] shop_01_bow 1
+scoreboard players remove @s[tag=canbuy] gold 18
+execute as @s[tag=!canbuy] at @s run function lib:sounds/error
+execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
+execute as @s[tag=canbuy] run function item:shop/refresh_gold
+tag @s remove canbuy

+ 15 - 0
data/item/functions/shop/buy/013_bow.mcfunction

@@ -0,0 +1,15 @@
+# 冲击弓 (8g)
+scoreboard players add @s shop_01_bow 0
+tag @s remove canbuy
+tag @s[scores={shop_01_bow=2,gold=72..}] add canbuy
+tellraw @s[scores={shop_01_bow=3..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
+tellraw @s[scores={shop_01_bow=2,gold=..71}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+tellraw @s[scores={shop_01_bow=..1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"冲击弓","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"冲击弓","color":"green"}]
+scoreboard players add @s[tag=canbuy] shop_01_bow 1
+scoreboard players remove @s[tag=canbuy] gold 72
+execute as @s[tag=!canbuy] at @s run function lib:sounds/error
+execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
+execute as @s[tag=canbuy] run function item:shop/refresh_gold
+tag @s remove canbuy

+ 15 - 0
data/item/functions/shop/buy/021_arrow.mcfunction

@@ -0,0 +1,15 @@
+# 箭 (1g)
+scoreboard players add @s shop_02_arrow 0
+tag @s remove canbuy
+tag @s[scores={shop_02_arrow=0,gold=9..}] add canbuy
+tellraw @s[scores={shop_02_arrow=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
+tellraw @s[scores={shop_02_arrow=0,gold=..8}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+tellraw @s[scores={shop_02_arrow=..-1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"箭","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"箭","color":"green"}]
+scoreboard players add @s[tag=canbuy] shop_02_arrow 1
+scoreboard players remove @s[tag=canbuy] gold 9
+execute as @s[tag=!canbuy] at @s run function lib:sounds/error
+execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
+execute as @s[tag=canbuy] run function item:shop/refresh_gold
+tag @s remove canbuy

+ 15 - 0
data/item/functions/shop/buy/022_arrow.mcfunction

@@ -0,0 +1,15 @@
+# 箭 x2 (2g)
+scoreboard players add @s shop_02_arrow 0
+tag @s remove canbuy
+tag @s[scores={shop_02_arrow=1,gold=18..}] add canbuy
+tellraw @s[scores={shop_02_arrow=2..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
+tellraw @s[scores={shop_02_arrow=1,gold=..17}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+tellraw @s[scores={shop_02_arrow=..0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"箭 x2","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"箭 x2","color":"green"}]
+scoreboard players add @s[tag=canbuy] shop_02_arrow 1
+scoreboard players remove @s[tag=canbuy] gold 18
+execute as @s[tag=!canbuy] at @s run function lib:sounds/error
+execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
+execute as @s[tag=canbuy] run function item:shop/refresh_gold
+tag @s remove canbuy

+ 15 - 0
data/item/functions/shop/buy/023_arrow.mcfunction

@@ -0,0 +1,15 @@
+# 缓慢之箭 x2 (4g)
+scoreboard players add @s shop_02_arrow 0
+tag @s remove canbuy
+tag @s[scores={shop_02_arrow=2,gold=36..}] add canbuy
+tellraw @s[scores={shop_02_arrow=3..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
+tellraw @s[scores={shop_02_arrow=2,gold=..35}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+tellraw @s[scores={shop_02_arrow=..1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"缓慢之箭 x2","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"缓慢之箭 x2","color":"green"}]
+scoreboard players add @s[tag=canbuy] shop_02_arrow 1
+scoreboard players remove @s[tag=canbuy] gold 36
+execute as @s[tag=!canbuy] at @s run function lib:sounds/error
+execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
+execute as @s[tag=canbuy] run function item:shop/refresh_gold
+tag @s remove canbuy

+ 15 - 0
data/item/functions/shop/buy/031_apple.mcfunction

@@ -0,0 +1,15 @@
+# 生命果 (2g)
+scoreboard players add @s shop_03_apple 0
+tag @s remove canbuy
+tag @s[scores={shop_03_apple=0,gold=18..}] add canbuy
+tellraw @s[scores={shop_03_apple=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
+tellraw @s[scores={shop_03_apple=0,gold=..17}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+tellraw @s[scores={shop_03_apple=..-1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"生命果","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"生命果","color":"green"}]
+scoreboard players add @s[tag=canbuy] shop_03_apple 1
+scoreboard players remove @s[tag=canbuy] gold 18
+execute as @s[tag=!canbuy] at @s run function lib:sounds/error
+execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
+execute as @s[tag=canbuy] run function item:shop/refresh_gold
+tag @s remove canbuy

+ 15 - 0
data/item/functions/shop/buy/032_apple.mcfunction

@@ -0,0 +1,15 @@
+# 附魔生命果 (4g)
+scoreboard players add @s shop_03_apple 0
+tag @s remove canbuy
+tag @s[scores={shop_03_apple=1,gold=36..}] add canbuy
+tellraw @s[scores={shop_03_apple=2..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
+tellraw @s[scores={shop_03_apple=1,gold=..35}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+tellraw @s[scores={shop_03_apple=..0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"附魔生命果","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"附魔生命果","color":"green"}]
+scoreboard players add @s[tag=canbuy] shop_03_apple 1
+scoreboard players remove @s[tag=canbuy] gold 36
+execute as @s[tag=!canbuy] at @s run function lib:sounds/error
+execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
+execute as @s[tag=canbuy] run function item:shop/refresh_gold
+tag @s remove canbuy

+ 15 - 0
data/item/functions/shop/buy/041_float.mcfunction

@@ -0,0 +1,15 @@
+# 浮空药水 I (4g)
+scoreboard players add @s shop_04_float 0
+tag @s remove canbuy
+tag @s[scores={shop_04_float=0,gold=36..}] add canbuy
+tellraw @s[scores={shop_04_float=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
+tellraw @s[scores={shop_04_float=0,gold=..35}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+tellraw @s[scores={shop_04_float=..-1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"浮空药水","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"浮空药水","color":"green"}]
+scoreboard players add @s[tag=canbuy] shop_04_float 1
+scoreboard players remove @s[tag=canbuy] gold 36
+execute as @s[tag=!canbuy] at @s run function lib:sounds/error
+execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
+execute as @s[tag=canbuy] run function item:shop/refresh_gold
+tag @s remove canbuy

+ 15 - 0
data/item/functions/shop/buy/042_float.mcfunction

@@ -0,0 +1,15 @@
+# 浮空药水 II (4g)
+scoreboard players add @s shop_04_float 0
+tag @s remove canbuy
+tag @s[scores={shop_04_float=1,gold=36..}] add canbuy
+tellraw @s[scores={shop_04_float=2..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
+tellraw @s[scores={shop_04_float=1,gold=..35}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+tellraw @s[scores={shop_04_float=..0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"浮空药水延时","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"浮空药水延时","color":"green"}]
+scoreboard players add @s[tag=canbuy] shop_04_float 1
+scoreboard players remove @s[tag=canbuy] gold 36
+execute as @s[tag=!canbuy] at @s run function lib:sounds/error
+execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
+execute as @s[tag=canbuy] run function item:shop/refresh_gold
+tag @s remove canbuy

+ 15 - 0
data/item/functions/shop/buy/051_axe.mcfunction

@@ -0,0 +1,15 @@
+# 破损的木斧 (2g)
+scoreboard players add @s shop_05_axe 0
+tag @s remove canbuy
+tag @s[scores={shop_05_axe=0,gold=9..}] add canbuy
+tellraw @s[scores={shop_05_axe=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
+tellraw @s[scores={shop_05_axe=0,gold=..17}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+tellraw @s[scores={shop_05_axe=..-1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"破损的木斧","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"破损的木斧","color":"green"}]
+scoreboard players add @s[tag=canbuy] shop_05_axe 1
+scoreboard players remove @s[tag=canbuy] gold 18
+execute as @s[tag=!canbuy] at @s run function lib:sounds/error
+execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
+execute as @s[tag=canbuy] run function item:shop/refresh_gold
+tag @s remove canbuy

+ 9 - 10
data/item/functions/shop/buy_weapon2.mcfunction → data/item/functions/shop/buy/052_axe.mcfunction

@@ -1,14 +1,13 @@
-# 石锹 (4 gi)
-# 触发器ID 12
-execute unless entity @s[scores={shop_weapon=0..}] run scoreboard players set @s shop_weapon 0
+# 破损的金斧 (4g)
+scoreboard players add @s shop_05_axe 0
 tag @s remove canbuy
-tag @s[scores={shop_weapon=1,gold=36..}] add canbuy
-tellraw @s[scores={shop_weapon=2..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-tellraw @s[scores={shop_weapon=1,gold=..35}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
-tellraw @s[scores={shop_weapon=..0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
-tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"石锹","color":"green"}]
-execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"石锹","color":"green"}]
-scoreboard players add @s[tag=canbuy] shop_weapon 1
+tag @s[scores={shop_05_axe=1,gold=36..}] add canbuy
+tellraw @s[scores={shop_05_axe=2..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
+tellraw @s[scores={shop_05_axe=1,gold=..35}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+tellraw @s[scores={shop_05_axe=..0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"破损的金斧","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"破损的金斧","color":"green"}]
+scoreboard players add @s[tag=canbuy] shop_05_axe 1
 scoreboard players remove @s[tag=canbuy] gold 36
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error
 execute as @s[tag=canbuy] at @s run function lib:sounds/levelup

+ 15 - 0
data/item/functions/shop/buy/053_axe.mcfunction

@@ -0,0 +1,15 @@
+# 金斧耐久升级 (4g)
+scoreboard players add @s shop_05_axe 0
+tag @s remove canbuy
+tag @s[scores={shop_05_axe=2,gold=36..}] add canbuy
+tellraw @s[scores={shop_05_axe=3..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
+tellraw @s[scores={shop_05_axe=2,gold=..35}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+tellraw @s[scores={shop_05_axe=..1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"金斧耐久升级","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"金斧耐久升级","color":"green"}]
+scoreboard players add @s[tag=canbuy] shop_05_axe 1
+scoreboard players remove @s[tag=canbuy] gold 36
+execute as @s[tag=!canbuy] at @s run function lib:sounds/error
+execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
+execute as @s[tag=canbuy] run function item:shop/refresh_gold
+tag @s remove canbuy

+ 15 - 0
data/item/functions/shop/buy/061_armor.mcfunction

@@ -0,0 +1,15 @@
+# 皮革靴子 (1g)
+scoreboard players add @s shop_06_armor 0
+tag @s remove canbuy
+tag @s[scores={shop_06_armor=0,gold=9..}] add canbuy
+tellraw @s[scores={shop_06_armor=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
+tellraw @s[scores={shop_06_armor=0,gold=..8}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+tellraw @s[scores={shop_06_armor=..-1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"皮革靴子","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"皮革靴子","color":"green"}]
+scoreboard players add @s[tag=canbuy] shop_06_armor 1
+scoreboard players remove @s[tag=canbuy] gold 9
+execute as @s[tag=!canbuy] at @s run function lib:sounds/error
+execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
+execute as @s[tag=canbuy] run function item:shop/refresh_gold
+tag @s remove canbuy

+ 15 - 0
data/item/functions/shop/buy/062_armor.mcfunction

@@ -0,0 +1,15 @@
+# 铁靴子 (2g)
+scoreboard players add @s shop_06_armor 0
+tag @s remove canbuy
+tag @s[scores={shop_06_armor=1,gold=18..}] add canbuy
+tellraw @s[scores={shop_06_armor=2..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
+tellraw @s[scores={shop_06_armor=1,gold=..17}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+tellraw @s[scores={shop_06_armor=..0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"铁靴子","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"铁靴子","color":"green"}]
+scoreboard players add @s[tag=canbuy] shop_06_armor 1
+scoreboard players remove @s[tag=canbuy] gold 18
+execute as @s[tag=!canbuy] at @s run function lib:sounds/error
+execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
+execute as @s[tag=canbuy] run function item:shop/refresh_gold
+tag @s remove canbuy

+ 15 - 0
data/item/functions/shop/buy/063_armor.mcfunction

@@ -0,0 +1,15 @@
+# 钻石靴子 (4g)
+scoreboard players add @s shop_06_armor 0
+tag @s remove canbuy
+tag @s[scores={shop_06_armor=2,gold=36..}] add canbuy
+tellraw @s[scores={shop_06_armor=3..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
+tellraw @s[scores={shop_06_armor=2,gold=..35}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+tellraw @s[scores={shop_06_armor=..1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"钻石靴子","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"钻石靴子","color":"green"}]
+scoreboard players add @s[tag=canbuy] shop_06_armor 1
+scoreboard players remove @s[tag=canbuy] gold 36
+execute as @s[tag=!canbuy] at @s run function lib:sounds/error
+execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
+execute as @s[tag=canbuy] run function item:shop/refresh_gold
+tag @s remove canbuy

+ 15 - 0
data/item/functions/shop/buy/064_armor.mcfunction

@@ -0,0 +1,15 @@
+# 下界合金靴子 (4g)
+scoreboard players add @s shop_06_armor 0
+tag @s remove canbuy
+tag @s[scores={shop_06_armor=3,gold=36..}] add canbuy
+tellraw @s[scores={shop_06_armor=4..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
+tellraw @s[scores={shop_06_armor=3,gold=..35}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+tellraw @s[scores={shop_06_armor=..2}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"下界合金靴子","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"下界合金靴子","color":"green"}]
+scoreboard players add @s[tag=canbuy] shop_06_armor 1
+scoreboard players remove @s[tag=canbuy] gold 36
+execute as @s[tag=!canbuy] at @s run function lib:sounds/error
+execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
+execute as @s[tag=canbuy] run function item:shop/refresh_gold
+tag @s remove canbuy

+ 15 - 0
data/item/functions/shop/buy/071_fish.mcfunction

@@ -0,0 +1,15 @@
+# 破损的钓鱼竿 (1g)
+scoreboard players add @s shop_07_fish 0
+tag @s remove canbuy
+tag @s[scores={shop_07_fish=0,gold=9..}] add canbuy
+tellraw @s[scores={shop_07_fish=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
+tellraw @s[scores={shop_07_fish=0,gold=..8}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+tellraw @s[scores={shop_07_fish=..-1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"破损的钓鱼竿","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"破损的钓鱼竿","color":"green"}]
+scoreboard players add @s[tag=canbuy] shop_07_fish 1
+scoreboard players remove @s[tag=canbuy] gold 9
+execute as @s[tag=!canbuy] at @s run function lib:sounds/error
+execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
+execute as @s[tag=canbuy] run function item:shop/refresh_gold
+tag @s remove canbuy

+ 15 - 0
data/item/functions/shop/buy/072_fish.mcfunction

@@ -0,0 +1,15 @@
+# 钓鱼竿耐久度升级 I (2g)
+scoreboard players add @s shop_07_fish 0
+tag @s remove canbuy
+tag @s[scores={shop_07_fish=1,gold=18..}] add canbuy
+tellraw @s[scores={shop_07_fish=2..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
+tellraw @s[scores={shop_07_fish=1,gold=..17}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+tellraw @s[scores={shop_07_fish=..0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"钓鱼竿耐久度升级 I","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"钓鱼竿耐久度升级 I","color":"green"}]
+scoreboard players add @s[tag=canbuy] shop_07_fish 1
+scoreboard players remove @s[tag=canbuy] gold 18
+execute as @s[tag=!canbuy] at @s run function lib:sounds/error
+execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
+execute as @s[tag=canbuy] run function item:shop/refresh_gold
+tag @s remove canbuy

+ 15 - 0
data/item/functions/shop/buy/073_fish.mcfunction

@@ -0,0 +1,15 @@
+# 饵钓钓鱼竿 (2g)
+scoreboard players add @s shop_07_fish 0
+tag @s remove canbuy
+tag @s[scores={shop_07_fish=2,gold=18..}] add canbuy
+tellraw @s[scores={shop_07_fish=3..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
+tellraw @s[scores={shop_07_fish=2,gold=..17}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+tellraw @s[scores={shop_07_fish=..1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"饵钓钓鱼竿","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"饵钓钓鱼竿","color":"green"}]
+scoreboard players add @s[tag=canbuy] shop_07_fish 1
+scoreboard players remove @s[tag=canbuy] gold 18
+execute as @s[tag=!canbuy] at @s run function lib:sounds/error
+execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
+execute as @s[tag=canbuy] run function item:shop/refresh_gold
+tag @s remove canbuy

+ 15 - 0
data/item/functions/shop/buy/074_fish.mcfunction

@@ -0,0 +1,15 @@
+# 钓鱼竿耐久度升级 II (4g)
+scoreboard players add @s shop_07_fish 0
+tag @s remove canbuy
+tag @s[scores={shop_07_fish=3,gold=36..}] add canbuy
+tellraw @s[scores={shop_07_fish=4..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
+tellraw @s[scores={shop_07_fish=3,gold=..35}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+tellraw @s[scores={shop_07_fish=..2}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"钓鱼竿耐久度升级 II","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"钓鱼竿耐久度升级 II","color":"green"}]
+scoreboard players add @s[tag=canbuy] shop_07_fish 1
+scoreboard players remove @s[tag=canbuy] gold 36
+execute as @s[tag=!canbuy] at @s run function lib:sounds/error
+execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
+execute as @s[tag=canbuy] run function item:shop/refresh_gold
+tag @s remove canbuy

+ 10 - 0
data/item/functions/shop/buy/101_hint.mcfunction

@@ -0,0 +1,10 @@
+# 提示 (1g)
+tag @s remove canbuy
+tag @s[scores={gold=9..}] add canbuy
+tellraw @s[scores={gold=..8}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+execute as @s[tag=canbuy] at @s run function item:shop/buy/101_hint_real
+scoreboard players remove @s[tag=canbuy] gold 9
+execute as @s[tag=!canbuy] at @s run function lib:sounds/error
+execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
+execute as @s[tag=canbuy] run function item:shop/refresh_gold
+tag @s remove canbuy

+ 14 - 0
data/item/functions/shop/buy/101_hint_real.mcfunction

@@ -0,0 +1,14 @@
+# 随机
+scoreboard players set $random_min mem 1
+scoreboard players set $random_max mem 8
+function lib:random
+
+# 显示提示
+execute if score $random mem matches 1 run tellraw @s "“你的手上如果有钓鱼竿的话,可以用它把物品给直接勾过来,哼唧。”"
+execute if score $random mem matches 2 run tellraw @s "“哼唧,你可以用钓鱼竿把人勾下悬崖,或者用来钓……哼哼,‘鱼’?”"
+execute if score $random mem matches 3 run tellraw @s "“继续沿着你来时的那条密道走,指不定能找到我隐居的神秘兄弟……?”"
+execute if score $random mem matches 4 run tellraw @s "“从蛛网密布的密道尽头,沿灰色珊瑚指引,就能窥见创世的秘密。”"
+execute if score $random mem matches 5 run tellraw @s "“听说用指令之力‘造访’商店,似乎会发生奇怪的事情……哼唧。”"
+execute if score $random mem matches 6 run tellraw @s "“我听说,商店的旗帜和遗迹的立柱似乎藏着什么秘密来着,哼唧。”"
+execute if score $random mem matches 7 run tellraw @s "“哼唧,如果在踏上钻石块的同时起跳,可以让你飞得更高!”"
+execute if score $random mem matches 8 run tellraw @s "“我不知道为什么商店里有一只猪……哼唧!难道猪灵是猪变的?”"

+ 12 - 0
data/item/functions/shop/buy/102_bgm.mcfunction

@@ -0,0 +1,12 @@
+# 老板换碟 (1g)
+tag @s remove canbuy
+tag @s[scores={gold=9..}] add canbuy
+tellraw @s[scores={gold=..8}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"换碟!","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"换碟!","color":"green"}]
+execute as @s[tag=canbuy] as @a at @s run function lib:sounds/music/mini_fast
+scoreboard players remove @s[tag=canbuy] gold 9
+execute as @s[tag=!canbuy] at @s run function lib:sounds/error
+execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
+execute as @s[tag=canbuy] run function item:shop/refresh_gold
+tag @s remove canbuy

+ 10 - 0
data/item/functions/shop/buy/103_pig.mcfunction

@@ -0,0 +1,10 @@
+# 哼唧 (1gn)
+tag @s remove canbuy
+tag @s[scores={gold=1..}] add canbuy
+tellraw @s[scores={gold=..0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金粒来购买这个物品!","color":"red"}]
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"哼?","color":"green"}]
+execute at @s run playsound entity.pig.ambient ambient @s 0 1000000 0 1000000
+scoreboard players remove @s[tag=canbuy] gold 1
+execute as @s[tag=!canbuy] at @s run function lib:sounds/error
+execute as @s[tag=canbuy] run function item:shop/refresh_gold
+tag @s remove canbuy

+ 5 - 6
data/item/functions/shop/buy_particle_system.mcfunction → data/item/functions/shop/buy/201_particle_system.mcfunction

@@ -1,15 +1,14 @@
 # 粒子系统 (2 eb)
-# 触发器ID 100
-execute unless entity @s[scores={shop_particle_s=0..}] run scoreboard players set @s shop_particle_s 0
+scoreboard players add @s shop_particle_system 0
 tag @s remove canbuy
-tag @s[scores={shop_particle_s=0,green=18..}] add canbuy
+tag @s[scores={shop_particle_system=0,green=18..}] add canbuy
 
-tellraw @s[scores={shop_particle_s=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了尾迹特效了!","color":"aqua"}]
-tellraw @s[scores={shop_particle_s=0,green=..17}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的绿宝石块来购买它!","color":"red"}]
+tellraw @s[scores={shop_particle_system=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了尾迹特效了!","color":"aqua"}]
+tellraw @s[scores={shop_particle_system=0,green=..17}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的绿宝石块来购买它!","color":"red"}]
 tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"尾迹特效","color":"green"}]
 execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"尾迹特效","color":"green"}]
 
-scoreboard players add @s[tag=canbuy] shop_particle_s 1
+scoreboard players add @s[tag=canbuy] shop_particle_system 1
 scoreboard players remove @s[tag=canbuy] green 18
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error
 execute as @s[tag=canbuy] at @s run function lib:sounds/levelup

+ 10 - 0
data/item/functions/shop/buy/210_particle_close.mcfunction

@@ -0,0 +1,10 @@
+# 关闭粒子 (0 e)
+scoreboard players add @s shop_particle_system 0
+
+tellraw @s[scores={shop_particle_system=0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先在左侧购买尾迹特效才能切换尾迹种类!","color":"red"}]
+execute as @s[scores={shop_particle_system=0}] at @s run function lib:sounds/error
+
+tellraw @s[scores={shop_particle_system=1..}] ["",{"text":">> ","color":"green","bold":true},"尾迹特效已 ",{"text":"关闭","color":"green"}]
+execute as @s[scores={shop_particle_system=1..}] at @s run function lib:sounds/hit
+
+scoreboard players set @s particle_type 0

+ 10 - 0
data/item/functions/shop/buy/211_particle1.mcfunction

@@ -0,0 +1,10 @@
+# 绿光粒子 (0 e)
+scoreboard players add @s shop_particle_system 0
+
+tellraw @s[scores={shop_particle_system=0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先在左侧购买尾迹特效才能切换尾迹种类!","color":"red"}]
+execute as @s[scores={shop_particle_system=0}] at @s run function lib:sounds/error
+
+tellraw @s[scores={shop_particle_system=1..}] ["",{"text":">> ","color":"green","bold":true},"尾迹特效已切换为 ",{"text":"绿光","color":"green"}]
+execute as @s[scores={shop_particle_system=1..}] at @s run function lib:sounds/hit
+
+scoreboard players set @s[scores={shop_particle_system=1..}] particle_type 1

+ 24 - 0
data/item/functions/shop/buy/212_particle2.mcfunction

@@ -0,0 +1,24 @@
+# 素雅粒子 (3 e)
+scoreboard players add @s shop_particle_system 0
+scoreboard players add @s shop_particle_2 0
+tag @s remove canbuy
+tag @s[scores={shop_particle_system=1..,shop_particle_2=0,green=3..}] add canbuy
+
+tellraw @s[scores={shop_particle_system=0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先在左侧购买尾迹特效才能切换尾迹种类!","color":"red"}]
+execute as @s[scores={shop_particle_system=0}] at @s run function lib:sounds/error
+
+tellraw @s[scores={shop_particle_system=1..,shop_particle_2=1..}] ["",{"text":">> ","color":"green","bold":true},"尾迹特效已切换为 ",{"text":"素雅","color":"green"}]
+execute as @s[scores={shop_particle_system=1..,shop_particle_2=1..}] at @s run function lib:sounds/hit
+
+tellraw @s[scores={shop_particle_system=1..,shop_particle_2=0,green=..2}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的绿宝石来购买它!","color":"red"}]
+execute as @s[scores={shop_particle_system=1..,shop_particle_2=0,green=..2}] at @s run function lib:sounds/error
+
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你已购买并切换尾迹特效为 ",{"text":"素雅","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"素雅尾迹","color":"green"}]
+scoreboard players add @s[tag=canbuy] shop_particle_2 1
+scoreboard players remove @s[tag=canbuy] green 3
+execute as @s[tag=canbuy] run function item:shop/refresh_green
+execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
+tag @s remove canbuy
+
+scoreboard players set @s[scores={shop_particle_2=1..}] particle_type 2

+ 24 - 0
data/item/functions/shop/buy/213_particle3.mcfunction

@@ -0,0 +1,24 @@
+# 水滴粒子 (3 e)
+scoreboard players add @s shop_particle_system 0
+scoreboard players add @s shop_particle_3 0
+tag @s remove canbuy
+tag @s[scores={shop_particle_system=1..,shop_particle_3=0,green=3..}] add canbuy
+
+tellraw @s[scores={shop_particle_system=0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先在左侧购买尾迹特效才能切换尾迹种类!","color":"red"}]
+execute as @s[scores={shop_particle_system=0}] at @s run function lib:sounds/error
+
+tellraw @s[scores={shop_particle_system=1..,shop_particle_3=1..}] ["",{"text":">> ","color":"green","bold":true},"尾迹特效已切换为 ",{"text":"水滴","color":"green"}]
+execute as @s[scores={shop_particle_system=1..,shop_particle_3=1..}] at @s run function lib:sounds/hit
+
+tellraw @s[scores={shop_particle_system=1..,shop_particle_3=0,green=..2}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的绿宝石来购买它!","color":"red"}]
+execute as @s[scores={shop_particle_system=1..,shop_particle_3=0,green=..2}] at @s run function lib:sounds/error
+
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你已购买并切换尾迹特效为 ",{"text":"水滴","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"水滴尾迹","color":"green"}]
+scoreboard players add @s[tag=canbuy] shop_particle_3 1
+scoreboard players remove @s[tag=canbuy] green 3
+execute as @s[tag=canbuy] run function item:shop/refresh_green
+execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
+tag @s remove canbuy
+
+scoreboard players set @s[scores={shop_particle_3=1..}] particle_type 3

+ 24 - 0
data/item/functions/shop/buy/214_particle4.mcfunction

@@ -0,0 +1,24 @@
+# 烈焰粒子 (6 e)
+scoreboard players add @s shop_particle_system 0
+scoreboard players add @s shop_particle_4 0
+tag @s remove canbuy
+tag @s[scores={shop_particle_system=1..,shop_particle_4=0,green=6..}] add canbuy
+
+tellraw @s[scores={shop_particle_system=0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先在左侧购买尾迹特效才能切换尾迹种类!","color":"red"}]
+execute as @s[scores={shop_particle_system=0}] at @s run function lib:sounds/error
+
+tellraw @s[scores={shop_particle_system=1..,shop_particle_4=1..}] ["",{"text":">> ","color":"green","bold":true},"尾迹特效已切换为 ",{"text":"烈焰","color":"green"}]
+execute as @s[scores={shop_particle_system=1..,shop_particle_4=1..}] at @s run function lib:sounds/hit
+
+tellraw @s[scores={shop_particle_system=1..,shop_particle_4=0,green=..5}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的绿宝石来购买它!","color":"red"}]
+execute as @s[scores={shop_particle_system=1..,shop_particle_4=0,green=..5}] at @s run function lib:sounds/error
+
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你已购买并切换尾迹特效为 ",{"text":"烈焰","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"烈焰尾迹","color":"green"}]
+scoreboard players add @s[tag=canbuy] shop_particle_4 1
+scoreboard players remove @s[tag=canbuy] green 6
+execute as @s[tag=canbuy] run function item:shop/refresh_green
+execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
+tag @s remove canbuy
+
+scoreboard players set @s[scores={shop_particle_4=1..}] particle_type 4

+ 24 - 0
data/item/functions/shop/buy/215_particle5.mcfunction

@@ -0,0 +1,24 @@
+# 炫彩粒子 (6 e)
+scoreboard players add @s shop_particle_system 0
+scoreboard players add @s shop_particle_5 0
+tag @s remove canbuy
+tag @s[scores={shop_particle_system=1..,shop_particle_5=0,green=6..}] add canbuy
+
+tellraw @s[scores={shop_particle_system=0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先在左侧购买尾迹特效才能切换尾迹种类!","color":"red"}]
+execute as @s[scores={shop_particle_system=0}] at @s run function lib:sounds/error
+
+tellraw @s[scores={shop_particle_system=1..,shop_particle_5=1..}] ["",{"text":">> ","color":"green","bold":true},"尾迹特效已切换为 ",{"text":"炫彩","color":"green"}]
+execute as @s[scores={shop_particle_system=1..,shop_particle_5=1..}] at @s run function lib:sounds/hit
+
+tellraw @s[scores={shop_particle_system=1..,shop_particle_5=0,green=..5}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的绿宝石来购买它!","color":"red"}]
+execute as @s[scores={shop_particle_system=1..,shop_particle_5=0,green=..5}] at @s run function lib:sounds/error
+
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你已购买并切换尾迹特效为 ",{"text":"炫彩","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"炫彩尾迹","color":"green"}]
+scoreboard players add @s[tag=canbuy] shop_particle_5 1
+scoreboard players remove @s[tag=canbuy] green 6
+execute as @s[tag=canbuy] run function item:shop/refresh_green
+execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
+tag @s remove canbuy
+
+scoreboard players set @s[scores={shop_particle_5=1..}] particle_type 5

+ 24 - 0
data/item/functions/shop/buy/216_particle6.mcfunction

@@ -0,0 +1,24 @@
+# 魂焰粒子 (1 eb)
+scoreboard players add @s shop_particle_system 0
+scoreboard players add @s shop_particle_6 0
+tag @s remove canbuy
+tag @s[scores={shop_particle_system=1..,shop_particle_6=0,green=9..}] add canbuy
+
+tellraw @s[scores={shop_particle_system=0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先在左侧购买尾迹特效才能切换尾迹种类!","color":"red"}]
+execute as @s[scores={shop_particle_system=0}] at @s run function lib:sounds/error
+
+tellraw @s[scores={shop_particle_system=1..,shop_particle_6=1..}] ["",{"text":">> ","color":"green","bold":true},"尾迹特效已切换为 ",{"text":"魂焰","color":"green"}]
+execute as @s[scores={shop_particle_system=1..,shop_particle_6=1..}] at @s run function lib:sounds/hit
+
+tellraw @s[scores={shop_particle_system=1..,shop_particle_6=0,green=..8}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的绿宝石块来购买它!","color":"red"}]
+execute as @s[scores={shop_particle_system=1..,shop_particle_6=0,green=..8}] at @s run function lib:sounds/error
+
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你已购买并切换尾迹特效为 ",{"text":"魂焰","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"魂焰尾迹","color":"green"}]
+scoreboard players add @s[tag=canbuy] shop_particle_6 1
+scoreboard players remove @s[tag=canbuy] green 9
+execute as @s[tag=canbuy] run function item:shop/refresh_green
+execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
+tag @s remove canbuy
+
+scoreboard players set @s[scores={shop_particle_6=1..}] particle_type 6

+ 9 - 0
data/item/functions/shop/buy/999_dice.mcfunction

@@ -0,0 +1,9 @@
+# 骰子 (1g)
+tag @s remove canbuy
+tag @s[scores={gold=9..}] add canbuy
+tellraw @s[scores={gold=..8}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金粒来赌骰子!","color":"red"}]
+scoreboard players remove @s[tag=canbuy] gold 9
+execute as @s[tag=!canbuy] at @s run function lib:sounds/error
+execute as @s[tag=canbuy] run function ltw:state/0/roll_dice/roll
+execute as @s[tag=canbuy] run function item:shop/refresh_gold
+tag @s remove canbuy

+ 13 - 0
data/item/functions/shop/buy/easter_egg.mcfunction

@@ -0,0 +1,13 @@
+# 臭蛋 (1g)
+tag @s remove canbuy
+tag @s[scores={gold=9..}] add canbuy
+tellraw @s[scores={gold=..8}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"臭蛋","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"臭蛋","color":"green"}]
+execute as @s[tag=canbuy] at @s run playsound entity.enderman.scream ambient @a ~ ~ ~ 2 0
+execute as @s[tag=canbuy] at @s run playsound entity.enderman.scream ambient @a ~ ~ ~ 2 1
+execute as @s[tag=canbuy] at @s run playsound entity.enderman.scream ambient @a ~ ~ ~ 2 2
+scoreboard players remove @s[tag=canbuy] gold 9
+execute as @s[tag=!canbuy] at @s run function lib:sounds/error
+execute as @s[tag=canbuy] run function item:shop/refresh_gold
+tag @s remove canbuy

+ 0 - 16
data/item/functions/shop/buy_apple1.mcfunction

@@ -1,16 +0,0 @@
-# 生命果 (4 gi)
-# 触发器ID 1
-execute unless entity @s[scores={shop_apple=0..}] run scoreboard players set @s shop_apple 0
-tag @s remove canbuy
-tag @s[scores={shop_apple=0,gold=36..}] add canbuy
-tellraw @s[scores={shop_apple=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-tellraw @s[scores={shop_apple=0,gold=..35}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
-tellraw @s[scores={shop_apple=..-1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
-tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"生命果","color":"green"}]
-execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"生命果","color":"green"}]
-scoreboard players add @s[tag=canbuy] shop_apple 1
-scoreboard players remove @s[tag=canbuy] gold 36
-execute as @s[tag=!canbuy] at @s run function lib:sounds/error
-execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
-execute as @s[tag=canbuy] run function item:shop/refresh_gold
-tag @s remove canbuy

+ 0 - 16
data/item/functions/shop/buy_apple2.mcfunction

@@ -1,16 +0,0 @@
-# 附魔生命果 (1 gb)
-# 触发器ID 2
-execute unless entity @s[scores={shop_apple=0..}] run scoreboard players set @s shop_apple 0
-tag @s remove canbuy
-tag @s[scores={shop_apple=1,gold=81..}] add canbuy
-tellraw @s[scores={shop_apple=2..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-tellraw @s[scores={shop_apple=1,gold=..80}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金块来购买这个物品!","color":"red"}]
-tellraw @s[scores={shop_apple=..0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
-tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"附魔生命果","color":"green"}]
-execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"附魔生命果","color":"green"}]
-scoreboard players add @s[tag=canbuy] shop_apple 1
-scoreboard players remove @s[tag=canbuy] gold 81
-execute as @s[tag=!canbuy] at @s run function lib:sounds/error
-execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
-execute as @s[tag=canbuy] run function item:shop/refresh_gold
-tag @s remove canbuy

+ 0 - 16
data/item/functions/shop/buy_armor1.mcfunction

@@ -1,16 +0,0 @@
-# 金靴子 (4 gi)
-# 触发器ID 3
-execute unless entity @s[scores={shop_armor=0..}] run scoreboard players set @s shop_armor 0
-tag @s remove canbuy
-tag @s[scores={shop_armor=0,gold=36..}] add canbuy
-tellraw @s[scores={shop_armor=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-tellraw @s[scores={shop_armor=0,gold=..35}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
-tellraw @s[scores={shop_armor=..-1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
-tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"金靴子","color":"green"}]
-execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"金靴子","color":"green"}]
-scoreboard players add @s[tag=canbuy] shop_armor 1
-scoreboard players remove @s[tag=canbuy] gold 36
-execute as @s[tag=!canbuy] at @s run function lib:sounds/error
-execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
-execute as @s[tag=canbuy] run function item:shop/refresh_gold
-tag @s remove canbuy

+ 0 - 16
data/item/functions/shop/buy_armor2.mcfunction

@@ -1,16 +0,0 @@
-# 金护腿 (1 gb)
-# 触发器ID 5
-execute unless entity @s[scores={shop_armor=0..}] run scoreboard players set @s shop_armor 0
-tag @s remove canbuy
-tag @s[scores={shop_armor=1,gold=81..}] add canbuy
-tellraw @s[scores={shop_armor=2..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-tellraw @s[scores={shop_armor=1,gold=..80}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金块来购买这个物品!","color":"red"}]
-tellraw @s[scores={shop_armor=..0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
-tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"金护腿","color":"green"}]
-execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"金护腿","color":"green"}]
-scoreboard players add @s[tag=canbuy] shop_armor 1
-scoreboard players remove @s[tag=canbuy] gold 81
-execute as @s[tag=!canbuy] at @s run function lib:sounds/error
-execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
-execute as @s[tag=canbuy] run function item:shop/refresh_gold
-tag @s remove canbuy

+ 0 - 16
data/item/functions/shop/buy_armor3.mcfunction

@@ -1,16 +0,0 @@
-# 金胸甲 (3 gb)
-# 触发器ID 6
-execute unless entity @s[scores={shop_armor=0..}] run scoreboard players set @s shop_armor 0
-tag @s remove canbuy
-tag @s[scores={shop_armor=2,gold=243..}] add canbuy
-tellraw @s[scores={shop_armor=3..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-tellraw @s[scores={shop_armor=2,gold=..242}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金块来购买这个物品!","color":"red"}]
-tellraw @s[scores={shop_armor=..1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
-tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"金胸甲","color":"green"}]
-execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"金胸甲","color":"green"}]
-scoreboard players add @s[tag=canbuy] shop_armor 1
-scoreboard players remove @s[tag=canbuy] gold 243
-execute as @s[tag=!canbuy] at @s run function lib:sounds/error
-execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
-execute as @s[tag=canbuy] run function item:shop/refresh_gold
-tag @s remove canbuy

+ 0 - 16
data/item/functions/shop/buy_arrow1.mcfunction

@@ -1,16 +0,0 @@
-# 箭 (1 gi)
-# 触发器ID 7
-execute unless entity @s[scores={shop_arrow=0..}] run scoreboard players set @s shop_arrow 0
-tag @s remove canbuy
-tag @s[scores={shop_arrow=0,gold=9..}] add canbuy
-tellraw @s[scores={shop_arrow=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-tellraw @s[scores={shop_arrow=0,gold=..8}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
-tellraw @s[scores={shop_arrow=..-1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
-tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"箭","color":"green"}]
-execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"箭","color":"green"}]
-scoreboard players add @s[tag=canbuy] shop_arrow 1
-scoreboard players remove @s[tag=canbuy] gold 9
-execute as @s[tag=!canbuy] at @s run function lib:sounds/error
-execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
-execute as @s[tag=canbuy] run function item:shop/refresh_gold
-tag @s remove canbuy

+ 0 - 16
data/item/functions/shop/buy_arrow2.mcfunction

@@ -1,16 +0,0 @@
-# 箭 x2 (4 gi)
-# 触发器ID 8
-execute unless entity @s[scores={shop_arrow=0..}] run scoreboard players set @s shop_arrow 0
-tag @s remove canbuy
-tag @s[scores={shop_arrow=1,gold=36..}] add canbuy
-tellraw @s[scores={shop_arrow=2..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-tellraw @s[scores={shop_arrow=1,gold=..35}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
-tellraw @s[scores={shop_arrow=..0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
-tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"箭 x2","color":"green"}]
-execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"箭 x2","color":"green"}]
-scoreboard players add @s[tag=canbuy] shop_arrow 1
-scoreboard players remove @s[tag=canbuy] gold 36
-execute as @s[tag=!canbuy] at @s run function lib:sounds/error
-execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
-execute as @s[tag=canbuy] run function item:shop/refresh_gold
-tag @s remove canbuy

+ 0 - 16
data/item/functions/shop/buy_arrow3.mcfunction

@@ -1,16 +0,0 @@
-# 缓慢之箭 x2 (1 gb)
-# 触发器ID 9
-execute unless entity @s[scores={shop_arrow=0..}] run scoreboard players set @s shop_arrow 0
-tag @s remove canbuy
-tag @s[scores={shop_arrow=2,gold=81..}] add canbuy
-tellraw @s[scores={shop_arrow=3..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-tellraw @s[scores={shop_arrow=2,gold=..80}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金块来购买这个物品!","color":"red"}]
-tellraw @s[scores={shop_arrow=..1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
-tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"缓慢之箭 x2","color":"green"}]
-execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"缓慢之箭 x2","color":"green"}]
-scoreboard players add @s[tag=canbuy] shop_arrow 1
-scoreboard players remove @s[tag=canbuy] gold 81
-execute as @s[tag=!canbuy] at @s run function lib:sounds/error
-execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
-execute as @s[tag=canbuy] run function item:shop/refresh_gold
-tag @s remove canbuy

+ 0 - 16
data/item/functions/shop/buy_bgm.mcfunction

@@ -1,16 +0,0 @@
-# 老板换碟 (1 gi)
-# 触发器ID 20
-execute unless entity @s[scores={shop_bgm=0..}] run scoreboard players set @s shop_bgm 0
-tag @s remove canbuy
-tag @s[scores={shop_bgm=0,gold=9..}] add canbuy
-tellraw @s[scores={shop_bgm=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-tellraw @s[scores={shop_bgm=0,gold=..8}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
-tellraw @s[scores={shop_bgm=..-1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
-tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"老板换碟","color":"green"}]
-execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"老板换碟","color":"green"}]
-execute as @s[tag=canbuy] run function item:shop/special_bgm
-scoreboard players remove @s[tag=canbuy] gold 9
-execute as @s[tag=!canbuy] at @s run function lib:sounds/error
-execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
-execute as @s[tag=canbuy] run function item:shop/refresh_gold
-tag @s remove canbuy

+ 0 - 16
data/item/functions/shop/buy_bow.mcfunction

@@ -1,16 +0,0 @@
-# 破损的弓 (1 gb)
-# 触发器ID 15
-execute unless entity @s[scores={shop_bow=0..}] run scoreboard players set @s shop_bow 0
-tag @s remove canbuy
-tag @s[scores={shop_bow=0,gold=81..}] add canbuy
-tellraw @s[scores={shop_bow=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-tellraw @s[scores={shop_bow=0,gold=..80}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金块来购买这个物品!","color":"red"}]
-tellraw @s[scores={shop_bow=..-1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
-tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"破损的弓","color":"green"}]
-execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"破损的弓","color":"green"}]
-scoreboard players add @s[tag=canbuy] shop_bow 1
-scoreboard players remove @s[tag=canbuy] gold 81
-execute as @s[tag=!canbuy] at @s run function lib:sounds/error
-execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
-execute as @s[tag=canbuy] run function item:shop/refresh_gold
-tag @s remove canbuy

+ 0 - 15
data/item/functions/shop/buy_dice.mcfunction

@@ -1,15 +0,0 @@
-# 骰子 (1 gi)
-# 触发器ID 999
-execute unless entity @s[scores={shop_dice=0..}] run scoreboard players set @s shop_dice 0
-tag @s remove canbuy
-tag @s[scores={shop_dice=0,gold=9..}] add canbuy
-tellraw @s[scores={shop_dice=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购赌了这个骰子了!","color":"aqua"}]
-tellraw @s[scores={shop_dice=0,gold=..8}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金粒来赌骰子!","color":"red"}]
-tellraw @s[scores={shop_dice=..-1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先赌上一级的骰子!","color":"red"}]
-# tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你赌了一次 ",{"text":"20面骰子","color":"green"}]
-# execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 赌了一次 ",{"text":"20面骰子","color":"green"}]
-execute as @s[tag=canbuy] run function ltw:state/0/roll_dice/roll
-scoreboard players remove @s[tag=canbuy] gold 9
-execute as @s[tag=!canbuy] at @s run function lib:sounds/error
-execute as @s[tag=canbuy] run function item:shop/refresh_gold
-tag @s remove canbuy

+ 0 - 16
data/item/functions/shop/buy_easter_egg.mcfunction

@@ -1,16 +0,0 @@
-# 臭彩蛋 (1 gn)
-# 触发器ID 114514
-execute unless entity @s[scores={shop_easter_egg=0..}] run scoreboard players set @s shop_easter_egg 0
-tag @s remove canbuy
-tag @s[scores={shop_easter_egg=0,gold=1..}] add canbuy
-tellraw @s[scores={shop_easter_egg=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-tellraw @s[scores={shop_easter_egg=0,gold=..0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金粒来购买这个物品!","color":"red"}]
-tellraw @s[scores={shop_easter_egg=..-1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
-tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"臭彩蛋","color":"green"}]
-execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"臭彩蛋","color":"green"}]
-execute as @s[tag=canbuy] run function item:shop/special_easter_egg
-scoreboard players remove @s[tag=canbuy] gold 1
-execute as @s[tag=!canbuy] at @s run function lib:sounds/error
-execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
-execute as @s[tag=canbuy] run function item:shop/refresh_gold
-tag @s remove canbuy

+ 0 - 16
data/item/functions/shop/buy_firework.mcfunction

@@ -1,16 +0,0 @@
-# 漂亮的烟花 (1 gb)
-# 触发器ID 19
-execute unless entity @s[scores={shop_firework=0..}] run scoreboard players set @s shop_firework 0
-tag @s remove canbuy
-tag @s[scores={shop_firework=0,gold=81..}] add canbuy
-tellraw @s[scores={shop_firework=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-tellraw @s[scores={shop_firework=0,gold=..80}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金块来购买这个物品!","color":"red"}]
-tellraw @s[scores={shop_firework=..-1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
-tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"漂亮的烟花","color":"green"}]
-execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"漂亮的烟花","color":"green"}]
-scoreboard players add @s[tag=canbuy] shop_firework 1
-scoreboard players remove @s[tag=canbuy] gold 81
-execute as @s[tag=!canbuy] at @s run function lib:sounds/error
-execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
-execute as @s[tag=canbuy] run function item:shop/refresh_gold
-tag @s remove canbuy

+ 0 - 16
data/item/functions/shop/buy_orange.mcfunction

@@ -1,16 +0,0 @@
-# 活跃橙 (3 gb)
-# 触发器ID 10
-execute unless entity @s[scores={shop_orange=0..}] run scoreboard players set @s shop_orange 0
-tag @s remove canbuy
-tag @s[scores={shop_orange=0,gold=243..}] add canbuy
-tellraw @s[scores={shop_orange=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-tellraw @s[scores={shop_orange=0,gold=..242}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金块来购买这个物品!","color":"red"}]
-tellraw @s[scores={shop_orange=..-1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
-tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"活跃橙","color":"green"},", 请私聊龙猫 PCL2 识别码领取!"]
-execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"活跃橙","color":"green"}]
-scoreboard players add @s[tag=canbuy] shop_orange 1
-scoreboard players remove @s[tag=canbuy] gold 243
-execute as @s[tag=!canbuy] at @s run function lib:sounds/error
-execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
-execute as @s[tag=canbuy] run function item:shop/refresh_gold
-tag @s remove canbuy

+ 0 - 11
data/item/functions/shop/buy_particle0.mcfunction

@@ -1,11 +0,0 @@
-# 关闭粒子 (0 e)
-# 触发器ID 102
-execute unless entity @s[scores={shop_particle_s=0..}] run scoreboard players set @s shop_particle_s 0
-
-tellraw @s[scores={shop_particle_s=0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先在左侧购买尾迹特效才能切换尾迹种类!","color":"red"}]
-execute as @s[scores={shop_particle_s=0}] at @s run function lib:sounds/error
-
-tellraw @s[scores={shop_particle_s=1..}] ["",{"text":">> ","color":"green","bold":true},"尾迹特效已 ",{"text":"关闭","color":"green"}]
-execute as @s[scores={shop_particle_s=1..}] at @s run function lib:sounds/hit
-
-scoreboard players set @s particle_type 0

+ 0 - 11
data/item/functions/shop/buy_particle1.mcfunction

@@ -1,11 +0,0 @@
-# 绿光粒子 (0 e)
-# 触发器ID 103
-execute unless entity @s[scores={shop_particle_s=0..}] run scoreboard players set @s shop_particle_s 0
-
-tellraw @s[scores={shop_particle_s=0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先在左侧购买尾迹特效才能切换尾迹种类!","color":"red"}]
-execute as @s[scores={shop_particle_s=0}] at @s run function lib:sounds/error
-
-tellraw @s[scores={shop_particle_s=1..}] ["",{"text":">> ","color":"green","bold":true},"尾迹特效已切换为 ",{"text":"绿光","color":"green"}]
-execute as @s[scores={shop_particle_s=1..}] at @s run function lib:sounds/hit
-
-scoreboard players set @s[scores={shop_particle_s=1..}] particle_type 1

+ 0 - 25
data/item/functions/shop/buy_particle2.mcfunction

@@ -1,25 +0,0 @@
-# 素雅粒子 (3 e)
-# 触发器ID 104
-execute unless entity @s[scores={shop_particle_s=0..}] run scoreboard players set @s shop_particle_s 0
-execute unless entity @s[scores={shop_particle_2=0..}] run scoreboard players set @s shop_particle_2 0
-tag @s remove canbuy
-tag @s[scores={shop_particle_s=1..,shop_particle_2=0,green=3..}] add canbuy
-
-tellraw @s[scores={shop_particle_s=0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先在左侧购买尾迹特效才能切换尾迹种类!","color":"red"}]
-execute as @s[scores={shop_particle_s=0}] at @s run function lib:sounds/error
-
-tellraw @s[scores={shop_particle_s=1..,shop_particle_2=1..}] ["",{"text":">> ","color":"green","bold":true},"尾迹特效已切换为 ",{"text":"素雅","color":"green"}]
-execute as @s[scores={shop_particle_s=1..,shop_particle_2=1..}] at @s run function lib:sounds/hit
-
-tellraw @s[scores={shop_particle_s=1..,shop_particle_2=0,green=..2}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的绿宝石来购买它!","color":"red"}]
-execute as @s[scores={shop_particle_s=1..,shop_particle_2=0,green=..2}] at @s run function lib:sounds/error
-
-tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你已购买并切换尾迹特效为 ",{"text":"素雅","color":"green"}]
-execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"素雅尾迹","color":"green"}]
-scoreboard players add @s[tag=canbuy] shop_particle_2 1
-scoreboard players remove @s[tag=canbuy] green 3
-execute as @s[tag=canbuy] run function item:shop/refresh_green
-execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
-tag @s remove canbuy
-
-scoreboard players set @s[scores={shop_particle_2=1..}] particle_type 2

+ 0 - 25
data/item/functions/shop/buy_particle3.mcfunction

@@ -1,25 +0,0 @@
-# 水滴粒子 (3 e)
-# 触发器ID 105
-execute unless entity @s[scores={shop_particle_s=0..}] run scoreboard players set @s shop_particle_s 0
-execute unless entity @s[scores={shop_particle_3=0..}] run scoreboard players set @s shop_particle_3 0
-tag @s remove canbuy
-tag @s[scores={shop_particle_s=1..,shop_particle_3=0,green=3..}] add canbuy
-
-tellraw @s[scores={shop_particle_s=0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先在左侧购买尾迹特效才能切换尾迹种类!","color":"red"}]
-execute as @s[scores={shop_particle_s=0}] at @s run function lib:sounds/error
-
-tellraw @s[scores={shop_particle_s=1..,shop_particle_3=1..}] ["",{"text":">> ","color":"green","bold":true},"尾迹特效已切换为 ",{"text":"水滴","color":"green"}]
-execute as @s[scores={shop_particle_s=1..,shop_particle_3=1..}] at @s run function lib:sounds/hit
-
-tellraw @s[scores={shop_particle_s=1..,shop_particle_3=0,green=..2}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的绿宝石来购买它!","color":"red"}]
-execute as @s[scores={shop_particle_s=1..,shop_particle_3=0,green=..2}] at @s run function lib:sounds/error
-
-tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你已购买并切换尾迹特效为 ",{"text":"水滴","color":"green"}]
-execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"水滴尾迹","color":"green"}]
-scoreboard players add @s[tag=canbuy] shop_particle_3 1
-scoreboard players remove @s[tag=canbuy] green 3
-execute as @s[tag=canbuy] run function item:shop/refresh_green
-execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
-tag @s remove canbuy
-
-scoreboard players set @s[scores={shop_particle_3=1..}] particle_type 3

+ 0 - 25
data/item/functions/shop/buy_particle4.mcfunction

@@ -1,25 +0,0 @@
-# 烈焰粒子 (6 e)
-# 触发器ID 106
-execute unless entity @s[scores={shop_particle_s=0..}] run scoreboard players set @s shop_particle_s 0
-execute unless entity @s[scores={shop_particle_4=0..}] run scoreboard players set @s shop_particle_4 0
-tag @s remove canbuy
-tag @s[scores={shop_particle_s=1..,shop_particle_4=0,green=6..}] add canbuy
-
-tellraw @s[scores={shop_particle_s=0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先在左侧购买尾迹特效才能切换尾迹种类!","color":"red"}]
-execute as @s[scores={shop_particle_s=0}] at @s run function lib:sounds/error
-
-tellraw @s[scores={shop_particle_s=1..,shop_particle_4=1..}] ["",{"text":">> ","color":"green","bold":true},"尾迹特效已切换为 ",{"text":"烈焰","color":"green"}]
-execute as @s[scores={shop_particle_s=1..,shop_particle_4=1..}] at @s run function lib:sounds/hit
-
-tellraw @s[scores={shop_particle_s=1..,shop_particle_4=0,green=..5}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的绿宝石来购买它!","color":"red"}]
-execute as @s[scores={shop_particle_s=1..,shop_particle_4=0,green=..5}] at @s run function lib:sounds/error
-
-tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你已购买并切换尾迹特效为 ",{"text":"烈焰","color":"green"}]
-execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"烈焰尾迹","color":"green"}]
-scoreboard players add @s[tag=canbuy] shop_particle_4 1
-scoreboard players remove @s[tag=canbuy] green 6
-execute as @s[tag=canbuy] run function item:shop/refresh_green
-execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
-tag @s remove canbuy
-
-scoreboard players set @s[scores={shop_particle_4=1..}] particle_type 4

+ 0 - 25
data/item/functions/shop/buy_particle5.mcfunction

@@ -1,25 +0,0 @@
-# 炫彩粒子 (6 e)
-# 触发器ID 107
-execute unless entity @s[scores={shop_particle_s=0..}] run scoreboard players set @s shop_particle_s 0
-execute unless entity @s[scores={shop_particle_5=0..}] run scoreboard players set @s shop_particle_5 0
-tag @s remove canbuy
-tag @s[scores={shop_particle_s=1..,shop_particle_5=0,green=6..}] add canbuy
-
-tellraw @s[scores={shop_particle_s=0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先在左侧购买尾迹特效才能切换尾迹种类!","color":"red"}]
-execute as @s[scores={shop_particle_s=0}] at @s run function lib:sounds/error
-
-tellraw @s[scores={shop_particle_s=1..,shop_particle_5=1..}] ["",{"text":">> ","color":"green","bold":true},"尾迹特效已切换为 ",{"text":"炫彩","color":"green"}]
-execute as @s[scores={shop_particle_s=1..,shop_particle_5=1..}] at @s run function lib:sounds/hit
-
-tellraw @s[scores={shop_particle_s=1..,shop_particle_5=0,green=..5}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的绿宝石来购买它!","color":"red"}]
-execute as @s[scores={shop_particle_s=1..,shop_particle_5=0,green=..5}] at @s run function lib:sounds/error
-
-tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你已购买并切换尾迹特效为 ",{"text":"炫彩","color":"green"}]
-execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"炫彩尾迹","color":"green"}]
-scoreboard players add @s[tag=canbuy] shop_particle_5 1
-scoreboard players remove @s[tag=canbuy] green 6
-execute as @s[tag=canbuy] run function item:shop/refresh_green
-execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
-tag @s remove canbuy
-
-scoreboard players set @s[scores={shop_particle_5=1..}] particle_type 5

+ 0 - 25
data/item/functions/shop/buy_particle6.mcfunction

@@ -1,25 +0,0 @@
-# 魂焰粒子 (1 eb)
-# 触发器ID 108
-execute unless entity @s[scores={shop_particle_s=0..}] run scoreboard players set @s shop_particle_s 0
-execute unless entity @s[scores={shop_particle_6=0..}] run scoreboard players set @s shop_particle_6 0
-tag @s remove canbuy
-tag @s[scores={shop_particle_s=1..,shop_particle_6=0,green=9..}] add canbuy
-
-tellraw @s[scores={shop_particle_s=0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先在左侧购买尾迹特效才能切换尾迹种类!","color":"red"}]
-execute as @s[scores={shop_particle_s=0}] at @s run function lib:sounds/error
-
-tellraw @s[scores={shop_particle_s=1..,shop_particle_6=1..}] ["",{"text":">> ","color":"green","bold":true},"尾迹特效已切换为 ",{"text":"魂焰","color":"green"}]
-execute as @s[scores={shop_particle_s=1..,shop_particle_6=1..}] at @s run function lib:sounds/hit
-
-tellraw @s[scores={shop_particle_s=1..,shop_particle_6=0,green=..8}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的绿宝石块来购买它!","color":"red"}]
-execute as @s[scores={shop_particle_s=1..,shop_particle_6=0,green=..8}] at @s run function lib:sounds/error
-
-tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你已购买并切换尾迹特效为 ",{"text":"魂焰","color":"green"}]
-execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"魂焰尾迹","color":"green"}]
-scoreboard players add @s[tag=canbuy] shop_particle_6 1
-scoreboard players remove @s[tag=canbuy] green 9
-execute as @s[tag=canbuy] run function item:shop/refresh_green
-execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
-tag @s remove canbuy
-
-scoreboard players set @s[scores={shop_particle_6=1..}] particle_type 6

+ 0 - 15
data/item/functions/shop/buy_pig.mcfunction

@@ -1,15 +0,0 @@
-# 哼唧 (1 gn)
-# 触发器ID 21
-execute unless entity @s[scores={shop_pig=0..}] run scoreboard players set @s shop_pig 0
-tag @s remove canbuy
-tag @s[scores={shop_pig=0,gold=1..}] add canbuy
-tellraw @s[scores={shop_pig=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-tellraw @s[scores={shop_pig=0,gold=..0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金粒来购买这个物品!","color":"red"}]
-tellraw @s[scores={shop_pig=..-1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
-tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"哼唧","color":"green"}]
-execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"哼唧","color":"green"}]
-execute as @s[tag=canbuy] run function item:shop/special_pig
-scoreboard players remove @s[tag=canbuy] gold 1
-execute as @s[tag=!canbuy] at @s run function lib:sounds/error
-execute as @s[tag=canbuy] run function item:shop/refresh_gold
-tag @s remove canbuy

+ 0 - 16
data/item/functions/shop/buy_potion_resist.mcfunction

@@ -1,16 +0,0 @@
-# 抗性提升 (0:20) (1 gb)
-# 触发器ID 16
-execute unless entity @s[scores={shop_potion_rst=0..}] run scoreboard players set @s shop_potion_rst 0
-tag @s remove canbuy
-tag @s[scores={shop_potion_rst=0,gold=81..}] add canbuy
-tellraw @s[scores={shop_potion_rst=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-tellraw @s[scores={shop_potion_rst=0,gold=..80}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金块来购买这个物品!","color":"red"}]
-tellraw @s[scores={shop_potion_rst=..-1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
-tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"抗性提升 (0:20)","color":"green"}]
-execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"抗性提升 (0:20)","color":"green"}]
-scoreboard players add @s[tag=canbuy] shop_potion_rst 1
-scoreboard players remove @s[tag=canbuy] gold 81
-execute as @s[tag=!canbuy] at @s run function lib:sounds/error
-execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
-execute as @s[tag=canbuy] run function item:shop/refresh_gold
-tag @s remove canbuy

+ 0 - 16
data/item/functions/shop/buy_potion_speed1.mcfunction

@@ -1,16 +0,0 @@
-# 速度 (0:15) (4 gi)
-# 触发器ID 17
-execute unless entity @s[scores={shop_potion_spd=0..}] run scoreboard players set @s shop_potion_spd 0
-tag @s remove canbuy
-tag @s[scores={shop_potion_spd=0,gold=36..}] add canbuy
-tellraw @s[scores={shop_potion_spd=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-tellraw @s[scores={shop_potion_spd=0,gold=..35}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
-tellraw @s[scores={shop_potion_spd=..-1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
-tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"速度 (0:15)","color":"green"}]
-execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"速度 (0:15)","color":"green"}]
-scoreboard players add @s[tag=canbuy] shop_potion_spd 1
-scoreboard players remove @s[tag=canbuy] gold 36
-execute as @s[tag=!canbuy] at @s run function lib:sounds/error
-execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
-execute as @s[tag=canbuy] run function item:shop/refresh_gold
-tag @s remove canbuy

+ 0 - 16
data/item/functions/shop/buy_potion_speed2.mcfunction

@@ -1,16 +0,0 @@
-# 速度 II (0:15) (1 gb)
-# 触发器ID 18
-execute unless entity @s[scores={shop_potion_spd=0..}] run scoreboard players set @s shop_potion_spd 0
-tag @s remove canbuy
-tag @s[scores={shop_potion_spd=1,gold=81..}] add canbuy
-tellraw @s[scores={shop_potion_spd=2..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-tellraw @s[scores={shop_potion_spd=1,gold=..80}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金块来购买这个物品!","color":"red"}]
-tellraw @s[scores={shop_potion_spd=..0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
-tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"速度 II (0:15)","color":"green"}]
-execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"速度 II (0:15)","color":"green"}]
-scoreboard players add @s[tag=canbuy] shop_potion_spd 1
-scoreboard players remove @s[tag=canbuy] gold 81
-execute as @s[tag=!canbuy] at @s run function lib:sounds/error
-execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
-execute as @s[tag=canbuy] run function item:shop/refresh_gold
-tag @s remove canbuy

+ 0 - 16
data/item/functions/shop/buy_weapon3.mcfunction

@@ -1,16 +0,0 @@
-# 铁锹 (1 gb)
-# 触发器ID 13
-execute unless entity @s[scores={shop_weapon=0..}] run scoreboard players set @s shop_weapon 0
-tag @s remove canbuy
-tag @s[scores={shop_weapon=2,gold=81..}] add canbuy
-tellraw @s[scores={shop_weapon=3..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-tellraw @s[scores={shop_weapon=2,gold=..80}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金块来购买这个物品!","color":"red"}]
-tellraw @s[scores={shop_weapon=..1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
-tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"铁锹","color":"green"}]
-execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"铁锹","color":"green"}]
-scoreboard players add @s[tag=canbuy] shop_weapon 1
-scoreboard players remove @s[tag=canbuy] gold 81
-execute as @s[tag=!canbuy] at @s run function lib:sounds/error
-execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
-execute as @s[tag=canbuy] run function item:shop/refresh_gold
-tag @s remove canbuy

+ 0 - 16
data/item/functions/shop/buy_weapon4.mcfunction

@@ -1,16 +0,0 @@
-# 钻石锹 (3 gb)
-# 触发器ID 14
-execute unless entity @s[scores={shop_weapon=0..}] run scoreboard players set @s shop_weapon 0
-tag @s remove canbuy
-tag @s[scores={shop_weapon=3,gold=243..}] add canbuy
-tellraw @s[scores={shop_weapon=4..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-tellraw @s[scores={shop_weapon=3,gold=..242}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金块来购买这个物品!","color":"red"}]
-tellraw @s[scores={shop_weapon=..2}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
-tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"钻石锹","color":"green"}]
-execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"钻石锹","color":"green"}]
-scoreboard players add @s[tag=canbuy] shop_weapon 1
-scoreboard players remove @s[tag=canbuy] gold 243
-execute as @s[tag=!canbuy] at @s run function lib:sounds/error
-execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
-execute as @s[tag=canbuy] run function item:shop/refresh_gold
-tag @s remove canbuy

+ 0 - 10
data/item/functions/shop/charity.mcfunction

@@ -1,10 +0,0 @@
-# 慈善家(在区域外999)
-# 触发器ID 999
-tellraw @s[scores={gold=..0}] ["",{"text":">> ","color":"red","bold":true},{"text":"看起来你已经身无分文,不要再远程购物啦!","color":"red"}]
-tellraw @s[scores={gold=1..}] ["",{"text":">> ","color":"green","bold":true},{"text":"一堆金粒凭空出现在了老板面前,老板一边喊着好东西好东西一边收下了金粒!","color":"green"}]
-execute as @s[scores={gold=1..}] at @s run function lib:sounds/levelup
-execute as @s[scores={gold=..0}] at @s run function lib:sounds/error
-scoreboard players set @s[scores={gold=1..8}] gold 0
-scoreboard players remove @s[scores={gold=9..}] gold 9
-execute as @s run function item:shop/refresh_gold
-scoreboard players set @s buy_trigger 0

+ 46 - 35
data/item/functions/shop/check.mcfunction

@@ -1,38 +1,49 @@
-execute if score @s buy_trigger matches 1..18 at @s unless entity @s[x=-3,z=-63,y=6,dx=25,dy=6,dz=30] run function item:shop/error
-execute if score @s buy_trigger matches 19..21 at @s unless entity @s[x=1,z=-63,y=20,dx=5,dy=4,dz=6] run function item:shop/error
-execute if score @s buy_trigger matches 100..108 at @s unless entity @s[x=-22,z=-75,y=18,dx=10,dy=4,dz=5] run function item:shop/error
-execute if score @s buy_trigger matches 999 at @s unless entity @s[x=-3,z=-49,y=27,dx=5,dy=4,dz=5] run function item:shop/charity
+# 范围检测
+execute if score @s buy_trigger matches 011..074 at @s unless entity @s[x=-3,z=-63,y=6,dx=25,dy=6,dz=30] run function item:shop/error/piglin
+execute if score @s buy_trigger matches 101..103 at @s unless entity @s[x=1,z=-63,y=20,dx=5,dy=4,dz=6] run function item:shop/error/piglin
+execute if score @s buy_trigger matches 201..219 at @s unless entity @s[x=-22,z=-75,y=18,dx=10,dy=4,dz=5] run function item:shop/error/villager
+execute if score @s buy_trigger matches 999 at @s unless entity @s[x=-3,z=-49,y=27,dx=5,dy=4,dz=5] run function item:shop/error/dice
 
-execute if score @s buy_trigger matches 1 if score $state mem matches 0 run function item:shop/buy_apple1
-execute if score @s buy_trigger matches 2 if score $state mem matches 0 run function item:shop/buy_apple2
-execute if score @s buy_trigger matches 3 if score $state mem matches 0 run function item:shop/buy_armor1
-execute if score @s buy_trigger matches 5 if score $state mem matches 0 run function item:shop/buy_armor2
-execute if score @s buy_trigger matches 6 if score $state mem matches 0 run function item:shop/buy_armor3
-execute if score @s buy_trigger matches 7 if score $state mem matches 0 run function item:shop/buy_arrow1
-execute if score @s buy_trigger matches 8 if score $state mem matches 0 run function item:shop/buy_arrow2
-execute if score @s buy_trigger matches 9 if score $state mem matches 0 run function item:shop/buy_arrow3
-execute if score @s buy_trigger matches 10 if score $state mem matches 0 run function item:shop/buy_orange
-execute if score @s buy_trigger matches 11 if score $state mem matches 0 run function item:shop/buy_weapon1
-execute if score @s buy_trigger matches 12 if score $state mem matches 0 run function item:shop/buy_weapon2
-execute if score @s buy_trigger matches 13 if score $state mem matches 0 run function item:shop/buy_weapon3
-execute if score @s buy_trigger matches 14 if score $state mem matches 0 run function item:shop/buy_weapon4
-execute if score @s buy_trigger matches 15 if score $state mem matches 0 run function item:shop/buy_bow
-execute if score @s buy_trigger matches 16 if score $state mem matches 0 run function item:shop/buy_potion_resist
-execute if score @s buy_trigger matches 17 if score $state mem matches 0 run function item:shop/buy_potion_speed1
-execute if score @s buy_trigger matches 18 if score $state mem matches 0 run function item:shop/buy_potion_speed2
-execute if score @s buy_trigger matches 19 if score $state mem matches 0 run function item:shop/buy_firework
-execute if score @s buy_trigger matches 20 if score $state mem matches 0 run function item:shop/buy_bgm
-execute if score @s buy_trigger matches 21 if score $state mem matches 0 run function item:shop/buy_pig
-execute if score @s buy_trigger matches 100 if score $state mem matches 0 run function item:shop/buy_particle_system
-execute if score @s buy_trigger matches 101 if score $state mem matches 0 run function item:shop/buy_particle_close
-execute if score @s buy_trigger matches 102 if score $state mem matches 0 run function item:shop/buy_particle0
-execute if score @s buy_trigger matches 103 if score $state mem matches 0 run function item:shop/buy_particle1
-execute if score @s buy_trigger matches 104 if score $state mem matches 0 run function item:shop/buy_particle2
-execute if score @s buy_trigger matches 105 if score $state mem matches 0 run function item:shop/buy_particle3
-execute if score @s buy_trigger matches 106 if score $state mem matches 0 run function item:shop/buy_particle4
-execute if score @s buy_trigger matches 107 if score $state mem matches 0 run function item:shop/buy_particle5
-execute if score @s buy_trigger matches 108 if score $state mem matches 0 run function item:shop/buy_particle6
-execute if score @s buy_trigger matches 999 if score $state mem matches 0 run function item:shop/buy_dice
-execute if score @s buy_trigger matches 114514 if score $state mem matches 0 run function item:shop/buy_easter_egg
+# 普通商店
+execute if score @s buy_trigger matches 011 if score $state mem matches 0 run function item:shop/buy/011_bow
+execute if score @s buy_trigger matches 012 if score $state mem matches 0 run function item:shop/buy/012_bow
+execute if score @s buy_trigger matches 013 if score $state mem matches 0 run function item:shop/buy/013_bow
+execute if score @s buy_trigger matches 021 if score $state mem matches 0 run function item:shop/buy/021_arrow
+execute if score @s buy_trigger matches 022 if score $state mem matches 0 run function item:shop/buy/022_arrow
+execute if score @s buy_trigger matches 023 if score $state mem matches 0 run function item:shop/buy/023_arrow
+execute if score @s buy_trigger matches 031 if score $state mem matches 0 run function item:shop/buy/031_apple
+execute if score @s buy_trigger matches 032 if score $state mem matches 0 run function item:shop/buy/032_apple
+execute if score @s buy_trigger matches 041 if score $state mem matches 0 run function item:shop/buy/041_float
+execute if score @s buy_trigger matches 042 if score $state mem matches 0 run function item:shop/buy/042_float
+execute if score @s buy_trigger matches 051 if score $state mem matches 0 run function item:shop/buy/051_axe
+execute if score @s buy_trigger matches 052 if score $state mem matches 0 run function item:shop/buy/052_axe
+execute if score @s buy_trigger matches 053 if score $state mem matches 0 run function item:shop/buy/053_axe
+execute if score @s buy_trigger matches 061 if score $state mem matches 0 run function item:shop/buy/061_armor
+execute if score @s buy_trigger matches 062 if score $state mem matches 0 run function item:shop/buy/062_armor
+execute if score @s buy_trigger matches 063 if score $state mem matches 0 run function item:shop/buy/063_armor
+execute if score @s buy_trigger matches 064 if score $state mem matches 0 run function item:shop/buy/064_armor
+execute if score @s buy_trigger matches 071 if score $state mem matches 0 run function item:shop/buy/071_fish
+execute if score @s buy_trigger matches 072 if score $state mem matches 0 run function item:shop/buy/072_fish
+execute if score @s buy_trigger matches 073 if score $state mem matches 0 run function item:shop/buy/073_fish
+execute if score @s buy_trigger matches 074 if score $state mem matches 0 run function item:shop/buy/074_fish
+# 隐藏商店
+execute if score @s buy_trigger matches 101 if score $state mem matches 0 run function item:shop/buy/101_hint
+execute if score @s buy_trigger matches 102 if score $state mem matches 0 run function item:shop/buy/102_bgm
+execute if score @s buy_trigger matches 103 if score $state mem matches 0 run function item:shop/buy/103_pig
+# 村民尾迹商店
+execute if score @s buy_trigger matches 201 if score $state mem matches 0 run function item:shop/buy/201_particle_system
+execute if score @s buy_trigger matches 210 if score $state mem matches 0 run function item:shop/buy/210_particle_close
+execute if score @s buy_trigger matches 211 if score $state mem matches 0 run function item:shop/buy/211_particle1
+execute if score @s buy_trigger matches 212 if score $state mem matches 0 run function item:shop/buy/212_particle2
+execute if score @s buy_trigger matches 213 if score $state mem matches 0 run function item:shop/buy/213_particle3
+execute if score @s buy_trigger matches 214 if score $state mem matches 0 run function item:shop/buy/214_particle4
+execute if score @s buy_trigger matches 215 if score $state mem matches 0 run function item:shop/buy/215_particle5
+execute if score @s buy_trigger matches 216 if score $state mem matches 0 run function item:shop/buy/216_particle6
+# 骰子房
+execute if score @s buy_trigger matches 999 if score $state mem matches 0 run function item:shop/buy/999_dice
+# 彩蛋
+execute if score @s buy_trigger matches 114514 if score $state mem matches 0 run function item:shop/buy/easter_egg
+
+# 重置
 scoreboard players set @s buy_trigger 0
 execute if score $state mem matches 0 run scoreboard players enable @s buy_trigger

+ 37 - 0
data/item/functions/shop/document.txt

@@ -0,0 +1,37 @@
+/data modify block -1 7 -52 Text1 set value '{"text":""}'
+/data modify block -1 7 -52 Text3 set value '{"clickEvent":{"action":"run_command","value":"/trigger buy_trigger set "},"text":""}'
+
+商店种类:
+00X 普通商店
+10X 楼上的隐藏商店
+20X 村民尾迹商店
+999 骰子房
+
+
+破损的木斧 (6)
++ 破损的金斧 (6)
++ 10% 耐久度 (9)
+
+皮革靴子
++ 铁靴子
++ 钻石靴子
++ 下界合金靴子
+
+破损的钓鱼竿(3)
++ 10% 耐久度(9)
++ 饵钓 II
++ 10% 耐久度(15)
+
+单发弓(1)
++ 1 耐久度(2)
++ 冲击 I
+
+箭
++ 1 箭(2)
++ 变为缓慢之箭
+
+浮空药水(饮用,II,0:02)
++ 1 秒(0:03)
+
+金苹果(一次性)
++ 附魔金苹果

+ 6 - 0
data/item/functions/shop/error/dice.mcfunction

@@ -0,0 +1,6 @@
+tellraw @s[scores={gold=..8}] ["",{"text":">> ","color":"red","bold":true},{"text":"连一个金锭都没有, 就别再远程丢骰子啦!","color":"red"}]
+tellraw @s[scores={gold=9..}] ["",{"text":">> ","color":"red","bold":true},{"text":"一个金锭凭空出现在了老板面前, 但老板没有看见人影, 只好收下了金锭……","color":"red"}]
+function lib:sounds/error
+scoreboard players remove @s[scores={gold=9..}] gold 9
+execute as @s run function item:shop/refresh_gold
+scoreboard players set @s buy_trigger 0

+ 6 - 0
data/item/functions/shop/error/piglin.mcfunction

@@ -0,0 +1,6 @@
+tellraw @s[scores={gold=..0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你已经身无分文, 就别再远程购物啦!","color":"red"}]
+tellraw @s[scores={gold=1..}] ["",{"text":">> ","color":"red","bold":true},{"text":"一颗金粒凭空出现在了猪灵面前, 但猪灵没有看见人影, 只好收下了金粒……","color":"red"}]
+function lib:sounds/error
+scoreboard players remove @s[scores={gold=1..}] gold 1
+execute as @s run function item:shop/refresh_gold
+scoreboard players set @s buy_trigger 0

+ 1 - 3
data/item/functions/shop/error.mcfunction → data/item/functions/shop/error/villager.mcfunction

@@ -1,5 +1,3 @@
-# 不在购物区域
-# 触发器ID None
 scoreboard players set @s buy_trigger 0
-tellraw @s ["",{"text":">> ","color":"red","bold":true},{"text":"老板还没开通网上购物服务,请进入实体店购买!","color":"red"}]
+tellraw @s ["",{"text":">> ","color":"red","bold":true},{"text":"村民还没开通网上服务呢, 请到线下实体店购买!","color":"red"}]
 execute at @s run function lib:sounds/error

+ 23 - 0
data/item/functions/shop/init.mcfunction

@@ -0,0 +1,23 @@
+
+# 商店系统
+scoreboard objectives add gold dummy "金粒"
+scoreboard objectives add gold_total dummy "总金粒"
+scoreboard objectives add green dummy "绿宝石"
+scoreboard objectives add green_total dummy "总绿宝石"
+scoreboard objectives add buy_trigger trigger "触发器_购买物品"
+scoreboard objectives add particle_type dummy "粒子种类"
+
+# 商店购买
+scoreboard objectives add shop_01_bow dummy
+scoreboard objectives add shop_02_arrow dummy
+scoreboard objectives add shop_03_apple dummy
+scoreboard objectives add shop_04_float dummy
+scoreboard objectives add shop_05_axe dummy
+scoreboard objectives add shop_06_armor dummy
+scoreboard objectives add shop_07_fish dummy
+scoreboard objectives add shop_particle_system dummy
+scoreboard objectives add shop_particle_2 dummy
+scoreboard objectives add shop_particle_3 dummy
+scoreboard objectives add shop_particle_4 dummy
+scoreboard objectives add shop_particle_5 dummy
+scoreboard objectives add shop_particle_6 dummy

+ 36 - 25
data/item/functions/shop/refresh_equip.mcfunction

@@ -1,36 +1,47 @@
 # 刷新单个玩家购买的物品
 
+# 01
 clear @s bow
-give @s[scores={shop_bow=1}] bow{display:{Name:'{"text":"弓","italic":false,"color":"gray"}'},Damage:381}
+give @s[scores={shop_01_bow=1}] bow{display:{Name:'{"text":"单发弓","italic":false,"color":"gray"}'},Damage:384}
+give @s[scores={shop_01_bow=2}] bow{display:{Name:'{"text":"弓","italic":false,"color":"gray"}'},Damage:346}
+give @s[scores={shop_01_bow=3}] bow{display:{Name:'{"text":"<冲击 I> 弓","italic":false,"color":"white"}'},Damage:346,Enchantments:[{id:"minecraft:punch",lvl:1s}]}
 
-clear @s wooden_shovel
-clear @s stone_shovel
-give @s[scores={shop_weapon=1}] wooden_shovel{display:{Name:'{"text":"木锹","italic":false,"color":"gray"}'}}
-give @s[scores={shop_weapon=2..}] stone_shovel{display:{Name:'{"text":"石锹","italic":false,"color":"gray"}'}}
-
-clear @s splash_potion
-give @s[scores={shop_potion_spd=1}] splash_potion{CustomPotionEffects:[{Id:1,Amplifier:0,Duration:300}],CustomPotionColor:8039610,display:{Name:'{"text":"喷溅型迅捷药水","italic":false,"color":"gray"}'}}
-give @s[scores={shop_potion_spd=2}] splash_potion{CustomPotionEffects:[{Id:1,Amplifier:1,Duration:300}],CustomPotionColor:8039610,display:{Name:'{"text":"喷溅型迅捷药水","italic":false,"color":"gray"}'}}
-give @s[scores={shop_potion_rst=1}] splash_potion{CustomPotionEffects:[{Id:11,Amplifier:0,Duration:400}],CustomPotionColor:9913400,display:{Name:'{"text":"喷溅型抵抗药水","italic":false,"color":"gray"}'}}
+# 02
+clear @s arrow
+clear @s tipped_arrow
+give @s[scores={shop_02_arrow=1}] arrow
+give @s[scores={shop_02_arrow=2}] arrow 2
+give @s[scores={shop_02_arrow=3}] tipped_arrow{Potion:"minecraft:slowness"} 2
 
+# 03
 clear @s golden_apple
 clear @s enchanted_golden_apple
-give @s[scores={shop_apple=1}] golden_apple{display:{Lore:['{"text":"恢复 4 颗心或生命 +1","italic":false,"color":"gray"}'],Name:'{"text":"生命果","italic":false,"color":"green"}'}}
-give @s[scores={shop_apple=2}] enchanted_golden_apple{display:{Name:'{"text":"附魔生命果","italic":false}',Lore:['{"text":"恢复到满血或生命加倍","italic":false,"color":"gray"}']}}
-scoreboard players reset @s shop_apple
+give @s[scores={shop_03_apple=1}] golden_apple{display:{Lore:['{"text":"恢复 4 颗心或生命 +1","italic":false,"color":"gray"}'],Name:'{"text":"生命果","italic":false,"color":"aqua"}'}}
+give @s[scores={shop_03_apple=2}] enchanted_golden_apple{display:{Name:'{"text":"附魔生命果","italic":false,"color":"light_purple"}',Lore:['{"text":"恢复到满血或生命加倍","italic":false,"color":"gray"}']}}
+scoreboard players reset @s shop_03_apple
 
-clear @s arrow
-clear @s tipped_arrow
-give @s[scores={shop_arrow=1}] arrow
-give @s[scores={shop_arrow=2}] arrow 2
-give @s[scores={shop_arrow=3}] tipped_arrow{Potion:"minecraft:slowness"} 2
+# 04
+clear @s potion
+give @s[scores={shop_04_float=1}] potion{CustomPotionEffects:[{Id:25,Amplifier:1,Duration:40}],CustomPotionColor:8039610,display:{Name:'{"text":"弱效浮空药水","italic":false,"color":"gray"}'}}
+give @s[scores={shop_04_float=2}] potion{CustomPotionEffects:[{Id:25,Amplifier:1,Duration:60}],CustomPotionColor:8039610,display:{Name:'{"text":"浮空药水","italic":false,"color":"white"}'}}
 
-clear @s crossbow
-give @s[scores={shop_firework=1}] minecraft:crossbow{display:{Name:'{"text":"烟花弩","italic":false,"color":"gray"}',Lore:['{"text":"发射一个漂亮的烟花!","italic":false,"color":"gray"}']},Damage:326,Charged:1b,ChargedProjectiles:[{id:"firework_rocket",Count:1b,tag:{Fireworks:{Flight:1b,Explosions:[{Type:0b,Colors:[I;11743532,15435844,14602026,4312372,6719955,2437522,8073150]}]}}}]} 1
+# 05
+clear @s wooden_axe
+clear @s golden_axe
+give @s[scores={shop_05_axe=1}] wooden_axe{display:{Name:'{"text":"木斧","italic":false,"color":"gray"}'},Damage:54}
+give @s[scores={shop_05_axe=2}] golden_axe{display:{Name:'{"text":"金斧","italic":false,"color":"gray"}'},Damage:28}
+give @s[scores={shop_05_axe=3}] golden_axe{display:{Name:'{"text":"金斧","italic":false,"color":"white"}'},Damage:25}
 
-item replace entity @s armor.chest with air
-item replace entity @s[scores={shop_armor=3..}] armor.chest with golden_chestplate{display:{Name:'{"text":"金胸甲","italic":false,"color":"gray"}'}}
-item replace entity @s armor.legs with air
-item replace entity @s[scores={shop_armor=2}] armor.legs with golden_leggings{display:{Name:'{"text":"金护腿","italic":false,"color":"gray"}'}}
+# 06
 item replace entity @s armor.feet with air
-item replace entity @s[scores={shop_armor=1}] armor.feet with golden_boots{display:{Name:'{"text":"金靴子","italic":false,"color":"gray"}'}}
+item replace entity @s[scores={shop_06_armor=1}] armor.feet with leather_boots{display:{Name:'{"text":"皮革靴子","italic":false,"color":"gray"}'}}
+item replace entity @s[scores={shop_06_armor=2}] armor.feet with iron_boots{display:{Name:'{"text":"铁靴子","italic":false,"color":"gray"}'}}
+item replace entity @s[scores={shop_06_armor=3}] armor.feet with diamond_boots{display:{Name:'{"text":"钻石靴子","italic":false,"color":"white"}'}}
+item replace entity @s[scores={shop_06_armor=4}] armor.feet with netherite_boots{display:{Name:'{"text":"下界合金靴子","italic":false,"color":"aqua"}'}}
+
+# 07
+clear @s fishing_rod
+give @s[scores={shop_07_fish=1}] fishing_rod{display:{Name:'{"text":"钓鱼竿","italic":false,"color":"gray"}'},Damage:62}
+give @s[scores={shop_07_fish=2}] fishing_rod{display:{Name:'{"text":"钓鱼竿","italic":false,"color":"gray"}'},Damage:56}
+give @s[scores={shop_07_fish=3}] fishing_rod{display:{Name:'{"text":"<饵钓 II> 钓鱼竿","italic":false,"color":"white"}'},Damage:56,Enchantments:[{id:"minecraft:lure",lvl:2s}]}
+give @s[scores={shop_07_fish=4}] fishing_rod{display:{Name:'{"text":"<饵钓 II> 钓鱼竿","italic":false,"color":"white"}'},Damage:50,Enchantments:[{id:"minecraft:lure",lvl:2s}]}

+ 2 - 2
data/item/functions/shop/refresh_gold.mcfunction

@@ -1,7 +1,7 @@
 # 刷新单个玩家背包中的金粒
 
-execute unless entity @s[scores={gold=0..}] run scoreboard players set @s gold 0
-execute unless entity @s[scores={gold=0..}] run scoreboard players set @s gold_total 0
+scoreboard players add @s gold 0
+scoreboard players add @s gold_total 0
 clear @s gold_block
 clear @s gold_ingot
 clear @s gold_nugget

+ 2 - 2
data/item/functions/shop/refresh_green.mcfunction

@@ -1,7 +1,7 @@
 # 刷新单个玩家背包中的绿宝石
 
-execute unless entity @s[scores={green=0..}] run scoreboard players set @s green 0
-execute unless entity @s[scores={green=0..}] run scoreboard players set @s green_total 0
+scoreboard players add @s green 0
+scoreboard players add @s green_total 0
 clear @s emerald_block
 clear @s emerald
 

+ 0 - 1
data/item/functions/shop/special_bgm.mcfunction

@@ -1 +0,0 @@
-execute as @a run function lib:sounds/music/mini_fast

+ 0 - 1
data/item/functions/shop/special_easter_egg.mcfunction

@@ -1 +0,0 @@
-execute at @s run playsound entity.enderman.scream ambient @a 0 1000000 0 1000000

+ 0 - 1
data/item/functions/shop/special_pig.mcfunction

@@ -1 +0,0 @@
-execute at @s run playsound entity.pig.ambient ambient @a 0 1000000 0 1000000

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

@@ -25,6 +25,7 @@ gamerule announceAdvancements true
 # 主寄存区块:将所有需要不卸载的都放里面
 #   已占用:(0,0,0) (0,0,1) (0,1,0) (0,1,1)
 forceload add 0 0
+forceload add 0 1900 50 2000
 setblock 0 0 0 jukebox
 setblock 0 0 1 shulker_box
 setblock 0 1 0 minecraft:acacia_wall_sign[facing=north]
@@ -62,38 +63,10 @@ scoreboard objectives remove player_id
 scoreboard objectives add player_id dummy "玩家编号"
 scoreboard objectives remove music_time
 scoreboard objectives add music_time dummy "BGM 时间"
-scoreboard players set $ game_id 0
-scoreboard players set $ round_id 0
-
-# 商店系统记分板
-scoreboard objectives add gold dummy "金粒"
-scoreboard objectives add gold_total dummy "总金粒"
-scoreboard objectives add green dummy "绿宝石"
-scoreboard objectives add green_total dummy "总绿宝石"
-scoreboard objectives add buy_trigger trigger "触发器_购买物品"
-scoreboard objectives add shop_arrow dummy "箭升级"
-scoreboard objectives add shop_potion dummy "药水升级"
-scoreboard objectives add shop_apple dummy "苹果升级"
-scoreboard objectives add shop_armor dummy "护甲升级"
-scoreboard objectives add shop_weapon dummy "武器升级"
-scoreboard objectives add shop_orange dummy "活跃橙升级"
-scoreboard objectives add shop_potion_spd dummy "速度药水升级"
-scoreboard objectives add shop_potion_rst dummy "抗性药水升级"
-scoreboard objectives add shop_bow dummy "弓升级"
-scoreboard objectives add shop_firework dummy "烟花"
-scoreboard objectives add shop_bgm dummy "BGM"
-scoreboard objectives add shop_pig dummy "猪叫"
-scoreboard objectives add shop_easter_egg dummy "臭彩蛋"
-scoreboard objectives add shop_particle_s dummy "粒子效果系统"
-scoreboard objectives add shop_particle_2 dummy "粒子效果2"
-scoreboard objectives add shop_particle_3 dummy "粒子效果3"
-scoreboard objectives add shop_particle_4 dummy "粒子效果4"
-scoreboard objectives add shop_particle_5 dummy "粒子效果5"
-scoreboard objectives add shop_particle_6 dummy "粒子效果6"
-scoreboard objectives add particle_type dummy "粒子种类"
-scoreboard objectives add shop_dice dummy "骰子"
 scoreboard objectives add stat_total dummy "总场次"
 scoreboard objectives add stat_win dummy "总胜场"
+scoreboard players set $ game_id 0
+scoreboard players set $ round_id 0
 
 # 常量与变量初始化
 scoreboard players set #mini_total mem 5

+ 1 - 0
data/ltw/functions/main/game_end.mcfunction

@@ -83,3 +83,4 @@ schedule function ltw:state/0/state_enter 2t replace
 execute as @a at @s run function lib:sounds/theend
 forceload remove all
 forceload add 0 0
+forceload add 0 1900 50 2000

+ 1 - 1
data/ltw/functions/state/0/state/check_slot.mcfunction

@@ -5,4 +5,4 @@ execute unless data entity @s[team=playing] Inventory[{Slot:8b,tag:{lobby_item:1
 execute if data entity @s[team=playing] Inventory[{tag:{lobby_item:1b,lobby_watch:1b}}] run clear @s gray_dye{lobby_item:1b,lobby_watch:1b}
 
 # 清除临时物品
-clear @s red_dye{LockTempItem:1b}
+clear @s crimson_button{LockTempItem:1b}

+ 1 - 0
data/ltw/functions/state/0/state_enter.mcfunction

@@ -33,6 +33,7 @@ function ltw:state/0/summon_entity
 # 清理加载区域
 forceload remove all
 forceload add 0 0
+forceload add 0 1900 50 2000
 
 # 启用节奏跑酷
 scoreboard players set $tempo_enable mem 1

+ 1 - 1
data/ltw/functions/state/0/summon_entity.mcfunction

@@ -3,7 +3,7 @@ execute unless entity @e[type=piglin,tag=shop_piglin_1,tag=lobby_entity] run sum
 execute unless entity @e[type=piglin,tag=shop_piglin_2,tag=lobby_entity] run summon piglin 0 22 -60 {Tags:["lobby_entity","shop_piglin_2"],PersistenceRequired:1b,IsImmuneToZombification:1b,CannotHunt:1b,HandItems:[{id:"music_disc_pigstep",Count:1b},{}],HandDropChances:[0.0f,0.0f]}
 execute unless entity @e[type=piglin,tag=shop_piglin_3,tag=lobby_entity] run summon piglin 1 9 -37 {Tags:["lobby_entity","shop_piglin_3"],PersistenceRequired:1b,IsImmuneToZombification:1b,CannotHunt:1b,HandItems:[{id:"fishing_rod",Count:1b},{}],HandDropChances:[0.0f,0.0f]}
 execute unless entity @e[type=pig,tag=shop_piglin_4,tag=lobby_entity] run summon pig 9 11 -36 {Tags:["lobby_entity","shop_piglin_4"],PersistenceRequired:1b}
-execute unless entity @e[type=piglin,tag=shop_piglin_5,tag=lobby_entity] run summon piglin 19 12 -39 {Tags:["lobby_entity","shop_piglin_5"],PersistenceRequired:1b,IsImmuneToZombification:1b,CannotHunt:1b,ArmorItems:[{id:"golden_boots",Count:1b},{id:"golden_leggings",Count:1b},{id:"golden_chestplate",Count:1b},{id:"golden_helmet",Count:1b}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandItems:[{id:"golden_chestplate",Count:1b},{}],HandDropChances:[0.0f,0.0f]}
+execute unless entity @e[type=piglin,tag=shop_piglin_5,tag=lobby_entity] run summon piglin 19 12 -39 {Tags:["lobby_entity","shop_piglin_5"],PersistenceRequired:1b,IsImmuneToZombification:1b,CannotHunt:1b,ArmorItems:[{id:"golden_boots",Count:1b},{id:"golden_leggings",Count:1b},{id:"golden_chestplate",Count:1b},{id:"golden_helmet",Count:1b}],ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],HandItems:[{id:"netherite_boots",Count:1b},{}],HandDropChances:[0.0f,0.0f]}
 execute unless entity @e[type=piglin,tag=shop_piglin_6,tag=lobby_entity] run summon piglin 23 10 -48 {Tags:["lobby_entity","shop_piglin_6"],PersistenceRequired:1b,IsImmuneToZombification:1b,CannotHunt:1b,HandItems:[{id:"golden_axe",Count:1b,tag:{Potion:"minecraft:slowness"}},{}],HandDropChances:[0.0f,0.0f]}
 execute unless entity @e[type=piglin,tag=shop_piglin_7,tag=lobby_entity] run summon piglin 22 12 -59 {Tags:["lobby_entity","shop_piglin_7"],PersistenceRequired:1b,IsImmuneToZombification:1b,CannotHunt:1b,HandItems:[{id:"potion",Count:1b,tag:{CustomPotionColor:8039610}},{}],HandDropChances:[0.0f,0.0f]}
 execute unless entity @e[type=piglin,tag=shop_piglin_8,tag=lobby_entity] run summon piglin 11 10 -61 {Tags:["lobby_entity","shop_piglin_8"],PersistenceRequired:1b,IsImmuneToZombification:1b,CannotHunt:1b,HandItems:[{id:"golden_apple",Count:1b},{}],HandDropChances:[0.0f,0.0f]}

+ 1 - 1
data/ltw/functions/state/6/player_enter.mcfunction

@@ -27,5 +27,5 @@ spectate
 
 # 清理物品
 clear @s #mini:game_item{game_item:1b}
-clear @s red_dye{LockItem:1b}
+clear @s crimson_button{LockItem:1b}
 recipe take @s *

+ 0 - 3
data/ltw/functions/state/6/state_enter.mcfunction

@@ -15,9 +15,6 @@ function mini:main/kill_remaining_entity
 # 初始化倒计时
 scoreboard players set $countdown mem 4
 
-# 初始化地图
-forceload add 0 1900 50 2000
-
 # 生成地图
 setblock 0 10 2000 minecraft:structure_block{mode:"LOAD",name:"ltw:select"}
 setblock 0 11 2000 minecraft:redstone_block

+ 1 - 2
data/ltw/functions/state/7/continue_gameparty.mcfunction

@@ -4,5 +4,4 @@ function lib:bossbar/show
 
 # 继续下一轮小游戏
 scoreboard players add $round mem 1
-schedule function ltw:state/3/state_enter 2t replace
-forceload remove 0 1900 50 2000
+schedule function ltw:state/3/state_enter 2t replace

+ 1 - 1
data/mini/functions/colormatch/game/start_new_round.mcfunction

@@ -17,7 +17,7 @@ scoreboard players set $color_match_type mem 0
 # 拉玩家下来
 execute as @a[tag=color_match_fall] at @s run tp @s ~ 19 ~
 execute as @a[tag=color_match_fall] at @s run function lib:sounds/teleport
-execute if entity @a[tag=color_match_fall] run scoreboard players add $countdown_fast mem 5
+execute if entity @a[tag=color_match_fall] run scoreboard players add $countdown_fast mem 7
 tag @a[tag=color_match_fall] remove color_match_fall
 
 # 告知玩家

+ 1 - 1
data/mini/functions/main/player_enter.mcfunction

@@ -8,7 +8,7 @@ scoreboard players set @s[team=watching] mini_score -1000000
 function mini:main/update_player_count
 
 clear @s #mini:game_item{game_item:1b}
-clear @s red_dye{LockItem:1b}
+clear @s crimson_button{LockItem:1b}
 recipe take @s *
 
 execute if score $mini_type mem matches 1 run function mini:parkour/player_enter