The dissoluted devourer zombie

data/json/effects.json

@@ -1746,6 +1746,26 @@
     "desc": [ "You've been struck by lightning, and feel... different." ],
     "base_mods": { "speed_mod": [ 50 ] }
   },
+  {
+    "type": "effect_type",
+    "id": "grown_of_fuse",
+    "name": [ "Grown of Fusion" ],
+    "desc": [ "AI effect to increase stats after fusing with another critter. 1 stack means one absorbed max_hp." ],
+    "//": "stats modified by the zombie_fuse special attack.",
+    "//1": "scaling:",
+    "//2": "/48 HP: +0,5 melee_skill, +0,5 dode_skill (unexpected movement), +5 Speed (bigger steps&more to attack with), +4 bash",
+    "//3": "/160 HP: +1 size",
+    "max_intensity": 480,
+    "base_mods": { "hit_mod": [ 0.0104 ], "dodge_mod": [ 0.0104 ], "speed_mod": [ 0.1042 ], "bash_mod": [ 0.08333 ] },
+    "scaling_mods": {
+      "hit_mod": [ 0.0104 ],
+      "dodge_mod": [ 0.0104 ],
+      "speed_mod": [ 0.1042 ],
+      "bash_mod": [ 0.08333 ],
+      "size_mod": [ 0.00625 ]
+    },
+    "int_decay_step": 0
+  },
   {
     "type": "effect_type",
     "id": "has_og_comm_freq"

data/json/monsters/monsters.json

@@ -439,6 +439,7 @@
     "special_attacks": [ [ "scratch", 20 ] ],
     "death_drops": "default_zombie_items",
     "death_function": [ "CONFLAGRATION" ],
+    "upgrades": { "half_life": 14, "into": "mon_fused" },
     "flags": [
       "SEES",
       "HEARS",
@@ -532,6 +533,56 @@
       "FILTHY"
     ]
   },
