Remove unnecessary damage types

data/json/ammo_effects.json

@@ -421,5 +421,11 @@
     "type": "ammo_effect",
     "//": "Creates a trail of laser",
     "trail": { "field_type": "fd_laser", "intensity_min": 2, "intensity_max": 2 }
+  },
+  {
+    "id": "GENE_STING_BARB",
+    "type": "ammo_effect",
+    "//": "runs EoC that cause you to mutate",
+    "eoc": [ "EOC_random_mutate" ]
   }
 ]

data/json/damage_types.json

@@ -140,51 +140,6 @@
     "melee_combat_info": { "order": 600, "show_type": false },
     "ablative_info": { "order": 600, "show_type": false }
   },
-  {
-    "id": "genetic_damage_pierce",
-    "type": "damage_type",
-    "physical": true,
-    "edged": true,
-    "melee_only": true,
-    "magic_color": "light_green",
-    "name": "genetic pierce",
-    "skill": "stabbing",
-    "derived_from": [ "stab", 1 ],
-    "immune_flags": { "character": [ "STAB_IMMUNE" ] },
-    "ondamage_eocs": [ "EOC_random_mutate" ]
-  },
-  {
-    "id": "genetic_damage_pierce",
-    "type": "damage_info_order",
-    "info_display": "detailed",
-    "verb": "shocking",
-    "bionic_info": { "order": 601, "show_type": true },
-    "protection_info": { "order": 701, "show_type": true },
-    "pet_prot_info": { "order": 701, "show_type": false },
-    "melee_combat_info": { "order": 601, "show_type": false },
-    "ablative_info": { "order": 601, "show_type": false }
-  },
-  {
-    "id": "genetic_damage_ballistic",
-    "type": "damage_type",
-    "physical": true,
-    "magic_color": "light_green",
-    "name": "genetic ballistic",
-    "derived_from": [ "bullet", 1 ],
-    "immune_flags": { "character": [ "BULLET_IMMUNE" ] },
-    "ondamage_eocs": [ "EOC_random_mutate" ]
-  },
-  {
-    "id": "genetic_damage_ballistic",
-    "type": "damage_info_order",
-    "info_display": "detailed",
-    "verb": "shocking",
-    "bionic_info": { "order": 601, "show_type": true },
-    "protection_info": { "order": 701, "show_type": true },
-    "pet_prot_info": { "order": 701, "show_type": false },
-    "melee_combat_info": { "order": 601, "show_type": false },
-    "ablative_info": { "order": 601, "show_type": false }
-  },
   {
     "//": "e.g. fire, plasma",
     "id": "heat",

data/json/items/ammo/barb.json

@@ -31,7 +31,8 @@
     "volume": "250 ml",
     "weight": "30 g",
     "ammo_type": "gene_sting",
-    "damage": { "damage_type": "genetic_damage_ballistic", "amount": 5, "armor_penetration": 5 },
+    "damage": { "damage_type": "bullet", "amount": 5, "armor_penetration": 5 },
+    "effects": [ "GENE_STING_BARB" ],
     "dispersion": 120,
     "loudness": 0,
     "count": 10,

data/json/monster_special_attacks/spells.json

@@ -586,38 +586,16 @@
     "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",
-    "damage_type": "biological",
-    "min_damage": 0,
-    "extra_effects": [ { "id": "spell_gene_sting_selector" } ]
-  },
-  {
-    "id": "spell_gene_sting_selector",
-    "type": "SPELL",
-    "name": "Gene Sting Selector",
-    "description": "The spell fires the EOC for the yugg gene sting.  It's a bug if you have it.",
-    "message": "",
-    "valid_targets": [ "hostile" ],
-    "flags": [ "NO_FAIL", "SILENT", "NO_HANDS", "NO_LEGS" ],
-    "effect": "effect_on_condition",
-    "effect_str": "EOC_random_mutate",
-    "shape": "blast",
-    "max_level": 1
-  },
   {
     "type": "effect_on_condition",
     "id": "EOC_random_mutate",
-    "condition": { "and": [ { "math": [ "_damage_taken", ">", "0" ] }, "u_is_npc" ] },
+    "condition": {
+      "and": [
+        { "or": [ { "math": [ "_proj_damage", ">", "0" ] }, { "math": [ "_damage", ">", "0" ] } ] },
+        "npc_is_npc",
+        "has_beta"
+      ]
+    },
     "effect": [
       { "set_string_var": "<random_category>", "target_var": { "context_val": "dart_mutation_category" }, "parse_tags": true },
       { "npc_mutate_category": { "context_val": "dart_mutation_category" }, "use_vitamins": false }

data/mods/Xedra_Evolved/monster_special_attacks/monster_special_attacks.json

@@ -24,14 +24,15 @@
     "id": "inject_warping_poison",
     "cooldown": 25,
     "move_cost": 150,
-    "damage_max_instance": [ { "damage_type": "genetic_damage_pierce", "amount": 15, "armor_penetration": 8, "armor_multiplier": 0.5 } ],
+    "damage_max_instance": [ { "damage_type": "pierce", "amount": 15, "armor_penetration": 8, "armor_multiplier": 0.5 } ],
     "hitsize_min": 4,
     "hit_dmg_u": "%1$s bites and injects poison into your %2$s!",
     "hit_dmg_npc": "%1$s bites and injects poison into your <npcname>!",
     "miss_msg_u": "%1$s tries to bite your %2$s, but you dodge!",
     "miss_msg_npc": "%1$s tries to bite <npcname>, but they dodge!",
     "no_dmg_msg_u": "%1$s tries to bite your %2$s, but fails to penetrate your armor.",
     "no_dmg_msg_npc": "%1$s tries to bite <npcname>, but fails to penetrate their armor.",
+    "eoc": [ "EOC_random_mutate" ],
     "dodgeable": true,
     "blockable": true
   },

tools/json_tools/generic_guns_validator.py

@@ -25,7 +25,7 @@
     'chemical_spray',
     'fishspear',
     'flammable',
-    'gene_sting_barb',
+    'gene_sting',
     'm235',  # Rocket
     'metal_rail',
     'nail',