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

Merge pull request #86 from badgerman/master 

Monsters should LOOT, not TAX in E3 and E4
This commit is contained in:
Enno Rehling 2014-12-20 21:53:08 +01:00
parent d67ecdb8cf 4018aa2dfe
commit 921e570102
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/monsters.c
View File

@ -199,7 +199,8 @@ static order *get_money_for_dragon(region * r, unit * u, int wanted)
/* falls die einnahmen erreicht werden, bleibt das monster noch eine */
/* runde hier. */
if (n + rmoney(r) >= wanted) {
return create_order(K_TAX, default_locale, NULL);
keyword_t kwd = keyword_disabled(K_TAX) ? K_LOOT : K_TAX;
return create_order(kwd, default_locale, NULL);
}
/* wenn wir NULL zurueckliefern, macht der drache was anderes, z.b. weggehen */