Merge pull request CleverRaven#76120 from harakka/anesthesia

Put player under during CBM surgery initiated from Rubik's dialogue
GuardianDll · Sep 2, 2024 · 9d8c9c6 · 9d8c9c6
2 parents 050fa50 + e80f19e
commit 9d8c9c6
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 9 deletions.
diff --git a/data/json/npcs/exodii/exodii_merchant_missions.json b/data/json/npcs/exodii/exodii_merchant_missions.json
@@ -480,19 +480,34 @@
     "responses": [
       {
         "text": "[Install Air Filtration CBM] I like the look of that air filtration thingy.  Does it come with pine-fresh scent?",
-        "effect": [ { "u_add_bionic": "bio_purifier" }, { "u_assign_activity": "ACT_CBM_SURGERY", "duration": "30 minutes" } ],
+        "effect": [
+          { "u_add_effect": "narcosis", "duration": "30 minutes" },
+          { "u_add_effect": "sleep", "duration": "30 minutes" },
+          { "u_assign_activity": "ACT_CBM_SURGERY", "duration": "30 minutes" },
+          { "u_add_bionic": "bio_purifier" }
+        ],
         "opinion": { "trust": 4, "value": 3 },
         "topic": "TALK_DONE"
       },
       {
         "text": "[Install Blood Analysis CBM] I've always wondered what's in my veins.  Let's try that blood analysis module.",
-        "effect": [ { "u_add_bionic": "bio_blood_anal" }, { "u_assign_activity": "ACT_CBM_SURGERY", "duration": "30 minutes" } ],
+        "effect": [
+          { "u_add_effect": "narcosis", "duration": "30 minutes" },
+          { "u_add_effect": "sleep", "duration": "30 minutes" },
+          { "u_assign_activity": "ACT_CBM_SURGERY", "duration": "30 minutes" },
+          { "u_add_bionic": "bio_blood_anal" }
+        ],
         "opinion": { "trust": 4, "value": 3 },
         "topic": "TALK_DONE"
       },
       {
         "text": "[Install Radiation Scrubber CBM] I have nightmares about ending up like Marie Curie.  Radiation scrubber it has to be.",
-        "effect": [ { "u_add_bionic": "bio_radscrubber" }, { "u_assign_activity": "ACT_CBM_SURGERY", "duration": "30 minutes" } ],
+        "effect": [
+          { "u_add_effect": "narcosis", "duration": "30 minutes" },
+          { "u_add_effect": "sleep", "duration": "30 minutes" },
+          { "u_assign_activity": "ACT_CBM_SURGERY", "duration": "30 minutes" },
+          { "u_add_bionic": "bio_radscrubber" }
+        ],
         "opinion": { "trust": 4, "value": 3 },
         "topic": "TALK_DONE"
       },

diff --git a/data/json/npcs/exodii/exodii_merchant_talk_exodization.json b/data/json/npcs/exodii/exodii_merchant_talk_exodization.json
@@ -7,12 +7,12 @@
       {
         "text": "[Install CBM Interface] Let's do it.",
         "effect": [
-          { "u_add_bionic": "bio_power_storage" },
-          { "u_add_bionic": "bio_cable" },
+          { "u_add_effect": "narcosis", "duration": "2 hours" },
+          { "u_add_effect": "sleep", "duration": "2 hours" },
           { "u_assign_activity": "ACT_CBM_SURGERY", "duration": "2 hours" },
-          { "u_add_effect": "blind", "duration": "2 hours" },
-          { "u_add_effect": "deaf", "duration": "2 hours" },
-          { "u_add_trait": "CBM_Interface" }
+          { "u_add_trait": "CBM_Interface" },
+          { "u_add_bionic": "bio_power_storage" },
+          { "u_add_bionic": "bio_cable" }
         ],
         "topic": "TALK_EXODII_MERCHANT_Exodized"
       },
@@ -203,9 +203,11 @@
       {
         "text": "[Install CBM Interface] All right.  Let's do this.",
         "effect": [
+          { "u_add_effect": "narcosis", "duration": "2 hours" },
+          { "u_add_effect": "sleep", "duration": "2 hours" },
+          { "u_assign_activity": "ACT_CBM_SURGERY", "duration": "2 hours" },
           { "u_add_bionic": "bio_power_storage" },
           { "u_add_bionic": "bio_cable" },
-          { "u_assign_activity": "ACT_CBM_SURGERY", "duration": "2 hours" },
           { "u_add_trait": "CBM_Interface" }
         ],
         "topic": "TALK_EXODII_MERCHANT_Exodized"