Merge branch 'master' of github.com:LTCatt/LTW3

data/ltw/functions/main/player_enter.mcfunction

@@ -37,7 +37,6 @@ function lib:bossbar/show
 
 # FIXME: [LTCat] BGM 可能会双响
 # TODO: [LTCat] {幻翼} 在玩家第一次到达半血时显示回血的提示
-# TODO: [LTCat] {色彩} 添加音效、修改描述
 # TODO: [LTCat] 增加文本可读性
 # TODO: [HIM] 重新处理主大厅的物品给予，在格子上显示固定的物品
 # TODO: [HIM] 不死图腾的处理

data/mini/functions/colormatch/game/start_new_round.mcfunction

@@ -4,7 +4,8 @@ function mini:colormatch/game/replace_wall
 execute positioned 1001 10 4000 run clone ~ ~ ~ ~20 ~ ~20 1050 16 4000 filtered #mini:colarmatch_floor
 
 # 设置倒计时
-scoreboard players remove $color_match_time mem 3
+execute if score $color_match_time mem matches 20.. run scoreboard players remove $color_match_time mem 3
+execute if score $color_match_time mem matches ..19 run scoreboard players remove $color_match_time mem 2
 execute if entity @a[tag=color_match_fall] run scoreboard players add $color_match_time mem 5
 execute if score $color_match_time mem matches 30.. run scoreboard players remove $color_match_time mem 3
 execute if score $color_match_time mem matches ..10 run scoreboard players set $color_match_time mem 11
@@ -15,6 +16,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
 tag @a[tag=color_match_fall] remove color_match_fall
 

data/mini/functions/colormatch/player_intro.mcfunction

@@ -1,9 +1,8 @@
 # 向单个玩家展示小游戏介绍
 tp @s[team=!debugging] 1062.78 22.00 4019.40 178.41 40.03
-tellraw @s ["",{"text":"\n >> 色彩迷阵 >>\n\n","color":"gold","bold":true}," 倒计时结束时地板会消失, 只有站在与墙壁显示的方块相同的地板上才能存活!\n"]
+tellraw @s ["",{"text":"\n >> 色彩迷阵 >>\n\n","color":"gold","bold":true}," 倒计时结束时地板会消失, 站在与墙壁窗口显示的方块相同的地板上才能存活!\n"]
 tellraw @s ["",{"text": " <生命淘汰制> ","color":"red","bold": true}, {"text":"你有 3 条生命, 生命耗尽后即被淘汰。","color":"gray"}]
 tellraw @s ["",{"text": " <PVP 干扰> ","color":"light_purple","bold": true}, {"text":"攻击其他玩家可以造成击退, 但没有伤害。","color":"gray"}]
-tellraw @s ["",{"text": " <原型> ","color":"gold","bold": true}, {"text":"此游戏目前仅用于玩法测试, 尚未进行修缮。","color":"gray"}]
 tellraw @s ""
 
 effect give @s night_vision 1000000 0 true

data/mini/functions/colormatch/player_lose_heart.mcfunction

