Merge pull request CleverRaven#78314 from Standing-Storm/weariness-drain

[MoM] Feral vitakinetics can drain your weariness
Standing-Storm · Dec 4, 2024 · 4f4dc70 · 4f4dc70
2 parents f9fa8ea + e8094cb
commit 4f4dc70
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 5 deletions.
diff --git a/data/mods/MindOverMatter/effects/effects_monster.json b/data/mods/MindOverMatter/effects/effects_monster.json
@@ -318,14 +318,27 @@
     "rating": "bad",
     "max_duration": "12 hours",
     "base_mods": {
-      "str_mod": [ -2 ],
+      "str_mod": [ -1 ],
       "h_mod_min": [ -2 ],
       "h_mod_chance": [ 1 ],
       "h_mod_chance_bot": [ 5 ],
       "h_mod_tick": [ 600 ],
       "healing_rate": [ 0.75 ]
     }
   },
+  {
+    "type": "effect_type",
+    "id": "effect_vitakinetic_health_down_monster",
+    "name": [ "" ],
+    "desc": [ "" ],
+    "max_intensity": 50,
+    "int_add_val": 1,
+    "int_decay_step": -1,
+    "int_decay_tick": 1800,
+    "int_decay_remove": true,
+    "base_mods": { "hit_mod": [ -0.2 ], "dodge_mod": [ -0.2 ], "speed_mod": [ -1 ] },
+    "scaling_mods": { "hit_mod": [ -0.2 ], "dodge_mod": [ -0.2 ], "speed_mod": [ -1 ] }
+  },
   {
     "type": "effect_type",
     "id": "effect_vitakinetic_healing_down",

diff --git a/data/mods/MindOverMatter/monsters/feral_psychics.json b/data/mods/MindOverMatter/monsters/feral_psychics.json
@@ -1356,10 +1356,10 @@
           "cooldown": { "math": [ "7 + rand(14)" ] },
           "accuracy": 4,
           "move_cost": 60,
-          "damage_max_instance": [ { "damage_type": "biological", "amount": 0 } ],
+          "damage_max_instance": [ { "damage_type": "biological", "amount": 1 } ],
           "dodgeable": true,
           "blockable": true,
-          "effects": [ { "id": "effect_vitakinetic_health_down", "duration": [ 620000, 1620000 ] } ],
+          "eoc": [ "EOC_FERAL_VITAKIN1_ENERVATING_TOUCH" ],
           "condition": { "not": { "u_has_flag": "NO_PSIONICS" } },
           "hit_dmg_u": "%1$s touches you and you feel weaker!",
           "hit_dmg_npc": "%1$s touches <npcname> and they flinch!",
@@ -1421,10 +1421,10 @@
           "cooldown": { "math": [ "7 + rand(14)" ] },
           "accuracy": 6,
           "move_cost": 60,
-          "damage_max_instance": [ { "damage_type": "biological", "amount": 0 } ],
+          "damage_max_instance": [ { "damage_type": "biological", "amount": 1 } ],
           "dodgeable": true,
           "blockable": true,
-          "effects": [ { "id": "effect_vitakinetic_healing_down", "duration": [ 920000, 2120000 ] } ],
+          "eoc": [ "EOC_FERAL_VITAKIN2_ENERVATING_TOUCH" ],
           "condition": { "not": { "u_has_flag": "NO_PSIONICS" } },
           "hit_dmg_u": "%1$s touches you and you feel weaker!",
           "hit_dmg_npc": "%1$s touches <npcname> and they flinch!",

diff --git a/data/mods/MindOverMatter/monsters/monster_eoc_attacks.json b/data/mods/MindOverMatter/monsters/monster_eoc_attacks.json
@@ -0,0 +1,24 @@
+[
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_FERAL_VITAKIN1_ENERVATING_TOUCH",
+    "condition": "npc_is_character",
+    "effect": [
+      { "npc_add_effect": "effect_vitakinetic_health_down", "duration": [ 620000, 1620000 ] },
+      { "math": [ "n_calories()", "-=", "75" ] },
+      { "math": [ "n_calories('dont_affect_weariness': true)", "+=", "75" ] }
+    ],
+    "false_effect": [ { "npc_add_effect": "effect_vitakinetic_health_down_monster", "duration": [ 620000, 1620000 ] } ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_FERAL_VITAKIN2_ENERVATING_TOUCH",
+    "condition": "npc_is_character",
+    "effect": [
+      { "npc_add_effect": "effect_vitakinetic_healing_down", "duration": [ 620000, 1620000 ] },
+      { "math": [ "n_calories()", "-=", "200" ] },
+      { "math": [ "n_calories('dont_affect_weariness': true)", "+=", "200" ] }
+    ],
+    "false_effect": [ { "npc_add_effect": "effect_vitakinetic_health_down_monster", "intensity": 3, "duration": [ 620000, 1620000 ] } ]
+  }
+]