Raptor adjustments

data/json/mapgen/butcher.json

@@ -83,7 +83,7 @@
         { "group": "butcher_raw_meat", "chance": 80, "repeat": [ 1, 3 ], "x": [ 4, 4 ], "y": [ 6, 10 ] },
         { "group": "restaur_trash", "chance": 80, "repeat": [ 1, 2 ], "x": [ 4, 18 ], "y": [ 16, 14 ] }
       ],
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE_FAT", "chance": 1, "x": [ 9, 4 ], "y": [ 5, 13 ] } ],
+      "place_monsters": [ { "monster": "GROUP_ZOMBIE_FAT_BASE", "chance": 1, "x": [ 9, 4 ], "y": [ 5, 13 ] } ],
       "place_fields": [
         { "field": "fd_blood", "x": [ 4, 7 ], "y": [ 5, 12 ], "repeat": [ 8, 12 ] },
         { "field": "fd_gibs_flesh", "x": [ 4, 7 ], "y": [ 5, 12 ], "repeat": [ 1, 5 ] },
@@ -285,7 +285,7 @@
         { "group": "clothing_glasses", "chance": 80, "x": 16, "y": 13 },
         { "group": "cleaning", "chance": 80, "x": 19, "y": 13, "repeat": [ 1, 2 ] }
       ],
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE_FAT", "chance": 1, "x": [ 9, 4 ], "y": [ 5, 13 ] } ],
+      "place_monsters": [ { "monster": "GROUP_ZOMBIE_FAT_BASE", "chance": 1, "x": [ 9, 4 ], "y": [ 5, 13 ] } ],
       "place_fields": [
         { "field": "fd_blood", "x": [ 5, 8 ], "y": [ 12, 14 ], "repeat": [ 8, 12 ] },
         { "field": "fd_gibs_flesh", "x": [ 5, 8 ], "y": [ 12, 15 ], "repeat": [ 1, 5 ] }

data/json/monster_special_attacks/spells.json

@@ -118,16 +118,14 @@
     "type": "SPELL",
     "id": "small_raptor_spawn",
     "name": { "str": "Spawn Raptors" },
-    "description": "Summons several zombiespawn raptors.",
+    "description": "Summons a few zombiespawn raptors.",
     "flags": [ "HOSTILE_SUMMON", "RANDOM_DAMAGE", "PERMANENT" ],
-    "valid_targets": [ "ground", "hostile" ],
-    "min_damage": 3,
-    "max_damage": 4,
-    "min_range": 3,
-    "max_range": 3,
+    "valid_targets": [ "ground", "self" ],
+    "min_damage": 1,
+    "max_damage": 2,
     "min_aoe": 2,
     "max_aoe": 2,
-    "base_casting_time": 80,
+    "base_casting_time": 500,
     "extra_effects": [ { "id": "spawning_zombie_die", "hit_self": true } ],
     "effect": "summon",
     "effect_str": "mon_spawn_raptor"
@@ -138,14 +136,12 @@
     "name": { "str": "Spawn Raptors" },
     "description": "Summons many zombiespawn raptors.",
     "flags": [ "HOSTILE_SUMMON", "RANDOM_DAMAGE", "PERMANENT" ],
-    "valid_targets": [ "ground", "hostile" ],
-    "min_damage": 6,
-    "max_damage": 8,
-    "min_range": 3,
-    "max_range": 3,
+    "valid_targets": [ "ground", "self" ],
+    "min_damage": 3,
+    "max_damage": 6,
     "min_aoe": 4,
-    "max_aoe": 5,
-    "base_casting_time": 80,
+    "max_aoe": 4,
+    "base_casting_time": 500,
     "extra_effects": [ { "id": "spawning_zombie_die", "hit_self": true } ],
     "effect": "summon",
     "effect_str": "mon_spawn_raptor"

data/json/monstergroups/zombie_upgrades.json

@@ -24,7 +24,18 @@
       { "monster": "mon_zombie_thorny", "freq": 30, "cost_multiplier": 5 },
       { "monster": "mon_zombie_static", "freq": 50, "cost_multiplier": 5 },
       { "monster": "mon_zombie_winged", "freq": 60, "cost_multiplier": 5 },
-      { "monster": "mon_zombie_pupa", "freq": 30, "cost_multiplier": 2 }
+      { "monster": "mon_zombie_pupa", "freq": 15, "cost_multiplier": 2 },
+      { "monster": "mon_zombie_pupa_decoy", "freq": 15, "cost_multiplier": 2 }
+    ]
+  },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_ZOMBIE_CRAWLER_UPGRADE",
+    "default": "mon_zombie_crawler",
+    "//": "crawling zombie upgrades",
+    "monsters": [
+      { "monster": "mon_zombie_crawler_pupa", "freq": 500, "cost_multiplier": 2 },
+      { "monster": "mon_zombie_crawler_pupa_decoy", "freq": 500, "cost_multiplier": 2 }
     ]
   },
   {
@@ -35,7 +46,8 @@
     "monsters": [
       { "monster": "mon_zombie_gasbag", "freq": 20, "cost_multiplier": 0 },
       { "monster": "mon_boomer", "freq": 480, "cost_multiplier": 2 },
-      { "monster": "mon_zombie_pupa", "freq": 300, "cost_multiplier": 2 },
+      { "monster": "mon_zombie_pupa", "freq": 150, "cost_multiplier": 2 },
+      { "monster": "mon_zombie_pupa_decoy", "freq": 150, "cost_multiplier": 2 },
       { "monster": "mon_zombie_necro_boomer", "freq": 1, "cost_multiplier": 27 }
     ]
   },

