继续调整进度

data/item/functions/bonus_item/add_score.mcfunction

@@ -21,5 +21,6 @@ execute if score #bonus_add_score mem matches 101 if score $random mem matches 0
 
 # 给予进度
 execute if entity @s[scores={total_score=10..}] run advancement grant @s only ltw:story/score1
-execute if entity @s[scores={total_score=18..}] run advancement grant @s only ltw:story/score2
-execute if entity @s[scores={total_score=26..}] run advancement grant @s only ltw:story/score3
+execute if entity @s[scores={total_score=20..}] run advancement grant @s only ltw:story/score2
+execute if entity @s[scores={total_score=30..}] run advancement grant @s only ltw:story/score3
+execute if entity @s[scores={total_score=40..}] run advancement grant @s only ltw:story/score4

data/lib/functions/effect/regen.mcfunction

@@ -1,8 +0,0 @@
-# 每秒一次
-# 绿宝石：回血
-
-execute as @a[gamemode=!spectator] at @s if block ~ ~-1 ~ emerald_block run effect give @s regeneration 2 2
-# scoreboard players remove @a[scores={effect_regen=0..}] effect_regen 1
-# execute as @a[gamemode=!spectator,scores={effect_regen=..0}] at @s if block ~ ~-1 ~ emerald_block run effect give @s regeneration 2 2
-# execute as @a[gamemode=!spectator,scores={effect_regen=..0}] at @s if block ~ ~-1 ~ emerald_block run scoreboard players set @s effect_regen 4
-# effect clear @a[scores={effect_regen=0}] regeneration

data/ltw/advancements/combat/phantom1.json → data/ltw/advancements/blood/phantom1.json

