00ll00 6 лет назад
Родитель
Сommit
65973cd89a

+ 1 - 1
data/item/functions/shop/buy_apple1.mcfunction

@@ -5,7 +5,7 @@
     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=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"}]

+ 1 - 1
data/item/functions/shop/buy_armor1.mcfunction

@@ -5,7 +5,7 @@
     tag @s[scores={shop_armor=0,gold=9..}] add canbuy
 
     tellraw @s[scores={shop_armor=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-    tellraw @s[scores={shop_armor=0,gold=..8}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金块来购买这个物品!","color":"red"}]
+    tellraw @s[scores={shop_armor=0,gold=..8}] ["",{"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"}]

+ 1 - 1
data/item/functions/shop/buy_armor2.mcfunction

@@ -5,7 +5,7 @@
     tag @s[scores={shop_armor=1,gold=36..}] add canbuy
 
     tellraw @s[scores={shop_armor=2..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-    tellraw @s[scores={shop_armor=1,gold=..35}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金块来购买这个物品!","color":"red"}]
+    tellraw @s[scores={shop_armor=1,gold=..35}] ["",{"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"}]

+ 15 - 14
data/item/functions/shop/buy_arrow1.mcfunction

@@ -1,18 +1,19 @@
-# 箭 x1 (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
+# 缓慢之箭 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=1,gold=81..}] 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=2..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
+    tellraw @s[scores={shop_arrow=1,gold=..80}] ["",{"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":"箭 x1","color":"green"}]
-execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"箭 x1","color":"green"}]
-scoreboard players add @s[tag=canbuy] shop_arrow 1
-scoreboard players remove @s[tag=canbuy] gold 9
+    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] 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
+    execute as @s[tag=canbuy] run function item:shop/refresh_gold

+ 14 - 13
data/item/functions/shop/buy_orange.mcfunction

@@ -1,18 +1,19 @@
 # 活跃橙 (3 gb)
-# 触发器ID 8
-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
+    # 触发器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":"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"},", 请私聊龙猫领取!"]
-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
+    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_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] 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
+    execute as @s[tag=canbuy] run function item:shop/refresh_gold

+ 15 - 14
data/item/functions/shop/buy_weapon1.mcfunction

@@ -1,18 +1,19 @@
-# 木铲 (2 gi)
-# 触发器ID 10
-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=..0,gold=18..}] add canbuy
+# 钻石锹 (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=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-tellraw @s[scores={shop_weapon=..0,gold=..17}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+    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 18
+    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] 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
+    execute as @s[tag=canbuy] run function item:shop/refresh_gold

+ 8 - 0
data/item/functions/shop/check.mcfunction

@@ -4,5 +4,13 @@ execute if score @s buy_trigger matches 3 run function item:shop/buy_armor1
 execute if score @s buy_trigger matches 4 run function item:shop/buy_armor2
 execute if score @s buy_trigger matches 5 run function item:shop/buy_armor3
 execute if score @s buy_trigger matches 6 run function item:shop/buy_armor4
+execute if score @s buy_trigger matches 7 run function item:shop/buy_arrow1
+execute if score @s buy_trigger matches 8 run function item:shop/buy_arrow1
+execute if score @s buy_trigger matches 9 run function item:shop/buy_arrow1
+execute if score @s buy_trigger matches 10 run function item:shop/buy_orange
+execute if score @s buy_trigger matches 11 run function item:shop/buy_weapon1
+execute if score @s buy_trigger matches 12 run function item:shop/buy_weapon1
+execute if score @s buy_trigger matches 13 run function item:shop/buy_weapon1
+execute if score @s buy_trigger matches 14 run function item:shop/buy_weapon1
 scoreboard players set @s buy_trigger 0
 scoreboard players enable @s buy_trigger