LTCatt před 6 roky
rodič
revize
479c0ff7e5

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

@@ -19,7 +19,7 @@ execute as @a[tag=!total_rank1,tag=!total_rank2] unless entity @a[tag=total_rank
 
 # 计算金粒奖励
 scoreboard players set #total_gold mem 0
-execute as @a[tag=!watcher] run scoreboard players add #total_gold mem 800
+execute as @a[tag=!watcher] run scoreboard players add #total_gold mem 900
 # 无名次
 execute as @a[tag=!total_rank1,tag=!total_rank2,tag=!total_rank3,tag=!watcher] run scoreboard players remove #total_gold mem 100
 # 计算总权重与单份奖励

+ 4 - 4
data/ltw/functions/shop/buy_apple1.mcfunction

@@ -1,16 +1,16 @@
-# 金苹果 (30 gi)
+# 金苹果 (4 gb)
 
 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=270..}] add canbuy
+tag @s[scores={shop_apple=..0,gold=324..}] add canbuy
 
 tellraw @s[scores={shop_apple=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-tellraw @s[scores={shop_apple=..0,gold=..269}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+tellraw @s[scores={shop_apple=..0,gold=..323}] ["",{"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 270
+scoreboard players remove @s[tag=canbuy] gold 324
 
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error
 execute as @s[tag=canbuy] at @s run function lib:sounds/levelup

+ 4 - 4
data/ltw/functions/shop/buy_armor3.mcfunction

@@ -1,17 +1,17 @@
-# 皮革衣 (10 gi)
+# 皮革衣 (2 gb)
 
 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=90..}] add canbuy
+tag @s[scores={shop_armor=2,gold=162..}] add canbuy
 
 tellraw @s[scores={shop_armor=3..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-tellraw @s[scores={shop_armor=2,gold=..89}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+tellraw @s[scores={shop_armor=2,gold=..161}] ["",{"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 90
+scoreboard players remove @s[tag=canbuy] gold 162
 
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error
 execute as @s[tag=canbuy] at @s run function lib:sounds/levelup

+ 4 - 4
data/ltw/functions/shop/buy_potion1.mcfunction

@@ -1,16 +1,16 @@
-# 速度药 (5 gi)
+# 速度药 (1 gb)
 
 execute unless entity @s[scores={shop_potion=0..}] run scoreboard players set @s shop_potion 0
 tag @s remove canbuy
-tag @s[scores={shop_potion=..0,gold=36..}] add canbuy
+tag @s[scores={shop_potion=..0,gold=81..}] add canbuy
 
 tellraw @s[scores={shop_potion=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-tellraw @s[scores={shop_potion=..0,gold=..35}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+tellraw @s[scores={shop_potion=..0,gold=..80}] ["",{"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 1
-scoreboard players remove @s[tag=canbuy] gold 36
+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

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

@@ -17,7 +17,7 @@ scoreboard players operation @a game_id = $ game_id
 
 # 重置物品
 clear @a[tag=!watcher,tag=!debug]
-function ltw:shop/refresh_equip
+execute as @a[tag=!watcher,tag=!debug] at @s run function ltw:shop/refresh_equip
 
 # 开始小游戏
 function lib:sounds/music/stop

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

@@ -19,3 +19,6 @@ execute at @s run function lib:sounds/levelup
 # 自由旁观
 gamemode spectator @s[tag=!debug]
 spectate
+
+# 清理物品
+clear @s #mini:game_item{game_item:1b}