From d04d8e782e5622d5f72e7bb251e2b441f5b99636 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sun, 6 Dec 2015 18:34:31 +0100
Subject: [PATCH] https://bugs.eressea.de/view.php?id=2173 rewrite the rules
 for magical damage reduction

---
 critbit           |  2 +-
 src/battle.c      |  6 +++---
 src/battle.test.c | 29 +++++++++++++++--------------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/critbit b/critbit
index dfe57a077..934c2dd94 160000
--- a/critbit
+++ b/critbit
@@ -1 +1 @@
-Subproject commit dfe57a077222c6b572da61a79dc0687f81c10055
+Subproject commit 934c2dd94d41da19637a76a1a8b3dfeb7aa8524d
diff --git a/src/battle.c b/src/battle.c
index 7541e54a6..828233346 100644
--- a/src/battle.c
+++ b/src/battle.c
@@ -1142,8 +1142,8 @@ int calculate_armor(troop dt, const weapon_type *dwtype, const weapon_type *awty
     ar += am;
 
     if (magres) {
-        /* magic_resistance gib x% Resistenzbonus zurück */
-        double res = *magres - magic_resistance(du) * 3.0;
+        // calculate damage multiplier for magical damage
+        double res = 1.0 - magic_resistance(du);
 
         if (u_race(du)->battle_flags & BF_EQUIPMENT) {
             /* der Effekt von Laen steigt nicht linear */
@@ -1157,7 +1157,7 @@ int calculate_armor(troop dt, const weapon_type *dwtype, const weapon_type *awty
 
         /* gegen Magie wirkt nur natürliche und magische Rüstung */
         ar = an + am;
-        *magres = res;
+        *magres = res > 0 ? res : 0;
     }
 
     return ar;
diff --git a/src/battle.test.c b/src/battle.test.c
index 4597f9e5b..be058913f 100644
--- a/src/battle.test.c
+++ b/src/battle.test.c
@@ -234,7 +234,7 @@ static void test_calculate_armor(CuTest * tc)
 
     dt.fighter = setup_fighter(&b, du);
     CuAssertIntEquals_Msg(tc, "default ac", 0, calculate_armor(dt, 0, 0, &magres));
-    CuAssertDblEquals_Msg(tc, "magres unmodified", 0.0, magres, 0.01);
+    CuAssertDblEquals_Msg(tc, "magres unmodified", 1.0, magres, 0.01);
     free_battle(b);
 
     i_change(&du->items, ibelt, 1);
@@ -264,7 +264,7 @@ static void test_calculate_armor(CuTest * tc)
     wtype->flags = WTF_NONE;
 
     CuAssertIntEquals_Msg(tc, "magical attack", 3, calculate_armor(dt, 0, 0, &magres));
-    CuAssertDblEquals_Msg(tc, "magres unmodified", 0.0, magres, 0.01);
+    CuAssertDblEquals_Msg(tc, "magres unmodified", 1.0, magres, 0.01);
 
     ashield->flags |= ATF_LAEN;
     achain->flags |= ATF_LAEN;
@@ -284,7 +284,7 @@ static void test_magic_resistance(CuTest *tc)
     armor_type *ashield, *achain;
     item_type *ishield, *ichain;
     race *rc;
-    double magres = 0.0;
+    double magres;
 
     test_cleanup();
     r = test_create_region(0, 0, 0);
@@ -298,16 +298,11 @@ static void test_magic_resistance(CuTest *tc)
 
     dt.fighter = setup_fighter(&b, du);
     calculate_armor(dt, 0, 0, &magres);
-    CuAssertDblEquals_Msg(tc, "magres unmodified", 0.0, magres, 0.01);
-
-    magres = 1.0;
-    calculate_armor(dt, 0, 0, &magres);
     CuAssertDblEquals_Msg(tc, "no magres bonus", 0.0, magic_resistance(du), 0.01);
-    CuAssertDblEquals_Msg(tc, "no magres bonus", 1.0, magres, 0.01);
+    CuAssertDblEquals_Msg(tc, "no magres reduction", 1.0, magres, 0.01);
 
     ashield->flags |= ATF_LAEN;
     ashield->magres = 0.1;
-    magres = 1.0;
     calculate_armor(dt, 0, 0, &magres);
     free_battle(b);
 
@@ -318,19 +313,25 @@ static void test_magic_resistance(CuTest *tc)
     ashield->flags |= ATF_LAEN;
     ashield->magres = 0.1;
     dt.fighter = setup_fighter(&b, du);
-    magres = 1.0;
     calculate_armor(dt, 0, 0, &magres);
-    CuAssertDblEquals_Msg(tc, "laen bonus", 0.81, magres, 0.01);
+    CuAssertDblEquals_Msg(tc, "laen reduction", 0.81, magres, 0.01);
     free_battle(b);
 
     i_change(&du->items, ishield, -1);
     i_change(&du->items, ichain, -1);
     set_level(du, SK_MAGIC, 2);
     dt.fighter = setup_fighter(&b, du);
-    magres = 1.0;
     calculate_armor(dt, 0, 0, &magres);
-    CuAssertDblEquals_Msg(tc, "magic bonus", 0.1, magic_resistance(du), 0.01);
-    CuAssertDblEquals_Msg(tc, "magic bonus", 0.7, magres, 0.01);
+    CuAssertDblEquals_Msg(tc, "skill bonus", 0.1, magic_resistance(du), 0.01);
+    CuAssertDblEquals_Msg(tc, "skill reduction", 0.9, magres, 0.01);
+    rc->magres = 0.5; /* gets added to skill bonus */
+    calculate_armor(dt, 0, 0, &magres);
+    CuAssertDblEquals_Msg(tc, "race bonus", 0.6, magic_resistance(du), 0.01);
+    CuAssertDblEquals_Msg(tc, "race reduction", 0.4, magres, 0.01);
+
+    rc->magres = 1.5; /* should not cause negative damage multiplier */
+    calculate_armor(dt, 0, 0, &magres);
+    CuAssertDblEquals_Msg(tc, "damage reduction is never < 0", 0.0, magres, 0.01);
 
     free_battle(b);
     test_cleanup();