进度系统奖励实装

data/ltw/advancements/combat/phantom_1.json

@@ -15,9 +15,6 @@
       "announce_to_chat": true,
       "hidden": false
     },
-    "rewards": {
-      "function": "ltw:advancement/combat/grant_root"
-    },
     "criteria": {
       "get_score":{
           "trigger": "minecraft:impossible"

data/ltw/advancements/combat/phantom_2.json

@@ -18,7 +18,7 @@
       "hidden": false
     },
     "rewards": {
-      "function": "ltw:advancement/combat/grant_root"
+      "function": "ltw:advancement/bonus_1"
     },
     "criteria": {
       "get_score":{

data/ltw/advancements/combat/phantom_3.json

@@ -18,7 +18,7 @@
       "hidden": false
     },
     "rewards": {
-      "function": "ltw:advancement/combat/grant_root"
+      "function": "ltw:advancement/bonus_2"
     },
     "criteria": {
       "finish":{

data/ltw/advancements/combat/root.json

@@ -17,7 +17,7 @@
     },
     "criteria": {
       "root": {
-        "trigger": "minecraft:impossible"
+        "trigger": "minecraft:location"
       }
     },
     "requirements": [

data/ltw/advancements/parkour/lobby_1.json → data/ltw/advancements/parkour/explore_1.json

@@ -15,9 +15,6 @@
       "announce_to_chat": true,
       "hidden": false
     },
-    "rewards": {
-      "function": "ltw:advancement/parkour/grant_root"
-    },
     "criteria": {
       "finish":{
           "trigger": "minecraft:impossible"

data/ltw/advancements/parkour/lobby_2.json → data/ltw/advancements/parkour/explore_2.json

@@ -1,5 +1,5 @@
 {
-    "parent": "ltw:parkour/lobby_1",
+    "parent": "ltw:parkour/explore_1",
     "display": {
       "icon": {
         "item": "minecraft:diamond_boots"
@@ -18,7 +18,7 @@
       "hidden": false
     },
     "rewards": {
-      "function": "ltw:advancement/parkour/grant_root"
+      "function": "ltw:advancement/bonus_1"
     },
     "criteria": {
       "finish":{

data/ltw/advancements/parkour/lobby_3.json → data/ltw/advancements/parkour/explore_3.json

@@ -1,5 +1,5 @@
 {
-    "parent": "ltw:parkour/lobby_2",
+    "parent": "ltw:parkour/explore_2",
     "display": {
       "icon": {
         "item": "minecraft:netherite_boots"
@@ -14,11 +14,11 @@
       ],
       "frame": "challenge",
       "show_toast": true,
-      "announce_to_chat": false,
+      "announce_to_chat": true,
       "hidden": true
     },
     "rewards": {
-      "function": "ltw:advancement/parkour/grant_root"
+      "function": "ltw:advancement/bonus_2"
     },
     "criteria": {
       "finish":{

data/ltw/advancements/parkour/root.json

@@ -17,7 +17,7 @@
   },
   "criteria": {
     "root": {
-      "trigger": "minecraft:impossible"
+      "trigger": "minecraft:location"
     }
   },
   "requirements": [

data/ltw/advancements/parkour/mini_1.json → data/ltw/advancements/parkour/treasure_1.json

@@ -15,9 +15,6 @@
       "announce_to_chat": true,
       "hidden": false
     },
-    "rewards": {
-      "function": "ltw:advancement/parkour/grant_root"
-    },
     "criteria": {
       "get_score":{
           "trigger": "minecraft:impossible"

data/ltw/advancements/parkour/mini_2.json → data/ltw/advancements/parkour/treasure_2.json

@@ -1,5 +1,5 @@
 {
-    "parent": "ltw:parkour/mini_1",
+    "parent": "ltw:parkour/treasure_1",
     "display": {
       "icon": {
         "item": "minecraft:diamond"
@@ -18,7 +18,7 @@
       "hidden": false
     },
     "rewards": {
-      "function": "ltw:advancement/parkour/grant_root"
+      "function": "ltw:advancement/bonus_1"
     },
     "criteria": {
       "get_score":{

data/ltw/advancements/parkour/mini_3.json → data/ltw/advancements/parkour/treasure_3.json

@@ -1,5 +1,5 @@
 {
-    "parent": "ltw:parkour/mini_2",
+    "parent": "ltw:parkour/treasure_2",
     "display": {
       "icon": {
         "item": "minecraft:netherite_scrap"
@@ -18,7 +18,7 @@
       "hidden": false
     },
     "rewards": {
-      "function": "ltw:advancement/parkour/grant_root"
+      "function": "ltw:advancement/bonus_2"
     },
     "criteria": {
       "get_score":{

data/ltw/functions/advancement/bonus_1.mcfunction

@@ -0,0 +1,3 @@
+scoreboard players add @s gold 4
+scoreboard players add @s gold_total 4
+execute if score $state mem matches 0 run function item:shop/refresh_gold

data/ltw/functions/advancement/bonus_2.mcfunction

@@ -0,0 +1,3 @@
+scoreboard players add @s gold 9
+scoreboard players add @s gold_total 9
+execute if score $state mem matches 0 run function item:shop/refresh_gold

data/ltw/functions/advancement/parkour/grant_root.mcfunction

@@ -1 +0,0 @@
-advancement grant @s only ltw:parkour/root

data/mini/functions/parkour/game/test_treasure.mcfunction

@@ -45,6 +45,6 @@ tellraw @a[tag=get_treasure,scores={treasure=..9}] ["",{"text":">> ","color":"gr
 execute as @a[tag=get_treasure,scores={treasure=10}] run function mini:parkour/player_finished
 execute as @a[tag=get_treasure] at @s run function lib:sounds/levelup
 
-execute as @a[tag=get_treasure] if score @s treasure matches 4 run advancement grant @s only ltw:parkour/mini_1
-execute as @a[tag=get_treasure] if score @s treasure matches 7 run advancement grant @s only ltw:parkour/mini_2
-execute as @a[tag=get_treasure] if score @s treasure matches 10 run advancement grant @s only ltw:parkour/mini_3
+execute as @a[tag=get_treasure] if score @s treasure matches 4 run advancement grant @s only ltw:parkour/treasure_1
+execute as @a[tag=get_treasure] if score @s treasure matches 7 run advancement grant @s only ltw:parkour/treasure_2
+execute as @a[tag=get_treasure] if score @s treasure matches 10 run advancement grant @s only ltw:parkour/treasure_3

data/mini/functions/phantom/tick5.mcfunction

@@ -8,3 +8,8 @@ execute as @a[tag=!watcher,scores={temp=1..,kill_phantom2=1..}] run function lib
 execute as @a[tag=!watcher,scores={temp=1..,kill_phantom2=0}] run function lib:sounds/levelup
 execute as @a[tag=!watcher,scores={temp=1..,kill_phantom2=0}] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"}," 已击杀 ",{"score": { "name": "@s","objective": "kill_phantom"},"color":"gold"}," 只幻翼!"]
 execute as @a[tag=!watcher] run scoreboard players operation @s kill_phantom2 = @s kill_phantom
+
+# 给予进度
+execute as @a[tag=!watcher,scores={temp=1..,kill_phantom=10}] run advancement grant @s only ltw:combat/phantom_1
+execute as @a[tag=!watcher,scores={temp=1..,kill_phantom=20}] run advancement grant @s only ltw:combat/phantom_2
+execute as @a[tag=!watcher,scores={temp=1..,kill_phantom=30}] run advancement grant @s only ltw:combat/phantom_3