Release 29.2

CMakeLists.txt

@@ -14,6 +14,7 @@ set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/"
 if (MSVC)
   find_package (PDCurses)
   set (CURSES_FOUND ${PDCURSES_FOUND})
+  set (CURSES_LIBRARY ${PDCURSES_LIBRARY})
   set (CURSES_LIBRARIES ${PDCURSES_LIBRARIES})
   set (CURSES_INCLUDE_DIRS ${PDCURSES_INCLUDE_DIR})
 endif(MSVC)

cmake/Modules/FindPDCurses.cmake

@@ -22,7 +22,6 @@ FIND_LIBRARY(PDCURSES_PANEL_LIBRARY
   PATH_SUFFIXES lib64 lib)
 
 IF(PDCURSES_LIBRARY)
-  SET(PDCURSES_LIBRARIES ${PDCURSES_LIBRARY})
   IF(PDCURSES_PANEL_LIBRARY)
     SET(PDCURSES_LIBRARIES ${PDCURSES_LIBRARIES} ${PDCURSES_PANEL_LIBRARY})
   ENDIF(PDCURSES_PANEL_LIBRARY)
@@ -32,7 +31,5 @@ SET(PDCURSES_FOUND "NO")
 IF(PDCURSES_INCLUDE_DIR AND PDCURSES_LIBRARY)
 #  message(STATUS "Found PDCurses library: ${PDCURSES_LIBRARIES}")
   # Set the final string here so the GUI reflects the final state.
-  SET(PDCURSES_LIBRARIES PDCURSES_LIBRARY} CACHE STRING "Where the PDCurses Library can be found")
-
   SET(PDCURSES_FOUND "YES")
 ENDIF(PDCURSES_INCLUDE_DIR AND PDCURSES_LIBRARY)

res/core/messages.xml

@@ -2191,7 +2191,7 @@
       <arg name="target" type="region"/>
     </type>
   </message>
-  <message name="leavefail" section="errors">
+  <message name="enterfail" section="errors">
     <type>
       <arg name="unit" type="unit"/>
       <arg name="region" type="region"/>
@@ -6013,6 +6013,14 @@
     </type>
   </message>
 
+  <message name="warpgate" section="events">
+    <type>
+      <arg name="from" type="region"/>
+      <arg name="to" type="region"/>
+      <arg name="unit" type="unit"/>
+    </type>
+  </message>
+
   <message name="tidalwave_kill" section="events">
     <type>
       <arg name="region" type="region"/>

res/core/weapons/greatbow.xml

@@ -7,7 +7,7 @@
     <construction skill="weaponsmithing" minskill="5">
       <requirement type="mallorn" quantity="2"/>
     </construction>
-    <weapon pierce="true" missile="true" skill="bow" offmod="0" defmod="0" reload="0" magres="0.0">
+    <weapon pierce="true" missile="true" skill="bow" offmod="0" defmod="0" reload="0" magres="0.15">
       <damage type="rider" value="2d6+4"/>
       <damage type="footman" value="2d6+4"/>
       <modifier type="missile_target" value="2"/>

res/translations/messages.de.po

@@ -173,7 +173,7 @@ msgid "victory_murder_cfulfilled"
 msgstr "\"Achtung: $faction($faction) hat die Siegbedingungen erfüllt und wird in $if($eq($remain,1),\"einer Woche\",\"$int($remain) Wochen\") zum Sieger erklärt werden.\""
 
 msgid "hangover_effect_1"
-msgstr "\"$unit($unit) hat höllische Kopfschmerzen und kann sich an die vergangene Woche nicht mehr erinnern. Nur noch daran, wie alles mit einer fröhlichen Feier in irgendeiner Taverne anfing....\""
+msgstr "\"$unit($unit) hat höllische Kopfschmerzen und kann sich an die vergangene Woche nicht mehr erinnern. Nur noch daran, wie alles mit einer fröhlichen Feier in irgendeiner Taverne anfing ...\""
 
 msgid "feedback_no_contact"
 msgstr "\"$unit($unit) in $region($region): '$order($command)' - $unit($target) hat keinen Kontakt mit uns aufgenommen.\""
