From 7ae6d0f2166e8c2bef19dcb8aef8063ce6fbcfd5 Mon Sep 17 00:00:00 2001 From: Standing-Storm <120433252+Standing-Storm@users.noreply.github.com> Date: Wed, 15 Nov 2023 23:02:54 -0600 Subject: [PATCH] [MoM] Change Pyrokinesis passive trait (#69356) * Initial commit * Kick tests * Change name to Internal Fire --- .../effectoncondition/eoc_awakening.json | 6 +- data/mods/MindOverMatter/hobbies.json | 2 +- .../mutations/psi_passives.json | 77 +++++-------------- .../obsolete/trait_migration.json | 22 ++++++ data/mods/MindOverMatter/professions.json | 2 +- 5 files changed, 47 insertions(+), 62 deletions(-) create mode 100644 data/mods/MindOverMatter/obsolete/trait_migration.json diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_awakening.json b/data/mods/MindOverMatter/effectoncondition/eoc_awakening.json index 348fc4757643a..d3a536782c441 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_awakening.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_awakening.json @@ -223,8 +223,7 @@ "popup": true }, { "u_add_trait": "PYROKINETIC" }, - { "u_add_trait": "PYROGLOW_WEAK" }, - { "u_add_trait": "PYROGLOW_STRONG" }, + { "u_add_trait": "PYROKIN_ADAPTATION" }, { "u_add_effect": "effect_pyrokinetic_cloak", "duration": "5 minutes" }, { "u_add_effect": "effect_pyrokinetic_aura", "duration": "5 minutes" }, { "run_eocs": "EOC_TEACH_PYROKIN_CONTEMPLATE_RECIPES" }, @@ -1139,8 +1138,7 @@ "popup": true }, { "u_add_trait": "PYROKINETIC" }, - { "u_add_trait": "PYROGLOW_WEAK" }, - { "u_add_trait": "PYROGLOW_STRONG" }, + { "u_add_trait": "PYROKIN_ADAPTATION" }, { "run_eocs": "EOC_TEACH_PYROKIN_CONTEMPLATE_RECIPES" }, { "u_add_effect": "psionic_awakened", "duration": { "math": [ "ps_str * u_val('time: 2 h')" ] } }, { "math": [ "awakening_countup", "+=", "1" ] }, diff --git a/data/mods/MindOverMatter/hobbies.json b/data/mods/MindOverMatter/hobbies.json index c8fe9ef956cf1..2daf51ee044d8 100644 --- a/data/mods/MindOverMatter/hobbies.json +++ b/data/mods/MindOverMatter/hobbies.json @@ -42,7 +42,7 @@ "name": "Newly-Awakened Pyrokinetic", "description": "Something happened during the storms that raged during the Cataclysm, and now you can do things that would have once seemed impossible. With just a thought, you can start a fire or make light radiate from the very air. It's already saved your life once when you burned a zombie while scavenging in a ruined house to ash. Sure, the house burned down too, but you'll definitely get more control as time goes on, right?", "points": 5, - "traits": [ "PYROKINETIC", "PYROGLOW_WEAK", "PYROGLOW_STRONG" ] + "traits": [ "PYROKINETIC", "PYROKIN_ADAPTATION" ] }, { "type": "profession", diff --git a/data/mods/MindOverMatter/mutations/psi_passives.json b/data/mods/MindOverMatter/mutations/psi_passives.json index f3f4f278ad2fd..48d396fbb3bc2 100644 --- a/data/mods/MindOverMatter/mutations/psi_passives.json +++ b/data/mods/MindOverMatter/mutations/psi_passives.json @@ -11,8 +11,8 @@ "cancels": [ "BIOKIN_NEEDS", "CLAIR_SENSES", - "PYROGLOW_WEAK", - "PYROGLOW_STRONG", + "PHOTO_EYES", + "PYROKIN_ADAPTATION", "TELEKINETIC_CARRY", "TELEPATHIC_SUGGESTION", "TELEPORTER_PROTECT", @@ -67,68 +67,33 @@ "id": "PHOTO_EYES", "name": { "str": "Photon Regulation" }, "points": 0, - "description": "Your powers adapt the amount of photons your eyes receive.", + "description": "Your powers passively filter the amount of photons your eyes receive.", "flags": [ "FLASH_PROTECTION", "SEESLEEP", "GLARE_RESIST" ], "player_display": true, "purifiable": false }, { "type": "mutation", - "id": "PYROGLOW_WEAK", - "name": { "str": "Pyrokinetic Radiance [soft]" }, + "id": "PYROKIN_ADAPTATION", + "name": { "str": "Internal Fire" }, "points": 0, - "description": "You can make the air around you emit light.", - "active": true, + "description": "You naturally heat the air around you slightly, making it more comfortable in the cold. It also helps prevent you from getting too wet.", + "bodytemp_modifiers": [ 250, 750 ], + "bodytemp_sleep": 500, + "wet_protection": [ + { "part": "head", "ignored": 10 }, + { "part": "leg_l", "ignored": 10 }, + { "part": "leg_r", "ignored": 10 }, + { "part": "foot_l", "ignored": 10 }, + { "part": "foot_r", "ignored": 10 }, + { "part": "arm_l", "ignored": 10 }, + { "part": "arm_r", "ignored": 10 }, + { "part": "hand_l", "ignored": 10 }, + { "part": "hand_r", "ignored": 10 }, + { "part": "torso", "ignored": 10 } + ], "player_display": true, - "purifiable": false, - "cost": 0, - "transform": { - "target": "PYROGLOW_WEAK_A", - "msg_transform": "The air around you starts glowing softly.", - "active": true, - "moves": 10 - } - }, - { - "type": "mutation", - "id": "PYROGLOW_WEAK_A", - "name": { "str": "Pyrokinetic Radiance [soft] (on)" }, - "description": "The air around you is emitting light.", - "copy-from": "PYROGLOW_WEAK", - "valid": false, - "transform": { "target": "PYROGLOW_WEAK", "msg_transform": "The air around you loses its radiance.", "active": false, "moves": 10 }, - "enchantments": [ { "values": [ { "value": "LUMINATION", "add": 20 } ] } ] - }, - { - "type": "mutation", - "id": "PYROGLOW_STRONG", - "name": { "str": "Pyrokinetic Radiance [bright]" }, - "points": 0, - "description": "You can make the air around you emit a strong light.", - "active": true, - "player_display": true, - "purifiable": false, - "cost": 0, - "transform": { - "target": "PYROGLOW_STRONG_A", - "msg_transform": "The air around you starts glowing brightly.", - "active": true, - "moves": 10 - } - }, - { - "type": "mutation", - "id": "PYROGLOW_STRONG_A", - "name": { "str": "Pyrokinetic Radiance [bright] (on)" }, - "description": "The air around you is emitting a bright light.", - "copy-from": "PYROGLOW_STRONG", - "valid": false, - "transform": { "target": "PYROGLOW_STRONG", "msg_transform": "The air around you loses its radiance.", "active": false, "moves": 10 }, - "enchantments": [ - { - "values": [ { "value": "LUMINATION", "add": { "math": [ "(50 + (20 * u_val('spell_level', 'school: PYROKINETIC')))" ] } } ] - } - ] + "purifiable": false }, { "type": "mutation", diff --git a/data/mods/MindOverMatter/obsolete/trait_migration.json b/data/mods/MindOverMatter/obsolete/trait_migration.json new file mode 100644 index 0000000000000..ffd6a100e3e74 --- /dev/null +++ b/data/mods/MindOverMatter/obsolete/trait_migration.json @@ -0,0 +1,22 @@ +[ + { + "type": "TRAIT_MIGRATION", + "id": "PYROGLOW_WEAK", + "trait": "PYROKIN_ADAPTATION" + }, + { + "type": "TRAIT_MIGRATION", + "id": "PYROGLOW_WEAK_A", + "trait": "PYROKIN_ADAPTATION" + }, + { + "type": "TRAIT_MIGRATION", + "id": "PYROGLOW_STRONG", + "remove": true + }, + { + "type": "TRAIT_MIGRATION", + "id": "PYROGLOW_STRONG_A", + "remove": true + } +] diff --git a/data/mods/MindOverMatter/professions.json b/data/mods/MindOverMatter/professions.json index 2c95e16527d13..e29ba2e2dd8b1 100644 --- a/data/mods/MindOverMatter/professions.json +++ b/data/mods/MindOverMatter/professions.json @@ -100,7 +100,7 @@ "description": "Fire always fascinated you. The fires you set almost got you arrested a few times, but the urge was just too powerful. It was like they were calling to you, urging you to create them. And ever since the sky broke, you can create fire with merely a thought.", "points": 4, "skills": [ { "level": 2, "name": "cooking" }, { "level": 1, "name": "driving" }, { "level": 2, "name": "metaphysics" } ], - "traits": [ "PYROMANIA", "PYROKINETIC", "PYROGLOW_WEAK", "PYROGLOW_STRONG" ], + "traits": [ "PYROMANIA", "PYROKINETIC", "PYROKIN_ADAPTATION" ], "spells": [ { "id": "pyrokinetic_eruption", "level": 4 }, { "id": "pyrokinetic_quell_flames", "level": 2 },