Merge pull request #75823 from CleverRaven/backport_npcs

backport #75444
CleverRaven · Aug 31, 2024 · 5ada9c1 · 5ada9c1
2 parents bdfb236 + c038011
commit 5ada9c1
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 30 deletions.
diff --git a/data/json/npcs/robofac/robofac_ancilla_npcs/NPC_ANCILLA_DOCTOR.json b/data/json/npcs/robofac/robofac_ancilla_npcs/NPC_ANCILLA_DOCTOR.json
@@ -117,14 +117,14 @@
       {
         "text": "[4 HGC, 30m] I need you to patch me up.",
         "topic": "TALK_ANCILLA_DOCTOR_AID_DONE",
-        "effect": [ { "u_spend_cash": 20000, "true_eocs": { "id": "give_aid", "effect": "give_aid" } } ],
-        "condition": { "npc_service": 20000 }
+        "effect": [ { "u_consume_item": "RobofacCoin", "count": 4 }, "give_aid" ],
+        "condition": { "u_has_items": { "item": "RobofacCoin", "count": 4 } }
       },
       {
         "text": "[8 HGC, 1h] I need you to patch my friends up.",
         "topic": "TALK_ANCILLA_DOCTOR_AID_DONE",
-        "effect": { "u_spend_cash": 40000, "true_eocs": { "id": "give_all_aid", "effect": "give_all_aid" } },
-        "condition": { "npc_service": 40000 }
+        "effect": [ { "u_consume_item": "RobofacCoin", "count": 8 }, "give_all_aid" ],
+        "condition": { "u_has_items": { "item": "RobofacCoin", "count": 8 } }
       },
       { "text": "I should be fine.", "topic": "TALK_ANCILLA_DOCTOR" }
     ]
@@ -138,25 +138,25 @@
         "text": "I was wondering if you could install a cybernetic implant…",
         "topic": "TALK_DONE",
         "effect": "bionic_install",
-        "condition": { "npc_service": 0 }
+        "condition": { "not": { "npc_has_effect": "currently_busy" } }
       },
       {
         "text": "I was wondering if you could install a cybernetic implant in my friend here…",
         "topic": "TALK_DONE",
         "effect": "bionic_install_allies",
-        "condition": { "npc_service": 0 }
+        "condition": { "not": { "npc_has_effect": "currently_busy" } }
       },
       {
         "text": "I need help removing an implant…",
         "topic": "TALK_DONE",
         "effect": "bionic_remove",
-        "condition": { "npc_service": 0 }
+        "condition": { "not": { "npc_has_effect": "currently_busy" } }
       },
       {
         "text": "I need help removing an implant from one of my friends…",
         "topic": "TALK_DONE",
         "effect": "bionic_remove_allies",
-        "condition": { "npc_service": 0 }
+        "condition": { "not": { "npc_has_effect": "currently_busy" } }
       },
       { "text": "Oh no, I was wondering if you knew where to get some.", "topic": "TALK_ANCILLA_DOCTOR_FIND_BIONICS" },
       { "text": "Never mind.", "topic": "TALK_NONE" }

diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_doctor.json b/data/json/npcs/tacoma_ranch/NPC_ranch_doctor.json
@@ -81,24 +81,24 @@
     },
     "responses": [
       {
-        "text": "[$200, 30m] I need you to patch me up.",
+        "text": "[80 merch, 30m] I need you to patch me up.",
         "topic": "TALK_RANCH_DOCTOR_AID_DONE",
-        "effect": [ "give_aid", { "u_spend_cash": 20000 } ],
+        "effect": [ { "u_consume_item": "FMCNote", "count": 80 }, "give_aid" ],
         "condition": {
           "and": [
-            { "npc_service": 20000 },
-            { "npc_has_var": "provides_aid", "type": "dialogue", "context": "tacoma_ranch", "value": "yes" }
+            { "u_has_items": { "item": "FMCNote", "count": 80 } },
+            { "npc_has_var": "dialogue_tacoma_ranch_provides_aid", "value": "yes" }
           ]
         }
       },
       {
-        "text": "[$500, 1h] I need you to patch my friends up.",
+        "text": "[200 merch, 1h] I need you to patch my friends up.",
         "topic": "TALK_RANCH_DOCTOR_AID_DONE",
-        "effect": [ "give_all_aid", { "u_spend_cash": 50000 } ],
+        "effect": [ { "u_consume_item": "FMCNote", "count": 200 }, "give_all_aid" ],
         "condition": {
           "and": [
-            { "npc_service": 50000 },
-            { "npc_has_var": "provides_aid", "type": "dialogue", "context": "tacoma_ranch", "value": "yes" }
+            { "u_has_items": { "item": "FMCNote", "count": 200 } },
+            { "npc_has_var": "dialogue_tacoma_ranch_provides_aid", "value": "yes" }
           ]
         }
       },

diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json b/data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json
@@ -91,16 +91,16 @@
     },
     "responses": [
       {
-        "text": "[$100, 15m] I need you to patch me up.",
+        "text": "[40 merch, 15m] I need you to patch me up.",
         "topic": "TALK_RANCH_NURSE_AID_DONE",
-        "effect": [ { "u_spend_cash": 10000, "true_eocs": { "id": "EOC_lesser_give_aid", "effect": "lesser_give_aid" } } ],
-        "condition": { "npc_service": 10000 }
+        "effect": [ { "u_consume_item": "FMCNote", "count": 40 }, "lesser_give_aid" ],
+        "condition": { "u_has_items": { "item": "FMCNote", "count": 40 } }
       },
       {
-        "text": "[$250, 30h] I need you to patch my friends up.",
+        "text": "[100 merch, 30m] I need you to patch my friends up.",
         "topic": "TALK_RANCH_NURSE_AID_DONE",
-        "effect": { "u_spend_cash": 25000, "true_eocs": { "id": "EOC_lesser_give_all_aid", "effect": "lesser_give_all_aid" } },
-        "condition": { "npc_service": 25000 }
+        "effect": [ { "u_consume_item": "FMCNote", "count": 100 }, "lesser_give_all_aid" ],
+        "condition": { "u_has_items": { "item": "FMCNote", "count": 100 } }
       },
       { "text": "I should be fine.", "topic": "TALK_RANCH_NURSE" }
     ]

diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_woodcutter1.json b/data/json/npcs/tacoma_ranch/NPC_ranch_woodcutter1.json
@@ -49,12 +49,12 @@
     },
     "responses": [
       {
-        "text": "[$2000, 1d] 10 logs",
+        "text": "[800 merch, 1d] 10 logs",
         "topic": "TALK_DONE",
         "effect": [
+          { "u_consume_item": "FMCNote", "count": 800 },
           {
-            "u_spend_cash": 200000,
-            "true_eocs": {
+            "run_eocs": {
               "id": "EOC_10_logs",
               "effect": [
                 { "mapgen_update": "tacoma_commune_woodcutter_10_logs", "om_terrain": "ranch_camp_67" },
@@ -64,15 +64,15 @@
             }
           }
         ],
-        "condition": { "npc_service": 200000 }
+        "condition": { "u_has_items": { "item": "FMCNote", "count": 800 } }
       },
       {
-        "text": "[$12000, 7d] 100 logs",
+        "text": "[4800 merch, 7d] 100 logs",
         "topic": "TALK_DONE",
         "effect": [
+          { "u_consume_item": "FMCNote", "count": 4800 },
           {
-            "u_spend_cash": 1200000,
-            "true_eocs": {
+            "run_eocs": {
               "id": "EOC_100_logs",
               "effect": [
                 { "mapgen_update": "tacoma_commune_woodcutter_100_logs", "om_terrain": "ranch_camp_67" },
@@ -82,7 +82,7 @@
             }
           }
         ],
-        "condition": { "npc_service": 1200000 }
+        "condition": { "u_has_items": { "item": "FMCNote", "count": 4800 } }
       },
       { "text": "Maybe later.", "topic": "TALK_RANCH_WOODCUTTER", "condition": "npc_available" },
       { "text": "I'll be back later.", "topic": "TALK_RANCH_WOODCUTTER" }