From 315acc72259a100de5746da7aafab28dce650e97 Mon Sep 17 00:00:00 2001 From: John Candlebury Date: Tue, 21 Jan 2020 10:19:19 -0600 Subject: [PATCH 1/3] Teak the scaling damage dealt by evolve kill strike attack --- src/monattack.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/monattack.cpp b/src/monattack.cpp index 646739419f4b4..f920f185f3d1e 100644 --- a/src/monattack.cpp +++ b/src/monattack.cpp @@ -4834,8 +4834,8 @@ bool mattack::evolve_kill_strike( monster *z ) const std::string target_name = target->disp_name(); damage_instance damage( z->type->melee_damage ); damage.mult_damage( 1.33f ); - int damage_dealt = target->deal_damage( z, bp_torso, damage_instance( DT_STAB, rng( 10, 20 ), - rng( 5, 15 ) ) ).total_damage(); + damage.add(damage_instance(DT_STAB, dice(z->type->melee_dice, z->type->melee_sides), rng(5, 15), 1.0, 0.5)); + int damage_dealt = target->deal_damage( z, bp_torso, damage ).total_damage(); if( damage_dealt > 0 ) { auto msg_type = target == &g->u ? m_bad : m_warning; target->add_msg_player_or_npc( msg_type, From ed01d788ee990fb608e56a23d909f25bf39a47ad Mon Sep 17 00:00:00 2001 From: John Candlebury Date: Wed, 22 Jan 2020 08:16:50 -0600 Subject: [PATCH 2/3] Update src/monattack.cpp Co-Authored-By: ZhilkinSerg --- src/monattack.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/monattack.cpp b/src/monattack.cpp index f920f185f3d1e..7165b20da38a2 100644 --- a/src/monattack.cpp +++ b/src/monattack.cpp @@ -4834,7 +4834,7 @@ bool mattack::evolve_kill_strike( monster *z ) const std::string target_name = target->disp_name(); damage_instance damage( z->type->melee_damage ); damage.mult_damage( 1.33f ); - damage.add(damage_instance(DT_STAB, dice(z->type->melee_dice, z->type->melee_sides), rng(5, 15), 1.0, 0.5)); + damage.add( damage_instance( DT_STAB, dice( z->type->melee_dice, z->type->melee_sides ), rng( 5, 15 ), 1.0, 0.5 ) ); int damage_dealt = target->deal_damage( z, bp_torso, damage ).total_damage(); if( damage_dealt > 0 ) { auto msg_type = target == &g->u ? m_bad : m_warning; From 3ea80d00b62497dbe18e2fddfef2ed924cdeee15 Mon Sep 17 00:00:00 2001 From: ZhilkinSerg Date: Fri, 24 Jan 2020 09:50:25 +0300 Subject: [PATCH 3/3] Astyle --- src/monattack.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/monattack.cpp b/src/monattack.cpp index 7165b20da38a2..46530885b7507 100644 --- a/src/monattack.cpp +++ b/src/monattack.cpp @@ -4834,7 +4834,8 @@ bool mattack::evolve_kill_strike( monster *z ) const std::string target_name = target->disp_name(); damage_instance damage( z->type->melee_damage ); damage.mult_damage( 1.33f ); - damage.add( damage_instance( DT_STAB, dice( z->type->melee_dice, z->type->melee_sides ), rng( 5, 15 ), 1.0, 0.5 ) ); + damage.add( damage_instance( DT_STAB, dice( z->type->melee_dice, z->type->melee_sides ), rng( 5, + 15 ), 1.0, 0.5 ) ); int damage_dealt = target->deal_damage( z, bp_torso, damage ).total_damage(); if( damage_dealt > 0 ) { auto msg_type = target == &g->u ? m_bad : m_warning;