几个新进度

data/ltw/advancements/parkour/tnt1.json

@@ -0,0 +1,33 @@
+{
+  "parent": "ltw:parkour/root",
+  "display": {
+    "icon": {
+      "item": "minecraft:dead_fire_coral_block"
+    },
+    "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/tnt2.json

@@ -1,14 +1,14 @@
 {
-  "parent": "ltw:parkour/root",
+  "parent": "ltw:parkour/tnt1",
   "display": {
     "icon": {
-      "item": "minecraft:obsidian"
+      "item": "minecraft:warped_hyphae"
     },
     "title": {
-      "text": "俾倪众生      "
+      "text": " 圣坛之主 · β "
     },
     "description": [
-      {"text": "在地陷圣坛中获胜, 且位于第 3 或第 4 层\n", "color":"gray"},
+      {"text": "【地陷圣坛】从最底层返回最顶层\n", "color":"gray"},
       {"text": "奖励: ","color":"green"},
       {"text": "2 绿宝石","color":"white"}
     ],

data/ltw/advancements/parkour/tnt3.json

@@ -2,23 +2,23 @@
     "parent": "ltw:parkour/tnt2",
     "display": {
       "icon": {
-        "item": "minecraft:crying_obsidian"
+        "item": "minecraft:crimson_hyphae"
       },
       "title": {
-        "text": "来自深渊      "
+        "text": " 圣坛之主 · γ "
       },
       "description": [
-        {"text": "从地陷圣坛的最底层返回最顶层\n", "color":"gray"},
+        {"text": "【地陷圣坛】几乎清空最顶层的所有方块\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
-        {"text": "2 绿宝石","color":"white"}
+        {"text": "3 绿宝石","color":"white"}
       ],
-      "frame": "task",
+      "frame": "challenge",
       "show_toast": true,
       "announce_to_chat": true,
       "hidden": false
     },
     "rewards": {
-      "function": "ltw:advancement/bonus_2"
+      "function": "ltw:advancement/bonus_3"
     },
     "criteria": {
       "get_score":{

data/ltw/advancements/parkour/treasure1.json

@@ -8,7 +8,7 @@
         "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

@@ -8,7 +8,7 @@
         "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

@@ -8,7 +8,7 @@
         "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

@@ -9,7 +9,7 @@
         "text": " 争分夺秒 · Ω "
       },
       "description": [
-        {"text": "遗迹寻宝中，在 33 秒内到达终点\n", "color":"gray"},
+        {"text": "【遗迹寻宝】在 33 秒内到达终点\n", "color":"gray"},
         {"text": "究极隐藏挑战！","color":"dark_gray","italic": true}
       ],
       "frame": "challenge",

data/ltw/advancements/story/win1.json

@@ -2,10 +2,10 @@
     "parent": "ltw:story/root",
     "display": {
       "icon": {
-        "item": "minecraft:apple"
+        "item": "minecraft:player_head"
       },
       "title": {
-        "text": "初尝胜果      "
+        "text": " 无人能敌 · α "
       },
       "description": [
         {"text": "获得 1 场游戏的胜利\n", "color":"gray"},
@@ -30,4 +30,4 @@
           "get_score"
       ]
     ]
-  }
+}

data/ltw/advancements/story/win2.json

@@ -2,13 +2,13 @@
     "parent": "ltw:story/win1",
     "display": {
       "icon": {
-        "item": "minecraft:golden_apple"
+        "item": "minecraft:skeleton_skull"
       },
       "title": {
-        "text": "常胜将军      "
+        "text": " 无人能敌 · β "
       },
       "description": [
-        {"text": "获得 5 场游戏的胜利\n", "color":"gray"},
+        {"text": "获得 4 场游戏的胜利\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "2 绿宝石","color":"white"}
       ],

data/ltw/advancements/story/win3.json

@@ -2,15 +2,15 @@
     "parent": "ltw:story/win2",
     "display": {
       "icon": {
-        "item": "minecraft:enchanted_golden_apple"
+        "item": "minecraft:wither_skeleton_skull"
       },
       "title": {
-        "text": "弱者为何要战斗"
+        "text": " 无人能敌 · γ "
       },
       "description": [
-        {"text": "获得 20 场游戏的胜利\n", "color":"gray"},
+        {"text": "获得 10 场游戏的胜利\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
-        {"text": "4 绿宝石","color":"white"}
+        {"text": "3 绿宝石","color":"white"}
       ],
       "frame": "challenge",
       "show_toast": true,
@@ -18,7 +18,7 @@
       "hidden": false
     },
     "rewards": {
-      "function": "ltw:advancement/bonus_4"
+      "function": "ltw:advancement/bonus_3"
     },
     "criteria": {
       "get_score":{

data/ltw/advancements/story/win4.json

@@ -0,0 +1,29 @@
+{
+    "parent": "ltw:story/win3",
+    "display": {
+      "icon": {
+        "item": "minecraft:dragon_head"
+      },
+      "title": {
+        "text": " 无人能敌 · Ω "
+      },
+      "description": [
+        {"text": "获得 25 场游戏的胜利\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/parkour/colormatch1.json → data/ltw/advancements/vs/colormatch1.json

@@ -1,5 +1,5 @@
 {
-    "parent": "ltw:parkour/root",
+    "parent": "ltw:vs/root",
     "display": {
       "icon": {
         "item": "minecraft:yellow_glazed_terracotta"
@@ -8,7 +8,7 @@
         "text": " 纷乱迷阵 · α "
       },
       "description": [
-        {"text": "色彩迷阵中，坚持至切换速度达到满速\n", "color":"gray"},
+        {"text": "【色彩迷阵】坚持至切换速度达到满速\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "1 绿宝石","color":"white"}
       ],

data/ltw/advancements/parkour/colormatch2.json → data/ltw/advancements/vs/colormatch2.json

@@ -1,5 +1,5 @@
 {
-    "parent": "ltw:parkour/colormatch1",
+    "parent": "ltw:vs/colormatch1",
     "display": {
       "icon": {
         "item": "minecraft:red_glazed_terracotta"
@@ -8,7 +8,7 @@
         "text": " 纷乱迷阵 · β "
       },
       "description": [
-        {"text": "色彩迷阵中，在满速切换后获胜，且剩余至少 2 颗心\n", "color":"gray"},
+        {"text": "【色彩迷阵】在满速切换后获胜，且剩余至少 2 颗心\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "2 绿宝石","color":"white"}
       ],

data/ltw/advancements/parkour/colormatch3.json → data/ltw/advancements/vs/colormatch3.json

@@ -1,5 +1,5 @@
 {
-    "parent": "ltw:parkour/colormatch2",
+    "parent": "ltw:vs/colormatch2",
     "display": {
       "icon": {
         "item": "minecraft:purple_glazed_terracotta"
@@ -8,7 +8,7 @@
         "text": " 纷乱迷阵 · γ "
       },
       "description": [
-        {"text": "色彩迷阵中，在满速切换后获胜，且不损失任何生命值\n", "color":"gray"},
+        {"text": "【色彩迷阵】在满速切换后获胜，且不损失任何生命值\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "3 绿宝石","color":"white"}
       ],

data/ltw/advancements/vs/potato1.json

@@ -8,7 +8,7 @@
         "text": " 君临天下 · α "
       },
       "description": [
-        {"text": "炸弹狂魔中，在剩余至少 2 颗心时获胜\n", "color":"gray"},
+        {"text": "【炸弹狂魔】在剩余至少 2 颗心时获胜\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "1 绿宝石","color":"white"}
       ],

data/ltw/advancements/vs/potato2.json

@@ -8,7 +8,7 @@
         "text": " 君临天下 · β "
       },
       "description": [
-        {"text": "炸弹狂魔中，在剩余至少 3 颗心时获胜\n", "color":"gray"},
+        {"text": "【炸弹狂魔】在剩余至少 3 颗心时获胜\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "2 绿宝石","color":"white"}
       ],

data/ltw/advancements/vs/potato3.json

@@ -8,7 +8,7 @@
         "text": " 君临天下 · γ "
       },
       "description": [
-        {"text": "炸弹狂魔中，在剩余至少 5 颗心时获胜\n", "color":"gray"},
+        {"text": "【炸弹狂魔】在剩余至少 5 颗心时获胜\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "3 绿宝石","color":"white"}
       ],

data/ltw/functions/main/game_end.mcfunction

@@ -29,8 +29,9 @@ tag @a[team=playing,tag=!total_rank1,tag=!total_rank2,tag=!total_rank3] add tota
 scoreboard players add @a[team=playing] stat_total 1
 scoreboard players add @a[tag=total_rank1] stat_win 1
 advancement grant @a[scores={stat_win=1..}] only ltw:story/win1
-advancement grant @a[scores={stat_win=5..}] only ltw:story/win2
-advancement grant @a[scores={stat_win=20..}] only ltw:story/win3
+advancement grant @a[scores={stat_win=4..}] only ltw:story/win2
+advancement grant @a[scores={stat_win=10..}] only ltw:story/win3
+advancement grant @a[scores={stat_win=25..}] only ltw:story/win4
 
 # 计算金粒奖励
 scoreboard players set #total_gold mem 0

data/mini/functions/main/game_end.mcfunction

@@ -29,7 +29,7 @@ tag @a[tag=max_uncounted] remove max_uncounted
 tag @a[tag=!mini_rank1,tag=!mini_rank2,tag=!mini_rank3,team=playing] add mini_rank4
 
 # 给予进度
-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 2 run advancement grant @a[tag=mini_rank1,scores={layer=2..}] only ltw:parkour/tnt1
 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

data/mini/functions/main/tick20.mcfunction

@@ -1,6 +1,7 @@
 
 # 触发单个模块
 execute if score $mini_type mem matches 1 run function mini:parkour/tick20
+execute if score $mini_type mem matches 2 run function mini:tntrun/tick20
 execute if score $mini_type mem matches 3 run function mini:hotpm/tick20
 execute if score $mini_type mem matches 4 run function mini:colormatch/tick20
 execute if score $mini_type mem matches 5 run function mini:phantom/tick20

data/mini/functions/parkour/player_finished.mcfunction

@@ -7,10 +7,10 @@ function mini:main/update_player_count
 # 计算时间
 scoreboard players set #temp mem 150
 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 score #temp mem matches 1..100 run advancement grant @s only ltw:vs/treasure1
+execute if score #temp mem matches 1..60 run advancement grant @s only ltw:vs/treasure2
+execute if score #temp mem matches 1..40 run advancement grant @s only ltw:vs/treasure3
+execute if score #temp mem matches 1..33 run advancement grant @s only ltw:vs/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"}]

data/mini/functions/tntrun/tick20.mcfunction

@@ -0,0 +1,5 @@
+
+# 进度判断
+clone 1008 33 2008 1030 33 2030 1000 4 2000
+execute store result score #tnt mem run fill 1000 4 2000 1022 4 2022 air replace #mini:tntrun_floor
+execute if score #tnt mem matches 1..20 run advancement grant @a[tag=mini_running,scores={layer=4}] only ltw:parkour/tnt3

data/mini/functions/tntrun/tick5.mcfunction

@@ -9,4 +9,4 @@ execute as @a[tag=mini_running] run scoreboard players operation @s layer = @s t
 
 # 进度判断
 tag @a[scores={layer=1}] add layer_bottom
-advancement grant @a[tag=layer_bottom,scores={layer=4}] only ltw:parkour/tnt3
+advancement grant @a[tag=layer_bottom,tag=mini_running,scores={layer=4}] only ltw:parkour/tnt2