JSONize yugg gene sting

data/json/monster_special_attacks/spells.json

@@ -586,6 +586,59 @@
     "min_field_intensity": 1,
     "max_field_intensity": 2
   },
+  {
+    "type": "SPELL",
+    "id": "spell_gene_sting",
+    "name": { "str": "Gene Sting" },
+    "description": "Yugg attack which causes random mutation.",
+    "effect": "attack",
+    "shape": "blast",
+    "valid_targets": [ "hostile" ],
+    "min_range": 24,
+    "max_range": 24,
+    "sound_description": "ssszziiipp",
+    "min_damage": 1,
+    "max_damage": 1,
+    "extra_effects": [ { "id": "spell_gene_sting_selector" } ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_sting_selector",
+    "condition": "u_is_character",
+    "effect": [
+      { "u_message": "The Yugg's barb injects you with something!", "type": "bad" },
+      { "u_message": "Mutation rips through your body changing you in improbable ways!", "type": "bad" },
+      {
+        "weighted_list_eocs": [
+          [ { "id": "sting_insect", "effect": { "u_mutate_category": "CHIMERA", "use_vitamins": false } }, 6 ],
+          [ { "id": "sting_alpha", "effect": { "u_mutate_category": "CHIMERA", "use_vitamins": false } }, 2 ],
+          [ { "id": "sting_ursine", "effect": { "u_mutate_category": "INSECT", "use_vitamins": false } }, 1 ],
+          [ { "id": "sting_chiropteran", "effect": { "u_mutate_category": "ALPHA", "use_vitamins": false } }, 2 ],
+          [ { "id": "sting_medical", "effect": { "u_mutate_category": "URSINE", "use_vitamins": false } }, 2 ],
+          [ { "id": "sting_bird", "effect": { "u_mutate_category": "CHIROPTERAN", "use_vitamins": false } }, 1 ],
+          [ { "id": "sting_lupine", "effect": { "u_mutate_category": "MEDICAL", "use_vitamins": false } }, 2 ],
+          [ { "id": "sting_slime", "effect": { "u_mutate_category": "LUPINE", "use_vitamins": false } }, 2 ],
+          [ { "id": "sting_rat", "effect": { "u_mutate_category": "BIRD", "use_vitamins": false } }, 1 ],
+          [ { "id": "sting_plant", "effect": { "u_mutate_category": "SLIME", "use_vitamins": false } }, 2 ],
+          [ { "id": "sting_raptor", "effect": { "u_mutate_category": "RAT", "use_vitamins": false } }, 2 ],
+          [ { "id": "sting_batrachian", "effect": { "u_mutate_category": "PLANT", "use_vitamins": false } }, 1 ],
+          [ { "id": "sting_mouse", "effect": { "u_mutate_category": "RAPTOR", "use_vitamins": false } }, 2 ],
+          [ { "id": "sting_elfa", "effect": { "u_mutate_category": "BATRACHIAN", "use_vitamins": false } }, 2 ],
+          [ { "id": "sting_cepholapod", "effect": { "u_mutate_category": "ELFA", "use_vitamins": false } }, 1 ],
+          [ { "id": "sting_fish", "effect": { "u_mutate_category": "MOUSE", "use_vitamins": false } }, 2 ],
+          [ { "id": "sting_gastropod", "effect": { "u_mutate_category": "CEPHALOPOD", "use_vitamins": false } }, 1 ],
+          [ { "id": "sting_rabbit", "effect": { "u_mutate_category": "GASTROPOD", "use_vitamins": false } }, 2 ],
+          [ { "id": "sting_human", "effect": { "u_mutate_category": "FISH", "use_vitamins": false } }, 2 ],
+          [ { "id": "sting_beast", "effect": { "u_mutate_category": "RABBIT", "use_vitamins": false } }, 2 ],
+          [ { "id": "sting_feline", "effect": { "u_mutate_category": "HUMAN", "use_vitamins": false } }, 2 ],
+          [ { "id": "sting_cattle", "effect": { "u_mutate_category": "BEAST", "use_vitamins": false } }, 2 ],
+          [ { "id": "sting_lizard", "effect": { "u_mutate_category": "FELINE", "use_vitamins": false } }, 2 ],
+          [ { "id": "sting_troglobite", "effect": { "u_mutate_category": "CATTLE", "use_vitamins": false } }, 2 ],
+          [ { "id": "sting_crustacean", "effect": { "u_mutate_category": "LIZARD", "use_vitamins": false } }, 2 ]
+        ]
+      }
+    ]
+  },
   {
     "type": "SPELL",
     "id": "base_portal",

data/json/monsters/nether.json

@@ -1428,7 +1428,7 @@
     "families": [ "prof_wp_netherium_abomination" ],
     "weakpoint_sets": [ "wps_netherium_abomination" ],
     "harvest": "meatslug",
-    "special_attacks": [ [ "GENE_STING", 20 ] ],
+    "special_attacks": [ { "type": "spell", "spell_data": { "id": "spell_gene_sting", "min_level": 5 }, "cooldown": 560 } ],
     "flags": [ "SEES", "SMELLS", "HEARS", "HAS_MIND", "BASHES", "DESTROYS", "POISON", "VENOM", "NO_BREATHE", "DIGS" ],
     "armor": { "bash": 6, "electric": 3 }
   },

src/monattack.cpp

@@ -2745,27 +2745,6 @@ bool mattack::dogthing( monster *z )
     return false;
 }
 
-bool mattack::gene_sting( monster *z )
-{
-    const float range = 7.0f;
-    Creature *target = sting_get_target( z, range );
-    if( target == nullptr || !( target->is_avatar() || target->is_npc() ) ) {
-        return false;
-    }
-
-    z->mod_moves( -to_moves<int>( 1_seconds ) * 1.5 );
-
-    damage_instance dam = damage_instance();
-    dam.add_damage( damage_stab, 6, 10, 0.6, 1 );
-    bool hit = sting_shoot( z, target, dam, range );
-    if( hit ) {
-        //Add checks if previous NPC/player conditions are removed
-        dynamic_cast<Character *>( target )->mutate();
-    }
-
-    return true;
-}
-
 bool mattack::para_sting( monster *z )
 {
     const float range = 4.0f;

src/monattack.h

@@ -57,7 +57,6 @@ bool jackson( monster *z );
 bool dance( monster *z );
 bool dogthing( monster *z );
 bool vortex( monster *z );
-bool gene_sting( monster *z );
 bool para_sting( monster *z );
 bool triffid_growth( monster *z );
 bool stare( monster *z );

src/monstergenerator.cpp

@@ -628,7 +628,6 @@ void MonsterGenerator::init_attack()
     add_hardcoded_attack( "JACKSON", mattack::jackson );
     add_hardcoded_attack( "DANCE", mattack::dance );
     add_hardcoded_attack( "DOGTHING", mattack::dogthing );
-    add_hardcoded_attack( "GENE_STING", mattack::gene_sting );
     add_hardcoded_attack( "PARA_STING", mattack::para_sting );
     add_hardcoded_attack( "TRIFFID_GROWTH", mattack::triffid_growth );
     add_hardcoded_attack( "PHOTOGRAPH", mattack::photograph );