进度系统大改

data/ltw/advancements/combat/phantom1.json

@@ -2,7 +2,7 @@
     "parent": "ltw:combat/root",
     "display": {
       "icon": {
-        "item": "minecraft:stick"
+        "item": "minecraft:arrow"
       },
       "title": {
         "text": "狩猎学徒      "

data/ltw/advancements/combat/phantom2.json

@@ -2,10 +2,10 @@
     "parent": "ltw:combat/phantom1",
     "display": {
       "icon": {
-        "item": "minecraft:arrow"
+        "item": "minecraft:phantom_membrane"
       },
       "title": {
-        "text": "狩猎大师      "
+        "text": "怪物猎人      "
       },
       "description": [
         {"text": "在月夜狩猎中击杀 16 只幻翼\n", "color":"gray"},

data/ltw/advancements/combat/phantom3.json

@@ -5,7 +5,7 @@
         "item": "minecraft:spectral_arrow"
       },
       "title": {
-        "text": "狩猎之神      "
+        "text": "不再有梦      "
       },
       "description": [
         {"text": "在月夜狩猎中击杀 24 只幻翼\n", "color":"gray"},

data/ltw/advancements/parkour/colormatch2.json

@@ -1,24 +1,24 @@
 {
-    "parent": "ltw:parkour/colormatch1",
+    "parent": "ltw:parkour/root",
     "display": {
       "icon": {
         "item": "minecraft:yellow_glazed_terracotta"
       },
       "title": {
-        "text": "终局迷阵      "
+        "text": "纷乱迷阵      "
       },
       "description": [
         {"text": "在色彩迷阵中达到最高速度, 并最终获胜\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
-        {"text": "3 绿宝石","color":"white"}
+        {"text": "2 绿宝石","color":"white"}
       ],
-      "frame": "challenge",
+      "frame": "task",
       "show_toast": true,
       "announce_to_chat": true,
       "hidden": false
     },
     "rewards": {
-      "function": "ltw:advancement/bonus_3"
+      "function": "ltw:advancement/bonus_2"
     },
     "criteria": {
       "get_score":{

data/ltw/advancements/parkour/tnt2.json

@@ -1,33 +1,33 @@
 {
-    "parent": "ltw:parkour/tnt1",
-    "display": {
-      "icon": {
-        "item": "minecraft:crying_obsidian"
-      },
-      "title": {
-        "text": "圣坛之主      "
-      },
-      "description": [
-        {"text": "在地陷圣坛中获胜, 且位于第 3 或第 4 层\n", "color":"gray"},
-        {"text": "奖励: ","color":"green"},
-        {"text": "3 绿宝石","color":"white"}
-      ],
-      "frame": "challenge",
-      "show_toast": true,
-      "announce_to_chat": true,
-      "hidden": false
+  "parent": "ltw:parkour/root",
+  "display": {
+    "icon": {
+      "item": "minecraft:obsidian"
     },
-    "rewards": {
-      "function": "ltw:advancement/bonus_3"
+    "title": {
+      "text": "俾倪众生      "
     },
-    "criteria": {
-      "get_score":{
-          "trigger": "minecraft:impossible"
-      }
-    },
-    "requirements": [
-      [
-          "get_score"
-      ]
+    "description": [
+      {"text": "在地陷圣坛中获胜, 且位于第 3 或第 4 层\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": {
+    "get_score":{
+        "trigger": "minecraft:impossible"
+    }
+  },
+  "requirements": [
+    [
+        "get_score"
     ]
-  }
+  ]
+}

data/ltw/advancements/parkour/colormatch1.json → data/ltw/advancements/parkour/tnt3.json

@@ -1,24 +1,24 @@
 {
-    "parent": "ltw:parkour/root",
+    "parent": "ltw:parkour/tnt2",
     "display": {
       "icon": {
-        "item": "minecraft:cyan_glazed_terracotta"
+        "item": "minecraft:crying_obsidian"
       },
       "title": {
-        "text": "纷乱迷阵      "
+        "text": "来自深渊      "
       },
       "description": [
-        {"text": "在色彩迷阵中达到最高速度\n", "color":"gray"},
+        {"text": "从地陷圣坛的最底层返回最顶层\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
-        {"text": "1 绿宝石","color":"white"}
+        {"text": "3 绿宝石","color":"white"}
       ],
-      "frame": "task",
+      "frame": "challenge",
       "show_toast": true,
       "announce_to_chat": true,
       "hidden": false
     },
     "rewards": {
-      "function": "ltw:advancement/bonus_1"
+      "function": "ltw:advancement/bonus_3"
     },
     "criteria": {
       "get_score":{

data/ltw/advancements/parkour/treasure3.json

@@ -5,7 +5,7 @@
         "item": "minecraft:ender_chest"
       },
       "title": {
-        "text": "宝藏之神      "
+        "text": "不做选择题    "
       },
       "description": [
         {"text": "在遗迹寻宝中收集全部宝藏\n", "color":"gray"},

data/ltw/advancements/story/score2.json

@@ -5,7 +5,7 @@
         "item": "minecraft:map"
       },
       "title": {
-        "text": "分数狂魔      "
+        "text": "双六          "
       },
       "description": [
         {"text": "在单局游戏中达到 12 分\n", "color":"gray"},

data/ltw/advancements/story/win3.json

@@ -5,7 +5,7 @@
         "item": "minecraft:enchanted_golden_apple"
       },
       "title": {
-        "text": "胜者为王      "
+        "text": "弱者为何要战斗"
       },
       "description": [
         {"text": "获得 20 场游戏的胜利\n", "color":"gray"},

data/ltw/advancements/vs/potato1.json → data/ltw/advancements/vs/diamond1.json

@@ -2,15 +2,15 @@
     "parent": "ltw:vs/root",
     "display": {
       "icon": {
-        "item": "minecraft:redstone_torch"
+        "item": "minecraft:obsidian"
       },
       "title": {
-        "text": "幸存者        "
+        "text": "冰桶挑战      "
       },
       "description": [
-        {"text": "在炸弹狂魔中获胜\n", "color":"gray"},
+        {"text": "挖掘一块黑曜石\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
-        {"text": "1 绿宝石","color":"white"}
+        {"text": "2 绿宝石","color":"white"}
       ],
       "frame": "task",
       "show_toast": true,
@@ -18,7 +18,7 @@
       "hidden": false
     },
     "rewards": {
-      "function": "ltw:advancement/bonus_1"
+      "function": "ltw:advancement/bonus_2"
     },
     "criteria": {
       "get_score":{

data/ltw/advancements/parkour/tnt1.json → data/ltw/advancements/vs/diamond2.json

@@ -1,24 +1,24 @@
 {
-    "parent": "ltw:parkour/root",
+    "parent": "ltw:vs/diamond1",
     "display": {
       "icon": {
-        "item": "minecraft:dead_horn_coral_block"
+        "item": "minecraft:enchanting_table"
       },
       "title": {
-        "text": "圣坛之慰      "
+        "text": "不可能的附魔师"
       },
       "description": [
-        {"text": "在地陷圣坛中获胜\n", "color":"gray"},
+        {"text": "用不知道从哪找到的书制作附魔台\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
-        {"text": "1 绿宝石","color":"white"}
+        {"text": "4 绿宝石","color":"white"}
       ],
-      "frame": "task",
+      "frame": "challenge",
       "show_toast": true,
       "announce_to_chat": true,
       "hidden": false
     },
     "rewards": {
-      "function": "ltw:advancement/bonus_1"
+      "function": "ltw:advancement/bonus_4"
     },
     "criteria": {
       "get_score":{
@@ -30,4 +30,4 @@
           "get_score"
       ]
     ]
-  }
+}

data/ltw/advancements/vs/potato2.json

@@ -1,5 +1,5 @@
 {
-    "parent": "ltw:vs/potato1",
+    "parent": "ltw:vs/root",
     "display": {
       "icon": {
         "item": "minecraft:tnt"
@@ -8,17 +8,17 @@
         "text": "炸弹人        "
       },
       "description": [
-        {"text": "在炸弹狂魔中获胜, 且剩余 3 心或更多的生命值\n", "color":"gray"},
+        {"text": "在炸弹狂魔中获胜, 且剩余 2 心或更多的生命值\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
-        {"text": "3 绿宝石","color":"white"}
+        {"text": "2 绿宝石","color":"white"}
       ],
-      "frame": "challenge",
+      "frame": "task",
       "show_toast": true,
       "announce_to_chat": true,
       "hidden": false
     },
     "rewards": {
-      "function": "ltw:advancement/bonus_3"
+      "function": "ltw:advancement/bonus_2"
     },
     "criteria": {
       "get_score":{

data/ltw/advancements/vs/potato3.json

@@ -0,0 +1,33 @@
+{
+    "parent": "ltw:vs/potato2",
+    "display": {
+      "icon": {
+        "item": "minecraft:enchanted_golden_apple"
+      },
+      "title": {
+        "text": "苹果炸弹      "
+      },
+      "description": [
+        {"text": "在炸弹狂魔中获胜, 且剩余 5 心或更多的生命值\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/functions/advancement/bonus_4.mcfunction

@@ -0,0 +1,4 @@
+scoreboard players add @s green 4
+scoreboard players add @s green_total 4
+execute if score $state mem matches 0 run function item:shop/refresh_green
+# MC 自己会播放完成音效

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

@@ -28,9 +28,6 @@ scoreboard players set $bossbar_type mem 1
 function lib:bossbar/show
 bossbar set mini:red name "地板消失"
 
-# 给予进度
-execute if score $color_match_time mem matches 10 as @a[team=!debugging,gamemode=adventure] run advancement grant @s only ltw:parkour/colormatch1
-
 # 更新地板方块
 scoreboard players operation $color_match_current mem = $color_match_floor mem
 execute as @a[team=!debugging] run function mini:colormatch/game/show_floor_block

data/mini/functions/main/game_end.mcfunction

@@ -27,11 +27,10 @@ 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] only ltw:parkour/tnt1
 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] 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 4 if score $color_match_time mem matches 10 run advancement grant @a[tag=mini_rank1] only ltw:parkour/colormatch2
+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=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
 
 # 进入状态 6
 function ltw:state/6/state_enter