+  {
+    "id": "mon_fused",
+    "type": "MONSTER",
+    "name": "fused",
+    "description": "Human bodies fused together into a colossus with heads and limbs sticking out of its bloated body. You may have trouble estimating its healthiness and its capabilities might change.",
+    "default_faction": "zombie",
+    "bodytype": "human",
+    "species": [ "ZOMBIE", "HUMAN" ],
+    "diff": 8,
+    "volume": "92500 ml",
+    "weight": 120000,
+    "hp": 112,
+    "speed": 60,
+    "material": [ "flesh" ],
+    "symbol": "Z",
+    "color": "dark_gray_yellow",
+    "aggression": 100,
+    "morale": 100,
+    "melee_skill": 4,
+    "melee_dice": 3,
+    "melee_dice_sides": 3,
+    "melee_cut": 0,
+    "armor_bash": 5,
+    "armor_cut": 5,
+    "vision_night": 3,
+    "harvest": "zombie",
+    "special_attacks": [ [ "GRAB", 7 ], [ "scratch", 20 ], [ "ZOMBIE_FUSE", 80 ] ],
+    "death_drops": {
+      "subtype": "collection",
+      "groups": [ "default_zombie_death_drops", "default_zombie_death_drops", "default_zombie_death_drops" ]
+    },
+    "death_function": [ "SPLATTER", "GAS" ],
+    "flags": [
+      "SEES",
+      "HEARS",
+      "SMELLS",
+      "STUMBLES",
+      "WARM",
+      "BASHES",
+      "GROUP_BASH",
+      "POISON",
+      "NO_BREATHE",
+      "REVIVES",
+      "BILE_BLOOD",
+      "PUSH_MON",
+      "PATH_AVOID_DANGER_1",
+      "FILTHY",
+      "REGENERATES_1"
+    ]
+  },
   {
     "id": "mon_breather",
     "type": "MONSTER",

src/creature.h

@@ -50,11 +50,11 @@ struct pathfinding_settings;
 struct trap;
 
 enum m_size : int {
-    MS_TINY = 0,    // Squirrel
-    MS_SMALL,      // Dog
-    MS_MEDIUM,    // Human
-    MS_LARGE,    // Cow
-    MS_HUGE     // TAAAANK
+    MS_TINY = 1,    // Squirrel
+    MS_SMALL = 2,      // Dog
+    MS_MEDIUM = 3,    // Human
+    MS_LARGE = 4,    // Cow
+    MS_HUGE = 5    // TAAAANK
 };
 
 enum FacingDirection {

src/effect.cpp

@@ -343,6 +343,14 @@ bool effect_type::load_mod_data( JsonObject &jo, const std::string &member )
         extract_effect( j, mod_data, "healing_head",    member, "HEAL_HEAD",  "amount" );
         extract_effect( j, mod_data, "healing_torso",   member, "HEAL_TORSO", "amount" );
 
+        // creature stats mod
+        extract_effect( j, mod_data, "dodge_mod",    member, "DODGE",  "min" );
+        extract_effect( j, mod_data, "block_mod",    member, "BLOCK",  "min" );
+        extract_effect( j, mod_data, "hit_mod",    member, "HIT",  "min" );
+        extract_effect( j, mod_data, "bash_mod",    member, "BASH",  "min" );
+        extract_effect( j, mod_data, "cut_mod",    member, "CUT",  "min" );
+        extract_effect( j, mod_data, "size_mod",    member, "SIZE",  "min" );
+
         return true;
     } else {
         return false;
@@ -465,6 +473,11 @@ bool effect_type::load_decay_msgs( JsonObject &jo, const std::string &member )
     return false;
 }
 
+int effect_type::get_max_intensity() const
+{
+    return max_intensity;
+}
+
 effect effect::null_effect;
 
 bool effect::is_null() const

src/effect.h

@@ -82,6 +82,9 @@ class effect_type
         /** Registers the effect in the global map */
         static void register_ma_buff_effect( const effect_type &eff );
 
+        /** Returns the maximum intensity of this type. */
+        int get_max_intensity() const;
+
     protected:
         int max_intensity;
         int max_effective_intensity;

src/monattack.cpp

@@ -135,6 +135,7 @@ const efftype_id effect_fungus( "fungus" );
 const efftype_id effect_glowing( "glowing" );
 const efftype_id effect_got_checked( "got_checked" );
 const efftype_id effect_grabbed( "grabbed" );
+const efftype_id effect_grown_of_fuse( "grown_of_fuse" );
 const efftype_id effect_grabbing( "grabbing" );
 const efftype_id effect_infected( "infected" );
 const efftype_id effect_laserlocked( "laserlocked" );
@@ -5283,6 +5284,41 @@ bool mattack::stretch_attack( monster *z )
     return true;
 }
 
+bool mattack::zombie_fuse( monster *z )
+{
+    const mfaction_id zombo = mfaction_id( "zombie" );
+    const tripoint zpos = z->pos();
+    Creature *critter = nullptr;
+    for( int x = zpos.x - 1; x < zpos.x + 2; x++ ) {
+        for( int y = zpos.y - 1; y < zpos.y + 2; y++ ) {
+            critter = g->critter_at( tripoint( x, y, zpos.z ) );
+            if( critter != nullptr && critter->is_monster() &&
+                static_cast<monster *>( critter )->faction == zombo
+                && critter != z && critter->get_size() <= z->get_size() ) {
+                break;
+            }
+        }
+    }
+
+    if( critter == nullptr ||
+        ( z->get_hp() + critter->get_hp() > z->get_hp_max() +
+          effect_grown_of_fuse.obj().get_max_intensity() ) ) {
+        return false;
+    }
+    if( g->u.sees( *z ) ) {
+        g->u.add_msg_if_player( _( "The %1$s fuses with the %2$s." ),
+                                static_cast<monster *>( critter )->name(),
+                                z->name() );
+    }
+    z->moves -= 200;
+    z->add_effect( effect_grown_of_fuse, time_duration::from_days( 10 ), num_bp, true,
+                   critter->get_hp_max() + z->get_effect( effect_grown_of_fuse ).get_intensity() );
+    z->heal( critter->get_hp(), true );
+    static_cast<monster *>( critter )->death_drops = false;
+    critter->die( z );
+    return true;
+}
+
 bool mattack::doot( monster *z )
 {
     z->moves -= 300;

src/monattack.h

@@ -98,6 +98,7 @@ bool kamikaze( monster *z );
 bool grenadier( monster *z );
 bool grenadier_elite( monster *z );
 bool doot( monster *z );
+bool zombie_fuse( monster *z );
 
 void taze( monster *z, Creature *target );
 void rifle( monster *z, Creature *target );             // Automated M4

src/monster.cpp

@@ -1874,6 +1874,7 @@ void monster::reset_bonuses()
     effect_cache.reset();
 
     Creature::reset_bonuses();
+    size_bonus = 0;
 }
 
 void monster::reset_stats()