@@ -761,6 +761,9 @@ msgstr "\"$unit($mage) ruft $int($amount) $race($race, $amount) zu Hilfe.\""
 msgid "tidalwave"
 msgstr "\"Eine gewaltige Flutwelle verschlingt $region($region) und alle Bewohner.\""
 
+msgid "warpgate"
+msgstr "\"$unit($unit) wird von $region($from) nach $region($to) teleportiert.\""
+
 msgid "cast_hero_effect"
 msgstr "\"$unit($mage) zaubert $spell($spell): $int($amount) Krieger wurden moralisch gestärkt.\""
 
@@ -951,7 +954,7 @@ msgid "error_cannotmake"
 msgstr "\"$unit($unit) in $region($region): '$order($command)' - So etwas kann man nicht machen.\""
 
 msgid "meow"
-msgstr "\"Miiauuuuuu...\""
+msgstr "\"Miiauuuuuu ...\""
 
 msgid "spelltargetnotfound"
 msgstr "\"$unit($unit) in $region($region): '$order($command)' - Es wurde kein Ziel gefunden.\""
@@ -1732,7 +1735,7 @@ msgid "santa_m"
 msgstr "'Ho ho ho!' Ein dicker Gnom fliegt auf einem von 8 Jungdrachen gezogenen Schlitten durch die Nacht und vermacht Deiner Partei einen $resource($item,1). (Um diesen Gegenstand einer Einheit zu geben, gib ihr den Befehl 'BEANSPRUCHE 1 $resource($item,1)')."
 
 msgid "error234"
-msgstr "\"$unit($unit) in $region($region): '$order($command)' - Die Einheit ist mit Ausschiffen beschäftigt..\""
+msgstr "\"$unit($unit) in $region($region): '$order($command)' - Die Einheit ist mit Ausschiffen beschäftigt.\""
 
 msgid "spellfail::nolevel"
 msgstr "\"$unit($mage) in $region($region): '$order($command)' - Dieser Zauber kann nicht mit Stufenangabe gezaubert werden.\""
@@ -2548,8 +2551,8 @@ msgctxt "curseinfo"
 msgid "maelstrom"
 msgstr "Der Mahlstrom in dieser Region wird alle Schiffe, die in seinen Sog geraten, schwer beschädigen. ($int36($id))"
 
-msgid "leavefail"
-msgstr "\"$unit($unit) konnte aus $region($region) nicht ausreisen.\""
+msgid "enterfail"
+msgstr "\"$unit($unit) konnte nach $region($region) nicht einreisen.\""
 
 msgid "reduced_production"
 msgstr "Die Region ist verwüstet, der Boden karg."

res/translations/messages.en.po

@@ -761,6 +761,9 @@ msgstr "\"$unit($mage) calls for the help of $int($amount) $race($race, $amount)
 msgid "tidalwave"
 msgstr "\"A tidal wave wipes out $region($region) and all who lived there.\""
 
+msgid "warpgate"
+msgstr "\"$unit($unit) is teleported from from $region($from) to $region($to).\""
+
 msgid "cast_hero_effect"
 msgstr "\"$unit($mage) casts $spell($spell): $int($amount) fighters had their moral boosted.\""
 
@@ -2548,8 +2551,8 @@ msgctxt "curseinfo"
 msgid "maelstrom"
 msgstr "The maelstrom in this area will heavily damage all ships coming into its wake. ($int36($id))"
 
-msgid "leavefail"
-msgstr "\"$unit($unit) could not leave $region($region).\""
+msgid "enterfail"
+msgstr "\"$unit($unit) could not enter $region($region).\""
 
 msgid "reduced_production"
 msgstr "The region is ravaged, the ground infertile."

scripts/eressea/warpgate.lua

@@ -38,6 +38,11 @@ function move_all(from, to)
         local units = {}
         for u in s.units do
             table.insert(units, u)
+            local msg = message.create('warpgate')
+            msg:set_region('from', from)
+            msg:set_region('to', to)
+            msg:set_unit('unit', u)
+            msg:send_faction(u.faction)
         end
         s.region = to
         moved = true

scripts/tests/e2/migration.lua

@@ -25,9 +25,9 @@ end
 
 function test_migration_success()
     local r = region.create(0, 0, "plain")
-    local f = faction.create('human')
+    local f = faction.create('elf')
     local u = setup_mage(f, r)
