From b1f1de33f0dadfffa6e801af91b86383a0cfa875 Mon Sep 17 00:00:00 2001 From: "Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm" Date: Thu, 19 Dec 2024 12:01:22 -0600 Subject: [PATCH 1/3] Add the spell --- .../Magiclysm/monsters/feral_wizards.json | 158 ++++++++---------- 1 file changed, 73 insertions(+), 85 deletions(-) diff --git a/data/mods/Magiclysm/monsters/feral_wizards.json b/data/mods/Magiclysm/monsters/feral_wizards.json index 7bf1e3d6fd4d2..567a7e227026e 100644 --- a/data/mods/Magiclysm/monsters/feral_wizards.json +++ b/data/mods/Magiclysm/monsters/feral_wizards.json @@ -160,97 +160,85 @@ "id": "mon_feral_radiation_mage", "type": "MONSTER", "name": { "str": "feral radiation mage" }, + "copy-from": "mon_feral_wizard_default", "description": "A research thaumaturge with the international radiation danger symbol in front of a pentagram on their lab coat. If you had a Geiger counter active, it would probably be going crazy right now.", - "default_faction": "zombie", - "looks_like": "chud", - "bodytype": "human", - "species": [ "FERAL" ], - "volume": "62500 ml", - "weight": "81500 g", - "hp": 80, - "speed": 100, - "material": [ "flesh" ], "symbol": "@", "color": "cyan", - "aggression": 30, - "morale": 100, - "melee_skill": 2, - "melee_dice": 1, - "melee_dice_sides": 3, - "weakpoint_sets": [ "wps_humanoid_body" ], - "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology" ], - "dodge": 1, - "harvest": "human", - "emit_fields": [ { "emit_id": "emit_rad_leak", "delay": "5 s" } ], - "dissect": "dissect_human_sample_single", - "vision_day": 45, - "vision_night": 3, - "stomach_size": 700, - "path_settings": { "max_dist": 30, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true }, - "special_attacks": [ - { - "id": "feral_rad_mage_wall_of_fog", - "type": "spell", - "spell_data": { "id": "stormshaper_wall_of_fog", "min_level": 3 }, - "cooldown": 15, - "condition": { "not": { "u_has_flag": "NO_SPELLCASTING" } }, - "monster_message": "%1$s gestures and a sudden force slams you to the ground!" - }, - { - "id": "feral_rad_mage_rad_attack", - "type": "spell", - "spell_data": { "id": "feral_rad_mage_rad_spell", "min_level": 5 }, - "cooldown": 25, - "condition": { "and": [ { "not": { "u_has_flag": "MUTE" } }, { "not": { "u_has_flag": "NO_SPELLCASTING" } } ] }, - "monster_message": "%1$s makes arcane motions and the air is filled with burning gas!" - }, - { - "id": "feral_thaum_sci_spell_mirrorimage", - "type": "spell", - "spell_data": { "id": "mirror_image_rad_mage", "min_level": 0 }, - "cooldown": 15, - "condition": { "and": [ { "not": { "u_has_flag": "MUTE" } }, { "not": { "u_has_flag": "NO_SPELLCASTING" } } ] }, - "monster_message": "%1$s smiles and duplicates appear!" - }, - { - "id": "feral_thaum_sci_spell_summon_zombie", - "type": "spell", - "spell_data": { "id": "feral_rad_mage_summon_spell", "min_level": 0 }, - "cooldown": 30, - "condition": { "and": [ { "not": { "u_has_flag": "MUTE" } }, { "not": { "u_has_flag": "NO_SPELLCASTING" } } ] }, - "monster_message": "%1$s intones words of power and a corpse claws its way out of the ground!" - }, - { - "id": "feral_thaum_sci_spell_disjunction", - "type": "spell", - "spell_data": { "id": "disjunction_monster", "min_level": 8 }, - "cooldown": 50, - "condition": { "and": [ { "not": { "u_has_flag": "MUTE" } }, { "not": { "u_has_flag": "NO_SPELLCASTING" } } ] }, - "monster_message": "%1$s waves their hands in a gesture of negation!" - }, - [ "BROWSE", 100 ], - [ "EAT_FOOD", 100 ] - ], + "extend": { + "special_attacks": [ + { + "type": "monster_attack", + "attack_type": "melee", + "id": "feral_rad_mage__magic_fissile", + "cooldown": 10, + "move_cost": 100, + "range": 12, + "damage_max_instance": [ { "damage_type": "necrotic", "amount": 10 } ], + "dodgeable": false, + "blockable": false, + "condition": { "and": [ { "not": { "u_has_flag": "MUTE" } }, { "not": { "u_has_flag": "NO_SPELLCASTING" } } ] }, + "eoc": [ "EOC_FERAL_RADIATION_MAGE_MAGIC_FISSILE_IRRADIATES_YOU" ], + "hit_dmg_u": "%1$s screams words of magic and a sickly-glowing eldritch bolt impacts your %2$s!", + "hit_dmg_npc": "%1$s screams words of magic and a sickly-glowing eldritch bolt impacts 's %2$s!", + "miss_msg_u": "%1$s screams words of magic and you narrowly avoid a sickly-glowing eldritch bolt!", + "miss_msg_npc": "%1$s screams words of magic and narrowly avoids a sickly-glowing eldritch bolt!", + "no_dmg_msg_u": "%1$s screams words of magic and your %2$s is impacted by a sickly-glowing eldritch bolt, but it does no damage.", + "no_dmg_msg_npc": "%1$s screams words of magic and 's %2$s is impacted by a sickly-glowing eldritch bolt, but it does no damage." + }, + { + "id": "feral_rad_mage_wall_of_fog", + "type": "spell", + "spell_data": { "id": "stormshaper_wall_of_fog", "min_level": 3 }, + "cooldown": 15, + "condition": { "not": { "u_has_flag": "NO_SPELLCASTING" } }, + "monster_message": "%1$s gestures and a sudden force slams you to the ground!" + }, + { + "id": "feral_rad_mage_rad_attack", + "type": "spell", + "spell_data": { "id": "feral_rad_mage_rad_spell", "min_level": 5 }, + "cooldown": 25, + "condition": { "and": [ { "not": { "u_has_flag": "MUTE" } }, { "not": { "u_has_flag": "NO_SPELLCASTING" } } ] }, + "monster_message": "%1$s makes arcane motions and the air is filled with burning gas!" + }, + { + "id": "feral_thaum_sci_spell_mirrorimage", + "type": "spell", + "spell_data": { "id": "mirror_image_rad_mage", "min_level": 0 }, + "cooldown": 15, + "condition": { "and": [ { "not": { "u_has_flag": "MUTE" } }, { "not": { "u_has_flag": "NO_SPELLCASTING" } } ] }, + "monster_message": "%1$s smiles and duplicates appear!" + }, + { + "id": "feral_thaum_sci_spell_summon_zombie", + "type": "spell", + "spell_data": { "id": "feral_rad_mage_summon_spell", "min_level": 0 }, + "cooldown": 30, + "condition": { "and": [ { "not": { "u_has_flag": "MUTE" } }, { "not": { "u_has_flag": "NO_SPELLCASTING" } } ] }, + "monster_message": "%1$s intones words of power and a corpse claws its way out of the ground!" + }, + { + "id": "feral_thaum_sci_spell_disjunction", + "type": "spell", + "spell_data": { "id": "disjunction_monster", "min_level": 8 }, + "cooldown": 50, + "condition": { "and": [ { "not": { "u_has_flag": "MUTE" } }, { "not": { "u_has_flag": "NO_SPELLCASTING" } } ] }, + "monster_message": "%1$s waves their hands in a gesture of negation!" + }, + [ "BROWSE", 100 ], + [ "EAT_FOOD", 100 ] + ], + "flags": [ "NO_BREATHE" ] + }, "death_drops": { "subtype": "collection", "items": [ { "item": "wrapped_rad_badge", "prob": 80 }, { "group": "mon_zombie_research_thaumaturge_death_drops", "prob": 100 } ] - }, - "zombify_into": "mon_zombie", - "fungalize_into": "mon_feral_human_pipe_fungal_infected", - "anger_triggers": [ "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ], - "//": "NO_BREATHE is required so it doesn't kill itself with its own radiation field", - "flags": [ - "SEES", - "HEARS", - "WARM", - "BASHES", - "GROUP_BASH", - "NO_BREATHE", - "HUMAN", - "CAN_OPEN_DOORS", - "PATH_AVOID_DANGER", - "EATS" - ] + } + }, + { + "type": "effect_on_condition", + "id": "EOC_FERAL_RADIATION_MAGE_MAGIC_FISSILE_IRRADIATES_YOU", + "effect": [ { "math": [ "n_val('rad') += rand(10)+10" ] }, { "npc_emit": "emit_rad_leak" } ] }, { "id": "mon_feral_druid", From 70aeebf0bef1fc3d044d09095bbf40978f1baf92 Mon Sep 17 00:00:00 2001 From: "Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm" Date: Thu, 19 Dec 2024 16:28:38 -0600 Subject: [PATCH 2/3] Kick tests again From a1a96285381a8a74d5726b0ba91de7877902f72f Mon Sep 17 00:00:00 2001 From: "Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm" Date: Thu, 19 Dec 2024 20:42:58 -0600 Subject: [PATCH 3/3] Remove duplicate eating attacks --- data/mods/Magiclysm/monsters/feral_wizards.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/data/mods/Magiclysm/monsters/feral_wizards.json b/data/mods/Magiclysm/monsters/feral_wizards.json index 567a7e227026e..f9a38d20fcccc 100644 --- a/data/mods/Magiclysm/monsters/feral_wizards.json +++ b/data/mods/Magiclysm/monsters/feral_wizards.json @@ -224,9 +224,7 @@ "cooldown": 50, "condition": { "and": [ { "not": { "u_has_flag": "MUTE" } }, { "not": { "u_has_flag": "NO_SPELLCASTING" } } ] }, "monster_message": "%1$s waves their hands in a gesture of negation!" - }, - [ "BROWSE", 100 ], - [ "EAT_FOOD", 100 ] + } ], "flags": [ "NO_BREATHE" ] },