@@ -3,6 +3,7 @@ tellraw @a ["",{"text":">> ","color":"gold","bold": true},{"selector":"@s","colo
 
 # 失去一颗心
 function mini:main/player_lose_heart
+function lib:sounds/error
 
 # 拉上屏障
 execute if entity @s[tag=mini_running] run tp @s 1060 29 4010

data/mini/functions/parkour/game/test_treasure.mcfunction

@@ -4,61 +4,61 @@ execute positioned 1009.50 14.50 1007.50 as @a[tag=!treasure1,team=playing,gamem
 execute positioned 1009.50 14.50 1007.50 as @a[tag=!treasure1,team=playing,gamemode=!spectator,distance=..2] run tag @s add get_treasure
 execute positioned 1009.50 14.50 1007.50 as @a[tag=!treasure1,team=playing,gamemode=!spectator,distance=..2] run tag @s add treasure1
 execute positioned 1009.50 14.50 1007.50 run particle minecraft:crit ~ ~0.9 ~ 0.25 0.25 0.25 0.2 5 normal @a[tag=!treasure1]
-execute positioned 1009.50 14.50 1007.50 run particle minecraft:totem_of_undying ~ ~0.9 ~ 0.25 0.25 0.25 0.2 5 normal @a[tag=treasure1]
+execute positioned 1009.50 14.50 1007.50 run particle minecraft:totem_of_undying ~ ~0.9 ~ 0.2 0.2 0.2 0.2 3 normal @a[tag=treasure1]
 
 execute positioned 1020.50 15.50 1016.50 as @a[tag=!treasure2,team=playing,gamemode=!spectator,distance=..2] unless entity @a[tag=treasure2] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "沙漠骨骸","color":"gold"}," 的宝藏!"]
 execute positioned 1020.50 15.50 1016.50 as @a[tag=!treasure2,team=playing,gamemode=!spectator,distance=..2] run tag @s add get_treasure
 execute positioned 1020.50 15.50 1016.50 as @a[tag=!treasure2,team=playing,gamemode=!spectator,distance=..2] run tag @s add treasure2
 execute positioned 1020.50 15.50 1016.50 run particle minecraft:crit ~ ~0.9 ~ 0.25 0.25 0.25 0.2 5 normal @a[tag=!treasure2]
-execute positioned 1020.50 15.50 1016.50 run particle minecraft:totem_of_undying ~ ~0.9 ~ 0.25 0.25 0.25 0.2 5 normal @a[tag=treasure2]
+execute positioned 1020.50 15.50 1016.50 run particle minecraft:totem_of_undying ~ ~0.9 ~ 0.2 0.2 0.2 0.2 3 normal @a[tag=treasure2]
 
 execute positioned 1008.50 30.50 1020.50 as @a[tag=!treasure3,team=playing,gamemode=!spectator,distance=..2] unless entity @a[tag=treasure3] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "神庙立柱","color":"gold"}," 的宝藏!"]
 execute positioned 1008.50 30.50 1020.50 as @a[tag=!treasure3,team=playing,gamemode=!spectator,distance=..2] run tag @s add get_treasure
 execute positioned 1008.50 30.50 1020.50 as @a[tag=!treasure3,team=playing,gamemode=!spectator,distance=..2] run tag @s add treasure3
 execute positioned 1008.50 30.50 1020.50 run particle minecraft:crit ~ ~0.9 ~ 0.25 0.25 0.25 0.2 5 normal @a[tag=!treasure3]
-execute positioned 1008.50 30.50 1020.50 run particle minecraft:totem_of_undying ~ ~0.9 ~ 0.25 0.25 0.25 0.2 5 normal @a[tag=treasure3]
+execute positioned 1008.50 30.50 1020.50 run particle minecraft:totem_of_undying ~ ~0.9 ~ 0.2 0.2 0.2 0.2 3 normal @a[tag=treasure3]
 
 execute positioned 1011.50 19.50 1058.50 as @a[tag=!treasure4,team=playing,gamemode=!spectator,distance=..2] unless entity @a[tag=treasure4] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "下界之门","color":"gold"}," 的宝藏!"]
 execute positioned 1011.50 19.50 1058.50 as @a[tag=!treasure4,team=playing,gamemode=!spectator,distance=..2] run tag @s add get_treasure
 execute positioned 1011.50 19.50 1058.50 as @a[tag=!treasure4,team=playing,gamemode=!spectator,distance=..2] run tag @s add treasure4
 execute positioned 1011.50 19.50 1058.50 run particle minecraft:crit ~ ~0.9 ~ 0.25 0.25 0.25 0.2 5 normal @a[tag=!treasure4]
