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

Merge pull request #383 from ennorehling/develop 

expandloot calculation repairs
This commit is contained in:
Enno Rehling 2015-11-10 11:09:05 +01:00
parent a2ac68197d 34c9958368
commit a4fc9c35de
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/economy.c
View File

@ -2898,18 +2898,17 @@ static void expandloot(region * r, request * lootorders)
if (!norders) if (!norders)
return; return;
for (i = 0; i != norders && startmoney > TAXFRACTION * 2; i++) { for (i = 0; i != norders && startmoney > looted + TAXFRACTION * 2; i++) {
change_money(oa[i].unit, TAXFRACTION); change_money(oa[i].unit, TAXFRACTION);
oa[i].unit->n += TAXFRACTION; oa[i].unit->n += TAXFRACTION;
/*Looting destroys double the money*/ /*Looting destroys double the money*/
startmoney = startmoney - TAXFRACTION * 2; looted += TAXFRACTION * 2;
rsetmoney(r, startmoney);
looted = looted + TAXFRACTION * 2;
} }
rsetmoney(r, startmoney - looted);
free(oa); free(oa);
/* Lowering morale by 1 depending on the looted money (+20%) */ /* Lowering morale by 1 depending on the looted money (+20%) */
if (rng_int() % 100 < ((looted / startmoney) + 0.2)) { if (rng_int() % 100 < 20 + (looted * 80) / startmoney) {
int m = region_get_morale(r); int m = region_get_morale(r);
if (m) { if (m) {
/*Nur Moral -1, turns is not changed, so the first time nothing happens if the morale is good*/ /*Nur Moral -1, turns is not changed, so the first time nothing happens if the morale is good*/