Merge pull request #866 from ennorehling/develop

Develop

clibs

@@ -1 +1 @@
-Subproject commit 1854780fe3073e491775836c22f709668b1fff62
+Subproject commit 6965050165efdae89305a13bff06283229f143f4

res/core/ships.xml

@@ -8,6 +8,13 @@
     </construction>
   </ship>
 
+  <ship name="galleon" range="5" storm="1.00" damage="1.00" cargo="2000000" cptskill="5" minskill="2" sumskill="250" opensea="yes">
+    <coast terrain="plain"/>
+    <construction skill="shipcraft" minskill="5" maxsize="2000">
+      <requirement type="log" quantity="1"/>
+    </construction>
+  </ship>
+
   <ship name="caravel" range="5" storm="1.00" damage="1.00" cargo="300000" cptskill="3" minskill="1" sumskill="30" opensea="yes">
     <coast terrain="plain"/>
     <construction skill="shipcraft" minskill="3" maxsize="250">

res/translations/strings.de.po

@@ -1707,6 +1707,9 @@ msgstr "Ring der Unsichtbarkeit"
 msgid "caravel_a"
 msgstr "eine Karavelle"
 
+msgid "galleon_a"
+msgstr "eine Galleone"
+
 msgctxt "keyword"
 msgid "describe"
 msgstr "BESCHREIBE"
@@ -2064,6 +2067,9 @@ msgstr "Wir schreiben %s des Monats %s im Jahre %d %s."
 msgid "caravel"
 msgstr "Karavelle"
 
+msgid "galleon"
+msgstr "Galleone"
+
 msgid "dragon_postfix_10"
 msgstr "der Goldene"
 

res/translations/strings.en.po

@@ -1458,6 +1458,12 @@ msgstr "DESCRIBE"
 msgid "roi"
 msgstr "ring of invisibility"
 
+msgid "galleon_a"
+msgstr "a galleon"
+
+msgid "galleon"
+msgstr "galleon"
+
 msgid "caravel_a"
 msgstr "a caravel"
 

scripts/eressea/xmasitems.lua

@@ -37,6 +37,7 @@ function use_snowglobe(u, amount, token, ord)
     local transform = {
         ocean = "glacier",
         firewall = "volcano",
+        activevolcano = "volcano",
         volcano = "mountain",
         desert = "plain"
     }

src/economy.c

@@ -1989,7 +1989,7 @@ static void expandentertainment(region * r, econ_request *ecbegin, econ_request
     assert(total == 0);
 }
 
-int entertain_cmd(unit * u, struct order *ord, econ_request **io_req)
+static int entertain_cmd(unit * u, struct order *ord, econ_request **io_req)
 {
     region *r = u->region;
     int wants, max_e;

src/report.c

@@ -1592,6 +1592,8 @@ static void allies(struct stream *out, const faction * f)
     const group *g = f->groups;
     char prefix[64];
 
+    rpline(out);
+    newline(out);
     centre(out, LOC(f->locale, "nr_alliances"), false);
     newline(out);
 
@@ -1678,6 +1680,8 @@ static void list_address(struct stream *out, const faction * uf, selist * seenfa
     int qi = 0;
     selist *flist = seenfactions;
 
+    rpline(out);
+    newline(out);
     centre(out, LOC(uf->locale, "nr_addresses"), false);
     newline(out);
 

src/reports.c

@@ -1293,6 +1293,9 @@ static void add_seen_lighthouse(region *r, faction *f)
     if (r->terrain->flags & SEA_REGION) {
         add_seen_nb(f, r, seen_lighthouse);
     }
+    else {
+        add_seen_nb(f, r, seen_neighbour);
+    }
 }
 
 /** mark all regions seen by the lighthouse.