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

adding a nice region message

Browse source
This commit is contained in:
Steffen Mecke 2015-01-15 03:45:07 +01:00
parent 863901d482
commit ec6560a281
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
res/core/messages.xml
View file

@ -3658,6 +3658,13 @@
<text locale="fr">"$unit($unit): '$order($command)' - The unit already uses $resource($using,0)."</text> <text locale="fr">"$unit($unit): '$order($command)' - The unit already uses $resource($using,0)."</text>
<text locale="en">"$unit($unit): '$order($command)' - The unit already uses $resource($using,0)."</text> <text locale="en">"$unit($unit): '$order($command)' - The unit already uses $resource($using,0)."</text>
</message> </message>
<message name="peasantluck_success" section="events">
<type>
<arg name="births" type="int"/>
</type>
<text locale="de">"$if($eq($births,1),"Einen Bauern","$int($births) Bauern") besucht unverhofft der Storch."</text>
<text locale="en">"The stork paid an unexpected visit to $if($eq($births,1),"one peasant","$int($births) peasants")."</text>
</message>
<message name="shipsink" section="events"> <message name="shipsink" section="events">
<type> <type>
<arg name="ship" type="ship"/> <arg name="ship" type="ship"/>

9
src/laws.c
View file

@ -305,9 +305,6 @@ static void peasants(region * r)
int n, satiated; int n, satiated;
int dead = 0; int dead = 0;
/* Bis zu 1000 Bauern können Zwillinge bekommen oder 1000 Bauern
* wollen nicht! */
if (peasants > 0 && get_param_int(global.parameters, "rules.peasants.growth", 1)) { if (peasants > 0 && get_param_int(global.parameters, "rules.peasants.growth", 1)) {
int luck = 0; int luck = 0;
double fraction = peasants * 0.0001F * PEASANTGROWTH; double fraction = peasants * 0.0001F * PEASANTGROWTH;
@ -318,8 +315,10 @@ static void peasants(region * r)
luck = a->data.i * 1000; luck = a->data.i * 1000;
} }
births += peasant_luck_effect(peasants, luck, maxp); luck = peasant_luck_effect(peasants, luck, maxp);
peasants += births; ADDMSG(&r->msgs, msg_message("peasantluck_success", "births", luck));
peasants += births + luck;
} }
/* Alle werden satt, oder halt soviele für die es auch Geld gibt */ /* Alle werden satt, oder halt soviele für die es auch Geld gibt */