-execute positioned 1011.50 19.50 1058.50 run particle minecraft:totem_of_undying ~ ~0.9 ~ 0.25 0.25 0.25 0.2 5 normal @a[tag=treasure4]
+execute positioned 1011.50 19.50 1058.50 run particle minecraft:totem_of_undying ~ ~0.9 ~ 0.2 0.2 0.2 0.2 3 normal @a[tag=treasure4]
 
 execute positioned 1026.50 18.50 1047.00 as @a[tag=!treasure5,team=playing,gamemode=!spectator,distance=..2] unless entity @a[tag=treasure5] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "落日森林","color":"gold"}," 的宝藏!"]
 execute positioned 1026.50 18.50 1047.00 as @a[tag=!treasure5,team=playing,gamemode=!spectator,distance=..2] run tag @s add get_treasure
 execute positioned 1026.50 18.50 1047.00 as @a[tag=!treasure5,team=playing,gamemode=!spectator,distance=..2] run tag @s add treasure5
 execute positioned 1026.50 18.50 1047.00 run particle minecraft:crit ~ ~0.9 ~ 0.25 0.25 0.25 0.2 5 normal @a[tag=!treasure5]
-execute positioned 1026.50 18.50 1047.00 run particle minecraft:totem_of_undying ~ ~0.9 ~ 0.25 0.25 0.25 0.2 5 normal @a[tag=treasure5]
+execute positioned 1026.50 18.50 1047.00 run particle minecraft:totem_of_undying ~ ~0.9 ~ 0.2 0.2 0.2 0.2 3 normal @a[tag=treasure5]
 
 execute positioned 1004.50 18.50 1043.50 as @a[tag=!treasure6,team=playing,gamemode=!spectator,distance=..2] unless entity @a[tag=treasure6] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "地狱之顶","color":"gold"}," 的宝藏!"]
 execute positioned 1004.50 18.50 1043.50 as @a[tag=!treasure6,team=playing,gamemode=!spectator,distance=..2] run tag @s add get_treasure
 execute positioned 1004.50 18.50 1043.50 as @a[tag=!treasure6,team=playing,gamemode=!spectator,distance=..2] run tag @s add treasure6
 execute positioned 1004.50 18.50 1043.50 run particle minecraft:crit ~ ~0.9 ~ 0.25 0.25 0.25 0.2 5 normal @a[tag=!treasure6]
-execute positioned 1004.50 18.50 1043.50 run particle minecraft:totem_of_undying ~ ~0.9 ~ 0.25 0.25 0.25 0.2 5 normal @a[tag=treasure6]
+execute positioned 1004.50 18.50 1043.50 run particle minecraft:totem_of_undying ~ ~0.9 ~ 0.2 0.2 0.2 0.2 3 normal @a[tag=treasure6]
 
 execute positioned 1013.00 08.50 1041.00 as @a[tag=!treasure7,team=playing,gamemode=!spectator,distance=..2] unless entity @a[tag=treasure7] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "节奏舞厅","color":"gold"}," 的宝藏!"]
 execute positioned 1013.00 08.50 1041.00 as @a[tag=!treasure7,team=playing,gamemode=!spectator,distance=..2] run tag @s add get_treasure
 execute positioned 1013.00 08.50 1041.00 as @a[tag=!treasure7,team=playing,gamemode=!spectator,distance=..2] run tag @s add treasure7
 execute positioned 1013.00 08.50 1041.00 run particle minecraft:crit ~ ~0.9 ~ 0.25 0.25 0.25 0.2 5 normal @a[tag=!treasure7]
