Merge pull request #1 from Cheerfulbull/Cheerfulbull-patch-1

Update battle_troop.cpp

Author: Cheerfulbull

src/fheroes2/battle/battle_troop.cpp

@@ -1378,7 +1378,7 @@ uint32_t Battle::Unit::CalculateSpellDamage( const Spell & spell, uint32_t spell
     assert( spell.isDamage() );
 
     // TODO: use fheroes2::getSpellDamage function to remove code duplication.
-    uint32_t dmg = spell.Damage() * spellPoints;
+    uint32_t dmg = fheroes2::getSpellDamage( spell, spellPoints, applyingHero );
 
     switch ( GetID() ) {
     case Monster::IRON_GOLEM:
@@ -1449,20 +1449,15 @@ uint32_t Battle::Unit::CalculateSpellDamage( const Spell & spell, uint32_t spell
         switch ( spell.GetID() ) {
         case Spell::COLDRAY:
         case Spell::COLDRING: {
-            std::vector<int32_t> extraDamagePercent
-                = applyingHero->GetBagArtifacts().getTotalArtifactMultipliedPercent( fheroes2::ArtifactBonusType::COLD_SPELL_EXTRA_EFFECTIVENESS_PERCENT );
-            for ( const int32_t value : extraDamagePercent ) {
-                dmg = dmg * ( 100 + value ) / 100;
-            }
-
             if ( useDefendingHeroArts ) {
                 const std::vector<int32_t> damageReductionPercent
                     = defendingHero->GetBagArtifacts().getTotalArtifactMultipliedPercent( fheroes2::ArtifactBonusType::COLD_SPELL_DAMAGE_REDUCTION_PERCENT );
                 for ( const int32_t value : damageReductionPercent ) {
                     dmg = dmg * ( 100 - value ) / 100;
                 }
 
-                extraDamagePercent = defendingHero->GetBagArtifacts().getTotalArtifactMultipliedPercent( fheroes2::ArtifactCurseType::COLD_SPELL_EXTRA_DAMAGE_PERCENT );
+                const std::vector<int32_t> extraDamagePercent
+                    = defendingHero->GetBagArtifacts().getTotalArtifactMultipliedPercent( fheroes2::ArtifactCurseType::COLD_SPELL_EXTRA_DAMAGE_PERCENT );
                 for ( const int32_t value : extraDamagePercent ) {
                     dmg = dmg * ( 100 + value ) / 100;
                 }
@@ -1472,20 +1467,15 @@ uint32_t Battle::Unit::CalculateSpellDamage( const Spell & spell, uint32_t spell
         }
         case Spell::FIREBALL:
         case Spell::FIREBLAST: {
-            std::vector<int32_t> extraDamagePercent
-                = applyingHero->GetBagArtifacts().getTotalArtifactMultipliedPercent( fheroes2::ArtifactBonusType::FIRE_SPELL_EXTRA_EFFECTIVENESS_PERCENT );
-            for ( const int32_t value : extraDamagePercent ) {
-                dmg = dmg * ( 100 + value ) / 100;
-            }
-
             if ( useDefendingHeroArts ) {
                 const std::vector<int32_t> damageReductionPercent
                     = defendingHero->GetBagArtifacts().getTotalArtifactMultipliedPercent( fheroes2::ArtifactBonusType::FIRE_SPELL_DAMAGE_REDUCTION_PERCENT );
                 for ( const int32_t value : damageReductionPercent ) {
                     dmg = dmg * ( 100 - value ) / 100;
                 }
 
-                extraDamagePercent = defendingHero->GetBagArtifacts().getTotalArtifactMultipliedPercent( fheroes2::ArtifactCurseType::FIRE_SPELL_EXTRA_DAMAGE_PERCENT );
+                const std::vector<int32_t> extraDamagePercent
+                    = defendingHero->GetBagArtifacts().getTotalArtifactMultipliedPercent( fheroes2::ArtifactCurseType::FIRE_SPELL_EXTRA_DAMAGE_PERCENT );
                 for ( const int32_t value : extraDamagePercent ) {
                     dmg = dmg * ( 100 + value ) / 100;
                 }
@@ -1495,12 +1485,6 @@ uint32_t Battle::Unit::CalculateSpellDamage( const Spell & spell, uint32_t spell
         }
         case Spell::LIGHTNINGBOLT:
         case Spell::CHAINLIGHTNING: {
-            const std::vector<int32_t> extraDamagePercent
-                = applyingHero->GetBagArtifacts().getTotalArtifactMultipliedPercent( fheroes2::ArtifactBonusType::LIGHTNING_SPELL_EXTRA_EFFECTIVENESS_PERCENT );
-            for ( const int32_t value : extraDamagePercent ) {
-                dmg = dmg * ( 100 + value ) / 100;
-            }
-
             if ( useDefendingHeroArts ) {
                 const std::vector<int32_t> damageReductionPercent
                     = defendingHero->GetBagArtifacts().getTotalArtifactMultipliedPercent( fheroes2::ArtifactBonusType::LIGHTNING_SPELL_DAMAGE_REDUCTION_PERCENT );