-    local u2 = unit.create(faction.create('human'), r)
+    local u2 = unit.create(faction.create('dwarf'), r)
     u2:add_order('KONTAKTIERE ' .. itoa36(u.id))
     u:add_order('ZAUBERE STUFE 1 "Ritual der Aufnahme" ' .. itoa36(u2.id))
     u.aura = 9
@@ -40,9 +40,9 @@ end
 
 function test_migration_no_familiars()
     local r = region.create(0, 0, "plain")
-    local f = faction.create('human')
+    local f = faction.create('elf')
     local u = setup_mage(f, r)
-    local f2 = faction.create('human')
+    local f2 = faction.create('dwarf')
     local u2 = setup_mage(f2, r)
     local u3 = unit.create(f2, r)
     u3.race = 'goblin'
@@ -60,9 +60,9 @@ end
 
 function test_migration_no_contact()
     local r = region.create(0, 0, "plain")
-    local f = faction.create('human')
+    local f = faction.create('elf')
     local u = setup_mage(f, r)
-    local u2 = unit.create(faction.create('human'), r)
+    local u2 = unit.create(faction.create('dwarf'), r)
     u:add_order('ZAUBERE STUFE 1 "Ritual der Aufnahme" ' .. itoa36(u2.id))
     u.aura = 9
     u.aura_max = 9
@@ -74,9 +74,9 @@ end
 
 function test_migration_too_many()
     local r = region.create(0, 0, "plain")
-    local f = faction.create('human')
+    local f = faction.create('elf')
     local u = setup_mage(f, r)
-    local u2 = unit.create(faction.create('human'), r)
+    local u2 = unit.create(faction.create('dwarf'), r)
     u2:add_order('KONTAKTIERE ' .. itoa36(u.id))
     u2.number = 2
     u:add_order('ZAUBERE STUFE 1 "Ritual der Aufnahme" ' .. itoa36(u2.id))
@@ -90,9 +90,9 @@ end
 
 function test_migration_with_ring()
     local r = region.create(0, 0, "plain")
-    local f = faction.create('human')
+    local f = faction.create('elf')
     local u = setup_mage(f, r)
-    local u2 = unit.create(faction.create('human'), r)
+    local u2 = unit.create(faction.create('dwarf'), r)
     u2:add_order('KONTAKTIERE ' .. itoa36(u.id))
     u2.number = 2
     u:add_item('rop', 1)
@@ -109,9 +109,9 @@ end
 function test_migration_insufficient_aura()
     -- if unit cannot pay full costs, it casts at a lower level.
     local r = region.create(0, 0, "plain")
-    local f = faction.create('human')
+    local f = faction.create('elf')
     local u = setup_mage(f, r)
-    local u2 = unit.create(faction.create('human'), r)
+    local u2 = unit.create(faction.create('dwarf'), r)
     u2:add_order('KONTAKTIERE ' .. itoa36(u.id))
     u2.number = 2
     u:add_order('ZAUBERE STUFE 2 "Ritual der Aufnahme" ' .. itoa36(u2.id))
@@ -127,9 +127,9 @@ end
 function test_migration_insufficient_max_aura()
     -- if unit cannot pay full costs, it casts at a lower level.
     local r = region.create(0, 0, "plain")
-    local f = faction.create('human')
+    local f = faction.create('elf')
     local u = setup_mage(f, r)
-    local u2 = unit.create(faction.create('human'), r)
+    local u2 = unit.create(faction.create('dwarf'), r)
     u2:add_order('KONTAKTIERE ' .. itoa36(u.id))
     u2.number = 2
     u:add_order('ZAUBERE STUFE 2 "Ritual der Aufnahme" ' .. itoa36(u2.id))
@@ -145,9 +145,9 @@ end
 function test_migration_reduced_cost()
     -- if unit cannot pay full costs, it casts at a lower level.
     local r = region.create(0, 0, "plain")
-    local f = faction.create('human')
+    local f = faction.create('elf')
     local u = setup_mage(f, r)
-    local u2 = unit.create(faction.create('human'), r)
+    local u2 = unit.create(faction.create('dwarf'), r)
     u2:add_order('KONTAKTIERE ' .. itoa36(u.id))
     u:add_order('ZAUBERE STUFE 2 "Ritual der Aufnahme" ' .. itoa36(u2.id))
     u.aura = 3

