- Eine ganze Menge an Kampfmeldungen übersetzt

- API für Kampfmessages runderneuert
- Alte Rendering-Funktionen rausgeworfen
- neue Rendering-Funktion für spells

src/common/gamecode/creport.c

@@ -368,12 +368,22 @@ cr_alliance(const void * v, char * buffer, const void * userdata)
 static int
 cr_skill(const void * v, char * buffer, const void * userdata)
 {
-	const faction * report = (const faction*)userdata;
+  const faction * report = (const faction*)userdata;
-	skill_t sk = (skill_t)(int)v;
+  skill_t sk = (skill_t)(int)v;
-	if (sk!=NOSKILL) sprintf(buffer, "\"%s\"",
+  if (sk!=NOSKILL) sprintf(buffer, "\"%s\"",
-		add_translation(skillname(sk, NULL), skillname(sk, report->locale)));
+    add_translation(skillname(sk, NULL), skillname(sk, report->locale)));
-	else strcpy(buffer, "\"\"");
+  else strcpy(buffer, "\"\"");
-	return 0;
+  return 0;
+}
+
+static int
+cr_spell(const void * v, char * buffer, const void * userdata)
+{
+  const faction * report = (const faction*)userdata;
+  spell * sp = (spell*)v;
+  if (sp!=NULL) sprintf(buffer, "\"%s\"", spell_name(sp, report->locale));
+  else strcpy(buffer, "\"\"");
+  return 0;
 }
 
 void
@@ -382,6 +392,7 @@ creport_init(void)
 	tsf_register("report", &cr_ignore);
 	tsf_register("string", &cr_string);
 	tsf_register("order", &cr_string);
+        tsf_register("spell", &cr_spell);
 	tsf_register("int", &cr_int);
 	tsf_register("unit", &cr_unit);
 	tsf_register("region", &cr_region);

src/common/gamecode/report.c

@@ -3483,6 +3483,16 @@ eval_unit(struct opstack ** stack, const void * userdata) /* unit -> string */
 	opush(stack, strcpy(balloc(len+1), c));
 }
 
