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

Merge pull request #49 from badgerman/master 

Dragons are looting, not taxing.
This commit is contained in:
Enno Rehling 2014-11-02 12:57:59 +01:00
parent 00ba5538f5 0b96cc7d13
commit 8c591a41bb
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/core/messages.xml
View File

@ -2754,7 +2754,7 @@
<arg name="wanted" type="int"/>
<arg name="mode" type="int"/>
</type>
<text locale="de">"$unit($unit) verdient$if($eq($mode,4)," am Handel","") in $region($region) $int($amount)$if($eq($wanted,$amount),""," statt $int($wanted)") Silber$if($eq($mode,1)," durch Unterhaltung",$if($eq($mode,2)," durch Steuern",$if($eq($mode,3)," durch Handel",$if($eq($mode,5)," durch Diebstahl",$if($eq($mode,6)," durch Zauberei",$if($eq($mode,7)," durch Pluendern","")))))."</text>
<text locale="de">"$unit($unit) verdient$if($eq($mode,4)," am Handel","") in $region($region) $int($amount)$if($eq($wanted,$amount),""," statt $int($wanted)") Silber$if($eq($mode,1)," durch Unterhaltung",$if($eq($mode,2)," durch Steuern",$if($eq($mode,3)," durch Handel",$if($eq($mode,5)," durch Diebstahl",$if($eq($mode,6)," durch Zauberei",$if($eq($mode,7)," durch Plündern",""))))))."</text>
<text locale="fr">"$unit($unit) earns $int($amount)$if($eq($wanted,$amount),""," of $int($wanted)") in $region($region)."</text>
<text locale="en">"$unit($unit) earns $int($amount)$if($eq($wanted,$amount),""," of $int($wanted)") in $region($region)."</text>
</message>

6
src/economy.c
View File

@ -3444,7 +3444,6 @@ void produce(struct region *r)
request workers[MAX_WORKERS];
request *taxorders, *lootorders, *sellorders, *stealorders, *buyorders;
unit *u;
int todo;
static int rule_autowork = -1;
bool limited = true;
request *nextworker = workers;
@ -3484,6 +3483,7 @@ void produce(struct region *r)
for (u = r->units; u; u = u->next) {
order *ord;
bool trader = false;
keyword_t todo;
if (u_race(u) == get_race(RC_SPELL) || fval(u, UFL_LONGACTION))
continue;
@ -3531,7 +3531,6 @@ void produce(struct region *r)
continue;
switch (todo) {
case K_ENTERTAIN:
entertain_cmd(u, u->thisorder);
break;
@ -3571,6 +3570,9 @@ void produce(struct region *r)
case K_RESEARCH:
research_cmd(u, u->thisorder);
break;
default:
/* not handled here */
break;
}
}

4
src/monsters.c
View File

@ -26,6 +26,7 @@
#include "give.h"
#include "monster.h"
#include "laws.h"
#include "keyword.h"
/* triggers includes */
#include <triggers/removecurse.h>
@ -173,7 +174,7 @@ static order *get_money_for_dragon(region * r, unit * u, int wanted)
/* 5% chance, dass der drache aus einer laune raus attackiert */
if (attack_chance <= 0.0 || chance(1.0 - u_race(u)->aggression)) {
/* Drachen haben in E3 und E4 keine Einnahmen. Neuer Befehl Pluendern erstmal nur fuer Monster?*/
return create_order(K_TAX, default_locale, NULL);
return create_order(K_LOOT, default_locale, NULL);
}
}
@ -866,6 +867,7 @@ void plan_monsters(faction * f)
}
if (long_order) {
addlist(&u->orders, long_order);
// u->thisorder = long_order;
}
}
}