From 30506e126aaff4cd0d96b40f720f31d709b80899 Mon Sep 17 00:00:00 2001 From: Standing-Storm <120433252+Standing-Storm@users.noreply.github.com> Date: Mon, 16 Dec 2024 14:26:42 -0600 Subject: [PATCH] [Magiclysm] Some spell tweaks (#78586) * Initial commit * Proficiency bonus * Mage armor tweaks * Caustic Aura changes * Mirror player changes for monsters * Mage armor has encumbrance * Acid changes * Root strike only applies on diggable ground * Darksight Overmap * Sacrificial healing better scaling * Lighting Storm difficulty change * Electric Eye edits * Electric Arts scaling * Mage blade edits * Update Power Supply * Pillar of Stone Aoe updates * Rework petrifying touch * Petrifying Touch does not work on robots * Typo fix * Lightning Blast edits * Remove damage from monster ethereal grasp * Fixes * Fix Power Supply --- data/mods/Magiclysm/Spells/biomancer.json | 26 +- data/mods/Magiclysm/Spells/classless.json | 30 ++- data/mods/Magiclysm/Spells/druid.json | 37 ++- data/mods/Magiclysm/Spells/earthshaper.json | 40 +--- .../Magiclysm/Spells/lizardfolk_shaman.json | 8 +- data/mods/Magiclysm/Spells/monsterspells.json | 64 ++++- data/mods/Magiclysm/Spells/stormshaper.json | 6 +- data/mods/Magiclysm/Spells/technomancer.json | 136 +++++++++-- data/mods/Magiclysm/effects/effects.json | 226 ++++++++++++++++-- data/mods/Magiclysm/items/ethereal_items.json | 82 +------ data/mods/Magiclysm/items/item_enchants.json | 24 +- data/mods/Magiclysm/magic_balance.md | 7 +- .../monsters/feral_dabbler_overrides.json | 16 +- .../Magiclysm/monsters/feral_wizards.json | 12 +- data/mods/Magiclysm/monsters/goblin.json | 2 +- data/mods/Magiclysm/monsters/triffids.json | 2 +- data/mods/Magiclysm/obsolete/effects.json | 14 ++ data/mods/Magiclysm/obsolete/items.json | 72 ++++++ data/mods/Magiclysm/obsolete/spells.json | 22 ++ 19 files changed, 616 insertions(+), 210 deletions(-) create mode 100644 data/mods/Magiclysm/obsolete/effects.json create mode 100644 data/mods/Magiclysm/obsolete/spells.json diff --git a/data/mods/Magiclysm/Spells/biomancer.json b/data/mods/Magiclysm/Spells/biomancer.json index 9eb9d22885121..47f4ad9e9965e 100644 --- a/data/mods/Magiclysm/Spells/biomancer.json +++ b/data/mods/Magiclysm/Spells/biomancer.json @@ -143,7 +143,12 @@ "range_increment": 0.25, "min_aoe": 25, "max_aoe": 60, - "aoe_increment": 5.0 + "aoe_increment": 5.0, + "field_id": "fd_acid", + "min_field_intensity": 1, + "max_field_intensity": 3, + "field_intensity_increment": 1, + "field_chance": 3 }, { "id": "bio_fleshpouch", @@ -381,7 +386,12 @@ "min_dot": 2, "max_dot": 2, "min_duration": 300, - "max_duration": 300 + "max_duration": 300, + "field_id": "fd_acid", + "min_field_intensity": 1, + "max_field_intensity": 2, + "field_intensity_increment": 1, + "field_chance": 2 }, { "id": "biomancer_caustic_aura", @@ -389,21 +399,17 @@ "name": "Caustic Aura", "description": "This spell suspends acid in a layer around you, corroding melee attackers when struck and enhancing your melee damage.", "valid_targets": [ "self" ], - "effect": "spawn_item", - "effect_str": "aura_caustic", + "effect": "attack", + "effect_str": "effect_biomancer_aura_caustic", "shape": "blast", "flags": [ "ENHANCEMENT_SPELL", "SOMATIC", "CONCENTRATE" ], "components": "spell_components_causticaura", "energy_source": "MANA", "spell_class": "BIOMANCER", "difficulty": 4, - "min_damage": 1, - "max_damage": 1, "base_casting_time": 400, "base_energy_cost": 350, "max_level": 15, - "min_range": 1, - "max_range": 1, "min_duration": 24000, "max_duration": 360000, "duration_increment": 24000, @@ -416,8 +422,8 @@ "name": "Improved Caustic Aura", "description": "This spell suspends acid in a layer around you, corroding melee attackers when struck and enhancing your melee damage. Now you know this spell like the back of your hand, and have started to design your own version.", "valid_targets": [ "self" ], - "effect": "spawn_item", - "effect_str": "aura_caustic", + "effect": "attack", + "effect_str": "effect_biomancer_aura_caustic", "shape": "blast", "flags": [ "ENHANCEMENT_SPELL", "SOMATIC", "NO_FAIL" ], "components": "spell_components_causticaura", diff --git a/data/mods/Magiclysm/Spells/classless.json b/data/mods/Magiclysm/Spells/classless.json index 8b35ac711ed0c..14e02661468c3 100644 --- a/data/mods/Magiclysm/Spells/classless.json +++ b/data/mods/Magiclysm/Spells/classless.json @@ -192,19 +192,16 @@ "id": "ethereal_grasp", "type": "SPELL", "name": "Ethereal Grasp", - "description": "A mass of spectral hands emerge from the ground, slowing everything in range. Higher levels allow a bigger AoE, and longer effect.", - "effect": "attack", - "effect_str": "effect_ethereal_grasp", + "description": "A mass of spectral hands emerge from the ground, grabbing and slowing everything in range. Higher levels allow a bigger AoE, and longer effect\n\nLarger targets will be less affected by the spell.", + "effect": "effect_on_condition", + "effect_str": "EOC_CLASSLESS_ETHEREAL_GRASP", "shape": "blast", "affected_body_parts": [ "foot_l", "foot_r" ], "valid_targets": [ "hostile", "ground" ], "max_level": 20, - "min_damage": 10, - "max_damage": 30, - "damage_increment": 1, "min_aoe": 2, - "max_aoe": 20, - "aoe_increment": 0.5, + "max_aoe": 8, + "aoe_increment": 0.33, "min_range": 5, "max_range": 20, "range_increment": 2.0, @@ -220,6 +217,23 @@ "difficulty": 3, "damage_type": "bash" }, + { + "type": "effect_on_condition", + "id": "EOC_CLASSLESS_ETHEREAL_GRASP", + "condition": "has_alpha", + "effect": [ + { "math": [ "u_ethereal_grasp_affected_level = n_spell_level('ethereal_grasp')" ] }, + { + "math": [ + "u_evocation_spell_affected_proficiency = (1 + (n_has_proficiency('prof_magic_evocation_beginner') * 0.1 ) + (n_has_proficiency('prof_magic_evocation_apprentice') * 0.1 ) + (n_has_proficiency('prof_magic_evocation_master') * 0.1 ) )" + ] + }, + { + "u_add_effect": "effect_ethereal_grasp", + "duration": { "math": [ "10 + (u_ethereal_grasp_affected_level * 2)" ] } + } + ] + }, { "id": "obfuscated_body", "type": "SPELL", diff --git a/data/mods/Magiclysm/Spells/druid.json b/data/mods/Magiclysm/Spells/druid.json index a72c51965136c..ab507e9381cad 100644 --- a/data/mods/Magiclysm/Spells/druid.json +++ b/data/mods/Magiclysm/Spells/druid.json @@ -3,11 +3,11 @@ "id": "druid_veggrasp", "type": "SPELL", "name": "Vegetative Grasp", - "description": "This spell causes roots and vines to burst forth from the ground and grab your foes, slowing them and doing a small amount of damage as they dig in.", + "description": "This spell causes roots and vines to burst forth from the ground and grab your foes, slowing them and doing a small amount of damage as they dig in.\n\nLarger targets will be less affected by the spell, and it has no effect on targets not on natural ground.", "valid_targets": [ "hostile", "ground" ], "flags": [ "EVOCATION_SPELL", "LOUD", "SOMATIC", "VERBAL", "NO_LEGS", "NO_PROJECTILE", "SPLIT_DAMAGE" ], - "effect": "attack", - "effect_str": "entangled", + "effect": "effect_on_condition", + "effect_str": "EOC_DRUID_VEGGRASP_ENTANGLED", "shape": "blast", "spell_class": "DRUID", "base_casting_time": 100, @@ -18,9 +18,9 @@ "min_damage": 1, "max_damage": 10, "damage_increment": 0.5, - "min_aoe": 4, - "max_aoe": 15, - "aoe_increment": 1.0, + "min_aoe": 2, + "max_aoe": 8, + "aoe_increment": 0.5, "min_range": 3, "max_range": 10, "range_increment": 1.0, @@ -30,9 +30,26 @@ "min_pierce": 1, "max_pierce": 5, "pierce_increment": 0.25, + "min_dot": 0.1, + "max_dot": 0.3, + "dot_increment": 0.01, "extra_effects": [ { "id": "eoc_evocation_setup", "hit_self": true } ], "damage_type": "stab" }, + { + "type": "effect_on_condition", + "id": "EOC_DRUID_VEGGRASP_ENTANGLED", + "condition": "has_alpha", + "effect": [ + { "math": [ "u_vegetative_grasp_affected_level = n_spell_level('druid_veggrasp')" ] }, + { + "math": [ + "u_evocation_spell_affected_proficiency = (1 + (n_has_proficiency('prof_magic_evocation_beginner') * 0.1 ) + (n_has_proficiency('prof_magic_evocation_apprentice') * 0.1 ) + (n_has_proficiency('prof_magic_evocation_master') * 0.1 ) )" + ] + }, + { "u_add_effect": "entangled", "duration": { "math": [ "10 + (u_vegetative_grasp_affected_level * 5)" ] } } + ] + }, { "id": "druid_rootstrike", "type": "SPELL", @@ -412,13 +429,13 @@ "difficulty": 5, "base_casting_time": 400, "base_energy_cost": 35, - "final_energy_cost": 20, - "energy_increment": -1.5, + "final_energy_cost": 15, + "energy_increment": -2, "extra_effects": [ { "id": "eoc_restoration_setup", "hit_self": true } ], "max_level": 10, "min_damage": -4, - "max_damage": -12, - "damage_increment": -0.8, + "max_damage": -20, + "damage_increment": -1.6, "min_aoe": 0, "max_aoe": 2, "aoe_increment": 0.2, diff --git a/data/mods/Magiclysm/Spells/earthshaper.json b/data/mods/Magiclysm/Spells/earthshaper.json index c92b7af101302..570b0c80b99d1 100644 --- a/data/mods/Magiclysm/Spells/earthshaper.json +++ b/data/mods/Magiclysm/Spells/earthshaper.json @@ -368,25 +368,26 @@ "min_damage": 80, "max_damage": 20, "damage_increment": -6, - "min_aoe": 6, - "max_aoe": 1, + "min_aoe": 5, + "max_aoe": 0, "aoe_increment": -0.5 }, { "id": "pertifying_touch", "type": "SPELL", "name": "Petrifying Touch", - "description": "Your hands tries to transform the body of your enemy into a pure stone. The effect is temporary, but it can deal significant damage.", + "description": "With a simple touch, you transform the body of your enemy into pure stone. The effect is temporary, but it can deal significant damage.", "valid_targets": [ "hostile" ], - "flags": [ "EVOCATION_SPELL", "NO_PROJECTILE", "SILENT", "NO_HANDS" ], + "flags": [ "EVOCATION_SPELL", "SILENT", "NO_HANDS" ], "effect": "attack", + "effect_str": "effect_earthshaper_petrifying_touch", "shape": "blast", "damage_type": "necrotic", - "min_damage": 10, - "damage_increment": 2, - "max_damage": 45, "min_range": 1, "max_range": 1, + "min_duration": 2000, + "max_duration": 12000, + "duration_increment": 500, "base_energy_cost": 175, "final_energy_cost": 75, "energy_increment": -5, @@ -396,28 +397,9 @@ "base_casting_time": 160, "final_casting_time": 40, "casting_time_increment": -6, - "extra_effects": [ { "id": "pertifying_touch_moves" }, { "id": "eoc_evocation_setup", "hit_self": true } ], - "energy_source": "MANA" - }, - { - "id": "pertifying_touch_moves", - "type": "SPELL", - "name": { "str": "Petrifying Touch Moves Removing", "//~": "NO_I18N" }, - "description": { - "str": "Delete some amount of moves from monster, and inflict DoT. You can see it only in debug mode.", - "//~": "NO_I18N" - }, - "valid_targets": [ "hostile" ], - "flags": [ "EVOCATION_SPELL", "SILENT", "NO_EXPLOSION_SFX", "SPLIT_DAMAGE" ], - "effect": "mod_moves", - "shape": "blast", - "min_damage": -1000, - "max_damage": -1, - "damage_increment": 50, - "min_dot": 0, - "max_dot": 10, - "dot_increment": 0.5, - "max_level": 20 + "extra_effects": [ { "id": "eoc_evocation_setup", "hit_self": true } ], + "energy_source": "MANA", + "ignored_monster_species": [ "ROBOT", "ROBOT_FLYING", "NETHER_EMANATION" ] }, { "id": "reactive_armor", diff --git a/data/mods/Magiclysm/Spells/lizardfolk_shaman.json b/data/mods/Magiclysm/Spells/lizardfolk_shaman.json index 22b2577a8b688..538c109e1a739 100644 --- a/data/mods/Magiclysm/Spells/lizardfolk_shaman.json +++ b/data/mods/Magiclysm/Spells/lizardfolk_shaman.json @@ -33,10 +33,10 @@ "max_range": 10, "message": "", "extra_effects": [ - { "id": "druid_veggrasp" }, - { "id": "druid_veggrasp" }, - { "id": "druid_veggrasp" }, - { "id": "druid_veggrasp" }, + { "id": "druid_veggrasp_monster" }, + { "id": "druid_veggrasp_monster" }, + { "id": "druid_veggrasp_monster" }, + { "id": "druid_veggrasp_monster" }, { "id": "light_healing", "hit_self": true }, { "id": "light_healing", "hit_self": true }, { "id": "light_healing", "hit_self": true }, diff --git a/data/mods/Magiclysm/Spells/monsterspells.json b/data/mods/Magiclysm/Spells/monsterspells.json index cda05132e335b..58ce8fb7628e5 100644 --- a/data/mods/Magiclysm/Spells/monsterspells.json +++ b/data/mods/Magiclysm/Spells/monsterspells.json @@ -238,7 +238,12 @@ "min_range": 10, "max_range": 10, "message": "", - "extra_effects": [ { "id": "blinding_flash" }, { "id": "ethereal_grasp" }, { "id": "point_flare" }, { "id": "dispel_magic_monster" } ] + "extra_effects": [ + { "id": "blinding_flash" }, + { "id": "ethereal_grasp_monster" }, + { "id": "point_flare" }, + { "id": "dispel_magic_monster" } + ] }, { "id": "monster_downed_stomp", @@ -510,5 +515,62 @@ "min_duration": 6000, "max_duration": 30000, "duration_increment": 2400 + }, + { + "id": "ethereal_grasp_monster", + "type": "SPELL", + "name": { "str": "Ethereal Grasp", "//~": "NO_I18N" }, + "description": "A mass of spectral hands emerge from the ground, slowing everything in range. Higher levels allow a bigger AoE, and longer effect.", + "effect": "attack", + "effect_str": "effect_ethereal_grasp_monster", + "shape": "blast", + "affected_body_parts": [ "foot_l", "foot_r" ], + "valid_targets": [ "hostile", "ground" ], + "max_level": 20, + "min_aoe": 2, + "max_aoe": 20, + "aoe_increment": 0.5, + "min_range": 5, + "max_range": 20, + "range_increment": 2.0, + "min_duration": 1000, + "max_duration": 5000, + "duration_increment": 200, + "spell_class": "NONE", + "flags": [ "SOMATIC", "NO_PROJECTILE" ], + "damage_type": "bash" + }, + { + "id": "druid_veggrasp_monster", + "type": "SPELL", + "name": { "str": "Vegetative Grasp Monster", "//~": "NO_I18N" }, + "description": "This spell causes roots and vines to burst forth from the ground and grab your foes, slowing them and doing a small amount of damage as they dig in.", + "valid_targets": [ "hostile", "ground" ], + "flags": [ "EVOCATION_SPELL", "LOUD", "SOMATIC", "VERBAL", "NO_LEGS", "NO_PROJECTILE", "SPLIT_DAMAGE" ], + "effect": "attack", + "effect_str": "entangled_monster", + "shape": "blast", + "spell_class": "NONE", + "difficulty": 2, + "max_level": 20, + "min_damage": 1, + "max_damage": 10, + "damage_increment": 0.5, + "min_aoe": 2, + "max_aoe": 8, + "aoe_increment": 0.5, + "min_range": 3, + "max_range": 10, + "range_increment": 1.0, + "min_duration": 1000, + "max_duration": 10000, + "duration_increment": 500, + "min_pierce": 1, + "max_pierce": 5, + "pierce_increment": 0.25, + "min_dot": 0.1, + "max_dot": 0.3, + "dot_increment": 0.01, + "damage_type": "stab" } ] diff --git a/data/mods/Magiclysm/Spells/stormshaper.json b/data/mods/Magiclysm/Spells/stormshaper.json index de706868d3bd7..525d2de5d0ab9 100644 --- a/data/mods/Magiclysm/Spells/stormshaper.json +++ b/data/mods/Magiclysm/Spells/stormshaper.json @@ -260,13 +260,13 @@ "max_range": 12, "range_increment": 0.2, "damage_increment": 3, - "difficulty": 10, + "difficulty": 6, "spell_class": "STORMSHAPER", "energy_source": "MANA", "base_casting_time": 120, "final_casting_time": 50, "casting_time_increment": -5, - "base_energy_cost": 55, + "base_energy_cost": 110, "damage_type": "electric", "sound_description": "a crackle", "shape": "blast", @@ -289,7 +289,7 @@ "max_range": 8, "range_increment": 0.01, "damage_increment": 4, - "difficulty": 20, + "difficulty": 9, "spell_class": "STORMSHAPER", "energy_source": "MANA", "base_energy_cost": 500, diff --git a/data/mods/Magiclysm/Spells/technomancer.json b/data/mods/Magiclysm/Spells/technomancer.json index 9fd07e141dc31..92b4b481a00b6 100644 --- a/data/mods/Magiclysm/Spells/technomancer.json +++ b/data/mods/Magiclysm/Spells/technomancer.json @@ -736,12 +736,12 @@ "id": "technomancer_conjure_ups", "type": "SPELL", "name": "Power Supply", - "description": "For the technomancer with no enhancements, this spell summons a power supply composed of pure mana that can be used to charge any compatible device. It will continually recharge until the duration expires.", + "description": "For the technomancer with no enhancements, this spell summons a power supply composed of pure mana that can be used to charge any compatible device. Just keep it on your person and it will continually recharge your electronic devices until the duration expires.", "valid_targets": [ "self" ], "flags": [ "CONJURATION_SPELL", "CONCENTRATE", "VERBAL", "SOMATIC" ], "extra_effects": [ { "id": "eoc_summon_setup", "hit_self": true } ], "effect": "effect_on_condition", - "effect_str": "EOC_CONJURE_UPS_SWITCHER", + "effect_str": "EOC_CONJURE_UPS_INITIATE", "shape": "blast", "spell_class": "TECHNOMANCER", "difficulty": 7, @@ -751,31 +751,139 @@ "duration_increment": 10000, "energy_source": "MANA", "base_casting_time": 3000, - "base_energy_cost": 300, - "final_energy_cost": 450, - "energy_increment": 7 + "base_energy_cost": 350 }, { "type": "effect_on_condition", - "id": "EOC_CONJURE_UPS_SWITCHER", + "id": "EOC_CONJURE_UPS_INITIATE", "effect": [ { "run_eocs": "EOC_CONJURE_UPS_REMOVER", "time_in_future": { "math": [ "((u_spell_level('technomancer_conjure_ups') * 100 ) + 1000) * summoning_proficiency_modifier()" ] } }, + { "u_spawn_item": "technomancer_summoned_ups", "suppress_message": true }, + { "run_eocs": "EOC_CONJURE_UPS_EFFECT_BEGIN" } + ] + }, + { + "type": "effect_on_condition", + "id": "EOC_CONJURE_UPS_EFFECT_BEGIN", + "condition": { "u_has_item": "technomancer_summoned_ups" }, + "effect": [ + { "run_eocs": "EOC_CONJURE_UPS_EFFECT_BEGIN", "time_in_future": 60 }, + { + "math": [ "u_technomancer_conjure_ups_powering", "=", "( (u_spell_level('technomancer_conjure_ups') / 3) + 1) " ] + }, + { "run_eocs": "EOC_CONJURE_UPS_EFFECT" } + ] + }, + { + "type": "effect_on_condition", + "id": "EOC_CONJURE_UPS_EFFECT", + "//": "recursively runs until available power is < 1 or all items are charged", + "condition": { "math": [ "u_technomancer_conjure_ups_powering >= 1" ] }, + "effect": [ + { "math": [ "u_technomancer_conjure_ups_item_count = 0" ] }, + { "run_eocs": "EOC_CONJURE_UPS_EFFECT_GET_ITEM_COUNT" }, + { "run_eocs": "EOC_CONJURE_UPS_EFFECT_AMMEND_ITEM_COUNT" }, + { + "math": [ + "u_technomancer_conjure_ups_max_indv_power", + "=", + "floor(u_technomancer_conjure_ups_powering / u_technomancer_conjure_ups_item_count)" + ] + }, + { "run_eocs": "EOC_CONJURE_UPS_EFFECT_POWER_ITEMS" } + ] + }, + { + "type": "effect_on_condition", + "id": "EOC_CONJURE_UPS_EFFECT_POWER_ITEMS", + "//": "power uncharged items and calls the main eoc to deal with any remaining power left over", + "condition": { + "and": [ + { "math": [ "u_technomancer_conjure_ups_powering >= 1" ] }, + { "math": [ "u_technomancer_conjure_ups_item_count >= 1" ] } + ] + }, + "effect": [ + { + "u_run_inv_eocs": "all", + "search_data": [ { "uses_energy": true, "excluded_flags": [ "USES_BIONIC_POWER" ] } ], + "true_eocs": [ + { + "id": "EOC_CONJURE_UPS_EFFECT_POWER_ITEMS_DISTRIBUTION", + "condition": { + "and": [ { "math": [ "n_val('power') < n_val('power_max')" ] }, { "math": [ "u_technomancer_conjure_ups_powering >= 1" ] } ] + }, + "effect": [ + { + "if": { "math": [ "u_technomancer_conjure_ups_max_indv_power >= 1" ] }, + "then": { + "math": [ + "u_technomancer_conjure_ups_powering_used", + "=", + "min( n_val('power_max') - n_val('power'), u_technomancer_conjure_ups_max_indv_power )" + ] + }, + "else": { + "math": [ + "u_technomancer_conjure_ups_powering_used", + "=", + "min( n_val('power_max') - n_val('power'), u_technomancer_conjure_ups_powering )" + ] + } + }, + { + "math": [ + "u_technomancer_conjure_ups_powering_used", + "=", + "min( n_val('power_max') - n_val('power'), u_technomancer_conjure_ups_max_indv_power )" + ] + }, + { "math": [ "n_val('power')", "+=", "u_technomancer_conjure_ups_powering_used" ] }, + { "math": [ "u_technomancer_conjure_ups_powering", "-=", "u_technomancer_conjure_ups_powering_used" ] } + ] + } + ] + }, + { "run_eocs": "EOC_CONJURE_UPS_EFFECT" } + ] + }, + { + "type": "effect_on_condition", + "id": "EOC_CONJURE_UPS_EFFECT_GET_ITEM_COUNT", + "//": "get total items without max power", + "effect": [ { - "switch": { "math": [ "u_spell_level('technomancer_conjure_ups')" ] }, - "cases": [ - { "case": 0, "effect": [ { "u_spawn_item": "technomancer_summoned_ups", "suppress_message": true } ] }, - { "case": 4, "effect": [ { "u_spawn_item": "technomancer_summoned_ups_2", "suppress_message": true } ] }, - { "case": 8, "effect": [ { "u_spawn_item": "technomancer_summoned_ups_3", "suppress_message": true } ] }, - { "case": 12, "effect": [ { "u_spawn_item": "technomancer_summoned_ups_4", "suppress_message": true } ] }, - { "case": 16, "effect": [ { "u_spawn_item": "technomancer_summoned_ups_5", "suppress_message": true } ] }, - { "case": 20, "effect": [ { "u_spawn_item": "technomancer_summoned_ups_6", "suppress_message": true } ] } + "u_run_inv_eocs": "all", + "search_data": [ { "uses_energy": true } ], + "true_eocs": [ + { + "id": "EOC_CONJURE_UPS_EFFECT_GET_ITEM_COUNT_2", + "condition": { "math": [ "n_val('power')", "<", "n_val('power_max')" ] }, + "effect": [ { "math": [ "u_technomancer_conjure_ups_item_count++" ] } ] + } ] } ] }, + { + "type": "effect_on_condition", + "id": "EOC_CONJURE_UPS_EFFECT_AMMEND_ITEM_COUNT", + "//": "Reduce item count if the total chargeable power / uncharged item count is less than 1.", + "condition": { + "and": [ + { "math": [ "u_technomancer_conjure_ups_powering", ">=", "1" ] }, + { "math": [ "u_technomancer_conjure_ups_item_count", ">=", "1" ] }, + { "math": [ "u_technomancer_conjure_ups_powering / u_technomancer_conjure_ups_item_count", "<", "1" ] } + ] + }, + "effect": [ + { "math": [ "u_technomancer_conjure_ups_item_count--" ] }, + { "run_eocs": "EOC_CONJURE_UPS_EFFECT_AMMEND_ITEM_COUNT" } + ] + }, { "type": "effect_on_condition", "id": "EOC_CONJURE_UPS_REMOVER", diff --git a/data/mods/Magiclysm/effects/effects.json b/data/mods/Magiclysm/effects/effects.json index 2c2acc5252ba9..1b55eb991ff4c 100644 --- a/data/mods/Magiclysm/effects/effects.json +++ b/data/mods/Magiclysm/effects/effects.json @@ -134,7 +134,18 @@ "apply_message": "Your sight adjusts to the darkness.", "remove_message": "The darkness loses its shape.", "rating": "good", - "enchantments": [ { "values": [ { "value": "NIGHT_VIS", "add": { "math": [ "((u_spell_level('dark_sight')) + 3)" ] } } ] } ] + "enchantments": [ + { + "values": [ + { "value": "NIGHT_VIS", "add": { "math": [ "((u_spell_level('dark_sight')) + 3)" ] } }, + { "value": "NIGHT_VIS", "add": { "math": [ "((u_spell_level('dark_sight')) + 3)" ] } } + ] + }, + { + "condition": { "and": [ { "not": "is_day" }, { "math": [ "u_spell_level('dark_sight') >= 4" ] } ] }, + "values": [ { "value": "OVERMAP_SIGHT", "add": { "math": [ "u_spell_level('dark_sight') / 4" ] } } ] + } + ] }, { "type": "effect_type", @@ -142,11 +153,82 @@ "name": [ "Ethereal Hold" ], "desc": [ "Ghostly arms are trying to hold you in place!" ], "max_intensity": 4, + "apply_message": "Ethereal arms shoot out of the ground and grab onto you!", + "remove_message": "The ghostly arms fade away.", + "show_in_info": true, + "//": "FIXME--top enchant is due to bug #78597", + "enchantments": [ + { + "values": [ + { + "value": "SPEED", + "add": { "math": [ "(-10 + (u_ethereal_grasp_affected_level * -2) ) * u_evocation_spell_affected_proficiency" ] } + } + ] + }, + { + "condition": { "math": [ "u_val('size')<= 1" ] }, + "values": [ + { + "value": "SPEED", + "add": { "math": [ "(-30 + (u_ethereal_grasp_affected_level * -4) ) * u_evocation_spell_affected_proficiency" ] } + } + ] + }, + { + "condition": { "math": [ "u_val('size')== 2" ] }, + "values": [ + { + "value": "SPEED", + "add": { "math": [ "(-20 + (u_ethereal_grasp_affected_level * -3) ) * u_evocation_spell_affected_proficiency" ] } + } + ] + }, + { + "condition": { "math": [ "u_val('size')== 3" ] }, + "values": [ + { + "value": "SPEED", + "add": { "math": [ "(-10 + (u_ethereal_grasp_affected_level * -2) ) * u_evocation_spell_affected_proficiency" ] } + } + ] + }, + { + "condition": { "math": [ "u_val('size')== 4" ] }, + "values": [ + { + "value": "SPEED", + "add": { "math": [ "(-5 + (u_ethereal_grasp_affected_level * -1) ) * u_evocation_spell_affected_proficiency" ] } + } + ] + }, + { + "condition": { "and": [ { "math": [ "u_val('size')>= 5" ] }, { "math": [ "u_ethereal_grasp_affected_level >= 15" ] } ] }, + "values": [ + { + "value": "SPEED", + "add": { "math": [ "(-5 + clamp( (u_ethereal_grasp_affected_level - 15), 0, -5) )* u_evocation_spell_affected_proficiency" ] } + } + ] + } + ] + }, + { + "type": "effect_type", + "id": "effect_ethereal_grasp_monster", + "name": [ "Ethereal Hold" ], + "desc": [ "Ghostly arms are trying to hold you in place!" ], + "max_intensity": 4, "int_add_val": 1, "apply_message": "Ethereal arms shoot out of the ground and grab onto you!", "remove_message": "The ghostly arms fade away.", - "base_mods": { "speed_mod": [ -40 ] }, - "scaling_mods": { "speed_mod": [ -10 ] } + "enchantments": [ + { "condition": { "math": [ "u_val('size')== 1" ] }, "values": [ { "value": "SPEED", "add": -60 } ] }, + { "condition": { "math": [ "u_val('size')== 2" ] }, "values": [ { "value": "SPEED", "add": -40 } ] }, + { "condition": { "math": [ "u_val('size')== 3" ] }, "values": [ { "value": "SPEED", "add": -30 } ] }, + { "condition": { "math": [ "u_val('size')== 4" ] }, "values": [ { "value": "SPEED", "add": -15 } ] }, + { "condition": { "math": [ "u_val('size')== 5" ] }, "values": [ { "value": "SPEED", "add": -5 } ] } + ] }, { "type": "effect_type", @@ -202,12 +284,85 @@ "name": [ "Vegetative Grasp" ], "desc": [ "Roots and vines entangle your foes." ], "max_intensity": 4, + "show_in_info": true, + "apply_message": "Roots and vines burst from the ground and entangle you!", + "remove_message": "The roots and vines wither up and die.", + "enchantments": [ + { + "values": [ + { + "value": "SPEED", + "add": { "math": [ "(-5 + (u_vegetative_grasp_affected_level * -2) ) * u_evocation_spell_affected_proficiency" ] } + } + ] + }, + { + "condition": { "and": [ { "math": [ "u_val('size')== 1" ] }, { "u_is_on_terrain_with_flag": "DIGGABLE" } ] }, + "values": [ + { + "value": "SPEED", + "add": { "math": [ "(-20 + (u_vegetative_grasp_affected_level * -4) ) * u_evocation_spell_affected_proficiency" ] } + } + ] + }, + { + "condition": { "and": [ { "math": [ "u_val('size')== 2" ] }, { "u_is_on_terrain_with_flag": "DIGGABLE" } ] }, + "values": [ + { + "value": "SPEED", + "add": { "math": [ "(-15 + (u_vegetative_grasp_affected_level * -3) ) * u_evocation_spell_affected_proficiency" ] } + } + ] + }, + { + "condition": { "and": [ { "math": [ "u_val('size')== 3" ] }, { "u_is_on_terrain_with_flag": "DIGGABLE" } ] }, + "values": [ + { + "value": "SPEED", + "add": { "math": [ "(-5 + (u_vegetative_grasp_affected_level * -2) ) * u_evocation_spell_affected_proficiency" ] } + } + ] + }, + { + "condition": { "and": [ { "math": [ "u_val('size')== 4" ] }, { "u_is_on_terrain_with_flag": "DIGGABLE" } ] }, + "values": [ + { + "value": "SPEED", + "add": { "math": [ "( (u_vegetative_grasp_affected_level * -1) ) * u_evocation_spell_affected_proficiency" ] } + } + ] + } + ], + "flags": [ "EFFECT_IMPEDING" ] + }, + { + "type": "effect_type", + "id": "entangled_monster", + "name": [ "Vegetative Grasp" ], + "desc": [ "Roots and vines entangle your foes." ], + "max_intensity": 4, "int_add_val": 1, "show_in_info": true, "apply_message": "Roots and vines burst from the ground and entangle you!", "remove_message": "The roots and vines wither up and die.", - "base_mods": { "speed_mod": [ -20 ] }, - "scaling_mods": { "speed_mod": [ -5 ] }, + "enchantments": [ + { + "condition": { "and": [ { "math": [ "u_val('size')== 1" ] }, { "u_is_on_terrain_with_flag": "DIGGABLE" } ] }, + "values": [ { "value": "SPEED", "add": -40 } ] + }, + { + "condition": { "and": [ { "math": [ "u_val('size')== 2" ] }, { "u_is_on_terrain_with_flag": "DIGGABLE" } ] }, + "values": [ { "value": "SPEED", "add": -30 } ] + }, + { + "condition": { "and": [ { "math": [ "u_val('size')== 3" ] }, { "u_is_on_terrain_with_flag": "DIGGABLE" } ] }, + "values": [ { "value": "SPEED", "add": -20 } ] + }, + { + "condition": { "and": [ { "math": [ "u_val('size')== 4" ] }, { "u_is_on_terrain_with_flag": "DIGGABLE" } ] }, + "values": [ { "value": "SPEED", "add": -10 } ] + } + ], "flags": [ "EFFECT_IMPEDING" ] }, { @@ -219,8 +374,7 @@ "int_add_val": 1, "apply_message": "Roots rip out from the ground and impale your enemies!", "remove_message": "The roots wither up and die.", - "base_mods": { "speed_mod": [ -30 ] }, - "scaling_mods": { "speed_mod": [ -5 ] } + "enchantments": [ { "values": [ { "value": "SPEED", "add": -25 } ] } ] }, { "type": "effect_type", @@ -452,6 +606,14 @@ "vomit_chance": [ 20 ] } }, + { + "type": "effect_type", + "id": "effect_biomancer_aura_caustic", + "name": [ "Caustic Aura" ], + "desc": [ "An aura of thin acid, swirling around your body ready to corrode your enemies when struck or while striking." ], + "rating": "good", + "enchantments": [ "ench_aura_caustic" ] + }, { "type": "effect_type", "id": "bio_weave", @@ -515,6 +677,31 @@ "max_duration": "2 d", "flags": [ "DIMENSIONAL_ANCHOR" ] }, + { + "type": "effect_type", + "id": "effect_earthshaper_petrifying_touch", + "name": [ "Petrified" ], + "desc": [ "You are made of stone. Fortunately it's temporary." ], + "rating": "bad", + "show_in_info": true, + "removes_effects": [ "haste", "enchant_windrun", "flask_speed_eff" ], + "enchantments": [ + { + "incoming_damage_mod": [ + { "type": "bash", "add": -30 }, + { "type": "stab", "add": -80 }, + { "type": "cut", "add": -80 }, + { "type": "bullet", "add": -120 }, + { "type": "heat", "add": -80 }, + { "type": "cold", "add": -50 }, + { "type": "necrotic", "add": -120 }, + { "type": "poison", "add": -120 }, + { "type": "gravity", "multiply": -0.5 } + ] + } + ], + "flags": [ "CANNOT_ATTACK", "CANNOT_MOVE" ] + }, { "type": "effect_type", "id": "slow_freeze_effect", @@ -712,10 +899,10 @@ "ELECTRIC_VISION", { "values": [ - { "value": "BONUS_BLOCK", "add": 1 }, { "value": "BONUS_DODGE", "add": 1 }, - { "value": "DEXTERITY", "add": 2 }, - { "value": "PERCEPTION", "add": 4 } + { "value": "DODGE_CHANCE", "add": { "math": [ "u_spell_level('electric_eye') / 7" ] } }, + { "value": "DEXTERITY", "add": { "math": [ "u_spell_level('electric_eye') / 10" ] } }, + { "value": "PERCEPTION", "add": { "math": [ "u_spell_level('electric_eye') / 5" ] } } ] } ] @@ -740,7 +927,9 @@ "remove_message": "Sparks under your skin vanish.", "rating": "good", "show_intensity": false, - "enchantments": [ { "incoming_damage_mod": [ { "type": "electric", "add": -35 } ] } ] + "enchantments": [ + { "incoming_damage_mod": [ { "type": "electric", "add": { "math": [ "u_spell_level('electric_arts') * -1.5" ] } } ] } + ] }, { "type": "effect_type", @@ -1244,18 +1433,6 @@ "conjunctivitis_bacterial" ] }, - { - "type": "effect_type", - "id": "effect_petrified", - "name": [ "Petrified" ], - "desc": [ "You skin feels like stone. You can't move." ], - "rating": "bad", - "apply_message": "Your whole body goes rigid and you can't move a muscle!", - "remove_message": "The rigidity fades and you can move again.", - "removes_effects": [ "haste", "enchant_windrun", "flask_speed_eff" ], - "max_intensity": 1000, - "flags": [ "EFFECT_IMPEDING" ] - }, { "type": "effect_type", "id": "effect_biomancer_hyper_regeneration", @@ -1538,7 +1715,6 @@ "max_duration": "2 seconds", "removes_effects": [ "enchant_windrun", - "effect_petrified", "dark_sight", "effect_ethereal_grasp", "invisibility", @@ -1670,7 +1846,7 @@ "max_duration": "2 seconds", "removes_effects": [ "enchant_windrun", - "effect_petrified", + "effect_earthshaper_petrifying_touch", "dark_sight", "effect_ethereal_grasp", "invisibility", diff --git a/data/mods/Magiclysm/items/ethereal_items.json b/data/mods/Magiclysm/items/ethereal_items.json index 3a5a55a36621c..a24e27fdad076 100644 --- a/data/mods/Magiclysm/items/ethereal_items.json +++ b/data/mods/Magiclysm/items/ethereal_items.json @@ -718,28 +718,6 @@ "loudness": 6, "melee_damage": { "bash": 4 } }, - { - "id": "aura_caustic", - "type": "ARMOR", - "name": "acid aura", - "description": "An aura of thin acid, swirling around your body ready to corrode when struck or while striking.", - "weight": "1 g", - "volume": "1 ml", - "symbol": "o", - "color": "blue", - "material": [ "magical_material" ], - "flags": [ - "AURA", - "ONLY_ONE", - "TRADER_AVOID", - "NO_TAKEOFF", - "NONCONDUCTIVE", - "OVERSIZE", - "UNBREAKABLE", - "ALLOWS_NATURAL_ATTACKS" - ], - "relic_data": { "passive_effects": [ { "id": "ench_aura_caustic" } ] } - }, { "id": "aura_werewolf", "type": "ARMOR", @@ -875,11 +853,11 @@ "material": [ "concentrated_mana" ], "warmth": 0, "material_thickness": 0, - "flags": [ "ONLY_ONE", "OVERSIZE", "PERSONAL", "STURDY", "NO_REPAIR", "NO_SALVAGE", "TRADER_AVOID", "PADDED" ], + "flags": [ "ONLY_ONE", "OVERSIZE", "OUTER", "STURDY", "NO_REPAIR", "NO_SALVAGE", "TRADER_AVOID", "PADDED" ], "relic_data": { "passive_effects": [ { "id": "ench_armor_spirit" } ] }, "armor": [ { - "encumbrance": 0, + "encumbrance": 8, "coverage": 100, "covers": [ "head", "mouth", "eyes", "torso", "arm_l", "arm_r", "hand_l", "hand_r", "leg_l", "leg_r", "foot_l", "foot_r" ] } @@ -1335,60 +1313,10 @@ "symbol": "=", "color": "yellow", "ammo_type": [ "battery" ], - "capacity": 1250, + "capacity": 1, "looks_like": "spiral_stone", - "flags": [ "TRADER_AVOID", "ONLY_ONE", "NO_DROP", "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD", "IS_UPS" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 1000 } } ], - "relic_data": { "charge_info": { "recharge_type": "periodic", "time": "2 s", "regenerate_ammo": true } }, - "//": "Recharge time is 2 seconds due to bug #48019, making it actually 1 second. Reduce to 1 second if that ever gets fixed." - }, - { - "id": "technomancer_summoned_ups_2", - "type": "TOOL_ARMOR", - "name": { "str": "technomantic power supply", "str_pl": "technomantic power supplies" }, - "description": "A smoothly-curved conglomeration of mana, humming softly as it provides power.", - "copy-from": "technomancer_summoned_ups", - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 2000 } } ], - "relic_data": { "charge_info": { "recharge_type": "periodic", "time": "2 s", "regenerate_ammo": true } }, - "//": "Recharge time is 2 seconds due to bug #48019, making it actually 1 second. Reduce to 1 second if that ever gets fixed." - }, - { - "id": "technomancer_summoned_ups_3", - "type": "TOOL_ARMOR", - "name": { "str": "technomantic power supply", "str_pl": "technomantic power supplies" }, - "description": "A smoothly-curved conglomeration of mana, humming softly as it provides power.", - "copy-from": "technomancer_summoned_ups", - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 4000 } } ], - "relic_data": { "charge_info": { "recharge_type": "periodic", "time": "2 s", "regenerate_ammo": true } }, - "//": "Recharge time is 2 seconds due to bug #48019, making it actually 1 second. Reduce to 1 second if that ever gets fixed." - }, - { - "id": "technomancer_summoned_ups_4", - "type": "TOOL_ARMOR", - "name": { "str": "technomantic power supply", "str_pl": "technomantic power supplies" }, - "description": "A smoothly-curved conglomeration of mana, humming softly as it provides power.", - "copy-from": "technomancer_summoned_ups", - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 8000 } } ], - "relic_data": { "charge_info": { "recharge_type": "periodic", "time": "2 s", "regenerate_ammo": true } }, - "//": "Recharge time is 2 seconds due to bug #48019, making it actually 1 second. Reduce to 1 second if that ever gets fixed." - }, - { - "id": "technomancer_summoned_ups_5", - "type": "TOOL_ARMOR", - "name": { "str": "technomantic power supply", "str_pl": "technomantic power supplies" }, - "description": "A smoothly-curved conglomeration of mana, humming softly as it provides power.", - "copy-from": "technomancer_summoned_ups", - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 16000 } } ], - "relic_data": { "charge_info": { "recharge_type": "periodic", "time": "2 s", "regenerate_ammo": true } }, - "//": "Recharge time is 2 seconds due to bug #48019, making it actually 1 second. Reduce to 1 second if that ever gets fixed." - }, - { - "id": "technomancer_summoned_ups_6", - "type": "TOOL_ARMOR", - "name": { "str": "technomantic power supply", "str_pl": "technomantic power supplies" }, - "description": "A smoothly-curved conglomeration of mana, humming softly as it provides power.", - "copy-from": "technomancer_summoned_ups", - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 32000 } } ], + "flags": [ "TRADER_AVOID", "ONLY_ONE", "NO_DROP", "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 1 } } ], "relic_data": { "charge_info": { "recharge_type": "periodic", "time": "2 s", "regenerate_ammo": true } }, "//": "Recharge time is 2 seconds due to bug #48019, making it actually 1 second. Reduce to 1 second if that ever gets fixed." }, diff --git a/data/mods/Magiclysm/items/item_enchants.json b/data/mods/Magiclysm/items/item_enchants.json index 315fe3e8c6098..0c03798c42be5 100644 --- a/data/mods/Magiclysm/items/item_enchants.json +++ b/data/mods/Magiclysm/items/item_enchants.json @@ -8,8 +8,10 @@ "description": "The damage done and light emitted by this sword increase with intelligence.", "melee_damage_bonus": [ { - "type": "cut", - "add": { "math": [ "(u_val('intelligence') * 2) + (u_spell_level('holy_blade') + u_spell_level('holy_blade_plus'))" ] } + "type": "light", + "add": { + "math": [ "min( ( (u_val('intelligence') * 2) + (u_spell_level('holy_blade') + u_spell_level('holy_blade_plus') ) ),40)" ] + } } ], "values": [ @@ -30,25 +32,33 @@ { "type": "bash", "add": { - "math": [ "((u_val('intelligence') * 1.5) + (u_spell_level('spirit_armor') + u_spell_level('spirit_armor_plus')) * 0.5) * -1" ] + "math": [ + "max( ( ( (u_val('intelligence') * 1.5) + (u_spell_level('spirit_armor') + u_spell_level('spirit_armor_plus')) * 0.5) * -1), -45)" + ] } }, { "type": "stab", "add": { - "math": [ "((u_val('intelligence') * 1.5) + (u_spell_level('spirit_armor') + u_spell_level('spirit_armor_plus')) * 0.5) * -1" ] + "math": [ + "max( ( ( (u_val('intelligence') * 1.5) + (u_spell_level('spirit_armor') + u_spell_level('spirit_armor_plus')) * 0.5) * -1), -45)" + ] } }, { "type": "cut", "add": { - "math": [ "((u_val('intelligence') * 1.5) + (u_spell_level('spirit_armor') + u_spell_level('spirit_armor_plus')) * 0.5) * -1" ] + "math": [ + "max( ( ( (u_val('intelligence') * 1.5) + (u_spell_level('spirit_armor') + u_spell_level('spirit_armor_plus')) * 0.5) * -1), -45)" + ] } }, { "type": "bullet", "add": { - "math": [ "((u_val('intelligence') * 1.5) + (u_spell_level('spirit_armor') + u_spell_level('spirit_armor_plus')) * 0.5) * -1" ] + "math": [ + "max( ( ( (u_val('intelligence') * 1.5) + (u_spell_level('spirit_armor') + u_spell_level('spirit_armor_plus')) * 0.5) * -1), -45)" + ] } } ], @@ -94,8 +104,6 @@ "id": "ench_aura_caustic", "has": "WORN", "condition": "ALWAYS", - "name": { "str": "Caustic Aura" }, - "description": "A thin shell of acid hangs in the air around you.", "hit_me_effect": [ { "id": "corrosive_aura_spell" } ], "incoming_damage_mod": [ { diff --git a/data/mods/Magiclysm/magic_balance.md b/data/mods/Magiclysm/magic_balance.md index 946863d976438..34fb845cab31b 100644 --- a/data/mods/Magiclysm/magic_balance.md +++ b/data/mods/Magiclysm/magic_balance.md @@ -19,7 +19,10 @@ - [Channeling](#channeling) - [Conjuration](#conjuration) - [Enhancement](#enhancement) + - [Enervation](#enervation) - [Conveyance](#conveyance) + - [Restoration](#restoration) + - [Transformation](#transformation) - [Advice for Using Proficiencies in Spells](#advice-for-using-proficiencies-in-spells) --- @@ -103,10 +106,10 @@ Enervation spells are the opposite of Enhancement, being spells that reduce the ### Conveyance Conveyance encompasses spells which involve translocating, teleporting, or moving the caster/target. Some spells covered are Phase Door, Magus's Mark, Shocking Dash, or Translocate Self. Proficiency in Conveyance will extend the range of the spell and lower the mana cost of the incantation. -## Restoration +### Restoration Restoration spells generally return the physical, spiritually, emotional, or magical capabilities of the target to its ideal state. Spells like Cure Light Wounds, Sacrificial Regrowth, Mind over Pain, or Stone's Endurance are all restoration spells. Restoratiojn also has a dark side, however; spells that drain the target of some capability to restore it to the caster are also restoration spells. Proficiency in Restoration will reduce the casting time and increase the amount healed. -## Transformation +### Transformation Transformation spells change one thing into another, such as changing a handful of leaves into gold or changing a charging enemy into a housecat. This also includes partial tranformations of the target. Spells like Harvest of the Hunter, Vicious Tentacle, or Convert are transformation spells. Proficiency in Transformation will increase the duration and reduce the casting time. ### Advice for Using Proficiencies in Spells diff --git a/data/mods/Magiclysm/monsters/feral_dabbler_overrides.json b/data/mods/Magiclysm/monsters/feral_dabbler_overrides.json index 8e469dae2eac0..d07666a8aa2a2 100644 --- a/data/mods/Magiclysm/monsters/feral_dabbler_overrides.json +++ b/data/mods/Magiclysm/monsters/feral_dabbler_overrides.json @@ -729,14 +729,10 @@ { "id": "feral_dabbler_ethereal_grasp", "type": "spell", - "spell_data": { "id": "ethereal_grasp", "min_level": 5 }, + "spell_data": { "id": "ethereal_grasp_monster", "min_level": 5 }, "cooldown": 30, "condition": { - "and": [ - { "not": { "u_has_flag": "MUTE" } }, - { "not": { "u_has_flag": "NO_SPELLCASTING" } }, - { "math": [ "u_feral_dabbler_chosen_spell_number == 26" ] } - ] + "and": [ { "not": { "u_has_flag": "NO_SPELLCASTING" } }, { "math": [ "u_feral_dabbler_chosen_spell_number == 26" ] } ] }, "monster_message": "%1$s makes a grasping gesture and ethereal hands burst from the ground around %3$s." } @@ -856,14 +852,10 @@ { "id": "feral_dabbler_ethereal_grasp", "type": "spell", - "spell_data": { "id": "ethereal_grasp", "min_level": 5 }, + "spell_data": { "id": "ethereal_grasp_monster", "min_level": 5 }, "cooldown": 30, "condition": { - "and": [ - { "not": { "u_has_flag": "MUTE" } }, - { "not": { "u_has_flag": "NO_SPELLCASTING" } }, - { "math": [ "u_feral_dabbler_chosen_spell_number == 26" ] } - ] + "and": [ { "not": { "u_has_flag": "NO_SPELLCASTING" } }, { "math": [ "u_feral_dabbler_chosen_spell_number == 26" ] } ] }, "monster_message": "%1$s makes a grasping gesture and ethereal hands burst from the ground around %3$s." } diff --git a/data/mods/Magiclysm/monsters/feral_wizards.json b/data/mods/Magiclysm/monsters/feral_wizards.json index 638bf49638c3a..d4b303e8a811e 100644 --- a/data/mods/Magiclysm/monsters/feral_wizards.json +++ b/data/mods/Magiclysm/monsters/feral_wizards.json @@ -293,7 +293,7 @@ { "id": "feral_druid_veggrasp_spell", "type": "spell", - "spell_data": { "id": "druid_veggrasp", "min_level": 5 }, + "spell_data": { "id": "druid_veggrasp_monster", "min_level": 5 }, "cooldown": 35, "condition": { "and": [ { "not": { "u_has_flag": "MUTE" } }, { "not": { "u_has_flag": "NO_SPELLCASTING" } } ] }, "monster_message": "%1$s waves their hands and roots burst from the ground around you!" @@ -372,7 +372,7 @@ { "id": "feral_high_druid_veggrasp_spell", "type": "spell", - "spell_data": { "id": "druid_veggrasp", "min_level": 5 }, + "spell_data": { "id": "druid_veggrasp_monster", "min_level": 5 }, "cooldown": 25, "condition": { "and": [ { "not": { "u_has_flag": "MUTE" } }, { "not": { "u_has_flag": "NO_SPELLCASTING" } } ] }, "monster_message": "%1$s waves their hands and roots burst from the ground around you!" @@ -561,7 +561,9 @@ "effects_require_dmg": false, "dodgeable": true, "blockable": false, - "effects": [ { "id": "effect_petrified", "duration": 3, "chance": 75, "intensity": 100, "affect_hit_bp": false } ], + "effects": [ + { "id": "effect_earthshaper_petrifying_touch", "duration": 3, "chance": 75, "intensity": 100, "affect_hit_bp": false } + ], "hit_dmg_u": "%1$s reaches out and touches your %2$s!", "hit_dmg_npc": "%1$s reaches out and touches 's %2$s!", "miss_msg_u": "%1$s reaches out and you narrowly avoid their touch!", @@ -820,8 +822,8 @@ "hit_dmg_npc": "%1$s gestures and sparks impact 's %2$s!", "miss_msg_u": "%1$s gestures and you narrowly avoid a shower of sparks!", "miss_msg_npc": "%1$s gestures and narrowly avoids a shower of sparks!", - "no_dmg_msg_u": "%1$s gestures and your %2$s is impacted by a shower of sparks bolt, but they do no damage.", - "no_dmg_msg_npc": "%1$s gestures and 's %2$s is impacted by a shower of sparks bolt, but they do no damage." + "no_dmg_msg_u": "%1$s gestures and your %2$s is impacted by a shower of spark bolts, but they do no damage.", + "no_dmg_msg_npc": "%1$s gestures and 's %2$s is impacted by a shower of spark bolts, but they do no damage." }, { "id": "feral_stormshaper_wall_of_fog", diff --git a/data/mods/Magiclysm/monsters/goblin.json b/data/mods/Magiclysm/monsters/goblin.json index 5772f94ab9d9c..c1c80b705a54e 100644 --- a/data/mods/Magiclysm/monsters/goblin.json +++ b/data/mods/Magiclysm/monsters/goblin.json @@ -141,7 +141,7 @@ { "id": "mon_goblin_mage_poison_veggrasp_spell", "type": "spell", - "spell_data": { "id": "druid_veggrasp", "min_level": 5 }, + "spell_data": { "id": "druid_veggrasp_monster", "min_level": 5 }, "cooldown": 20, "condition": { "and": [ { "not": { "u_has_flag": "MUTE" } }, { "not": { "u_has_flag": "NO_SPELLCASTING" } } ] }, "monster_message": "%1$s waves their hands and roots burst from the ground around you!" diff --git a/data/mods/Magiclysm/monsters/triffids.json b/data/mods/Magiclysm/monsters/triffids.json index b5ebac82932ed..7832db928f61f 100644 --- a/data/mods/Magiclysm/monsters/triffids.json +++ b/data/mods/Magiclysm/monsters/triffids.json @@ -40,7 +40,7 @@ { "id": "triffid_vineweaver_druid_veggrasp", "type": "spell", - "spell_data": { "id": "druid_veggrasp", "min_level": 2 }, + "spell_data": { "id": "druid_veggrasp_monster", "min_level": 2 }, "cooldown": 30, "condition": { "not": { "u_has_flag": "NO_SPELLCASTING" } }, "monster_message": "%1$s twitches its base and roots burst from the ground around %3$s." diff --git a/data/mods/Magiclysm/obsolete/effects.json b/data/mods/Magiclysm/obsolete/effects.json new file mode 100644 index 0000000000000..66b69426d5160 --- /dev/null +++ b/data/mods/Magiclysm/obsolete/effects.json @@ -0,0 +1,14 @@ +[ + { + "type": "effect_type", + "id": "effect_petrified", + "name": [ "Petrified" ], + "desc": [ "You skin feels like stone. You can't move." ], + "rating": "bad", + "apply_message": "Your whole body goes rigid and you can't move a muscle!", + "remove_message": "The rigidity fades and you can move again.", + "removes_effects": [ "haste", "enchant_windrun", "flask_speed_eff" ], + "max_intensity": 1000, + "flags": [ "EFFECT_IMPEDING" ] + } +] diff --git a/data/mods/Magiclysm/obsolete/items.json b/data/mods/Magiclysm/obsolete/items.json index 9a0a9bfa4ed63..7661ba8b7e508 100644 --- a/data/mods/Magiclysm/obsolete/items.json +++ b/data/mods/Magiclysm/obsolete/items.json @@ -35,5 +35,77 @@ } ] } + }, + { + "id": "aura_caustic", + "type": "ARMOR", + "name": "acid aura", + "description": "An aura of thin acid, swirling around your body ready to corrode when struck or while striking.", + "weight": "1 g", + "volume": "1 ml", + "symbol": "o", + "color": "blue", + "material": [ "magical_material" ], + "flags": [ + "AURA", + "ONLY_ONE", + "TRADER_AVOID", + "NO_TAKEOFF", + "NONCONDUCTIVE", + "OVERSIZE", + "UNBREAKABLE", + "ALLOWS_NATURAL_ATTACKS" + ], + "relic_data": { "passive_effects": [ { "id": "ench_aura_caustic" } ] } + }, + { + "id": "technomancer_summoned_ups_2", + "type": "TOOL_ARMOR", + "name": { "str": "technomantic power supply", "str_pl": "technomantic power supplies" }, + "description": "A smoothly-curved conglomeration of mana, humming softly as it provides power.", + "copy-from": "technomancer_summoned_ups", + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 2000 } } ], + "relic_data": { "charge_info": { "recharge_type": "periodic", "time": "2 s", "regenerate_ammo": true } }, + "//": "Recharge time is 2 seconds due to bug #48019, making it actually 1 second. Reduce to 1 second if that ever gets fixed." + }, + { + "id": "technomancer_summoned_ups_3", + "type": "TOOL_ARMOR", + "name": { "str": "technomantic power supply", "str_pl": "technomantic power supplies" }, + "description": "A smoothly-curved conglomeration of mana, humming softly as it provides power.", + "copy-from": "technomancer_summoned_ups", + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 4000 } } ], + "relic_data": { "charge_info": { "recharge_type": "periodic", "time": "2 s", "regenerate_ammo": true } }, + "//": "Recharge time is 2 seconds due to bug #48019, making it actually 1 second. Reduce to 1 second if that ever gets fixed." + }, + { + "id": "technomancer_summoned_ups_4", + "type": "TOOL_ARMOR", + "name": { "str": "technomantic power supply", "str_pl": "technomantic power supplies" }, + "description": "A smoothly-curved conglomeration of mana, humming softly as it provides power.", + "copy-from": "technomancer_summoned_ups", + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 8000 } } ], + "relic_data": { "charge_info": { "recharge_type": "periodic", "time": "2 s", "regenerate_ammo": true } }, + "//": "Recharge time is 2 seconds due to bug #48019, making it actually 1 second. Reduce to 1 second if that ever gets fixed." + }, + { + "id": "technomancer_summoned_ups_5", + "type": "TOOL_ARMOR", + "name": { "str": "technomantic power supply", "str_pl": "technomantic power supplies" }, + "description": "A smoothly-curved conglomeration of mana, humming softly as it provides power.", + "copy-from": "technomancer_summoned_ups", + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 16000 } } ], + "relic_data": { "charge_info": { "recharge_type": "periodic", "time": "2 s", "regenerate_ammo": true } }, + "//": "Recharge time is 2 seconds due to bug #48019, making it actually 1 second. Reduce to 1 second if that ever gets fixed." + }, + { + "id": "technomancer_summoned_ups_6", + "type": "TOOL_ARMOR", + "name": { "str": "technomantic power supply", "str_pl": "technomantic power supplies" }, + "description": "A smoothly-curved conglomeration of mana, humming softly as it provides power.", + "copy-from": "technomancer_summoned_ups", + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 32000 } } ], + "relic_data": { "charge_info": { "recharge_type": "periodic", "time": "2 s", "regenerate_ammo": true } }, + "//": "Recharge time is 2 seconds due to bug #48019, making it actually 1 second. Reduce to 1 second if that ever gets fixed." } ] diff --git a/data/mods/Magiclysm/obsolete/spells.json b/data/mods/Magiclysm/obsolete/spells.json new file mode 100644 index 0000000000000..67d51af1efb5a --- /dev/null +++ b/data/mods/Magiclysm/obsolete/spells.json @@ -0,0 +1,22 @@ +[ + { + "id": "pertifying_touch_moves", + "type": "SPELL", + "name": { "str": "Petrifying Touch Moves Removing", "//~": "NO_I18N" }, + "description": { + "str": "Delete some amount of moves from monster, and inflict DoT. You can see it only in debug mode.", + "//~": "NO_I18N" + }, + "valid_targets": [ "hostile" ], + "flags": [ "EVOCATION_SPELL", "SILENT", "NO_EXPLOSION_SFX", "SPLIT_DAMAGE" ], + "effect": "mod_moves", + "shape": "blast", + "min_damage": -1000, + "max_damage": -1, + "damage_increment": 50, + "min_dot": 0, + "max_dot": 10, + "dot_increment": 0.5, + "max_level": 20 + } +]