LTCatt 6 лет назад
Родитель
Сommit
0399619e53

+ 3 - 2
data/ltw/functions/shop/buy_apple1.mcfunction

@@ -7,11 +7,12 @@ tag @s[scores={shop_apple=..0,gold=270..}] 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[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"生命果","color":"green"},"!"]
+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
 
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error
 execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
 
-function ltw:shop/refresh_gold
+function ltw:shop/refresh_gold

+ 2 - 1
data/ltw/functions/shop/buy_armor1.mcfunction

@@ -7,7 +7,8 @@ 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[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"皮革帽子","color":"green"},"!"]
+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
 

+ 2 - 1
data/ltw/functions/shop/buy_armor2.mcfunction

@@ -8,7 +8,8 @@ tellraw @s[scores={shop_armor=2..}] ["",{"text":">> ","color":"aqua","bold":true
 tellraw @s[scores={shop_armor=1,gold=..62}] ["",{"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"},"!"]
+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 63
 

+ 2 - 1
data/ltw/functions/shop/buy_armor3.mcfunction

@@ -8,7 +8,8 @@ tellraw @s[scores={shop_armor=3..}] ["",{"text":">> ","color":"aqua","bold":true
 tellraw @s[scores={shop_armor=2,gold=..89}] ["",{"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"},"!"]
+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
 

+ 2 - 1
data/ltw/functions/shop/buy_arrow1.mcfunction

@@ -7,7 +7,8 @@ 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[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"箭 x2","color":"green"},"!"]
+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 9
 

+ 2 - 1
data/ltw/functions/shop/buy_arrow2.mcfunction

@@ -8,7 +8,8 @@ tellraw @s[scores={shop_arrow=2..}] ["",{"text":">> ","color":"aqua","bold":true
 tellraw @s[scores={shop_arrow=1,gold=..44}] ["",{"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":"缓慢之箭 x3","color":"green"},"!"]
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你升级到了 ",{"text":"缓慢之箭 x3","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 升级到了 ",{"text":"缓慢之箭 x3","color":"green"}]
 scoreboard players add @s[tag=canbuy] shop_arrow 1
 scoreboard players remove @s[tag=canbuy] gold 45
 

+ 2 - 1
data/ltw/functions/shop/buy_potion1.mcfunction

@@ -7,7 +7,8 @@ tag @s[scores={shop_potion=..0,gold=36..}] 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[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"速度 (0:20) 药水","color":"green"},"!"]
+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
 

+ 2 - 1
data/ltw/functions/shop/buy_weapon1.mcfunction

@@ -7,7 +7,8 @@ tag @s[scores={shop_weapon=..0,gold=18..}] 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[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"木锹","color":"green"},"!"]
+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
 

+ 2 - 1
data/ltw/functions/shop/buy_weapon2.mcfunction

@@ -8,7 +8,8 @@ tellraw @s[scores={shop_weapon=2..}] ["",{"text":">> ","color":"aqua","bold":tru
 tellraw @s[scores={shop_weapon=1,gold=..53}] ["",{"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"},"!"]
+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 54
 

+ 3 - 3
data/mini/functions/slime/game/set_attack.mcfunction

@@ -1,3 +1,3 @@
-execute if score $countdown mem matches 61.. as @e[type=slime] run attribute @s minecraft:generic.attack_damage base set 3
-execute if score $countdown mem matches 31..60 as @e[type=slime] run attribute @s minecraft:generic.attack_damage base set 5
-execute if score $countdown mem matches ..30 as @e[type=slime] run attribute @s minecraft:generic.attack_damage base set 7
+execute if score $countdown mem matches 91.. as @e[type=slime] run attribute @s minecraft:generic.attack_damage base set 2.5
+execute if score $countdown mem matches 31..90 as @e[type=slime] run attribute @s minecraft:generic.attack_damage base set 4
+execute if score $countdown mem matches ..30 as @e[type=slime] run attribute @s minecraft:generic.attack_damage base set 6

+ 2 - 2
data/mini/functions/slime/game/summon.mcfunction

@@ -1,4 +1,4 @@
 # 召唤史莱姆
-summon slime 1012.0 6.01 7015.0 {Size:2}
+summon slime 1010.00 6.01 7008.98 {Size:2}
 effect give @e[type=slime] resistance 1000000 5 true
-schedule function mini:slime/game/set_attack 1t
+schedule function mini:slime/game/set_attack 1t

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

@@ -11,7 +11,7 @@ gamerule naturalRegeneration false
 effect give @s night_vision 1000000 0 true
 
 # 传送玩家
-tp @s[tag=!debug] 1003.00 7.41 7003.04
+tp @s[tag=!debug] 1002.0 7.5 7002.0
 
 # 调整模式
 gamemode spectator @s[tag=!debug]

+ 1 - 1
data/mini/functions/slime/player_intro.mcfunction

@@ -1,5 +1,5 @@
 # 向单个玩家展示小游戏介绍
-tp @s[tag=!debug] 1008.54 7.69 7003.91 332.38 9.83
+tp @s[tag=!debug] 1004.13 7.86 7003.00 -2922.38 12.84
 tellraw @s ["",{"text":"\n >> 夺命足球 >>\n\n","color":"gold","bold":true}," 将史莱姆踢到其他人的脸上, 干掉他们!\n"]
 tellraw @s ["",{"text": " <死亡淘汰制> ","color":"red","bold": true}, {"text":"生命无法自然恢复, 被史莱姆杀死时即被淘汰。","color":"gray"}]
 tellraw @s ["",{"text": " <间接 PVP> ","color":"light_purple","bold": true}, {"text":"无法直接攻击他人, 但可以击退史莱姆撞击他人。","color":"gray"}]

+ 10 - 10
data/mini/functions/slime/tick20.mcfunction

@@ -1,17 +1,17 @@
 
+# 属性提升 1
+execute if score $countdown mem matches 90 run function mini:slime/game/set_attack
+execute if score $countdown mem matches 90 run tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"text": "史莱姆的攻击力提高了!","color":"red"}]
+execute if score $countdown mem matches 90 as @a at @s run function lib:sounds/error
+
 # 召唤提示 1
-execute if score $countdown mem matches 95 run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"text": "新的史莱姆将在 5 秒后空投到球场中央!","color":"gold"}]
-execute if score $countdown mem matches 95 as @a at @s run function lib:sounds/error
+execute if score $countdown mem matches 65 run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"text": "新的史莱姆将在 5 秒后空投到球场中央!","color":"gold"}]
+execute if score $countdown mem matches 65 as @a at @s run function lib:sounds/error
 
 # 召唤 1
