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

data/ltw/advancements/eastereggs/author_team.json

@@ -20,8 +20,25 @@
     },
     "criteria": {
       "finish":{
-          "trigger": "minecraft:impossible"
-      }
+        "trigger": "minecraft:location",
+        "conditions": {
+            "dimension": "minecraft:overworld",
+            "position": {
+                "x":{
+                    "max": 24,
+                    "min": 20
+                },
+                "y":{
+                    "max": 54,
+                    "min": 52
+                },
+                "z":{
+                    "max": -38,
+                    "min": -42
+                }
+            }
+        }
+    }
     },
     "requirements": [
       [

data/ltw/advancements/eastereggs/cave_gate.json

@@ -25,7 +25,7 @@
               "dimension": "minecraft:overworld",
               "position": {
                   "x":{
-                      "max": -27,
+                      "max": -25,
                       "min": -29
                   },
                   "y":{

data/ltw/advancements/eastereggs/mall_gate.json

@@ -8,7 +8,7 @@
         "text": "超商的观察者"
       },
       "description": {
-        "text": "从高处观察繁忙的超商"
+        "text": "居高临下观察繁忙的超商"
       },
       "frame": "task",
       "show_toast": true,
@@ -20,8 +20,22 @@
     },
     "criteria": {
       "finish":{
-          "trigger": "minecraft:impossible"
-      }
+        "trigger": "minecraft:location",
+        "conditions": {
+            "dimension": "minecraft:overworld",
+            "position": {
+                "x":{
+                    "max": -3,
+                    "min": -5
+                },
+                "y":17,
+                "z":{
+                    "max": -45,
+                    "min": -47
+                }
+            }
+        }
+    }
     },
     "requirements": [
       [

data/ltw/advancements/eastereggs/parkour_to_outworld.json

@@ -20,8 +20,22 @@
     },
     "criteria": {
       "finish":{
-          "trigger": "minecraft:impossible"
-      }
+        "trigger": "minecraft:location",
+        "conditions": {
+            "dimension": "minecraft:overworld",
+            "position": {
+                "x":{
+                    "max": -1,
+                    "min": -3
+                },
+                "y":46,
+                "z":{
+                    "max": -58,
+                    "min": -60
+                }
+            }
+        }
+    }
     },
     "requirements": [
       [

data/ltw/advancements/parkour/lobby_2.json

@@ -13,7 +13,7 @@
       "frame": "challenge",
       "show_toast": true,
       "announce_to_chat": true,
-      "hidden": false
+      "hidden": true
     },
     "rewards": {
       "function": "ltw:advancement/parkour/grant_root"

data/ltw/functions/init.mcfunction

@@ -100,7 +100,11 @@ team modify gold color gold
 team modify gold friendlyFire false
 
 # 进度
-advancement revoke @a everything
+advancement revoke @a only lib:damage_dealt
+advancement revoke @a only lib:damage_taken
+advancement revoke @a only item:container/place
+advancement revoke @a only item:special/consume_enchanted_apple
+advancement revoke @a only item:special/consume_golden_apple
 
 # 时钟
 schedule function ltw:clock/tick2 2t replace

data/ltw/functions/main/game_end.mcfunction

@@ -75,6 +75,5 @@ forceload remove all
 # TODO: [LTCat] 主大厅时，玩家锁定栏添加选择是否加入游戏以及是否旁观
 # TODO: [LTCat] 增加一个tag来实现玩家在主大厅时不会受到游戏系统的消息（音效/Bossbar/tellraw）
 # TODO: [LTCat] 更新大厅后，新加入的玩家优先扔进主大厅，除非手动选择加入旁观
-# TODO: [HIM] 新大厅搬完后，重构跑酷的节奏方块
 # TODO: [HIM] 重构大厅跑酷系统，在hotbar增加用时提示，增加adv来给与奖励，并开启跑酷的最佳用时榜单
 # TODO: [HIM/LTCat] 在大厅框选跑酷区域来判定玩家是否在跑酷，离开时触发相应函数

data/ltw/functions/main/player_enter.mcfunction

@@ -1,7 +1,13 @@
 # 当玩家加入游戏时触发
 team join player @s
-advancement revoke @s everything
-execute as @a at @s run function lib:sounds/error
+
+advancement revoke @s only lib:damage_dealt
+advancement revoke @s only lib:damage_taken
+advancement revoke @s only item:container/place
+advancement revoke @s only item:special/consume_enchanted_apple
+advancement revoke @s only item:special/consume_golden_apple
+
+execute as @a at @s run function lib:sounds/hit
 
 # 存储UUID
 execute store result score @s UUID run data get entity @s UUID[0]

data/ltw/functions/state/0/parkour/tempo_block/marker_spawn.mcfunction

@@ -2,37 +2,42 @@
 kill @e[type=armor_stand,tag=lobby_tempo]
 
 # 生成as
-summon armor_stand 11 15.6 26 {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_red"]}
-summon armor_stand 11 16.6 30 {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_red"]}
-summon armor_stand 11 17.6 37 {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_red"]}
-summon armor_stand 9 19.6 40 {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_red"]}
-summon armor_stand 9 19.6 32 {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_red"]}
-summon armor_stand 9 20.6 27 {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_red"]}
-summon armor_stand 10 22.6 23 {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_red"]}
-summon armor_stand 11 23.6 28 {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_red"]}
-summon armor_stand 11 23.6 35 {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_red"]}
-summon armor_stand 9 23.6 40 {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_red"]}
-summon armor_stand 11 25.6 40 {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_red"]}
-summon armor_stand 9 26.6 34 {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_red"]}
-summon armor_stand 9 27.6 27 {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_red"]}
-summon armor_stand 9 26.6 25 {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_red"]}
-summon armor_stand 9 29.6 24 {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_red"]}
+execute positioned 6 12 -26 run summon armor_stand ~ ~-0.4 ~ {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_red_t"]}
+execute positioned 11 14 -27 run summon armor_stand ~ ~-0.4 ~ {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_red_t"]}
+execute positioned 11 16 -31 run summon armor_stand ~ ~-0.4 ~ {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_red_t"]}
+execute positioned 10 16 -22 run summon armor_stand ~ ~-0.4 ~ {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_red_t"]}
+execute positioned 5 17 -24 run summon armor_stand ~ ~-0.4 ~ {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_red_t"]}
+execute positioned 6 19 -27 run summon armor_stand ~ ~-0.4 ~ {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_red_t"]}
+execute positioned 13 43 -61 run summon armor_stand ~ ~-0.4 ~ {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_red_t"]}
+execute positioned 12 45 -56 run summon armor_stand ~ ~-0.4 ~ {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_red_t"]}
+execute positioned 17 45 -51 run summon armor_stand ~ ~-0.4 ~ {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_red_t"]}
+execute positioned 21 49 -33 run summon armor_stand ~ ~-0.4 ~ {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_red_t"]}
+execute positioned 21 50 -33 run summon armor_stand ~ ~-0.4 ~ {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_red_t"]}
 
-summon armor_stand 11 16.6 26 {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_blue"]}
-summon armor_stand 11 17.6 33 {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_blue"]}
-summon armor_stand 11 17.6 40 {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_blue"]}
-summon armor_stand 10 18.6 42 {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_blue"]}
-summon armor_stand 9 19.6 36 {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_blue"]}
-summon armor_stand 9 19.6 29 {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_blue"]}
-summon armor_stand 9 21.6 25 {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_blue"]}
-summon armor_stand 11 23.6 24 {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_blue"]}
-summon armor_stand 11 23.6 31 {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_blue"]}
-summon armor_stand 10 23.6 37 {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_blue"]}
-summon armor_stand 10 24.6 42 {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_blue"]}
-summon armor_stand 11 26.6 37 {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_blue"]}
-summon armor_stand 9 26.6 30 {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_blue"]}
-summon armor_stand 10 26.6 23 {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_blue"]}
+execute positioned 16 43 -46 run summon armor_stand ~ ~-0.4 ~ {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_red_r"]}
+execute positioned 14 44 -43 run summon armor_stand ~ ~-0.4 ~ {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_red_r"]}
+execute positioned 15 47 -38 run summon armor_stand ~ ~-0.4 ~ {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_red_r"]}
+execute positioned 19 45 -35 run summon armor_stand ~ ~-0.4 ~ {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_red_r"]}
+execute positioned 19 49 -30 run summon armor_stand ~ ~-0.4 ~ {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_red_r"]}
+
+
+execute positioned 6 13 -26 run summon armor_stand ~ ~-0.4 ~ {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_blue_t"]}
+execute positioned 11 15 -27 run summon armor_stand ~ ~-0.4 ~ {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_blue_t"]}
+execute positioned 9 17 -31 run summon armor_stand ~ ~-0.4 ~ {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_blue_t"]}
+execute positioned 10 17 -22 run summon armor_stand ~ ~-0.4 ~ {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_blue_t"]}
+execute positioned 5 18 -24 run summon armor_stand ~ ~-0.4 ~ {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_blue_t"]}
+execute positioned 6 20 -27 run summon armor_stand ~ ~-0.4 ~ {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_blue_t"]}
+execute positioned 13 44 -61 run summon armor_stand ~ ~-0.4 ~ {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_blue_t"]}
+execute positioned 12 46 -56 run summon armor_stand ~ ~-0.4 ~ {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_blue_t"]}
+execute positioned 17 46 -51 run summon armor_stand ~ ~-0.4 ~ {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_blue_t"]}
+execute positioned 21 48 -33 run summon armor_stand ~ ~-0.4 ~ {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_blue_t"]}
+
+execute positioned 17 43 -44 run summon armor_stand ~ ~-0.4 ~ {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_blue_r"]}
+execute positioned 11 47 -41 run summon armor_stand ~ ~-0.4 ~ {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_blue_r"]}
+execute positioned 16 47 -37 run summon armor_stand ~ ~-0.4 ~ {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_blue_r"]}
+execute positioned 23 47 -30 run summon armor_stand ~ ~-0.4 ~ {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_blue_r"]}
+execute positioned 14 50 -30 run summon armor_stand ~ ~-0.4 ~ {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["lobby_tempo","tempo_blue_r"]}
 
 # 显示as
-replaceitem entity @e[type=armor_stand,tag=tempo_red,tag=lobby_tempo] armor.head red_stained_glass
-replaceitem entity @e[type=armor_stand,tag=tempo_blue,tag=lobby_tempo] armor.head blue_stained_glass
+replaceitem entity @e[type=armor_stand,tag=tempo_red_t,tag=lobby_tempo] armor.head red_stained_glass
+replaceitem entity @e[type=armor_stand,tag=tempo_blue_t,tag=lobby_tempo] armor.head blue_stained_glass

data/ltw/functions/state/0/parkour/tempo_block/tempo_blue.mcfunction

@@ -1,6 +1,8 @@
 # 替换方块
-execute at @e[type=armor_stand,tag=lobby_tempo,tag=tempo_red] run setblock ~ ~0.4 ~ air
-execute at @e[type=armor_stand,tag=lobby_tempo,tag=tempo_blue] run setblock ~ ~0.4 ~ blue_concrete
+execute at @e[type=armor_stand,tag=lobby_tempo,tag=tempo_red_t] run setblock ~ ~0.4 ~ air
+execute at @e[type=armor_stand,tag=lobby_tempo,tag=tempo_blue_t] run setblock ~ ~0.4 ~ blue_terracotta
+execute at @e[type=armor_stand,tag=lobby_tempo,tag=tempo_red_r] run setblock ~ ~0.4 ~ black_glazed_terracotta
+execute at @e[type=armor_stand,tag=lobby_tempo,tag=tempo_blue_r] run setblock ~ ~0.4 ~ redstone_block
 
 # 播放音效
 execute at @e[type=armor_stand,tag=lobby_tempo] run playsound block.note_block.pling block @a ~ ~0.4 ~ 0.5 0.6

data/ltw/functions/state/0/parkour/tempo_block/tempo_red.mcfunction

@@ -1,6 +1,8 @@
 # 替换方块
-execute at @e[type=armor_stand,tag=lobby_tempo,tag=tempo_blue] run setblock ~ ~0.4 ~ air
-execute at @e[type=armor_stand,tag=lobby_tempo,tag=tempo_red] run setblock ~ ~0.4 ~ red_concrete
+execute at @e[type=armor_stand,tag=lobby_tempo,tag=tempo_blue_t] run setblock ~ ~0.4 ~ air
+execute at @e[type=armor_stand,tag=lobby_tempo,tag=tempo_red_t] run setblock ~ ~0.4 ~ magenta_terracotta
+execute at @e[type=armor_stand,tag=lobby_tempo,tag=tempo_blue_r] run setblock ~ ~0.4 ~ black_glazed_terracotta
+execute at @e[type=armor_stand,tag=lobby_tempo,tag=tempo_red_r] run setblock ~ ~0.4 ~ redstone_block
 
 # 播放音效
 execute at @e[type=armor_stand,tag=lobby_tempo] run playsound block.note_block.pling block @a ~ ~0.4 ~ 0.5 1.1