-execute positioned 1013.00 08.50 1041.00 run particle minecraft:totem_of_undying ~ ~0.9 ~ 0.25 0.25 0.25 0.2 5 normal @a[tag=treasure7]
+execute positioned 1013.00 08.50 1041.00 run particle minecraft:totem_of_undying ~ ~0.9 ~ 0.2 0.2 0.2 0.2 3 normal @a[tag=treasure7]
 
 execute positioned 1007.50 13.50 1025.50 as @a[tag=!treasure8,team=playing,gamemode=!spectator,distance=..2] unless entity @a[tag=treasure8] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "末路营火","color":"gold"}," 的宝藏!"]
 execute positioned 1007.50 13.50 1025.50 as @a[tag=!treasure8,team=playing,gamemode=!spectator,distance=..2] run tag @s add get_treasure
 execute positioned 1007.50 13.50 1025.50 as @a[tag=!treasure8,team=playing,gamemode=!spectator,distance=..2] run tag @s add treasure8
 execute positioned 1007.50 13.50 1025.50 run particle minecraft:crit ~ ~0.9 ~ 0.25 0.25 0.25 0.2 5 normal @a[tag=!treasure8]
-execute positioned 1007.50 13.50 1025.50 run particle minecraft:totem_of_undying ~ ~0.9 ~ 0.25 0.25 0.25 0.2 5 normal @a[tag=treasure8]
+execute positioned 1007.50 13.50 1025.50 run particle minecraft:totem_of_undying ~ ~0.9 ~ 0.2 0.2 0.2 0.2 3 normal @a[tag=treasure8]
 
 execute positioned 1024.50 29.50 1038.50 as @a[tag=!treasure9,team=playing,gamemode=!spectator,distance=..2] unless entity @a[tag=treasure9] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "活塞平台","color":"gold"}," 的宝藏!"]
 execute positioned 1024.50 29.50 1038.50 as @a[tag=!treasure9,team=playing,gamemode=!spectator,distance=..2] run tag @s add get_treasure
 execute positioned 1024.50 29.50 1038.50 as @a[tag=!treasure9,team=playing,gamemode=!spectator,distance=..2] run tag @s add treasure9
 execute positioned 1024.50 29.50 1038.50 run particle minecraft:crit ~ ~0.9 ~ 0.25 0.25 0.25 0.2 5 normal @a[tag=!treasure9]
-execute positioned 1024.50 29.50 1038.50 run particle minecraft:totem_of_undying ~ ~0.9 ~ 0.25 0.25 0.25 0.2 5 normal @a[tag=treasure9]
+execute positioned 1024.50 29.50 1038.50 run particle minecraft:totem_of_undying ~ ~0.9 ~ 0.2 0.2 0.2 0.2 3 normal @a[tag=treasure9]
 
 execute positioned 1014.50 19.50 1024.50 as @a[tag=!treasure10,team=playing,gamemode=!spectator,distance=..2] unless entity @a[tag=treasure10] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "沙漠密室","color":"gold"}," 的宝藏!"]
 execute positioned 1014.50 19.50 1024.50 as @a[tag=!treasure10,team=playing,gamemode=!spectator,distance=..2] run tag @s add get_treasure
 execute positioned 1014.50 19.50 1024.50 as @a[tag=!treasure10,team=playing,gamemode=!spectator,distance=..2] run tag @s add treasure10
 execute positioned 1014.50 19.50 1024.50 run particle minecraft:crit ~ ~0.9 ~ 0.25 0.25 0.25 0.2 5 normal @a[tag=!treasure10]
-execute positioned 1014.50 19.50 1024.50 run particle minecraft:totem_of_undying ~ ~0.9 ~ 0.25 0.25 0.25 0.2 5 normal @a[tag=treasure10]
+execute positioned 1014.50 19.50 1024.50 run particle minecraft:totem_of_undying ~ ~0.9 ~ 0.2 0.2 0.2 0.2 3 normal @a[tag=treasure10]
 
 scoreboard players add @a[tag=get_treasure] treasure 1
 tellraw @a[tag=get_treasure,scores={treasure=..9}] ["",{"text":">> ","color":"green","bold": true},"你已获得 ",{"score": {"objective": "treasure","name": "*"},"color":"green"},{"text": " 份 ","color":"green"},"宝藏!"]