Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MoM] Genericize Enervating Touch #78971

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions data/mods/MindOverMatter/PowerDescriptionSpoilers.md
Original file line number Diff line number Diff line change
Expand Up @@ -1215,10 +1215,10 @@ Powers causing telepathic damage have a 5% chance to down the target, a 33% chan
## Enervating Touch
*Difficulty*: 3<br />
*Target*: One enemy within range 1<br />
*Duration*: 4 seconds to 30 seconds, plus 0.5 seconds to 1.5 seconds per power level<br />
*Duration*: 18 seconds to 1 minute and 1 second, plus 29 seconds to 1 minute and 18 seconds per power level<br />
*Stamina Cost*: 2000, minus 65 per level to a minimum of 950<br />
*Channeling Time*: 85 moves, minus 3 moves per level to a minimum of 55<br />
*Effects*: Cause decay in the target's tissues, reducing speed by 5%, slightly reducing their chance to hit, and having a 5% chance per second to cause 1 biological damage, +1% chance per power level to a maximum of a 33% chance. As well, while the power is in effect, any creature with regeneration has their rate of regeneration cut in half.<br />
*Effects*: Cause decay in the target's tissues, reducing speed by 5%, slightly reducing their chance to hit, and having a 3% chance per second to cause 1 biological damage, +0.2% chance per power level to a maximum of a 10% chance. As well, while the power is in effect, any creature with regeneration has their rate of regeneration cut in half.<br />
*Prerequisites*: Medicinal Touch 5, Coagulation 5<br />

