LTCatt пре 6 година
родитељ
комит
8cb342801f

+ 1 - 1
data/ltw/advancements/combat/root.json

@@ -13,7 +13,7 @@
       "show_toast": false,
       "announce_to_chat": false,
       "hidden": false,
-      "background": "minecraft:textures/gui/advancements/backgrounds/adventure.png"
+      "background": "minecraft:textures/blocks/red_nether_brick.png"
     },
     "criteria": {
       "root": {

+ 1 - 1
data/ltw/advancements/parkour/root.json

@@ -7,7 +7,7 @@
       "text":"跑酷"
     },
     "description": [
-      {"text": "跑酷的时光开始了……", "color":"gray"}
+      {"text": "这很简单, 只是从这里跳到那里而已", "color":"gray"}
     ],
     "frame": "task",
     "show_toast": false,

+ 33 - 0
data/ltw/advancements/vs/potato1.json

@@ -0,0 +1,33 @@
+{
+    "parent": "ltw:vs/root",
+    "display": {
+      "icon": {
+        "item": "minecraft:redstone_torch"
+      },
+      "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"
+      ]
+    ]
+  }

+ 33 - 0
data/ltw/advancements/vs/potato2.json

@@ -0,0 +1,33 @@
+{
+    "parent": "ltw:vs/potato2",
+    "display": {
+      "icon": {
+        "item": "minecraft:tnt"
+      },
+      "title": {
+        "text": "炸弹仁"
+      },
+      "description": [
+        {"text": "在炸弹狂魔小游戏中获胜, 且剩余 3 心或更多的生命值\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"
+      ]
+    ]
+  }

+ 28 - 0
data/ltw/advancements/vs/root.json

@@ -0,0 +1,28 @@
+{
+    "display": {
+      "icon": {
+        "item": "minecraft:wooden_axe"
+      },
+      "title": {
+        "text":"竞技"
+      },
+      "description": [
+        {"text": "还好, 这里不会因为一轮的失败就把你淘汰……", "color":"gray"}
+      ],
+      "frame": "task",
+      "show_toast": false,
+      "announce_to_chat": false,
+      "hidden": false,
+      "background": "minecraft:textures/blocks/stonebrick.png"
+    },
+    "criteria": {
+      "root": {
+        "trigger": "minecraft:location"
+      }
+    },
+    "requirements": [
+      [
+        "root"
+      ]
+    ]
+  }

+ 4 - 1
data/mini/functions/main/game_end.mcfunction

@@ -22,9 +22,12 @@ tag @a[tag=mini_rank2] add max_uncounted
 function mini:main/get_max_score
 execute as @a[tag=!max_uncounted] if score @s mini_score = #score_max mem run tag @s[tag=!watcher] add mini_rank3
 tag @a[tag=max_uncounted] remove max_uncounted
-
 # 4
 tag @a[tag=!mini_rank1,tag=!mini_rank2,tag=!mini_rank3,tag=!watcher] add mini_rank4
 
+# 给予进度
+execute if score $mini_type mem matches 3 as @a[tag=mini_rank1] run advancement grant @s only ltw:vs/potato1
+execute if score $mini_type mem matches 3 as @a[tag=mini_rank1,scores={mini_heart=3..}] run advancement grant @s only ltw:vs/potato2
+
 # 进入状态 6
 function ltw:state/6/state_enter