@@ -1,14 +1,14 @@
 {
-    "parent": "ltw:combat/root",
+    "parent": "ltw:blood/root",
     "display": {
       "icon": {
-        "item": "minecraft:arrow"
+        "item": "minecraft:phantom_membrane"
       },
       "title": {
-        "text": "狩猎学徒      "
+        "text": "不再有梦 · α "
       },
       "description": [
-        {"text": "在月夜狩猎中击杀 8 只幻翼\n", "color":"gray"},
+        {"text": "【月夜狩猎】击杀 8 只幻翼\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "1 绿宝石","color":"white"}
       ],

data/ltw/advancements/combat/phantom2.json → data/ltw/advancements/blood/phantom2.json

@@ -1,14 +1,14 @@
 {
-    "parent": "ltw:combat/phantom1",
+    "parent": "ltw:blood/phantom1",
     "display": {
       "icon": {
-        "item": "minecraft:phantom_membrane"
+        "item": "minecraft:phantom_spawn_egg"
       },
       "title": {
-        "text": "怪物猎人      "
+        "text": "不再有梦 · β "
       },
       "description": [
-        {"text": "在月夜狩猎中击杀 16 只幻翼\n", "color":"gray"},
+        {"text": "【月夜狩猎】击杀 16 只幻翼\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "2 绿宝石","color":"white"}
       ],

data/ltw/advancements/combat/phantom3.json → data/ltw/advancements/blood/phantom3.json

@@ -1,14 +1,14 @@
 {
-    "parent": "ltw:combat/phantom2",
+    "parent": "ltw:blood/phantom2",
     "display": {
       "icon": {
-        "item": "minecraft:spectral_arrow"
+        "item": "minecraft:trident"
       },
       "title": {
-        "text": "不再有梦      "
+        "text": "不再有梦 · γ "
       },
       "description": [
-        {"text": "在月夜狩猎中击杀 24 只幻翼\n", "color":"gray"},
+        {"text": "【月夜狩猎】击杀 24 只幻翼\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "3 绿宝石","color":"white"}
       ],
@@ -21,13 +21,8 @@
       "function": "ltw:advancement/bonus_3"
     },
     "criteria": {
-      "finish":{
+      "a":{
           "trigger": "minecraft:impossible"
       }
-    },
-    "requirements": [
-      [
-          "finish"
-      ]
-    ]
+    }
   }

data/ltw/advancements/blood/phantom4.json

@@ -0,0 +1,24 @@
+{
+    "parent": "ltw:blood/phantom3",
+    "display": {
+      "icon": {
+        "item": "minecraft:red_bed"
+      },
+      "title": {
+        "text": "不再有梦 · Ω "
+      },
+      "description": [
+        {"text": "【月夜狩猎】击杀 32 只幻翼\n", "color":"gray"},
+        {"text": "究极隐藏挑战！","color":"dark_gray","italic": true}
+      ],
+      "frame": "challenge",
+      "show_toast": true,
+      "announce_to_chat": true,
+      "hidden": true
+    },
+    "criteria": {
+      "a":{
+          "trigger": "minecraft:impossible"
+      }
+    }
+  }

data/ltw/advancements/combat/root.json → data/ltw/advancements/blood/root.json

@@ -1,10 +1,10 @@
 {
     "display": {
       "icon": {
-        "item": "minecraft:wooden_sword"
+        "item": "minecraft:crossbow"
       },
       "title": {
-        "text":"战斗"
+        "text":"金铁交鸣"
       },
       "description": [
         {"text": "", "color":"gray"}

data/ltw/advancements/parkour/root.json

@@ -4,7 +4,7 @@
       "item": "minecraft:leather_boots"
     },
     "title": {
-      "text":"跑酷"
+      "text":"飞檐走壁"
     },
     "description": [
       {"text": "", "color":"gray"}

data/ltw/advancements/parkour/tnt1.json

@@ -5,7 +5,7 @@
       "item": "minecraft:dead_fire_coral_block"
     },
     "title": {
-      "text": " 圣坛之主 · α "
+      "text": "圣坛之主 · α "
     },
     "description": [
       {"text": "【地陷圣坛】在不位于最底层时获胜\n", "color":"gray"},

data/ltw/advancements/parkour/tnt2.json

@@ -5,7 +5,7 @@
       "item": "minecraft:warped_hyphae"
     },
     "title": {
-      "text": " 圣坛之主 · β "
+      "text": "圣坛之主 · β "
     },
     "description": [
       {"text": "【地陷圣坛】从最底层返回最顶层\n", "color":"gray"},

data/ltw/advancements/parkour/tnt3.json

@@ -5,7 +5,7 @@
         "item": "minecraft:crimson_hyphae"
       },
       "title": {
-        "text": " 圣坛之主 · γ "
+        "text": "圣坛之主 · γ "
       },
       "description": [
         {"text": "【地陷圣坛】几乎清空最顶层的所有方块\n", "color":"gray"},

data/ltw/advancements/parkour/treasure1.json

@@ -5,7 +5,7 @@
         "item": "minecraft:iron_boots"
       },
       "title": {
-        "text": " 争分夺秒 · α "
+        "text": "争分夺秒 · α "
       },
       "description": [
         {"text": "【遗迹寻宝】在 100 秒内到达终点\n", "color":"gray"},

data/ltw/advancements/parkour/treasure2.json

@@ -5,7 +5,7 @@
         "item": "minecraft:diamond_boots"
       },
       "title": {
-        "text": " 争分夺秒 · β "
+        "text": "争分夺秒 · β "
       },
       "description": [
         {"text": "【遗迹寻宝】在 60 秒内到达终点\n", "color":"gray"},

data/ltw/advancements/parkour/treasure3.json

@@ -5,7 +5,7 @@
         "item": "minecraft:netherite_boots"
       },
       "title": {
-        "text": " 争分夺秒 · γ "
+        "text": "争分夺秒 · γ "
       },
       "description": [
         {"text": "【遗迹寻宝】在 40 秒内到达终点\n", "color":"gray"},

data/ltw/advancements/parkour/treasure4.json

@@ -6,7 +6,7 @@
         "nbt": "{Enchantments:[{id:\"minecraft:protection\",lvl:4s}]}"
       },
       "title": {
-        "text": " 争分夺秒 · Ω "
+        "text": "争分夺秒 · Ω "
       },
       "description": [
         {"text": "【遗迹寻宝】在 33 秒内到达终点\n", "color":"gray"},

data/ltw/advancements/story/root.json

@@ -1,10 +1,10 @@
 {
     "display": {
       "icon": {
-        "item": "minecraft:flower_banner_pattern"
+        "item": "minecraft:book"
       },
       "title": {
-        "text":"履历"
+        "text":"荣誉之路"
       },
       "description": [
         {"text": "", "color":"gray"}

data/ltw/advancements/story/score1.json

@@ -5,7 +5,7 @@
         "item": "minecraft:paper"
       },
       "title": {
-        "text": "两位数的突破  "
+        "text": "积分猎手 · α "
       },
       "description": [
         {"text": "在单局游戏中达到 10 积分\n", "color":"gray"},

data/ltw/advancements/story/score2.json

@@ -5,10 +5,10 @@
         "item": "minecraft:map"
       },
       "title": {
-        "text": "分数猎手      "
+        "text": "积分猎手 · β "
       },
       "description": [
-        {"text": "在单局游戏中达到 18 积分\n", "color":"gray"},
+        {"text": "在单局游戏中达到 20 积分\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "2 绿宝石","color":"white"}
       ],

data/ltw/advancements/story/score3.json

@@ -2,13 +2,13 @@
     "parent": "ltw:story/score2",
     "display": {
       "icon": {
-        "item": "minecraft:nether_star"
+        "item": "minecraft:flower_banner_pattern"
       },
       "title": {
-        "text": "分数满屋      "
+        "text": "积分猎手 · γ "
       },
       "description": [
-        {"text": "在单局游戏中达到 26 积分\n", "color":"gray"},
+        {"text": "在单局游戏中达到 30 积分\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "3 绿宝石","color":"white"}
       ],

data/ltw/advancements/story/score4.json

@@ -0,0 +1,24 @@
+{
+    "parent": "ltw:story/score3",
+    "display": {
+      "icon": {
+        "item": "minecraft:nether_star"
+      },
+      "title": {
+        "text": "积分猎手 · Ω "
+      },
+      "description": [
+        {"text": "在单局游戏中达到 40 积分\n", "color":"gray"},
+        {"text": "究极隐藏挑战！","color":"dark_gray","italic": true}
+      ],
+      "frame": "challenge",
+      "show_toast": true,
+      "announce_to_chat": true,
+      "hidden": true
+    },
+    "criteria": {
+      "a":{
+          "trigger": "minecraft:impossible"
+      }
+    }
+  }

data/ltw/advancements/story/win1.json

@@ -5,7 +5,7 @@
         "item": "minecraft:player_head"
       },
       "title": {
-        "text": " 无人能敌 · α "
+        "text": "无人能敌 · α "
       },
       "description": [
         {"text": "获得 1 场游戏的胜利\n", "color":"gray"},

data/ltw/advancements/story/win2.json

@@ -5,7 +5,7 @@
         "item": "minecraft:skeleton_skull"
       },
       "title": {
-        "text": " 无人能敌 · β "
+        "text": "无人能敌 · β "
       },
       "description": [
         {"text": "获得 4 场游戏的胜利\n", "color":"gray"},

data/ltw/advancements/story/win3.json

@@ -5,7 +5,7 @@
         "item": "minecraft:wither_skeleton_skull"
       },
       "title": {
-        "text": " 无人能敌 · γ "
+        "text": "无人能敌 · γ "
       },
       "description": [
         {"text": "获得 10 场游戏的胜利\n", "color":"gray"},

data/ltw/advancements/story/win4.json

@@ -5,7 +5,7 @@
         "item": "minecraft:dragon_head"
       },
       "title": {
-        "text": " 无人能敌 · Ω "
+        "text": "无人能敌 · Ω "
       },
       "description": [
         {"text": "获得 25 场游戏的胜利\n", "color":"gray"},

data/ltw/advancements/vs/colormatch1.json

@@ -5,7 +5,7 @@
         "item": "minecraft:yellow_glazed_terracotta"
       },
       "title": {
-        "text": " 纷乱迷阵 · α "
+        "text": "纷乱迷阵 · α "
       },
       "description": [
         {"text": "【色彩迷阵】坚持至切换速度达到满速\n", "color":"gray"},

data/ltw/advancements/vs/colormatch2.json

@@ -5,7 +5,7 @@
         "item": "minecraft:red_glazed_terracotta"
       },
       "title": {
-        "text": " 纷乱迷阵 · β "
+        "text": "纷乱迷阵 · β "
       },
       "description": [
         {"text": "【色彩迷阵】在满速切换后获胜，且剩余至少 2 颗心\n", "color":"gray"},

data/ltw/advancements/vs/colormatch3.json

@@ -5,7 +5,7 @@
         "item": "minecraft:purple_glazed_terracotta"
       },
       "title": {
-        "text": " 纷乱迷阵 · γ "
+        "text": "纷乱迷阵 · γ "
       },
       "description": [
         {"text": "【色彩迷阵】在满速切换后获胜，且不损失任何生命值\n", "color":"gray"},

data/ltw/advancements/vs/emerald1.json

@@ -5,7 +5,7 @@
         "item": "minecraft:emerald"
       },
       "title": {
-        "text": " 商业奇迹 · α "
+        "text": "商业奇迹 · α "
       },
       "description": [
         {"text": "【贸易专家】持有 8 个绿宝石\n", "color":"gray"},

data/ltw/advancements/vs/emerald2.json

@@ -5,10 +5,10 @@
         "item": "minecraft:nether_star"
       },
       "title": {
-        "text": " 商业奇迹 · β "
+        "text": "商业奇迹 · β "
       },
       "description": [
-        {"text": "【贸易专家】完成一项获得 2 积分的交易\n", "color":"gray"},
+        {"text": "【贸易专家】完成获得 2 积分的交易\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "2 绿宝石","color":"white"}
       ],

data/ltw/advancements/vs/emerald3.json

@@ -5,7 +5,7 @@
         "item": "minecraft:emerald_block"
       },
       "title": {
-        "text": " 商业奇迹 · γ "
+        "text": "商业奇迹 · γ "
       },
       "description": [
         {"text": "【贸易专家】清空整个交易列表\n", "color":"gray"},

data/ltw/advancements/vs/potato1.json

@@ -5,7 +5,7 @@
         "item": "minecraft:apple"
       },
       "title": {
-        "text": " 君临天下 · α "
+        "text": "君临天下 · α "
       },
       "description": [
         {"text": "【炸弹狂魔】在剩余至少 2 颗心时获胜\n", "color":"gray"},

data/ltw/advancements/vs/potato2.json

@@ -5,7 +5,7 @@
         "item": "minecraft:golden_apple"
       },
       "title": {
-        "text": " 君临天下 · β "
+        "text": "君临天下 · β "
       },
       "description": [
         {"text": "【炸弹狂魔】在剩余至少 3 颗心时获胜\n", "color":"gray"},

data/ltw/advancements/vs/potato3.json

@@ -5,7 +5,7 @@
         "item": "minecraft:enchanted_golden_apple"
       },
       "title": {
-        "text": " 君临天下 · γ "
+        "text": "君临天下 · γ "
       },
       "description": [
         {"text": "【炸弹狂魔】在剩余至少 5 颗心时获胜\n", "color":"gray"},

data/ltw/advancements/vs/root.json

@@ -1,10 +1,10 @@
 {
     "display": {
       "icon": {
-        "item": "minecraft:wooden_axe"
+        "item": "minecraft:fishing_rod"
       },
       "title": {
-        "text":"竞技"
+        "text":"百般绝学"
       },
       "description": [
         {"text": "", "color":"gray"}

data/ltw/functions/clock/tick20.mcfunction

@@ -11,9 +11,6 @@ execute if score $state mem matches 6 run function ltw:state/6/tick20
 execute if score $state mem matches 7 run function ltw:state/7/tick20
 function lib:sounds/music/tick20
 
-# 特殊方块给予效果
-function lib:effect/regen
-
 # 全局倒计时
 execute if score $countdown mem matches 1.. run scoreboard players remove $countdown mem 1
 scoreboard players remove @e[scores={countdown=1..}] countdown 1

data/mini/functions/phantom/tick5.mcfunction

@@ -10,6 +10,7 @@ execute as @a[team=playing,scores={temp=1..,kill_phantom2=0}] run tellraw @a [""
 execute as @a[team=playing] run scoreboard players operation @s kill_phantom2 = @s kill_phantom
 
 # 给予进度
-execute as @a[team=playing,scores={temp=1..,kill_phantom=8}] run advancement grant @s only ltw:combat/phantom1
-execute as @a[team=playing,scores={temp=1..,kill_phantom=16}] run advancement grant @s only ltw:combat/phantom2
-execute as @a[team=playing,scores={temp=1..,kill_phantom=24}] run advancement grant @s only ltw:combat/phantom3
+execute as @a[team=playing,scores={temp=1..,kill_phantom=8}] run advancement grant @s only ltw:blood/phantom1
+execute as @a[team=playing,scores={temp=1..,kill_phantom=16}] run advancement grant @s only ltw:blood/phantom2
+execute as @a[team=playing,scores={temp=1..,kill_phantom=24}] run advancement grant @s only ltw:blood/phantom3
+execute as @a[team=playing,scores={temp=1..,kill_phantom=32}] run advancement grant @s only ltw:blood/phantom4