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

report the unit limit in NR and CR. 

this implements https://bugs.eressea.de/view.php?id=2055
This commit is contained in:
Enno Rehling 2014-12-19 19:57:24 +01:00
parent 2966e1ea3d
commit b3bec13051
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
res/core/messages.xml
View File

@ -787,10 +787,11 @@
<message name="nr_population" section="nr">
<type>
<arg name="population" type="int"/>
<arg name="limit" type="int"/>
<arg name="units" type="int"/>
</type>
<text locale="de">"Deine Partei hat $int($population) Personen in $int($units) Einheiten."</text>
<text locale="en">"Your faction has $int($population) people in $int($units) units."</text>
<text locale="de">"Deine Partei hat $int($population) Personen in $int($units) von maximal $int($limit) Einheiten."</text>
<text locale="en">"Your faction has $int($population) people in $int($units) of $int($limit) possible units."</text>
</message>
<message name="nr_stat_header" section="nr">
<type>

1
src/creport.c
View File

@ -1523,6 +1523,7 @@ report_computer(const char *filename, report_context * ctx, const char *charset)
fprintf(F, "\"%s\";Spiel\n", game_name());
fprintf(F, "\"%s\";Konfiguration\n", "Standard");
fprintf(F, "\"%s\";Koordinaten\n", "Hex");
fprintf(F, "%d;max_units\n", rule_faction_limit());
fprintf(F, "%d;Basis\n", 36);
fprintf(F, "%d;Runde\n", turn);
fprintf(F, "%d;Zeitalter\n", era);

2
src/report.c
View File

@ -2195,7 +2195,7 @@ const char *charset)
no_people = f->num_people;
}
#endif
m = msg_message("nr_population", "population units", no_people, no_units);
m = msg_message("nr_population", "population units limit", no_people, no_units, rule_faction_limit());
nr_render(m, f->locale, buf, sizeof(buf), f);
msg_release(m);
centre(F, buf, true);