[MoM] Update morphic resilience cream (renamed "morphic reinforcement…

… serum") with MUT_INSTABILITY_MOD, switch it and noetic resilience treatment over to `consume_drug` use action (CleverRaven#75437) * Initial commit * Adjust mutagen consumption
Stephen2 · Aug 6, 2024 · f6c5cc7 · f6c5cc7
1 parent 2c0f4c1
commit f6c5cc7
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 33 deletions.
diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_potions.json b/data/mods/MindOverMatter/effectoncondition/eoc_potions.json
@@ -142,9 +142,16 @@
   },
   {
     "type": "effect_on_condition",
-    "id": "EOC_DRAIN_RESIST_POTION",
+    "id": "EOC_NOETIC_RESILIENCE_TRIGGER",
+    "eoc_type": "EVENT",
+    "required_event": "character_gains_effect",
+    "condition": { "compare_string": [ "effect_noetic_resilience_trigger", { "context_val": "effect" } ] },
+    "effect": [ { "run_eocs": "EOC_DRAIN_RESIST_POTION_START_EFFECTS" } ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_DRAIN_RESIST_POTION_START_EFFECTS",
     "effect": [
-      { "u_message": "You drink the concoction." },
       { "u_lose_effect": "effect_noetic_resilience_comedown" },
       { "u_add_effect": "effect_noetic_resilience", "duration": "30 hours" },
       { "queue_eocs": "EOC_DRAIN_RESIST_POTION_COMEDOWN", "time_in_future": [ "18 hours", "30 hours" ] }

diff --git a/data/mods/MindOverMatter/effects/effects_items.json b/data/mods/MindOverMatter/effects/effects_items.json
@@ -2,13 +2,13 @@
   {
     "id": "instability_remover",
     "type": "effect_type",
-    "name": [ "Severe Itching" ],
-    "desc": [ "You rubbed the cream all over your skin.  Hopefully it was a good idea." ],
+    "name": [ "Morphic Reinforcement" ],
+    "desc": [ "You're not exactly sure what morphic reinforcement means, but it definitely itches like crazy." ],
     "apply_message": "Your entire body itches terribly!",
     "remove_message": "The itching finally fades away.",
     "rating": "mixed",
     "max_duration": "24 hours",
-    "vitamins": [ { "vitamin": "instability", "rate": [ [ -1, -1 ] ], "tick": [ "3 m" ] } ],
+    "vitamins": [ { "vitamin": "mutagen", "rate": [ [ -1, -1 ] ], "tick": [ "2 m" ] } ],
     "base_mods": {
       "speed_mod": [ -10 ],
       "str_mod": [ -1 ],
@@ -18,7 +18,15 @@
       "h_mod_chance": [ 1 ],
       "h_mod_chance_bot": [ 5 ],
       "h_mod_tick": [ 3600 ]
-    }
+    },
+    "enchantments": [ { "condition": "ALWAYS", "values": [ { "value": "MUT_INSTABILITY_MOD", "add": -2 } ] } ]
+  },
+  {
+    "id": "effect_noetic_resilience_trigger",
+    "type": "effect_type",
+    "//": "Hidden effect to set off an EoC",
+    "name": [ "" ],
+    "desc": [ "" ]
   },
   {
     "id": "force_field_generated",

diff --git a/data/mods/MindOverMatter/items/medical.json b/data/mods/MindOverMatter/items/medical.json
@@ -1,24 +1,29 @@
 [
   {
     "id": "psionic_instability_remover",
-    "name": { "str_sp": "morphic resilience cream" },
-    "description": "An extremely thick cream that will \"enhance your resilience to the deleterious effects of XE037 overexposure\" if you rub it on your skin.  It smells like nail polish somehow gone rotten, and even touching it makes your fingertips itch terribly.",
+    "name": { "str_sp": "morphic reinforcement serum" },
+    "description": "An extremely thick-looking liquid that will \"enhance your resilience against detrimental mutagenic alterations caused by XE037 overexposure\" if injected.",
     "type": "COMESTIBLE",
     "comestible_type": "MED",
-    "weight": "265 g",
-    "volume": "250 ml",
-    "price": "30 USD",
-    "price_postapoc": "30 USD",
-    "fun": -3,
-    "symbol": "q",
-    "container": "bottle_plastic_small",
+    "weight": "20 g",
+    "volume": "10ml",
+    "charges": 1,
+    "price": "300 kUSD",
+    "price_postapoc": 25,
+    "symbol": "!",
+    "material": [ "nether_crystal", "alien_liquid" ],
+    "phase": "liquid",
+    "container": "test_tube",
     "color": "blue",
-    "flags": [ "EATEN_COLD" ],
-    "phase": "solid",
+    "vitamins": [  ],
+    "healthy": -4,
+    "freezing_point": -15,
+    "flags": [ "NO_INGEST" ],
     "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Rub the cream on your skin.",
-      "effect_on_conditions": [ "EOC_INSTABILITY_CREAM" ]
+      "type": "consume_drug",
+      "activation_message": "You inject the morphic reinforcement serum.",
+      "tools_needed": { "syringe": -1 },
+      "effects": [ { "id": "instability_remover", "duration": 86400 } ]
     }
   },
   {
@@ -30,16 +35,17 @@
     "weight": "20 g",
     "volume": "10ml",
     "charges": 1,
-    "price": "12 kUSD",
-    "price_postapoc": "30 USD",
+    "price": "120 kUSD",
+    "price_postapoc": 10,
     "material": [ "nether_crystal", "alien_liquid" ],
     "phase": "liquid",
-    "container": "flask_glass",
+    "container": "test_tube",
     "symbol": "!",
     "color": "green",
     "vitamins": [  ],
     "healthy": -4,
-    "flags": [ "SINGLE_USE" ],
+    "freezing_point": -15,
+    "flags": [ "SINGLE_USE", "NO_INGEST" ],
     "use_action": [ "PURIFY_SMART" ]
   },
   {
@@ -51,20 +57,22 @@
     "weight": "20 g",
     "volume": "10ml",
     "charges": 1,
-    "price": "12 kUSD",
-    "price_postapoc": "30 USD",
+    "price": "120 kUSD",
+    "price_postapoc": 10,
     "material": [ "nether_crystal", "alien_liquid" ],
     "phase": "liquid",
-    "container": "flask_glass",
+    "container": "test_tube",
     "symbol": "!",
     "color": "white",
     "vitamins": [  ],
     "healthy": -4,
-    "flags": [ "SINGLE_USE" ],
+    "freezing_point": -15,
+    "flags": [ "NO_INGEST" ],
     "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Inject the concoction.",
-      "effect_on_conditions": [ "EOC_DRAIN_RESIST_POTION" ]
+      "type": "consume_drug",
+      "activation_message": "You inject the noetic resilience treatment.",
+      "tools_needed": { "syringe": -1 },
+      "effects": [ { "id": "effect_noetic_resilience_trigger", "duration": 1 } ]
     }
   }
 ]
diff --git a/data/mods/MindOverMatter/items/schematics.json b/data/mods/MindOverMatter/items/schematics.json
@@ -128,8 +128,8 @@
   {
     "id": "schematics_instability_remover",
     "type": "BOOK",
-    "name": { "str_sp": "morphic resilience cream schematics" },
-    "description": "This document details a series of steps for making a cream which will \"enhance the subject's resilience to the deleterious effects of XE037 overexposure, allowing more rapid experimentation and reducing the need for subject acquisition\".  It's stamped with a XEDRA symbol in the corner with \"Project PHAVIAN\" written at the top.",
+    "name": { "str_sp": "morphic reinforcement serum schematics" },
+    "description": "This document details a series of steps for making an injectable serum which will \"enhance the subject's resilience against detrimental mutagenic alterations caused by XE037 overexposure, reducing negative outcomes during testing\".  It's stamped with a XEDRA symbol in the corner with \"Project PHAVIAN\" written at the top.",
     "copy-from": "schematics_generic",
     "skill": "chemistry",
     "required_level": 7,