diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c index 38708c9cd..7ca607a89 100644 --- a/src/common/gamecode/laws.c +++ b/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) { diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c index c252a2747..a41fa1dcd 100644 --- a/src/common/gamecode/report.c +++ b/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) { diff --git a/src/common/kernel/eressea.c b/src/common/kernel/eressea.c index c000eab7a..fbb07bace 100644 --- a/src/common/kernel/eressea.c +++ b/src/common/kernel/eressea.c @@ -362,7 +362,8 @@ const char *parameters[MAXPARAMS] = "BAEUME", "XEPOTION", "XEBALLOON", - "XELAEN" + "XELAEN", + "ALLIANZ" }; diff --git a/src/common/kernel/types.h b/src/common/kernel/types.h index df27b21e9..0a40109fc 100644 --- a/src/common/kernel/types.h +++ b/src/common/kernel/types.h @@ -218,6 +218,7 @@ enum { P_XEPOTION, P_XEBALLOON, P_XELAEN, + P_ALLIANCE, MAXPARAMS, NOPARAM = (param_t) - 1 }; diff --git a/src/res/messages.xml b/src/res/messages.xml index 913d8209e..cdf5d87ca 100644 --- a/src/res/messages.xml +++ b/src/res/messages.xml @@ -753,6 +753,15 @@ "Deine Partei hat $int($units) Migranten und kann maximal $int($maxunits) Migranten aufnehmen." "Your faction has $int($units) migrants out of a possible total of $int($maxunits)." + + + + + + + "Mitglied der Allianz '$name ($int36($id))', angeführt von $faction($leader)." + "Member of '$name ($int36($id))', led by $faction($leader)." +