Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
Enno Rehling 2015-12-06 18:39:54 +01:00
commit 1075b7ce17
2 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/battle.c
View file

@ -1136,8 +1136,8 @@ int calculate_armor(troop dt, const weapon_type *dwtype, const weapon_type *awty
ar += am; ar += am;
if (magres) { if (magres) {
/* magic_resistance gib x% Resistenzbonus zurück */ // calculate damage multiplier for magical damage
double res = *magres - magic_resistance(du) * 3.0; double res = 1.0 - magic_resistance(du);
if (u_race(du)->battle_flags & BF_EQUIPMENT) { if (u_race(du)->battle_flags & BF_EQUIPMENT) {
/* der Effekt von Laen steigt nicht linear */ /* der Effekt von Laen steigt nicht linear */
@ -1151,7 +1151,7 @@ int calculate_armor(troop dt, const weapon_type *dwtype, const weapon_type *awty
/* gegen Magie wirkt nur natürliche und magische Rüstung */ /* gegen Magie wirkt nur natürliche und magische Rüstung */
ar = an + am; ar = an + am;
*magres = res; *magres = res > 0 ? res : 0;
} }
return ar; return ar;

29
src/battle.test.c
View file

@ -252,7 +252,7 @@ static void test_calculate_armor(CuTest * tc)
dt.fighter = setup_fighter(&b, du); dt.fighter = setup_fighter(&b, du);
CuAssertIntEquals_Msg(tc, "default ac", 0, calculate_armor(dt, 0, 0, &magres)); 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); free_battle(b);
i_change(&du->items, ibelt, 1); i_change(&du->items, ibelt, 1);
@ -282,7 +282,7 @@ static void test_calculate_armor(CuTest * tc)
wtype->flags = WTF_NONE; wtype->flags = WTF_NONE;
CuAssertIntEquals_Msg(tc, "magical attack", 3, calculate_armor(dt, 0, 0, &magres)); 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; ashield->flags |= ATF_LAEN;
achain->flags |= ATF_LAEN; achain->flags |= ATF_LAEN;
@ -302,7 +302,7 @@ static void test_magic_resistance(CuTest *tc)
armor_type *ashield, *achain; armor_type *ashield, *achain;
item_type *ishield, *ichain; item_type *ishield, *ichain;
race *rc; race *rc;
double magres = 0.0; double magres;
test_cleanup(); test_cleanup();
r = test_create_region(0, 0, 0); r = test_create_region(0, 0, 0);
@ -316,16 +316,11 @@ static void test_magic_resistance(CuTest *tc)
dt.fighter = setup_fighter(&b, du); dt.fighter = setup_fighter(&b, du);
calculate_armor(dt, 0, 0, &magres); 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", 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->flags |= ATF_LAEN;
ashield->magres = 0.1; ashield->magres = 0.1;
magres = 1.0;
calculate_armor(dt, 0, 0, &magres); calculate_armor(dt, 0, 0, &magres);
free_battle(b); free_battle(b);
@ -336,19 +331,25 @@ static void test_magic_resistance(CuTest *tc)
ashield->flags |= ATF_LAEN; ashield->flags |= ATF_LAEN;
ashield->magres = 0.1; ashield->magres = 0.1;
dt.fighter = setup_fighter(&b, du); dt.fighter = setup_fighter(&b, du);
magres = 1.0;
calculate_armor(dt, 0, 0, &magres); 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); free_battle(b);
i_change(&du->items, ishield, -1); i_change(&du->items, ishield, -1);
i_change(&du->items, ichain, -1); i_change(&du->items, ichain, -1);
set_level(du, SK_MAGIC, 2); set_level(du, SK_MAGIC, 2);
dt.fighter = setup_fighter(&b, du); dt.fighter = setup_fighter(&b, du);
magres = 1.0;
calculate_armor(dt, 0, 0, &magres); calculate_armor(dt, 0, 0, &magres);
CuAssertDblEquals_Msg(tc, "magic bonus", 0.1, magic_resistance(du), 0.01); CuAssertDblEquals_Msg(tc, "skill bonus", 0.1, magic_resistance(du), 0.01);
CuAssertDblEquals_Msg(tc, "magic bonus", 0.7, magres, 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); free_battle(b);
test_cleanup(); test_cleanup();