data/json/monsters/zed-classic.json

@@ -166,7 +166,7 @@
     "death_drops": "default_zombie_death_drops",
     "death_function": [ "NORMAL" ],
     "burn_into": "mon_zombie_scorched",
-    "upgrades": { "half_life": 8, "into": "mon_zombie_crawler_pupa" },
+    "upgrades": { "half_life": 14, "into_group": "GROUP_ZOMBIE_CRAWLER_UPGRADE" },
     "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "GRABS", "POISON", "NO_BREATHE", "REVIVES", "FILTHY" ]
   },
   {
@@ -233,7 +233,7 @@
     "death_drops": "default_zombie_death_drops",
     "death_function": [ "NORMAL" ],
     "burn_into": "mon_zombie_scorched",
-    "upgrades": { "half_life": 10, "into_group": "GROUP_ZOMBIE_FAT" },
+    "upgrades": { "half_life": 12, "into_group": "GROUP_ZOMBIE_FAT" },
     "flags": [
       "SEES",
       "HEARS",

data/json/monsters/zed-pupating.json

@@ -0,0 +1,62 @@
+[
+  {
+    "id": "mon_zombie_crawler_pupa_decoy",
+    "type": "MONSTER",
+    "name": { "str": "pupating zombie crawler" },
+    "description": "This half of a human corpse is wrapped in sticky black fibers that cover everything neck down.  Beneath the wrapping there is strange rhythmic movement grotesque to behold.",
+    "copy-from": "mon_zombie_crawler",
+    "armor_bash": 7,
+    "armor_cut": 5,
+    "armor_bullet": 5,
+    "special_attacks": [ { "type": "bite", "cooldown": 3 } ],
+    "regenerates": 10,
+    "extend": { "flags": [ "SLUDGETRAIL", "SLUDGEPROOF" ] }
+  },
+  {
+    "id": "mon_zombie_crawler_pupa",
+    "type": "MONSTER",
+    "name": { "str": "pupating zombie crawler" },
+    "description": "This half of a human corpse is wrapped in sticky black fibers that cover everything neck down.  Beneath the wrapping there is strange rhythmic movement grotesque to behold.",
+    "copy-from": "mon_zombie_crawler_pupa_decoy",
+    "extend": {
+      "special_attacks": [
+        {
+          "type": "spell",
+          "spell_data": { "id": "small_raptor_spawn", "hit_self": true },
+          "cooldown": 50,
+          "monster_message": "The pupating zombie crawler bursts, and gore-smeared winged beasts climb out of the corpse!"
+        }
+      ]
+    }
+  },
+  {
+    "id": "mon_zombie_pupa_decoy",
+    "type": "MONSTER",
+    "name": { "str": "pupating zombie" },
+    "description": "This human corpse is wrapped in sticky black fibers that cover everything neck down.  Beneath the wrapping there is strange rhythmic movement grotesque to behold.",
+    "copy-from": "mon_zombie_fat",
+    "armor_bash": 8,
+    "armor_cut": 6,
+    "armor_bullet": 6,
+    "special_attacks": [ { "type": "bite", "cooldown": 3 } ],
+    "regenerates": 10,
+    "extend": { "flags": [ "SLUDGETRAIL", "SLUDGEPROOF" ] }
+  },
+  {
+    "id": "mon_zombie_pupa",
+    "type": "MONSTER",
+    "name": { "str": "pupating zombie" },
+    "description": "This human corpse is wrapped in sticky black fibers that cover everything neck down.  Beneath the wrapping there is strange rhythmic movement grotesque to behold.",
+    "copy-from": "mon_zombie_pupa_decoy",
+    "extend": {
+      "special_attacks": [
+        {
+          "type": "spell",
+          "spell_data": { "id": "small_raptor_spawn", "hit_self": true },
+          "cooldown": 50,
+          "monster_message": "The pupating zombie bursts, and gore-smeared winged beasts climb out of the corpse!"
+        }
+      ]
+    }
+  }
+]

data/json/monsters/zed-winged.json

@@ -48,48 +48,6 @@
     ],
     "//": "In the future, it would be nice if these guys could be resistant to fall damage."
   },
