Merge pull request #76607 from cknight828/backport-mission-fix

Backport #76478
CleverRaven · Sep 22, 2024 · 14edf5b · 14edf5b
2 parents f1ec14f + 1c4b923
commit 14edf5b
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/data/json/npcs/missiondef.json b/data/json/npcs/missiondef.json
@@ -34,8 +34,8 @@
     "id": "MISSION_GET_INHALER",
     "type": "mission_definition",
     "name": { "str": "Find Inhaler" },
-    "goal": "MGOAL_FIND_ITEM",
-    "item": "inhaler",
+    "goal": "MGOAL_CONDITION",
+    "goal_condition": { "u_has_item": "inhaler" },
     "difficulty": 2,
     "value": 150000,
     "urgent": true,
@@ -96,7 +96,21 @@
       ]
     },
     "end": {
-      "effect": [ { "npc_lose_effect": "infection" }, "stop_guard", { "set_npc_rule": "investigate_noises" }, "npc_thankful" ]
+      "effect": [
+        { "npc_lose_effect": "infection" },
+        "stop_guard",
+        { "set_npc_rule": "investigate_noises" },
+        "npc_thankful",
+        {
+          "if": { "u_has_item": "antibiotics" },
+          "then": { "u_consume_item": "antibiotics", "popup": true },
+          "else": {
+            "if": { "u_has_item": "strong_antibiotic" },
+            "then": { "u_consume_item": "strong_antibiotic", "popup": true },
+            "else": { "u_consume_item": "panacea", "popup": true }
+          }
+        }
+      ]
     },
     "fail": { "effect": "npc_die" }
   },