From 5178bbd674b122a64eab25144ccb56516e442862 Mon Sep 17 00:00:00 2001
From: Philipp Dreher <dreher.philipp@googlemail.com>
Date: Tue, 3 Nov 2015 00:05:55 +0100
Subject: [PATCH] moved application of armor-penetration

halfed armor now includes the effect of natural armor, but not the
effect of magic armor
---
 src/battle.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/battle.c b/src/battle.c
index 1707b29ad..b60094053 100644
--- a/src/battle.c
+++ b/src/battle.c
@@ -1156,12 +1156,6 @@ terminate(troop dt, troop at, int type, const char *damage, bool missile)
     /* Momentan nur Trollgürtel und Werwolf-Eigenschaft */
     am = select_magicarmor(dt);
 
-    if (awtype && fval(awtype, WTF_ARMORPIERCING)) {
-        /* crossbows */
-        ar /= 2;
-        an /= 2;
-    }
-
     if (rule_armor < 0) {
         rule_armor = get_param_int(global.parameters, "rules.combat.nat_armor", 0);
     }
@@ -1178,6 +1172,12 @@ terminate(troop dt, troop at, int type, const char *damage, bool missile)
         /* use the higher value, add half the other value */
         ar = (ar > an) ? (ar + an / 2) : (an + ar / 2);
     }
+
+    if (awtype && fval(awtype, WTF_ARMORPIERCING)) {
+        /* crossbows */
+        ar /= 2;
+    }
+
     ar += am;
 
     if (type != AT_COMBATSPELL && type != AT_SPELL) {