From b3bec13051eb81a1e8dd66f0f0ee2acc810bc231 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Fri, 19 Dec 2014 19:57:24 +0100
Subject: [PATCH] report the unit limit in NR and CR. this implements
 https://bugs.eressea.de/view.php?id=2055

---
 res/core/messages.xml | 5 +++--
 src/creport.c         | 1 +
 src/report.c          | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/res/core/messages.xml b/res/core/messages.xml
index 409e2ee09..52b132220 100644
--- a/res/core/messages.xml
+++ b/res/core/messages.xml
@@ -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>
diff --git a/src/creport.c b/src/creport.c
index 2bb96f65f..0bfe10033 100644
--- a/src/creport.c
+++ b/src/creport.c
@@ -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);
diff --git a/src/report.c b/src/report.c
index 7bc09d60c..3500e938f 100644
--- a/src/report.c
+++ b/src/report.c
@@ -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);