三组新进度

data/ltw/advancements/parkour/colormatch1.json

@@ -0,0 +1,33 @@
+{
+    "parent": "ltw:parkour/root",
+    "display": {
+      "icon": {
+        "item": "minecraft:yellow_glazed_terracotta"
+      },
+      "title": {
+        "text": " 纷乱迷阵 · α "
+      },
+      "description": [
+        {"text": "色彩迷阵中，坚持至切换速度达到满速\n", "color":"gray"},
+        {"text": "奖励: ","color":"green"},
+        {"text": "1 绿宝石","color":"white"}
+      ],
+      "frame": "task",
+      "show_toast": true,
+      "announce_to_chat": true,
+      "hidden": false
+    },
+    "rewards": {
+      "function": "ltw:advancement/bonus_1"
+    },
+    "criteria": {
+      "get_score":{
+          "trigger": "minecraft:impossible"
+      }
+    },
+    "requirements": [
+      [
+          "get_score"
+      ]
+    ]
+  }

data/ltw/advancements/parkour/colormatch2.json

@@ -1,14 +1,14 @@
 {
-    "parent": "ltw:parkour/root",
+    "parent": "ltw:parkour/colormatch1",
     "display": {
       "icon": {
-        "item": "minecraft:yellow_glazed_terracotta"
+        "item": "minecraft:red_glazed_terracotta"
       },
       "title": {
-        "text": "纷乱迷阵      "
+        "text": " 纷乱迷阵 · β "
       },
       "description": [
-        {"text": "在色彩迷阵中达到最高速度, 并最终获胜\n", "color":"gray"},
+        {"text": "色彩迷阵中，在满速切换后获胜，且剩余至少 2 颗心\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "2 绿宝石","color":"white"}
       ],

data/ltw/advancements/parkour/colormatch3.json

@@ -0,0 +1,33 @@
+{
+    "parent": "ltw:parkour/colormatch2",
+    "display": {
+      "icon": {
+        "item": "minecraft:purple_glazed_terracotta"
+      },
+      "title": {
+        "text": " 纷乱迷阵 · γ "
+      },
+      "description": [
+        {"text": "色彩迷阵中，在满速切换后获胜，且不损失任何生命值\n", "color":"gray"},
+        {"text": "奖励: ","color":"green"},
+        {"text": "3 绿宝石","color":"white"}
+      ],
+      "frame": "challenge",
+      "show_toast": true,
+      "announce_to_chat": true,
+      "hidden": false
+    },
+    "rewards": {
+      "function": "ltw:advancement/bonus_3"
+    },
+    "criteria": {
+      "get_score":{
+          "trigger": "minecraft:impossible"
+      }
+    },
+    "requirements": [
+      [
+          "get_score"
+      ]
+    ]
+  }

data/ltw/advancements/parkour/treasure1.json

@@ -5,10 +5,10 @@
         "item": "minecraft:iron_boots"
       },
       "title": {
-        "text": "争分夺秒 · α      "
+        "text": " 争分夺秒 · α "
       },
       "description": [
-        {"text": "在遗迹寻宝中，于 100 秒内到达终点\n", "color":"gray"},
+        {"text": "遗迹寻宝中，在 100 秒内到达终点\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "1 绿宝石","color":"white"}
       ],

data/ltw/advancements/parkour/treasure2.json

@@ -5,10 +5,10 @@
         "item": "minecraft:diamond_boots"
       },
       "title": {
-        "text": "争分夺秒 · β    "
+        "text": " 争分夺秒 · β "
       },
       "description": [
-        {"text": "在遗迹寻宝中，于 60 秒内到达终点\n", "color":"gray"},
+        {"text": "遗迹寻宝中，在 60 秒内到达终点\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "2 绿宝石","color":"white"}
       ],

data/ltw/advancements/parkour/treasure3.json

@@ -5,10 +5,10 @@
         "item": "minecraft:netherite_boots"
       },
       "title": {
-        "text": "争分夺秒 · γ    "
+        "text": " 争分夺秒 · γ "
       },
       "description": [
-        {"text": "在遗迹寻宝中，于 40 秒内到达终点\n", "color":"gray"},
+        {"text": "遗迹寻宝中，在 40 秒内到达终点\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "3 绿宝石","color":"white"}
       ],

data/ltw/advancements/parkour/treasure4.json

@@ -0,0 +1,30 @@
+{
+    "parent": "ltw:parkour/treasure3",
+    "display": {
+      "icon": {
+        "item": "minecraft:netherite_boots",
+        "nbt": "{Enchantments:[{id:\"minecraft:protection\",lvl:4s}]}"
+      },
+      "title": {
+        "text": " 争分夺秒 · Ω "
+      },
+      "description": [
+        {"text": "遗迹寻宝中，在 33 秒内到达终点\n", "color":"gray"},
+        {"text": "究极隐藏挑战！","color":"dark_gray","italic": true}
+      ],
+      "frame": "challenge",
+      "show_toast": true,
+      "announce_to_chat": true,
+      "hidden": true
+    },
+    "criteria": {
+      "get_score":{
+          "trigger": "minecraft:impossible"
+      }
+    },
+    "requirements": [
+      [
+          "get_score"
+      ]
+    ]
+  }

data/ltw/advancements/vs/diamond0.json

@@ -1,50 +0,0 @@
-{
-    "parent": "ltw:vs/root",
-    "display": {
-      "icon": {
-        "item": "minecraft:cooked_salmon"
-      },
-      "title": {
-        "text": "美味的鱼儿    "
-      },
-      "description": [
-        {"text": "抓了鱼儿然后烤\n", "color":"gray"},
-        {"text": "奖励: ","color":"green"},
-        {"text": "1 绿宝石","color":"white"}
-      ],
-      "frame": "task",
-      "show_toast": true,
-      "announce_to_chat": true,
-      "hidden": false
-    },
-    "rewards": {
-      "function": "ltw:advancement/bonus_1"
-    },
-    "criteria": {
-        "f1": {
-          "trigger": "minecraft:inventory_changed",
-          "conditions": {
-            "items": [
-              {
-                "items": ["minecraft:cooked_salmon"]
-              }
-            ]
-          }
-        },
-        "f2": {
-          "trigger": "minecraft:inventory_changed",
-          "conditions": {
-            "items": [
-              {
-                "items": ["minecraft:cooked_cod"]
-              }
-            ]
-          }
-        }
-    },
-    "requirements": [
-        [
-          "f1", "f2"
-        ]
-    ]
-}

data/ltw/advancements/vs/diamond1.json

@@ -1,40 +0,0 @@
-{
-    "parent": "ltw:vs/diamond0",
-    "display": {
-      "icon": {
-        "item": "minecraft:obsidian"
-      },
-      "title": {
-        "text": "冰桶挑战      "
-      },
-      "description": [
-        {"text": "挖掘一块黑曜石\n", "color":"gray"},
-        {"text": "奖励: ","color":"green"},
-        {"text": "2 绿宝石","color":"white"}
-      ],
-      "frame": "task",
-      "show_toast": true,
-      "announce_to_chat": true,
-      "hidden": false
-    },
-    "rewards": {
-      "function": "ltw:advancement/bonus_2"
-    },
-    "criteria": {
-        "obsidian": {
-          "trigger": "minecraft:inventory_changed",
-          "conditions": {
-            "items": [
-              {
-                "items": ["minecraft:obsidian"]
-              }
-            ]
-          }
-        }
-    },
-    "requirements": [
-        [
-          "obsidian"
-        ]
-    ]
-}

data/ltw/advancements/vs/diamond2.json

@@ -1,40 +0,0 @@
-{
-    "parent": "ltw:vs/diamond1",
-    "display": {
-      "icon": {
-        "item": "minecraft:enchanting_table"
-      },
-      "title": {
-        "text": "附魔师?!    "
-      },
-      "description": [
-        {"text": "制作一个附魔台\n", "color":"gray"},
-        {"text": "奖励: ","color":"green"},
-        {"text": "4 绿宝石","color":"white"}
-      ],
-      "frame": "challenge",
-      "show_toast": true,
-      "announce_to_chat": true,
-      "hidden": false
-    },
-    "rewards": {
-      "function": "ltw:advancement/bonus_4"
-    },
-    "criteria": {
-        "c": {
-          "trigger": "minecraft:inventory_changed",
-          "conditions": {
-            "items": [
-              {
-                "items": ["minecraft:enchanting_table"]
-              }
-            ]
-          }
-        }
-    },
-    "requirements": [
-        [
-          "c"
-        ]
-    ]
-}

data/ltw/advancements/vs/potato1.json

@@ -0,0 +1,33 @@
+{
+    "parent": "ltw:vs/root",
+    "display": {
+      "icon": {
+        "item": "minecraft:apple"
+      },
+      "title": {
+        "text": " 君临天下 · α "
+      },
+      "description": [
+        {"text": "炸弹狂魔中，在剩余至少 2 颗心时获胜\n", "color":"gray"},
+        {"text": "奖励: ","color":"green"},
+        {"text": "1 绿宝石","color":"white"}
+      ],
+      "frame": "task",
+      "show_toast": true,
+      "announce_to_chat": true,
+      "hidden": false
+    },
+    "rewards": {
+      "function": "ltw:advancement/bonus_1"
+    },
+    "criteria": {
+      "get_score":{
+          "trigger": "minecraft:impossible"
+      }
+    },
+    "requirements": [
+      [
+          "get_score"
+      ]
+    ]
+  }

data/ltw/advancements/vs/potato2.json

@@ -1,14 +1,14 @@
 {
-    "parent": "ltw:vs/root",
+    "parent": "ltw:vs/potato1",
     "display": {
       "icon": {
-        "item": "minecraft:tnt"
+        "item": "minecraft:golden_apple"
       },
       "title": {
-        "text": "炸弹人        "
+        "text": " 君临天下 · β "
       },
       "description": [
-        {"text": "在炸弹狂魔中获胜, 且剩余 2 心或更多的生命值\n", "color":"gray"},
+        {"text": "炸弹狂魔中，在剩余至少 3 颗心时获胜\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "2 绿宝石","color":"white"}
       ],

data/ltw/advancements/vs/potato3.json

@@ -5,10 +5,10 @@
         "item": "minecraft:enchanted_golden_apple"
       },
       "title": {
-        "text": "君临天下      "
+        "text": " 君临天下 · γ "
       },
       "description": [
-        {"text": "在炸弹狂魔中获胜, 且剩余 5 心或更多的生命值\n", "color":"gray"},
+        {"text": "炸弹狂魔中，在剩余至少 5 颗心时获胜\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "3 绿宝石","color":"white"}
       ],

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

@@ -0,0 +1,4 @@
+advancement grant @a[tag=mini_running] only ltw:parkour/colormatch1
+tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"text": "色彩迷阵的切换速度已达满速！","color":"gold"}]
+playsound minecraft:entity.ender_dragon.growl player @a 0 1000000 0 1000000 1.5
+scoreboard players set #max_speed mem 1

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

@@ -11,7 +11,7 @@ execute as @a at @s run function lib:sounds/hit2
 scoreboard players set $countdown_fast mem 28
 scoreboard players operation $countdown_fast mem < $color_match_time mem
 scoreboard players remove $countdown_fast mem 3
-execute if score $countdown_fast mem matches ..16 run scoreboard players set $countdown_fast mem 17
+execute if score $countdown_fast mem matches ..17 run scoreboard players set $countdown_fast mem 18
 scoreboard players set $color_match_type mem 1
 
 # HUD

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

@@ -4,12 +4,14 @@ function mini:colormatch/game/replace_wall
 execute positioned 1001 10 4000 run clone ~ ~ ~ ~20 ~ ~20 1050 16 4000 filtered #mini:colormatch_floor
 
 # 设置倒计时
-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
-execute if score $color_match_time mem matches ..10 run scoreboard players set $color_match_time mem 11
+execute if entity @a[tag=color_match_fall] run scoreboard players add $color_match_time mem 6
+execute if score $color_match_time mem matches 12..15 run scoreboard players remove $color_match_time mem 1
+execute if score $color_match_time mem matches 16..19 run scoreboard players remove $color_match_time mem 2
+execute if score $color_match_time mem matches 20..29 run scoreboard players remove $color_match_time mem 3
+execute if score $color_match_time mem matches 30..39 run scoreboard players remove $color_match_time mem 4
+execute if score $color_match_time mem matches 40.. run scoreboard players remove $color_match_time mem 5
 scoreboard players operation $countdown_fast mem = $color_match_time mem
+execute if score $color_match_time mem matches ..11 if score #max_speed mem matches 0 run function mini:colormatch/game/reach_max_speed
 
 # 重置分数
 scoreboard players set $color_match_type mem 0

data/mini/functions/colormatch/game_init.mcfunction

@@ -9,6 +9,7 @@ scoreboard players set $show_score mem 0
 scoreboard players set $color_match_time mem 60
 scoreboard players set $color_match_type mem 0
 scoreboard players set $new_item_cd mem 0
+scoreboard players set #max_speed mem 0
 
 # 刷新地基
 function mini:colormatch/game/prepare_round

data/mini/functions/colormatch/player_enter.mcfunction

@@ -9,6 +9,7 @@ function mini:colormatch/give_effect
 # 设置玩家生命
 scoreboard players set @s[team=playing,tag=!rejoining] mini_heart 3
 function mini:main/player_max_health
+tag @s remove colormatch_hurt
 
 # 传送玩家
 tp @s[team=playing,tag=!rejoining] 1062 19 4012

data/mini/functions/colormatch/player_lose_heart.mcfunction

@@ -2,6 +2,7 @@
 tellraw @a ["",{"text":">> ","color":"gold","bold": true},{"selector":"@s","color":"gold"}," 掉入了陷阱!"]
 
 # 失去一颗心
+tag @s add colormatch_hurt
 function mini:main/player_lose_heart
 function lib:sounds/error
 

data/mini/functions/main/game_end.mcfunction

@@ -30,9 +30,11 @@ tag @a[tag=!mini_rank1,tag=!mini_rank2,tag=!mini_rank3,team=playing] add mini_ra
 
 # 给予进度
 execute if score $mini_type mem matches 2 run advancement grant @a[tag=mini_rank1,scores={layer=3..}] only ltw:parkour/tnt2
-execute if score $mini_type mem matches 3 run advancement grant @a[tag=mini_rank1,scores={mini_heart=2..}] only ltw:vs/potato2
+execute if score $mini_type mem matches 3 run advancement grant @a[tag=mini_rank1,scores={mini_heart=2..}] only ltw:vs/potato1
+execute if score $mini_type mem matches 3 run advancement grant @a[tag=mini_rank1,scores={mini_heart=3..}] only ltw:vs/potato2
 execute if score $mini_type mem matches 3 run advancement grant @a[tag=mini_rank1,scores={mini_heart=5..}] only ltw:vs/potato3
-execute if score $mini_type mem matches 4 if score $color_match_time mem matches ..13 run advancement grant @a[tag=mini_rank1] only ltw:parkour/colormatch2
+execute if score $mini_type mem matches 4 if score #max_speed mem matches 1 run advancement grant @a[tag=mini_rank1,scores={mini_heart=2..}] only ltw:parkour/colormatch2
+execute if score $mini_type mem matches 4 if score #max_speed mem matches 1 run advancement grant @a[tag=mini_rank1,tag=!colormatch_hurt] only ltw:parkour/colormatch3
 
 # 清理怪东西
 clear @a[team=!debugging] #mini:game_item{game_item:1b}

data/mini/functions/parkour/player_finished.mcfunction

@@ -10,6 +10,7 @@ scoreboard players operation #temp mem -= $countdown mem
 execute if score #temp mem matches 1..100 run advancement grant @s only ltw:parkour/treasure1
 execute if score #temp mem matches 1..60 run advancement grant @s only ltw:parkour/treasure2
 execute if score #temp mem matches 1..40 run advancement grant @s only ltw:parkour/treasure3
+execute if score #temp mem matches 1..33 run advancement grant @s only ltw:parkour/treasure4
 
 # 显示提示
 execute if entity @s[tag=!rejoining] if score $player_finish mem matches 1 run tellraw @a ["",{"text": ">> ","color":"green","bold": true},{"selector": "@s"},{"text": " 已到达终点，用时 ","color":"green"},{"score": {"name": "#temp","objective": "mem"}}," 秒",{"text": "！第 ","color":"green"},{"score": {"name": "$player_finish","objective": "mem"},"color":"green"},{"text": " 名！","color":"green"}]