- NAME ALLIANCE

src/common/gamecode/laws.c

@@ -1484,6 +1484,14 @@ name_cmd(unit * u, struct order * ord)
   }
 
   switch (p) {
+  case P_ALLIANCE:
+    if (foreign==false && u->faction->alliance) {
+      alliance * al = u->faction->alliance;
+      if (al->leader==u->faction) {
+        s = &al->name;
+      }
+    }
+    break;
   case P_BUILDING:
   case P_GEBAEUDE:
     if (foreign == true) {

src/common/gamecode/report.c

@@ -2058,6 +2058,12 @@ report_plaintext(const char * filename, report_context * ctx, const char * chars
       centre(F, buf, true);
     }
   }
+  if (f->alliance) {
+    m = msg_message("nr_alliance", "leader name id", f->alliance->leader, f->alliance->name, f->alliance->id);
+    nr_render(m, f->locale, buf, sizeof(buf), f);
+    msg_release(m);
+    centre(F, buf, true);
+  }
   {
     int maxh = maxheroes(f);
     if (maxh) {

src/common/kernel/eressea.c

@@ -362,7 +362,8 @@ const char *parameters[MAXPARAMS] =
   "BAEUME",
   "XEPOTION",
   "XEBALLOON",
-  "XELAEN"
+  "XELAEN",
+  "ALLIANZ"
 };
 
 

src/common/kernel/types.h

@@ -218,6 +218,7 @@ enum {
   P_XEPOTION,
   P_XEBALLOON,
   P_XELAEN,
+  P_ALLIANCE,
   MAXPARAMS,
   NOPARAM = (param_t) - 1
 };

src/res/messages.xml

@@ -753,6 +753,15 @@
     <text locale="de">"Deine Partei hat $int($units) Migranten und kann maximal $int($maxunits) Migranten aufnehmen."</text>
     <text locale="en">"Your faction has $int($units) migrants out of a possible total of $int($maxunits)."</text>
   </message>
+  <message name="nr_alliance" section="nr">
+    <type>
+      <arg name="leader" type="faction"/>
+      <arg name="name" type="string"/>
+      <arg name="id" type="int"/>
+    </type>
+    <text locale="de">"Mitglied der Allianz '$name ($int36($id))', angeführt von $faction($leader)."</text>
+    <text locale="en">"Member of '$name ($int36($id))', led by $faction($leader)."</text>
+  </message>
   <message name="nr_heroes" section="nr">
     <type>
       <arg name="units" type="int"/>