diff --git a/src/common/gamecode/creport.c b/src/common/gamecode/creport.c
index e1c5ceacd..36d9eb851 100644
--- a/src/common/gamecode/creport.c
+++ b/src/common/gamecode/creport.c
@@ -1281,18 +1281,18 @@ report_computer(const char * filename, report_context * ctx)
#endif
if (fval(r->terrain, LAND_REGION)) {
int trees = rtrees(r, 2);
- int ytrees = rtrees(r, 1);
+ int saplings = rtrees(r, 1);
# ifdef RESOURCECOMPAT
if (trees > 0) fprintf(F, "%d;Baeume\n", trees);
- if (ytrees > 0) fprintf(F, "%d;Schoesslinge\n", ytrees);
- if (fval(r, RF_MALLORN) && (trees > 0 || ytrees > 0))
+ if (saplings > 0) fprintf(F, "%d;Schoesslinge\n", saplings);
+ if (fval(r, RF_MALLORN) && (trees > 0 || saplings > 0))
fprintf(F, "1;Mallorn\n");
# endif
if (!fval(r, RF_MALLORN)) {
- if (ytrees) pos = report_resource(pos, "rm_youngtrees", f->locale, ytrees, -1);
+ if (saplings) pos = report_resource(pos, "rm_sapling", f->locale, saplings, -1);
if (trees) pos = report_resource(pos, "rm_trees", f->locale, trees, -1);
} else {
- if (ytrees) pos = report_resource(pos, "rm_youngmallorn", f->locale, ytrees, -1);
+ if (saplings) pos = report_resource(pos, "rm_mallornsapling", f->locale, saplings, -1);
if (trees) pos = report_resource(pos, "rm_mallorn", f->locale, trees, -1);
}
fprintf(F, "%d;Bauern\n", rpeasants(r));
diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c
index 52d6968c0..bdc328f28 100644
--- a/src/common/gamecode/report.c
+++ b/src/common/gamecode/report.c
@@ -776,7 +776,7 @@ describe(FILE * F, const region * r, int partial, faction * f)
boolean dh;
direction_t d;
int trees;
- int ytrees;
+ int saplings;
attrib *a;
const char *tname;
struct edge {
@@ -844,10 +844,10 @@ describe(FILE * F, const region * r, int partial, faction * f)
/* Bäume */
trees = rtrees(r,2);
- ytrees = rtrees(r,1);
+ saplings = rtrees(r,1);
if (production(r)) {
- if (trees > 0 || ytrees > 0) {
- bufp += sprintf(bufp, ", %d/%d ", trees, ytrees);
+ if (trees > 0 || saplings > 0) {
+ bufp += sprintf(bufp, ", %d/%d ", trees, saplings);
if (fval(r, RF_MALLORN)) {
if (trees == 1) {
bufp += strxcpy(bufp, LOC(f->locale, "nr_mallorntree"));
diff --git a/src/eressea/lua/region.cpp b/src/eressea/lua/region.cpp
index 8b39d9a7a..531ab273b 100644
--- a/src/eressea/lua/region.cpp
+++ b/src/eressea/lua/region.cpp
@@ -128,6 +128,8 @@ region_getresource(const region& r, const char * type)
if (rtype==rt_find("money")) return rmoney(&r);
if (rtype==rt_find("peasant")) return rpeasants(&r);
} else {
+ if (strcmp(type, "seed")==0) return rtrees(&r, 0);
+ if (strcmp(type, "sapling")==0) return rtrees(&r, 1);
if (strcmp(type, "tree")==0) return rtrees(&r, 2);
if (strcmp(type, "grave")==0) return deathcount(&r);
if (strcmp(type, "chaos")==0) return chaoscount(&r);
@@ -143,7 +145,11 @@ region_setresource(region& r, const char * type, int value)
if (rtype==rt_find("money")) rsetmoney(&r, value);
if (rtype==rt_find("peasant")) return rsetpeasants(&r, value);
} else {
- if (strcmp(type, "tree")==0) {
+ if (strcmp(type, "seed")==0) {
+ return rsettrees(&r, 0, value);
+ } else if (strcmp(type, "sapling")==0) {
+ return rsettrees(&r, 1, value);
+ } else if (strcmp(type, "tree")==0) {
rsettrees(&r, 2, value);
} else if (strcmp(type, "grave")==0) {
int fallen = value-deathcount(&r);
diff --git a/src/mapper/map_modify.c b/src/mapper/map_modify.c
index 95b17069a..150913a4a 100644
--- a/src/mapper/map_modify.c
+++ b/src/mapper/map_modify.c
@@ -237,7 +237,7 @@ addmenulist(menulist ** SP, const char *s, int *val)
static int peasants, money, trees, horses, iron, laen, chaotisch;
-static int ytrees, seeds;
+static int saplings, seeds;
static int ironlevel, laenlevel, stone, stonelevel;
@@ -248,7 +248,7 @@ get_region(region *r) {
peasants = rpeasants(r);
money = rmoney(r);
trees = rtrees(r,2);
- ytrees = rtrees(r,1);
+ saplings = rtrees(r,1);
seeds = rtrees(r,0);
horses = rhorses(r);
iron = -1;
@@ -280,7 +280,7 @@ put_region(region *r) {
rsetpeasants(r, peasants);
rsetmoney(r,money);
rsettrees(r,2,trees);
- rsettrees(r,1,ytrees);
+ rsettrees(r,1,saplings);
rsettrees(r,0,seeds);
rsethorses(r, horses);
@@ -315,11 +315,11 @@ create_region_menu(menulist ** menu, region * r)
addmenulist(menu, "Silver", &money);
if (fval(r, RF_MALLORN)) {
addmenulist(menu, "Mallorntrees", &trees);
- addmenulist(menu, "Mallornsprouts", &ytrees);
+ addmenulist(menu, "Mallornsaplings", &saplings);
addmenulist(menu, "Mallornseeds", &seeds);
} else {
addmenulist(menu, "Trees", &trees);
- addmenulist(menu, "Sprouts", &ytrees);
+ addmenulist(menu, "Saplings", &saplings);
addmenulist(menu, "Seeds", &seeds);
}
addmenulist(menu, "Horses", &horses);
diff --git a/src/res/de/strings.xml b/src/res/de/strings.xml
index d22295a22..832bc5675 100644
--- a/src/res/de/strings.xml
+++ b/src/res/de/strings.xml
@@ -6613,14 +6613,14 @@
laen
-
+
Schößlinge
- young trees
+ saplings
-
+
Mallornschößlinge
- young mallorn
+ mallorn saplings