scripts/tests/e2/spells.lua

@@ -47,11 +47,29 @@ function test_shapeshift()
     u1:add_spell("shapeshift")
     u1:add_order("ZAUBERE STUFE 1 Gestaltwandlung " .. itoa36(u2.id) .. " Goblin")
     process_orders()
-    assert_equal(f.race, u2.race)
+    assert_equal(f.race, u2.race) -- it's just an illusion
     s = u2:show()
     assert_equal("1 Goblin", string.sub(s, string.find(s, "1 Goblin")))
 end
 
+function test_shapeshift_bad_race()
+    local r = region.create(42, 0, "plain")
+    local f = faction.create("human", "[email protected]", "de")
+    local u1 = unit.create(f, r, 1)
+    local u2 = unit.create(f, r, 1)
+    u1:clear_orders()
+    u1.magic = "gray"
+    u1:set_skill("magic", 2)
+    u1.aura = 1
+    u1:add_spell("shapeshift")
+    u1:add_order("ZAUBERE STUFE 1 Gestaltwandlung " .. itoa36(u2.id) .. " Schlumpf")
+    process_orders()
+    assert_equal(f.race, u2.race) -- it's just an illusion
+    s = u2:show()
+    assert_equal("1 Mensch", string.sub(s, string.find(s, "1 Mensch")))
+    assert_nil(string.find(s, "Schlumpf"))
+end
+
 function test_raindance()
     local r = region.create(0, 0, "plain")
     local f = faction.create("halfling", "[email protected]", "de")

scripts/tests/harbor.lua

@@ -1,4 +1,4 @@
-local tcname = 'tests.e2.harbor'
+local tcname = 'tests.harbor'
 local lunit = require('lunit')
 if _VERSION >= 'Lua 5.2' then
   _ENV = module(tcname, 'seeall')
@@ -9,6 +9,10 @@ end
 function setup()
     eressea.free_game()
     eressea.settings.set("rules.ship.damage.nocrewocean", "0")
+    eressea.settings.set("rules.ship.damage.nocrew", "0")
+    eressea.settings.set("nmr.timeout", "0")
+    eressea.settings.set("rules.ship.drifting", "0")
+    eressea.settings.set("rules.ship.storms", "0")
     eressea.config.parse([[
 {
     "keywords": {
@@ -42,13 +46,15 @@ function setup()
         }
     },
     "races": {
-        "human": {},
+        "human": {
+            "maintenance": 0
+        },
         "insect": {}
     },
     "buildings" : {
         "harbour" : {
             "maintenance": [
-                { "amount" : 500, "type": "money" }
+                { "amount" : 250, "type": "money" }
             ],
             "maxcapacity" : 25,
             "maxsize" : 25
@@ -190,6 +196,41 @@ function test_sail_into_harbor()
     assert_equal(r, u.region)
 end
 
+function test_leave_harbour()
+    local f = faction.create('human')
+    local r1 = region.create(1, 0, 'ocean')
+    local r2 = region.create(-1, 0, 'ocean')
+    local r = region.create(0, 0, 'glacier')
+    local b = building.create(r, 'harbour', 25)
+    local sh = ship.create(r1, 'longboat')
+    local u = unit.create(f, r1, 1)
+    local u2 = unit.create(f, r, 1)
+    u2.building = b
+    u.name = 'Xolgrim'
+    u.ship = sh
+    u:set_skill('sailing', 10)
+
+    -- kein Hafenunterhalt, keine Einreise
+    u:set_orders('NACH W')
+    process_orders()
+    assert_false(b.working)
+    assert_equal(r1, sh.region)
+
+    -- Hafenunterhalt, Einreise erlaubt
+    u2:add_item('money', 250)
+    u:set_orders('NACH W')
+    process_orders()
+    assert_true(b.working)
+    assert_equal(r, sh.region)
+    assert_equal(0, u2:get_item('money'))
+
+    -- Kein Unterhalt, Abreise in "falsche" Richtung
+    u:set_orders('NACH W')
+    process_orders()
+    assert_false(b.working)
+    assert_equal(r2, sh.region)
+end
+
 function test_landing_insects()
     local ocean = region.create(1, 0, "ocean")
     local r = region.create(0, 0, "glacier")