@@ -2259,6 +2260,13 @@ void monster::process_one_effect( effect &it, bool is_new )
     };
 
     mod_speed_bonus( get_effect( "SPEED", reduced ) );
+    mod_dodge_bonus( get_effect( "DODGE", reduced ) );
+    mod_block_bonus( get_effect( "BLOCK", reduced ) );
+    mod_hit_bonus( get_effect( "HIT", reduced ) );
+    mod_bash_bonus( get_effect( "BASH", reduced ) );
+    mod_cut_bonus( get_effect( "CUT", reduced ) );
+    mod_size_bonus( get_effect( "SIZE", reduced ) );
+
 
     int val = get_effect( "HURT", reduced );
     if( val > 0 ) {
@@ -2492,19 +2500,34 @@ field_type_id monster::gibType() const
     return type->gibType();
 }
 
+int monster::get_size_bonus() const
+{
+    return size_bonus;
+}
+
+void monster::set_size_bonus( int nsize )
+{
+    size_bonus = nsize;
+}
+
+void monster::mod_size_bonus( int nsize )
+{
+    size_bonus += nsize;
+}
+
 m_size monster::get_size() const
 {
-    return type->size;
+    return m_size( type->size + get_size_bonus() );
 }
 
 units::mass monster::get_weight() const
 {
-    return type->weight;
+    return units::from_gram( ( units::to_gram( type->weight ) * get_size() ) / type->size );
 }
 
 units::volume monster::get_volume() const
 {
-    return type->volume;
+    return units::from_milliliter( ( units::to_milliliter( type->volume ) * get_size() ) / type->size );
 }
 
 void monster::add_msg_if_npc( const std::string &msg ) const

src/monster.h

@@ -113,6 +113,9 @@ class monster : public Creature
         int get_hp_max( hp_part ) const override;
         int get_hp_max() const override;
         int hp_percentage() const override;
+        int get_size_bonus() const;
+        void set_size_bonus( int nsize );
+        void mod_size_bonus( int nsize );
 
         // Access
         std::string get_name() const override;
@@ -377,7 +380,7 @@ class monster : public Creature
         /** Resets stats, and applies effects in an idempotent manner */
         void reset_stats() override;
 
-        void die( Creature *killer ) override; //this is the die from Creature, it calls kill_mon
+        void die( Creature *killer ) override;
         void drop_items_on_death();
 
         // Other
@@ -512,6 +515,7 @@ class monster : public Creature
         tripoint goal;
         tripoint position;
         bool dead;
+        int size_bonus;
         /** Legacy loading logic for monsters that are packing ammo. **/
         void normalize_ammo( int old_ammo );
         /** Normal upgrades **/

src/monstergenerator.cpp

@@ -543,6 +543,7 @@ void MonsterGenerator::init_attack()
     add_hardcoded_attack( "GRAB", mattack::grab );
     add_hardcoded_attack( "GRAB_DRAG", mattack::grab_drag );
     add_hardcoded_attack( "DOOT", mattack::doot );
+    add_hardcoded_attack( "ZOMBIE_FUSE", mattack::zombie_fuse );
 }
 
 void MonsterGenerator::init_defense()