+static void
+eval_spell(struct opstack ** stack, const void * userdata) /* unit -> string */
+{
+  const struct faction * f = (const struct faction *)userdata;
+  const struct spell * sp = opop(stack, const struct spell *);
+  const char * c = sp?spell_name(sp, f->locale):"an unknown spell";
+  size_t len = strlen(c);
+  opush(stack, strcpy(balloc(len+1), c));
+}
+
 static void
 eval_unitname(struct opstack ** stack, const void * userdata) /* unit -> string */
 {
@@ -3628,6 +3638,7 @@ report_init(void)
 	add_function("ship", &eval_ship);
 	add_function("unit", &eval_unit);
         add_function("order", &eval_string);
+        add_function("spell", &eval_spell);
 	add_function("unit.name", &eval_unitname);
 	add_function("unit.id", &eval_unitid);
 	add_function("building", &eval_building);

src/common/kernel/Jamfile

@@ -31,7 +31,6 @@ SOURCES =
  pool.c
  race.c
  region.c
- render.c
  reports.c
  resources.c
  save.c

src/common/kernel/battle.h

@@ -36,6 +36,8 @@ extern "C" {
 #define LAST_ROW (NUMROWS-1)
 #define FIRST_ROW FIGHT_ROW
 
+  struct message;
+
   typedef struct bfaction {
     struct bfaction * next;
     struct side * sides;
@@ -60,7 +62,9 @@ extern "C" {
     boolean reelarrow;
     int     dh;
     int     alive;
+#ifdef SMALL_BATTLE_MESSAGES
     boolean small;
+#endif
 #ifdef FAST_GETUNITROW
     boolean nonblockers;
 #endif
@@ -218,6 +222,8 @@ extern "C" {
   extern boolean terminate(troop dt, troop at, int type, const char *damage, boolean missile);
   extern void battlemsg(battle * b, struct unit * u, const char * s);
   extern void battlerecord(battle * b, const char *s);
+  extern void message_all(battle * b, struct message * m);
+  extern void message_faction(battle * b, struct faction * f, struct message * m);
   extern int hits(troop at, troop dt, weapon * awp);
   extern void damage_building(struct battle *b, struct building *bldg, int damage_abs);
   extern struct cvector * fighters(struct battle *b, struct fighter *af, int minrow, int maxrow, int mask);

src/common/kernel/combatspells.c

@@ -19,6 +19,7 @@
 #include "faction.h"
 #include "item.h"
 #include "magic.h"
+#include "message.h"
 #include "region.h"
 #include "unit.h"
 #include "movement.h"
@@ -141,9 +142,10 @@ sp_kampfzauber(fighter * fi, int level, double power, spell * sp)
 
 	enemies = count_enemies(b, fi->side, minrow, maxrow);
 	if (!enemies) {
-		scat(", aber niemand war in Reichweite.");
+          message * m = msg_message("battle::out_of_range", "mage spell", fi->unit, sp);
-		battlerecord(b, buf);
+          message_all(b, m);
-		return 0;
+          msg_release(m);
+          return 0;
 	}
 	scat(":");
 	battlerecord(b, buf);

src/common/kernel/eressea.c

@@ -577,14 +577,11 @@ ffindhash(int no)
 void
 stripfaction (faction * f)
 {
-#ifdef OLD_MESSAGES
-	free_messages(f->msgs);
-#else
 	/* TODO: inhalt auch löschen */
 	if (f->msgs) free(f->msgs);
 	if (f->battles) free(f->battles);
-#endif
+
-	/* TODO: free msgs */
+        /* TODO: free msgs */
 	freestrlist(f->mistakes);
 	freelist(f->allies);
 	free(f->email);

src/common/kernel/kernel.vcproj

@@ -363,9 +363,6 @@
 		<File
 			RelativePath=".\region.c">
 		</File>
-		<File
-			RelativePath=".\render.c">
-		</File>
 		<File
 			RelativePath=".\reports.c">
 		</File>

src/common/kernel/render.c

@@ -1,565 +0,0 @@
-/* vi: set ts=2:
- *
- *	
- *	Eressea PB(E)M host Copyright (C) 1998-2003
- *      Christian Schlittchen (corwin@amber.kn-bremen.de)
- *      Katja Zedel (katze@felidae.kn-bremen.de)
- *      Henning Peters (faroul@beyond.kn-bremen.de)
- *      Enno Rehling (enno@eressea-pbem.de)
- *      Ingo Wilken (Ingo.Wilken@informatik.uni-oldenburg.de)
- *
- *  based on:
- *
- * Atlantis v1.0  13 September 1993 Copyright 1993 by Russell Wallace
- * Atlantis v1.7                    Copyright 1996 by Alex Schröder
- *
- * This program may not be used, modified or distributed without
- * prior permission by the authors of Eressea.
- * This program may not be sold or used commercially without prior written
- * permission from the authors.
- */
-
-#include <config.h>
-#include "eressea.h"
-#include "render.h"
-
-#include "message.h"
-
-#ifdef OLD_MESSAGES
-#include "item.h"
-#include "faction.h"
-#include "language.h"
-#include "goodies.h"
-#include "region.h"
-#include "unit.h"
-#include "building.h"
-#include "ship.h"
-#include "reports.h"
-#include "karma.h"
-#include "unit.h"
-
-
-#include <assert.h>
-#include <limits.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define RMAXHASH 64
-
-int lastint = 0;
-
-typedef struct localizer {
-	struct localizer * nexthash;
-	unsigned int hashkey;
-	const locale * lang;
-	struct renderer * renderers[RMAXHASH];
-	struct eval * evaluators[RMAXHASH];
-} localizer;
-
-typedef const char* (*eval_fun)(const locale * lang, void *);
-typedef char * (*render_fun)(const message * m, const locale * lang);
-
-typedef struct renderer {
-	unsigned int hashkey;
-	render_fun fun;
-	char * name;
-	struct renderer * nexthash;
-} renderer;
-
-typedef struct eval {
-	unsigned int hashkey;
-	eval_fun fun;
-	const char * name;
-	struct eval * nexthash;
-} eval;
-
-#define LMAXHASH 32
-localizer * localizers[LMAXHASH];
-
-static localizer *
-get_localizer(const locale * lang)
-{
-	unsigned int hkey = locale_hashkey(lang);
-	int id = hkey % LMAXHASH;
-	localizer * find = localizers[id];
-	while (find && find->lang!=lang) find = find->nexthash;
-	if (!find) {
-		find = calloc(sizeof(localizer), 1);
-		find->nexthash = localizers[id];
-		localizers[id] = find;
-		find->hashkey = hkey;
-		find->lang = lang;
-	}
-	return find;
-}
-
-void
-add_renderfun(const char * name, localizer * l, render_fun fun)
-{
-	unsigned int hkey = hashstring(name);
-	unsigned int id = hkey % RMAXHASH;
-	renderer * find = l->renderers[id];
-	while (find && find->hashkey!=hkey) find=find->nexthash;
-	if (!find) {
-		find = calloc(1, sizeof(renderer));
-		find->nexthash = l->renderers[id];
-		l->renderers[id] = find;
-		find->hashkey = hkey;
-		find->fun = fun;
-		find->name = strdup(name);
-	}
-	else assert(!strcmp(find->name, name));
-}
-
-void
-add_evalfun(const char * name, localizer * l, eval_fun fun)
-{
-	unsigned int hkey = hashstring(name);
-	unsigned int id = hkey % RMAXHASH;
-	eval * find = l->evaluators[id];
-	while (find && find->hashkey!=hkey) find=find->nexthash;
-	if (!find) {
-		find = calloc(1, sizeof(eval));
-		find->nexthash = l->evaluators[id];
-		l->evaluators[id] = find;
-		find->hashkey = hkey;
-		find->fun = fun;
-		find->name = strdup(name);
-	}
-	else assert(!strcmp(find->name, name));
-}
-
-void
-render_cleanup(void)
-{
-	int i;
-	for (i=0;i!=LMAXHASH;++i) {
-		while (localizers[i]) {
-			int s;
-			localizer * l = localizers[i]->nexthash;
-#if 0
-			for (s=0;s!=SMAXHASH;++s) {
-				while (localizers[i]->strings[s]) {
-					struct locale_string * ls = localizers[i]->strings[s]->nexthash;
-					free(localizers[i]->strings[s]);
-					localizers[i]->strings[s]=ls;
-				}
-			}
-#endif
-			for (s=0;s!=RMAXHASH;++s) {
-				while (localizers[i]->evaluators[s]) {
-					eval * e = localizers[i]->evaluators[s]->nexthash;
-					free(localizers[i]->evaluators[s]);
-					localizers[i]->evaluators[s] = e;
-				}
-			}
-
-			for (s=0;s!=RMAXHASH;++s) {
-				while (localizers[i]->renderers[s]) {
-					renderer * e = localizers[i]->renderers[s]->nexthash;
-					free(localizers[i]->renderers[s]);
-					localizers[i]->renderers[s] = e;
-				}
-			}
-			free(localizers[i]);
-			localizers[i] = l;
-		}
-	}
-}
-
-static const char *
-v_order(const locale * l, void * data) {
-  return (const char *)data;
-}
-
-static const char *
-v_unit(const locale * l, void * data) {
-	unit * u = (void*)data;
-	if (u) return unitname(u);
-	return locale_string(l, "unknownunit");
-}
-
-static const char *
-v_of_de(const locale * l, void * data) {
-	int i = (int)data;
-	if (!i || i==INT_MAX || i==lastint) return "";
-	sprintf(buf, "von %d ", i);
-	return buf;
-}
-
-static const char *
-v_sink_de(const locale * l, void * data) {
-	int i = (int)data;
-	unused(l);
-	return i?" und sank":"";
-}
-
-static const char *
-v_mage_de(const locale * l, void * data) {
-	int i = (int)data;
-	unused(l);
-	/* TODO: i==1 getarnt, wilder Hack */
-	return i>1?unitname((unit*)i):"Jemand";
-}
-
-static const char *
-v_unknown(const locale * l, void * data) {
-	unused(l);
-	unused(data);
-	/* TODO: i==1 getarnt, wilder Hack */
-	return "[an error occured]";
-}
-
-const char *
-v_dir(const locale * l, void * data) {
-	int i = (int)data;
-	static const char* dres[6] = { "northwest", "northeast", "east",
-		"southeast", "southwest", "west" };
-	/* static char buffer[10]; */
-	return locale_string(l, dres[i]);
-}
-
-static char rbuf[8192];
-
-static char *
-render_immediate(const message * m, const char * find, localizer * l)
-{
-	char * b = rbuf;
-	const char * p = find;
-	while (*p) {
-		while (*p && *p!='{') *b++ = *p++;
-		if (*p=='{') {
-			static char token[128];
-			static char function[128];
-			char * t = token;
-			char * f = function;
-			eval_fun fun = NULL;
-			const char * var = NULL;
-			int i = 0;
-			struct entry * e = m->type->entries;
-			++p;
-			if (*p=='$') {
-				unsigned int key;
-				eval * e;
-				++p;
-				while (*p!=' ') *f++ = *p++;
-				*f = 0;
-				key = hashstring(function);
-				for (e = l->evaluators[key % RMAXHASH];e;e=e->nexthash) {
-					if (!strcmp(e->name, function)) break;
-				}
-				if (e==NULL) {
-					/* in default gucken */
-					localizer * l = get_localizer(find_locale("de"));
-					for (e = l->evaluators[key % RMAXHASH];e;e=e->nexthash) {
-						if (!strcmp(e->name, function)) break;
-					}
-					if (!e) {
-						fun = v_unknown;
-						fprintf(stderr, "WARNING: unknown function for rendering %s\n", function);
-					}
-					else fun = e->fun;
-				}
-				else fun = e->fun;
-				++p;
-			}
-			while (*p!='}') {
-				*t++ = *p++;
-			}
-			*t = 0;
-			++p;
-			while (e && strcmp(e->name, token)) {
-				e = e->next;
-				++i;
-			}
-			if (fun) var = fun(l->lang, m->data[i]);
-			else if (e) switch (e->type) {
-			case IT_FACTION:
-				var = factionname((faction*)m->data[i]);
-				break;
-			case IT_UNIT:
-				/* TODO: Grammatik falsch. Groß/Kleinschreibung */
-				if (m->data[i] == (void *)&u_peasants) {
-					if (b == rbuf) {
-						var = "Die Bevölkerung";
-					} else {
-						var = "die Bevölkerung";
-					}
-				} else if(m->data[i] == NULL || m->data[i] == &u_unknown) {
-					if (b == rbuf) {
-						var = "Eine unerkannte Einheit";
-					} else {
-						var = "eine unerkannte Einheit";
-					}
-				} else {
-					var = unitname((unit*)m->data[i]);
-				}
-				break;
-			case IT_REGION:
-				if (m->data[i]) var = tregionid((region*)m->data[i], m->receiver);
-				else var="eine unbekannte Region";
-				break;
-			case IT_SHIP:
-				var = shipname((ship*)m->data[i]);
-				break;
-			case IT_BUILDING:
-				var = buildingname((building*)m->data[i]);
-				break;
-			case IT_RESOURCETYPE:
-				var = locale_string(l->lang, resourcename((const resource_type *)m->data[i], (lastint==1)?0:GR_PLURAL));
-				break;
-			case IT_RESOURCE:
-				var = resname((resource_t)m->data[i], lastint!=1);
-				break;
-			case IT_SKILL:
-				var = skillnames[(int)m->data[i]];
-				break;
-			case IT_INT:
-				sprintf(token, "%d", (int)m->data[i]);
-				var = token;
-				lastint = (int)m->data[i];
-				break;
-			case IT_STRING:
-				var = (char*)m->data[i];
-				break;
-			case IT_DIRECTION:
-				var = directions[(int)m->data[i]];
-				break;
-			case IT_FSPECIAL:
-				var = fspecials[(int)m->data[i]].name;
-				break;
-			} else {
-				assert(!"unknown token");
-			}
-			while (*var) *b++ = *var++;
-		}
-	}
-	*b = 0;
-	return rbuf;
-}
-
-void
-rendercr(FILE * f, messagetype * mt, const locale * lang)
-{
-	fprintf(f, "\"%s\";%u\n", locale_string(lang, mt->name), mt->hashkey);
-}
-
-static char *
-render_default(const message * m, const locale * lang)
-{
-	const char * str = locale_string(lang, m->type->name);
-	if (!str) {
-		fprintf(stderr, "WARNUNG: fehlende message %s\n", m->type->name);
-		return m->type->name;
-	}
-	else return render_immediate(m, str, get_localizer(lang));
-}
-
-static render_fun
-get_renderfun(const char * name, const localizer * l)
-{
-	unsigned int hkey = hashstring(name);
-	unsigned int id = hkey % RMAXHASH;
-	renderer * find = l->renderers[id];
-	while (find && find->hashkey!=hkey) find=find->nexthash;
-	if (find && !strcmp(find->name, name)) return find->fun;
-	return &render_default;
-}
-
-const char *
-render(const message * m, const locale * lang)
-{
-	localizer * loc = get_localizer(lang);
-	char * s;
-	render_fun f;
-	f = get_renderfun(m->type->name, loc);
-	s = f(m, lang);
-	return s;
-}
-
-static char *
-render_income(const message * m, const locale * lang)
-{
-	static const char * special[] = {"income_work","income_entertainment","income_tax","income_trade","income_tradetax", "income_steal", "income_magic"};
-	static const char * special2[] = {"income_work_reduced","income_entertainment_reduced","income_tax_reduced","income_trade","income_tradetax", "income_steal_reduced", "income_magic_reduced"};
-	int want=0, have=0, type = -1;
-	const char * key;
-	localizer * l = get_localizer(lang);
-	struct entry * e = m->type->entries;
-	const char * ls;
-	int i = 0;
-	if (!l) return render_default(m, lang);
-	while (e) {
-		switch(e->type) {
-		case IT_INT:
-			if (!strcmp(e->name, "amount")) have = (int)m->data[i];
-			else if (!strcmp(e->name, "wanted")) want = (int)m->data[i];
-			else if (!strcmp(e->name, "mode")) type = (int)m->data[i];
-			else assert(0);
-			break;
-		case IT_REGION:
-		case IT_UNIT:
-			/* part of the message, but safely ignored here */
-			break;
-		default:
-			assert(0);
-		}
-		++i;
-		e = e->next;
-	}
-	if (type<0) return render_default(m, lang);
-	if (want!=have) key = special2[type];
-	else key = special[type];
-	ls = locale_string(lang, key);
-	return render_immediate(m, ls, l);
-}
-
-static char *
-de_render_casualties(const message * m, const locale * lang)
-{
-/*
- * casualties;de;{unit} verlor {fallen} Personen, {alive} überlebten und {run} flohen nach {runto}.
- */
-	int i, fallen=0, alive=0, run=0;
-	region * runto = NULL;
-	unit * u = NULL;
-	char * sbuf;
-	struct entry * e = m->type->entries;
-	for(i=0;e;e=e->next, ++i) {
-		switch(e->type) {
-		case IT_INT:
-			if (!strcmp(e->name, "fallen")) fallen = (int)m->data[i];
-			else if (!strcmp(e->name, "run")) run = (int)m->data[i];
-			else if (!strcmp(e->name, "alive")) alive = (int)m->data[i];
-			else assert(0);
-			break;
-		case IT_REGION:
-			if (!strcmp(e->name, "runto")) runto = (region*)m->data[i];
-			else assert(0);
-			break;
-		case IT_UNIT:
-			if (!strcmp(e->name, "unit")) u = (unit*)m->data[i];
-			else assert(0);
-			break;
-		default:
-			assert(!"message format of 'casualties' is broken");
-		}
-	}
-	sbuf = rbuf;
-	if (fallen) {
-		sbuf = strcpy(sbuf, unitname(u)) + strlen(sbuf);
-		sbuf += sprintf(sbuf, " verlor %d Person%s", fallen, fallen==1?"":"en");
-		if (alive) sbuf += sprintf(sbuf, ", %d überlebt%s", alive, alive==1?"e":"en");
-		if (run) sbuf += sprintf(sbuf, " und %d floh%s nach %s", run, run==1?"":"en", tregionid(runto, m->receiver));
-	} else {
-		if (alive && run) {
-			sprintf(sbuf, "%d Person%s aus %s überlebt%s und %d floh%s nach %s",
-				alive, alive==1?"":"en",
-				unitname(u), alive==1?"e":"en",
-				run, run==1?"":"en",
-				tregionid(runto, m->receiver));
-		} else if (run) {
-			sprintf(sbuf, "%d Person%s aus %s floh%s nach %s",
-			run, run==1?"":"en", unitname(u), run==1?"":"en",
-			tregionid(runto, m->receiver));
-		}
-	}
-	strcat(sbuf, ".");
-	return rbuf;
-}
-
-static const char *
-v_travel(const locale * l, void * data)
-{
-	int i = (int)data;
-	unused(l);
-	switch(i) {
-	case 0: return "flieht";
-	case 1: return "reitet";
-	default: return "wandert";
-	}
-}
-
-static const char *
-v_travelthru_de(const locale * l, void * data) {
-	char * c = (char*)data;
-	unused(l);
-	if (c && strlen(c)) sprintf(buf," Dabei wurde %s durchquert.", c);
-	else return "";
-	return buf;
-}
-
-void
-render_init(void)
-{
-	localizer * loc;
-	locale * lang = find_locale("de");
-
-	if (lang==NULL) lang = make_locale("de");
-	loc = get_localizer(lang);
-	add_renderfun("income", loc, render_income);
-	add_renderfun("casualties", loc, de_render_casualties);
-	add_evalfun("dir", loc, v_dir);
-	add_evalfun("dir", loc, v_dir);
-	add_evalfun("travel", loc, v_travel);
-        add_evalfun("unit", loc, v_unit);
-        add_evalfun("order", loc, v_order);
-	add_evalfun("of", loc, v_of_de);
-	add_evalfun("sink", loc, v_sink_de);
-	add_evalfun("mage", loc, v_mage_de);
-	add_evalfun("travelthru", loc, v_travelthru_de);
-
-	lang = find_locale("en");
-	if (lang==NULL) lang = make_locale("en");
-	loc = get_localizer(lang);
-	add_renderfun("income", loc, render_income);
-}
-
-void
-read_messages(FILE * F, const struct locale * deflocale)
-{
-	unused(deflocale);
-	while (fgets(buf, 8192, F)) {
-		char * b = buf;
-		char * name = b;
-		char * language;
-		struct locale * lang;
-		char * section = NULL;
-		int level = 0;
-		messagetype * mtype;
-
-		buf[strlen(buf)-1] = 0; /* \n weg */
-		if (buf[0]=='#' || buf[0]==0) continue;
-		while (*b && *b!=';') ++b;
-		if (!*b) continue;
-		*b++ = 0;
-		section = b;
-		while (*b && *b!=';' && *b!=':') ++b;
-		if (!strcmp(section, "none")) section=NULL;
-		if (*b==':') {
-			char * x;
-			*b++ = 0;
-			x = b;
-			while (*b && *b!=';') ++b;
-			*b++ = 0;
-			level=atoi(x);
-		} else {
-			level = 0;
-			*b++ = 0;
-		}
-		language = b;
-		while (*b && *b!=';') ++b;
-		*b++ = 0;
-		lang = find_locale(language);
-		if (!lang) lang = make_locale(language);
-		mtype = find_messagetype(name);
-		if (!mtype) mtype = new_messagetype(name, level, section);
-		else if (section && !mtype->section) {
-			mtype->section = mc_add(section);
-			mtype->level = level;
-		}
-		locale_setstring(lang, name, b);
-	}
-}
-
-#endif

src/res/messages.xml

@@ -2047,7 +2047,7 @@
     </type>
     <text locale="de">"$unit($unit) in $region($region) stellt fest, dass es hier $localize($amount,$locale("de")) $resource($herb,$amount) gibt."</text>
     <text locale="fr">"$unit($unit) discovers that $localize($amount,$locale("en")) $resource($herb,$amount) grow in $region($region)."</text>
-    <text locale="en">"$unit($unit) discovers that $localize($amount,$locale("en")) $resource($herb,$amount) grow in $region($region)."</text>
+    <text locale="en">"$unit($unit) discovers that $localize($amount,$locale("fr")) $resource($herb,$amount) grow in $region($region)."</text>
   </message>
   <message name="destroy_partial" section="events">
     <type>
@@ -5692,5 +5692,55 @@
     <text locale="fr">"The wormhole in $region($region) disappears."</text>
     <text locale="en">"The wormhole in $region($region) disappears."</text>
   </message>
+  <message name="battle::potionsave" section="battle">
+    <type>
+      <arg name="unit" type="unit"/>
+    </type>
+    <text locale="de">"$unit($unit) konnte durch einen Heiltrank überleben."</text>
+    <text locale="en">"$unit($unit) was saved by a haling potion."</text>
+  </message>
+  <message name="battle::tactics_lost" section="battle">
+    <type>
+      <arg name="unit" type="unit"/>
+    </type>
+    <text locale="de">"$unit($unit) konnte dem Gegner eine Falle stellen."</text>
+    <text locale="en">"$unit($unit) lured the enemy into an ambush."</text>
+  </message>
+  <message name="battle::tactics_won" section="battle">
+    <type>
+      <arg name="unit" type="unit"/>
+    </type>
+    <text locale="de">"$unit($unit) überrascht den Gegner."</text>
+    <text locale="en">"$unit($unit) surprises the enemies."</text>
+  </message>
+  <message name="battle::spell_failed" section="battle">
+    <type>
+      <arg name="unit" type="unit"/>
+      <arg name="spell" type="spell"/>
+    </type>
+    <text locale="de">"$unit($unit) versucht $spell($spell) zu zaubern, doch der Zauber schlägt fehl!"</text>
+    <text locale="en">"$unit($unit) tries to cast $spell($spell), but the spell fails!"</text>
+  </message>
+  <message name="battle::row_header" section="battle">
+    <type>
+    </type>
+    <text locale="de">"Der Kampf wurde abgebrochen, da alle Verteidiger flohen."</text>
+    <text locale="en">"The battle was aborted because all enemies escaped."</text>
+  </message>
+  <message name="battle::aborted" section="battle">
+    <type>
+      <arg name="row" type="int"/>
+    </type>
+    <text locale="de">"... in der $int($row) Kampflinie:"</text>
+    <text locale="en">"... in combat rank $int($row):"</text>
+  </message>
+  <message name="battle::out_of_range" section="battle">
+    <type>
+      <arg name="mage" type="unit"/>
+      <arg name="spell" type="spell"/>
+    </type>
+    <text locale="de">"$unit($mage) zaubert $spell($spell), aber niemand war in Reichweite."</text>
+    <text locale="en">"$unit($mage) casts $spell($spell), but nobody was in range."</text>
+  </message>
 </messages>