Fix monsters doing bonus damage even when hit missed

Also fixes bonus damage being applied for second and third attacks when they are 0. Fixes problem reported here https://forums.dfworkshop.net/viewtopic.php?f=4&t=4368
Aelthien · Dec 14, 2020 · 5674a60 · 5674a60
1 parent 6c98c86
commit 5674a60
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Assets/Scripts/Game/Formulas/FormulaHelper.cs b/Assets/Scripts/Game/Formulas/FormulaHelper.cs
@@ -635,17 +635,21 @@ public static int CalculateAttackDamage(DaggerfallEntity attacker, DaggerfallEnt
 
                         int reflexesChance = 50 - (10 * ((int)player.Reflexes - 2));
 
+                        int hitDamage = 0;
                         if (DFRandom.rand() % 100 < reflexesChance && minBaseDamage > 0 && CalculateSuccessfulHit(attacker, target, chanceToHitMod, struckBodyPart))
                         {
-                            int hitDamage = UnityEngine.Random.Range(minBaseDamage, maxBaseDamage + 1);
+                            hitDamage = UnityEngine.Random.Range(minBaseDamage, maxBaseDamage + 1);
                             // Apply special monster attack effects
                             if (hitDamage > 0)
                                 OnMonsterHit(AIAttacker, target, hitDamage);
 
                             damage += hitDamage;
                         }
 
-                        damage += GetBonusOrPenaltyByEnemyType(attacker, target);
+                        // Apply bonus damage only when monster has actually hit, or they will accumulate bonus damage even for missed attacks and zero-damage attacks
+                        if (hitDamage > 0)
+                            damage += GetBonusOrPenaltyByEnemyType(attacker, target);
+
                         ++attackNumber;
                     }
                 }