-execute if score $countdown mem matches 90 run function mini:slime/game/summon
-execute if score $countdown mem matches 90 run tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"text": "新的史莱姆已空投!","color":"red"}]
-execute if score $countdown mem matches 90 as @a at @s run function lib:sounds/teleport
-
-# 属性提升 1
-execute if score $countdown mem matches 60 run function mini:slime/game/set_attack
-execute if score $countdown mem matches 60 run tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"text": "史莱姆的攻击力提高了!","color":"red"}]
-execute if score $countdown mem matches 60 as @a at @s run function lib:sounds/error
+execute if score $countdown mem matches 60 run function mini:slime/game/summon
+execute if score $countdown mem matches 60 run tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"text": "新的史莱姆已空投!","color":"red"}]
+execute if score $countdown mem matches 60 as @a at @s run function lib:sounds/teleport
 
 # 属性提升 2
 execute if score $countdown mem matches 30 run function mini:slime/game/set_attack

+ 1 - 1
data/mini/functions/slime/watcher_limit.mcfunction

@@ -1,3 +1,3 @@
 # 观察者限制飞行范围
 execute as @a[gamemode=spectator] unless entity @s[x=1001,y=6,z=7001,dx=30,dy=4,dz=30] run spectate
-execute as @a[gamemode=spectator] unless entity @s[x=1001,y=6,z=7001,dx=30,dy=4,dz=30] run tp @s[tag=!debug] 1008.54 7.69 7003.91 332.38 9.83
+execute as @a[gamemode=spectator] unless entity @s[x=1001,y=6,z=7001,dx=30,dy=4,dz=30] run tp @s[tag=!debug] 1004.13 7.86 7003.00 -2922.38 12.84