Patch Level B: Revert part of defense calculations when critically hit

Incides mostly over DEF2. Do note the 40 attack bonus was kept!!

1 files changed, 9 insertions, 1 deletions

diff --git a/src/emap/battle.c b/src/emap/battle.c
index 5a24927..d574919 100644
--- a/src/emap/battle.c
+++ b/src/emap/battle.c
@@ -91,9 +91,17 @@ struct Damage ebattle_calc_weapon_attack_post(struct Damage retVal,
                                               struct block_list *src,
                                               struct block_list *target,
                                               uint16 skill_id,
-                                              uint16 skill_lv __attribute__ ((unused)),
+                                              uint16 skill_lv,
                                               int wflag __attribute__ ((unused)))
 {
+    // ML: Crits ignore defense (estimate)
+    // (regardless of source or target)
+    if (retVal.type == BDT_CRIT) {
+        int pnerf;
+        pnerf=battle->calc_defense(BF_WEAPON, src, target, skill_id, skill_lv, retVal.damage, 0, 0);
+        retVal.damage+=retVal.damage-pnerf;
+    }
+
     if (src == NULL)
         return retVal;