## Detoxification
Expand Down
5 changes: 3 additions & 2 deletions data/mods/MindOverMatter/effects/effects_psionic.json
Original file line number Diff line number Diff line change
Expand Up @@ -2388,9 +2388,10 @@
"name": [ "Enervating Touch" ],
"desc": [ "This reduces monsters' regeneration. It's a bug if you have it." ],
"rating": "bad",
"max_duration": "1 minutes",
"max_duration": "300 minutes",
"show_in_info": true,
"base_mods": { "hit_mod": [ -1 ] },
"enchantments": [ { "values": [ { "value": "SPEED", "multiply": -0.05 } ] } ]
"enchantments": [ { "values": [ { "value": "SPEED", "multiply": -0.05 }, { "value": "REGEN_HP", "multiply": -0.5 } ] } ]
},
{
"type": "effect_type",
Expand Down
1 change: 0 additions & 1 deletion data/mods/MindOverMatter/monsters/civilian_psychics.json
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,6 @@
"diff": 0,
"copy-from": "mon_civilian_clairsentient",
"regenerates": 5,
"regeneration_modifiers": [ [ "effect_vitakin_hurt", -3 ] ],
"vision_day": 10,
"vision_night": 1,
"dodge": 1,
Expand Down
6 changes: 3 additions & 3 deletions data/mods/MindOverMatter/monsters/feral_psychics.json
Original file line number Diff line number Diff line change
Expand Up @@ -1375,7 +1375,7 @@
"morale": 45,
"regen_morale": true,
"regenerates": 2,
"regeneration_modifiers": [ [ "effect_vitakin_hurt", -1 ], [ "effect_psi_null", -2 ] ],
"regeneration_modifiers": [ [ "effect_psi_null", -2 ] ],
"bleed_rate": 0,
"death_drops": "feral_humans_death_drops_vita",
"zombify_into": "mon_zombie_survivor",
Expand Down Expand Up @@ -1418,7 +1418,7 @@
"morale": 45,
"regen_morale": true,
"regenerates": 5,
"regeneration_modifiers": [ [ "effect_vitakin_hurt", -2 ], [ "effect_psi_null", -5 ], [ "effect_feral_regeneration", 5 ] ],
"regeneration_modifiers": [ [ "effect_psi_null", -5 ], [ "effect_feral_regeneration", 5 ] ],
"bleed_rate": 0,
"death_drops": "feral_humans_death_drops_vita",
"zombify_into": "mon_zombie_survivor",
Expand Down Expand Up @@ -1492,7 +1492,7 @@
"morale": 45,
"regen_morale": true,
"regenerates": 5,
"regeneration_modifiers": [ [ "effect_vitakin_hurt", -2 ], [ "effect_psi_null", -5 ], [ "effect_feral_regeneration", 10 ] ],
"regeneration_modifiers": [ [ "effect_psi_null", -5 ], [ "effect_feral_regeneration", 10 ] ],
"bleed_rate": 0,
"zombify_into": "mon_zombie_survivor",
"anger_triggers": [ "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ],
Expand Down
108 changes: 1 addition & 107 deletions data/mods/MindOverMatter/monsters/monster_overrides.json
Original file line number Diff line number Diff line change
@@ -1,107 +1,20 @@
[
{
"id": "mon_zombie_crawler_pupa_decoy",
"copy-from": "mon_zombie_crawler_pupa_decoy",
"type": "MONSTER",
"regeneration_modifiers": [ [ "effect_vitakin_hurt", -5 ] ]
},
{
"id": "mon_zombie_crawler_pupa",
"copy-from": "mon_zombie_crawler_pupa",
"type": "MONSTER",
"regeneration_modifiers": [ [ "effect_vitakin_hurt", -5 ] ]
},
{
"id": "mon_zombie_pupa_decoy",
"copy-from": "mon_zombie_pupa_decoy",
"type": "MONSTER",
"regeneration_modifiers": [ [ "effect_vitakin_hurt", -5 ] ]
},
{
"id": "mon_zombie_pupa",
"copy-from": "mon_zombie_pupa",
"type": "MONSTER",
"regeneration_modifiers": [ [ "effect_vitakin_hurt", -5 ] ]
},
{
"id": "mon_brute_pupa_decoy",
"copy-from": "mon_brute_pupa_decoy",
"type": "MONSTER",
"regeneration_modifiers": [ [ "effect_vitakin_hurt", -5 ] ]
},
{
"id": "mon_brute_pupa",
"copy-from": "mon_brute_pupa",
"type": "MONSTER",
"regeneration_modifiers": [ [ "effect_vitakin_hurt", -5 ] ]
},
{
"id": "mon_hulk_pupa_decoy",
"copy-from": "mon_hulk_pupa_decoy",
"type": "MONSTER",
"regeneration_modifiers": [ [ "effect_vitakin_hurt", -5 ] ]
},
{
"id": "mon_hulk_pupa",
"copy-from": "mon_hulk_pupa",
"type": "MONSTER",
"regeneration_modifiers": [ [ "effect_vitakin_hurt", -5 ] ]
},
{
"id": "mon_zombie_pupa_decoy_shady",
"copy-from": "mon_zombie_pupa_decoy_shady",
"type": "MONSTER",
"regeneration_modifiers": [ [ "effect_vitakin_hurt", -2 ] ]
},
{
"id": "mon_zombie_pupa_shady",
"copy-from": "mon_zombie_pupa_shady",
"type": "MONSTER",
"regeneration_modifiers": [ [ "effect_vitakin_hurt", -2 ] ]
},
{
"id": "mon_zombie_medical_pupa",
"copy-from": "mon_zombie_medical_pupa",
"type": "MONSTER",
"regeneration_modifiers": [ [ "effect_vitakin_hurt", -5 ] ]
},
{
"id": "mon_zombie_pupa_medical_decoy",
"copy-from": "mon_zombie_pupa_medical_decoy",
"type": "MONSTER",
"regeneration_modifiers": [ [ "effect_vitakin_hurt", -5 ] ]
},
{
"id": "mon_mutant_evolved",
"copy-from": "mon_mutant_evolved",
"type": "MONSTER",
"regeneration_modifiers": [ [ "effect_vitakin_hurt", -1 ] ]
},
{
"id": "mon_sludge_crawler",
"copy-from": "mon_sludge_crawler",
"type": "MONSTER",
"regeneration_modifiers": [ [ "effect_vitakin_hurt", -25 ] ]
},
{
"id": "mon_strange_megafrog",
"copy-from": "mon_strange_megafrog",
"type": "MONSTER",
"regeneration_modifiers": [ [ "effect_vitakin_hurt", -2 ] ],
"extend": { "flags": [ "CANPLAY", "PET_MOUNTABLE" ] }
},
{
"id": "mon_odd_megafrog",
"copy-from": "mon_odd_megafrog",
"type": "MONSTER",
"regeneration_modifiers": [ [ "effect_vitakin_hurt", -2 ] ],
"extend": { "flags": [ "CANPLAY", "PET_MOUNTABLE" ] }
},
{
"id": "mon_foul_megafrog",
"copy-from": "mon_foul_megafrog",
"type": "MONSTER",
"regeneration_modifiers": [ [ "effect_vitakin_hurt", -1 ] ],
"extend": { "flags": [ "CANPLAY", "PET_MOUNTABLE" ] }
},
{
Expand All @@ -110,25 +23,13 @@
"type": "MONSTER",
"extend": { "flags": [ "CANPLAY" ] }
},
{
"id": "mon_zombie_regenerating",
"copy-from": "mon_zombie_regenerating",
"type": "MONSTER",
"regeneration_modifiers": [ [ "effect_vitakin_hurt", -6 ] ]
},
{
"id": "mon_zombie_medical_regenerating",
"copy-from": "mon_zombie_medical_regenerating",
"type": "MONSTER",
"regeneration_modifiers": [ [ "effect_vitakin_hurt", -6 ] ]
},
{
"type": "MONSTER",
"id": "mon_zombie_nemesis",
"copy-from": "mon_zombie_nemesis",
"name": { "str": "mindhunter" },
"description": "A hulking zombie swollen to the size of six men. Its inky black eyes are locked on you, gleaming with malign intent. No matter how far you run, it always seems to find you.",
"regeneration_modifiers": [ [ "effect_vitakin_hurt", -7 ], [ "effect_feral_regeneration", 10 ] ],
"regeneration_modifiers": [ [ "effect_feral_regeneration", 10 ] ],
"extend": {
"special_attacks": [
{
Expand Down Expand Up @@ -314,17 +215,10 @@
]
}
},
{
"id": "mon_frog_mother",
"copy-from": "mon_frog_mother",
"type": "MONSTER",
"regeneration_modifiers": [ [ "effect_vitakin_hurt", -20 ] ]
},
{
"id": "mon_shoggoth",
"copy-from": "mon_shoggoth",
"type": "MONSTER",
"regeneration_modifiers": [ [ "effect_vitakin_hurt", -25 ] ],
"extend": { "flags": [ "TEEP_IMMUNE" ], "armor": { "psi_telekinetic_damage": 20 } }
},
{
Expand Down
8 changes: 4 additions & 4 deletions data/mods/MindOverMatter/powers/vitakinesis.json
Original file line number Diff line number Diff line change
Expand Up @@ -219,23 +219,23 @@
"damage_type": "biological",
"min_dot": {
"math": [
"min( ( ( (u_spell_level('vita_hurt_touch') * 0.01) + 0.05) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 0.33)"
"min( ( ( (u_spell_level('vita_hurt_touch') * 0.002) + 0.03) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 0.1)"
]
},
"max_dot": {
"math": [
"min( ( ( (u_spell_level('vita_hurt_touch') * 0.01) + 0.05) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 0.33)"
"min( ( ( (u_spell_level('vita_hurt_touch') * 0.002) + 0.03) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling), 0.1)"
]
},
"min_range": 1,
"min_duration": {
"math": [
"( (u_spell_level('vita_hurt_touch') * 50) + 400) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling"
"( (u_spell_level('vita_hurt_touch') * 2900) + 1800) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling"
]
},
"max_duration": {
"math": [
"( (u_spell_level('vita_hurt_touch') * 150) + 3000) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling"
"( (u_spell_level('vita_hurt_touch') * 7800) + 6100) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling"
]
},
"energy_source": "STAMINA",
Expand Down
Loading