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

http://eressea.upb.de/mantis/view.php?id=1172 

"Fliehende Einheit verliert Waffen"

Miscalculated lootfactor
This commit is contained in:
Enno Rehling 2007-04-19 14:54:17 +00:00
parent cb65679573
commit 8159fdae46
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/kernel/battle.c
View File

@ -2345,20 +2345,19 @@ loot_items(fighter * corpse)
while (itm) { while (itm) {
float lootfactor = dead/(float)u->number; /* only loot the dead! */ float lootfactor = dead/(float)u->number; /* only loot the dead! */
if (itm->number) { int maxloot = (int)(itm->number*lootfactor);
int i = min(10, itm->number); if (maxloot>0) {
int i = min(10, maxloot);
for (; i != 0; --i) { for (; i != 0; --i) {
int loot = (int)(itm->number*lootfactor/i); int loot = maxloot/i;
/* Looten tun hier immer nur die Gegner. Das ist als Ausgleich für die
* neue Loot-regel (nur ganz tote Einheiten) fair.
* zusätzlich looten auch geflohene, aber nach anderen Regeln.
*/
if (loot>0) { if (loot>0) {
int maxrow = BEHIND_ROW; int maxrow = BEHIND_ROW;
int lootchance = 50 + b->keeploot; int lootchance = 50 + b->keeploot;
if (itm->type->flags & (ITF_CURSED|ITF_NOTLOST)) maxrow = LAST_ROW; if (itm->type->flags & (ITF_CURSED|ITF_NOTLOST)) maxrow = LAST_ROW;
itm->number -= loot; itm->number -= loot;
maxloot -= loot;
if (maxrow == LAST_ROW || rng_int() % 100 < lootchance) { if (maxrow == LAST_ROW || rng_int() % 100 < lootchance) {
fighter *fig = select_enemy(corpse, FIGHT_ROW, maxrow, 0).fighter; fighter *fig = select_enemy(corpse, FIGHT_ROW, maxrow, 0).fighter;