Merge branch 'master' of github.com:00ll00/LTW3

data/item/loot_tables/gameparty/normal/white.json

@@ -43,6 +43,17 @@
         }
     ]
 },
+{
+    "type": "minecraft:item",
+    "weight": 1,
+    "name": "minecraft:stick",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"<击退 I> 木棍\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"Enchantments\":[{\"id\":\"knockback\",\"lvl\":1}],\"display\":{\"Name\":\"{\\\"text\\\":\\\"<击退 I> 木棍\\\",\\\"italic\\\":false,\\\"color\\\":\\\"white\\\"}\"}}"
+        }
+    ]
+},
 {
     "type": "minecraft:item",
     "weight": 1,

data/item/tags/items/bonus.json

@@ -12,6 +12,7 @@
         "minecraft:iron_sword",
         "minecraft:nether_star",
         "minecraft:trident",
+        "minecraft:stick",
         "minecraft:wooden_axe",
         "minecraft:stone_axe",
         "minecraft:iron_axe",

data/ltw/functions/main/player_enter.mcfunction

@@ -32,7 +32,6 @@ function lib:bossbar/show
 # FIXME: 关掉 JourneyMap 的生物雷达
 # TODO: 逐个游戏检查中途退出重进是否造成 Bug
 # TODO: 逐个游戏检查是否在开始时清理了实体
-# TODO: {跑酷} 为已获取的宝藏标识新的粒子，并显示提示*
 # TODO: {TNTRun} 有多人汇报存在严重卡顿，检查是否是场地的粒子造成，或者是游戏中的光照更新、实体、方块变化
 
 # FIXME: [LTCat] BGM 可能会双响

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

@@ -4,7 +4,7 @@ function mini:colormatch/game/replace_wall
 execute positioned 1001 10 4000 run clone ~ ~ ~ ~20 ~ ~20 1050 16 4000 filtered #mini:colarmatch_floor
 
 # 设置倒计时
-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 20.. run scoreboard players remove $color_match_time mem 4
 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

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.2 0.2 0.2 0.2 3 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 2 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.2 0.2 0.2 0.2 3 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 2 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.2 0.2 0.2 0.2 3 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 2 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.2 0.2 0.2 0.2 3 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 2 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.2 0.2 0.2 0.2 3 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 2 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.2 0.2 0.2 0.2 3 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 2 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.2 0.2 0.2 0.2 3 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 2 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.2 0.2 0.2 0.2 3 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 2 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.2 0.2 0.2 0.2 3 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 2 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.2 0.2 0.2 0.2 3 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 2 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"},"宝藏!"]