-  {
-    "id": "mon_zombie_crawler_pupa",
-    "type": "MONSTER",
-    "name": { "str": "pulsing zombie crawler" },
-    "description": "This half of a human corpse is wrapped in sticky black fibers that cover everything neck down.  Beneath the wrapping there is strange rhythmic movement grotesque to behold.",
-    "copy-from": "mon_zombie_crawler",
-    "armor_bash": 7,
-    "armor_cut": 5,
-    "armor_bullet": 5,
-    "special_attacks": [
-      { "type": "bite", "cooldown": 3 },
-      {
-        "type": "spell",
-        "spell_data": { "id": "small_raptor_spawn" },
-        "cooldown": 20,
-        "monster_message": "The pulsing zombie crawler bursts, and gore-smeared winged beasts climb out of the corpse!"
-      }
-    ],
-    "regenerates": 10,
-    "extend": { "flags": [ "SLUDGETRAIL", "SLUDGEPROOF" ] }
-  },
-  {
-    "id": "mon_zombie_pupa",
-    "type": "MONSTER",
-    "name": { "str": "pupating zombie" },
-    "description": "This human corpse is wrapped in sticky black fibers that cover everything neck down.  Beneath the wrapping there is strange rhythmic movement grotesque to behold.",
-    "copy-from": "mon_zombie_fat",
-    "armor_bash": 8,
-    "armor_cut": 6,
-    "armor_bullet": 6,
-    "special_attacks": [
-      { "type": "bite", "cooldown": 3 },
-      {
-        "type": "spell",
-        "spell_data": { "id": "big_raptor_spawn" },
-        "cooldown": 20,
-        "monster_message": "The pupating zombie bursts, and gore-smeared winged beasts climb out of the corpse!"
-      }
-    ],
-    "regenerates": 20,
-    "extend": { "flags": [ "SLUDGETRAIL", "SLUDGEPROOF" ] }
-  },
   {
     "id": "mon_zombie_brute_winged",
     "type": "MONSTER",

src/mattack_actors.cpp

@@ -187,7 +187,7 @@ bool mon_spellcasting_actor::call( monster &mon ) const
         return false;
     }
 
-    const tripoint target = mon.attack_target()->pos();
+    const tripoint target = self ? mon.pos() : mon.attack_target()->pos();
 
     std::string fx = spell_data.effect();
     // is the spell an attack that needs to hit the target?