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

fix für Schild des Fisches

This commit is contained in:
Steffen Mecke 2021-03-21 12:47:51 +01:00 committed by Enno Rehling
parent 480d80f7c6
commit 4ee01be75f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/battle.c
View File

@ -111,6 +111,7 @@ const troop no_troop = { 0, 0 };
static int max_turns; static int max_turns;
static int rule_damage; static int rule_damage;
static int rule_loot; static int rule_loot;
static float loot_divisor;
static int flee_chance_max_percent; static int flee_chance_max_percent;
static int flee_chance_base; static int flee_chance_base;
static int flee_chance_skill_bonus; static int flee_chance_skill_bonus;
@ -148,6 +149,7 @@ static void init_rules(void)
rule_vampire = config_get_int("rules.combat.demon_vampire", 0); rule_vampire = config_get_int("rules.combat.demon_vampire", 0);
rule_loot = config_get_int("rules.combat.loot", rule_loot = config_get_int("rules.combat.loot",
LOOT_MONSTERS | LOOT_OTHERS | LOOT_KEEPLOOT); LOOT_MONSTERS | LOOT_OTHERS | LOOT_KEEPLOOT);
loot_divisor = config_get_flt("rules.items.loot_divisor", 1);
/* new formula to calculate to-hit-chance */ /* new formula to calculate to-hit-chance */
skill_formula = config_get_int("rules.combat.skill_formula", skill_formula = config_get_int("rules.combat.skill_formula",
FORMULA_ORIG); FORMULA_ORIG);
@ -1234,7 +1236,7 @@ static int apply_magicshield(int reduced_damage, fighter *df,
/* jeder Schaden wird um effect% reduziert bis der Schild duration /* jeder Schaden wird um effect% reduziert bis der Schild duration
* Trefferpunkte aufgefangen hat */ * Trefferpunkte aufgefangen hat */
if (me->typ == SHIELD_REDUCE) { if (me->typ == SHIELD_REDUCE) {
int hp = reduced_damage * (me->effect / 100); int hp = reduced_damage * me->effect / 100;
reduced_damage -= hp; reduced_damage -= hp;
me->duration -= hp; me->duration -= hp;
} }
@ -2440,10 +2442,9 @@ static int loot_quota(const unit * src, const unit * dst,
{ {
UNUSED_ARG(type); UNUSED_ARG(type);
if (dst && src && src->faction != dst->faction) { if (dst && src && src->faction != dst->faction) {
double divisor = config_get_flt("rules.items.loot_divisor", 1); assert(loot_divisor <= 0 || loot_divisor >= 1);
assert(divisor <= 0 || divisor >= 1); if (loot_divisor > 1) {
if (divisor >= 1) { double r = n / loot_divisor;
double r = n / divisor;
int x = (int)r; int x = (int)r;
r = r - x; r = r - x;