Changes in Release 31.2

.github/workflows/main.yml

@@ -6,7 +6,7 @@ name: CI
 on:
   # Triggers the workflow on push or pull request events but only for the master branch
   push:
-    branches: [ master, develop ]
+    branches: [ master, develop, gh ]
   pull_request:
     branches: [ master, develop ]
 
@@ -45,3 +45,8 @@ jobs:
         with:
           args: "-DCMAKE_BUILD_TYPE=Debug"
           run-test: true
+      - name: Integration Test
+        run: |
+          cd tests
+          ./run-turn.sh
+

CMakeLists.txt

@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.13)
 
+include_directories (${CMAKE_CURRENT_SOURCE_DIR})
+
 set(CMAKE_C_STANDARD 99)
 if (WIN32)
 file(TO_CMAKE_PATH "${CMAKE_MODULE_PATH}" CMAKE_MODULE_PATH )

CONTRIBUTING.md

@@ -0,0 +1,21 @@
+# Contributing to Eressea
+
+Since Eressea is for the most part a one-person show run by
+[me](https://enno.horse/), contributions that fix bugs,
+add features or improve usability are always welcome. Due to the 
+one-person thing however, my time to work on this project and review 
+PRs is fairly limited.
+
+## Use of large language models / generative "AI"
+
+Eressea is something I do for fun, and to relax. I love programming,
+games, communities, and everything else that's involved in running
+online games.
+
+Receiving a LLM-generated PR however takes the joy out of this and makes
+reviewing the PR a wasted effort. If you didn't bother writing and 
+thinking about it, I won't bother reading it.
+
+Therefore, LLM-generated pull requests will not be accepted in this 
+project.
+

conf/e2/terrains.json

@@ -285,7 +285,7 @@
       "flags": [ "land", "walk", "sail" ]
     },
     "wall1": {
-      "flags": [ "forbidden", "land" ]
+      "flags": [ "forbidden" ]
     }
   }
 }

docker/start-container

@@ -6,4 +6,4 @@ fi
 
 export LUA_PATH="/usr/local/share/eressea/scripts/?.lua;/usr/local/share/eressea/scripts/?/init.lua;$LUA_PATH"
 export ERESSEA_INSTALL=/usr/local/share/eressea
-exec eressea -i "$ERESSEA_INSTALL" "$@"
+exec eressea "$@"

process/compress.py

@@ -1,7 +1,8 @@
 #!/usr/bin/env python3
 
+
 from sys import argv, exit
-import os
+import os, subprocess, shlex
 import io
 import os.path
 
@@ -63,7 +64,8 @@
                 filename = "%s%s" % (prefix, extension)
                 if os.path.isfile(filename):
                     parameters = parameters + [ filename ]
-            os.system("zip %s -q -m -j %s" % (output, ' '.join(parameters)))
+            subprocess.run(["zip", shlex.quote(output), "-q", "-m", "-j",
+                ' '.join(shlex.quote(p) for p in parameters)], check=True)
     else:
         files = []
         for extension in reports:
@@ -74,7 +76,7 @@
                 if os.path.isfile(filename):
                     if os.path.isfile(output):
                         continue
-                    os.system("bzip2 %s" % filename)
+                    subprocess.run(["bzip2", shlex.quote(filename)], check=True)
     for extra in extras:
         if os.path.isfile(extra):
             files = files + [extra]

process/cron/run-eressea.cron

@@ -62,7 +62,7 @@ backup()
 
 export ERESSEA
 eval "$(luarocks path)"
-export LUA_PATH="${ERESSEA}/server/scripts/?.lua;${ERESSEA}/git/scripts/?/init.lua;$LUA_PATH"
+export LUA_PATH="${ERESSEA}/server/scripts/?.lua;$LUA_PATH"
 BIN="$ERESSEA/server/bin"
 TURN=$(cat "$ERESSEA/game-$GAME/turn")
 if [ ! -e "$ERESSEA/game-$GAME/data/$TURN.dat" ]; then

res/core/messages.xml

@@ -2639,7 +2639,7 @@
       <arg name="ship" type="ship"/>
     </type>
   </message>
-  <message name="shipnoshore" section="movement">
+  <message name="shipnoshore" section="errors">
     <type>
       <arg name="ship" type="ship"/>
       <arg name="region" type="region"/>
@@ -5863,18 +5863,32 @@
     </type>
   </message>
 
-  <message name="block_spell" section="magic">
+  <message name="spell_blocked" section="magic">
+    <type>
+      <arg name="target" type="unit"/>
+      <arg name="region" type="region"/>
+    </type>
+  </message>
+
+  <message name="spell_blocked_by" section="magic">
     <type>
-      <arg name="self" type="unit"/>
       <arg name="mage" type="unit"/>
+      <arg name="target" type="unit"/>
       <arg name="region" type="region"/>
     </type>
   </message>
 
-  <message name="reduce_spell" section="magic">
+  <message name="spell_reduced" section="magic">
+    <type>
+      <arg name="target" type="unit"/>
+      <arg name="region" type="region"/>
+    </type>
+  </message>
+
+  <message name="spell_reduced_by" section="magic">
     <type>
-      <arg name="self" type="unit"/>
       <arg name="mage" type="unit"/>
+      <arg name="target" type="unit"/>
       <arg name="region" type="region"/>
     </type>
   </message>

res/e3a/races.xml

@@ -714,7 +714,7 @@
     <skill name="building" modifier="-99"/>
     <skill name="forestry" modifier="-99"/>
     <skill name="catapult" modifier="-99"/>
-     <skill name="magic" modifier="-99"/>
+    <skill name="magic" modifier="-99"/>
     <skill name="training" modifier="-99"/>
     <skill name="riding" modifier="-99"/>
     <skill name="armorer" modifier="-99"/>

res/translations/messages.de.po

@@ -61,8 +61,11 @@ msgstr "\"$unit($unit) hat Schwierigkeiten seine magischen Energien zu sammeln.
 msgid "harbor_trade"
 msgstr "\"$unit($unit) erhielt $resources($items) von der $ship($ship).\""
 
-msgid "reduce_spell"
-msgstr "\"$unit($self) schwächt in $region($region) einen Zauber von $unit.dative($mage) durch Antimagie ab.\""
+msgid "spell_reduced_by"
+msgstr "\"$unit($mage) schwächt in $region($region) einen Zauber von $unit.dative($target) durch Antimagie ab.\""
+
+msgid "spell_reduced"
+msgstr "In $region($region) wird ein Zauber von $unit.dative($target) durch Antimagie abgeschwächt.\""
 
 msgid "raised"
 msgstr "\"$unit($unit) züchtet $int($amount) Pferde.\""
@@ -338,8 +341,11 @@ msgstr "\"Moral der Bauern: $int($morale)\""
 msgid "changemail_invalid"
 msgstr "\"Die Reportadresse wurde nicht geändert, '${value}' ist keine gültige email.\""
 
-msgid "block_spell"
-msgstr "\"Antimagie von $unit.dative($self) blockiert in $region($region) einen Zauber von $unit.dative($mage).\""
+msgid "spell_blocked_by"
+msgstr "\"Antimagie von $unit.dative($mage) blockiert in $region($region) einen Zauber von $unit.dative($target).\""
+
+msgid "spell_blocked"
+msgstr "\"In $region($region) wird ein Zauber von $unit.dative($target) durch Antimagie blockiert.\""
 
 msgid "enter_overload"
 msgstr "\"$unit($unit) in $region($region): '$order($command)' - Die Einheit darf nicht an Bord kommen, da sie das Schiff überladen würde.\""

res/translations/messages.en.po

@@ -61,8 +61,11 @@ msgstr "\"$unit($unit) finds it difficult to gather its magical energies. ($int3
 msgid "harbor_trade"
 msgstr "\"$unit($unit) received $resources($items) from the $ship($ship).\""
 
-msgid "reduce_spell"
-msgstr "\"In $region($region), anti-magic from $unit($self) reduces the effect of $unit($mage)'s spell.\""
+msgid "spell_reduced_by"
+msgstr "\"In $region($region), anti-magic from $unit($mage) reduces the effect of $unit($target)'s spell.\""
+
+msgid "spell_reduced"
+msgstr "\"In $region($region), anti-magic reduces the effect of $unit($target)'s spell.\""
 
 msgid "raised"
 msgstr "\"$unit($unit) breeds $int($amount) horses.\""
@@ -338,8 +341,11 @@ msgstr "\"peasant morale: $int($morale)\""
 msgid "changemail_invalid"
 msgstr "\"Address not changed, '$value' is an invalid email.\""
 
-msgid "block_spell"
-msgstr "\"In $region($region), anti-magic from $unit($self) blocks the spell of $unit($mage).\""
+msgid "spell_blocked"
+msgstr "\"In $region($region), anti-magic blocks a spell by $unit($target).\""
+
+msgid "spell_blocked_by"
+msgstr "\"In $region($region), anti-magic from $unit($mage) blocks a spell by $unit($target).\""
 
 msgid "enter_overload"
 msgstr "\"$unit($unit) in $region($region): '$order($command)' - The unit cannot go aboard, the ship would be overloaded.\""

s/cmake-init

@@ -2,8 +2,9 @@
 
 WITHOUT_LUA=OFF
 ERESSEA_DB=memory
+if [ -n "$(which pkg-config)" ]; then
 pkg-config --exists sqlite3 && ERESSEA_DB=sqlite
-
+fi
 usage()
 {
     echo "usage: $0 --help --db=DB"

s/install

@@ -13,15 +13,14 @@ done
 if [ "$FORCE" != "yes" ] ; then
   DESCRIBE=$(git describe --tags)
   VERSION=$(build/eressea/eressea --version | sed -e 's/Eressea version \([^,]*\),.*/\1/')
-  if [ "v$VERSION" != "$DESCRIBE" ] ; then
-      echo "You must buld the server before installing it"
-      echo "Current build is $VERSION, source is $DESCRIBE"
-      exit
-  fi
   BRANCH=$(git status -s -b | head -1 | cut -d\  -f 2 | sed 's/\..*//')
   if [ "$BRANCH" != "master" ] ; then
     echo "You should only install stable versions from the master branch. Use -f to override."
     exit
+  elseif [ "v$VERSION" != "$DESCRIBE" ] 
+    echo "You must build the server before installing it"
+    echo "Current build is $VERSION, source is $DESCRIBE"
+    exit
   fi
 fi
 [ -z "$CC" ] && [ -n "$(which clang)" ] && CC="clang"
@@ -31,7 +30,9 @@ fi
 BIN_DIR="build"
 
 ROOT=$(git rev-parse --show-toplevel)
+if [ -z "$PREFIX" ]; then
 PREFIX=$(dirname "$ROOT")/server
+fi
 cd "$ROOT" || exit
 cmake --install "$BIN_DIR" --prefix "$PREFIX"
 if [ ! -e "$PREFIX/bin/backup-eressea" ] ; then

s/preview

@@ -57,7 +57,6 @@ cat >| eressea.ini <<HEREDOC
 [lua]
 dbname = eressea.db
 dbswap = :memory:
-install = $SOURCE
 rules = e$game
 HEREDOC
 }
@@ -81,7 +80,7 @@ VALGRIND="$(which valgrind)"
 if [ -n "$VALGRIND" ]; then
 SERVER="$VALGRIND --quiet --suppressions=$SUPP --error-exitcode=1 --leak-check=no $SERVER"
 fi
-$SERVER -v "$verbose" -t "$turn" "$SOURCE/scripts/run-turn.lua"
+ERESSEA_INSTALL="$SOURCE" $SERVER -v "$verbose" -t "$turn" "$SOURCE/scripts/run-turn.lua"
 (( turn=turn+1 ))
 [ -e "data/$turn.dat" ] || abort "no data file created"
 }

s/release

@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 
-import os
+import subprocess
 import sys
 
 def new_version(ver):
-    os.system("git tag -f v%s" % ver)
-    os.system("git push --tags -f")
+    subprocess.run(["git", "tag", "-f", "v" + ver], check=True)
+    subprocess.run(["git", "push", "--tags", "-f"], check=True)
 
 new_version(sys.argv[1])

s/setup

@@ -99,14 +99,9 @@ ini_start
 ini_sec game
 ini_add game locales de,en
 ini_add game id "$game"
-ini_add game start 1
 ini_sec lua
-ini_add lua install "$SOURCE"
 ini_add lua rules "$rules"
 
 echo 0 > turn
 touch newfactions
 ln -sf "$SOURCE/bin/eressea" .
-ln -sf "$SOURCE/scripts/run-turn.lua" .
-ln -sf "$SOURCE/scripts/reports.lua" .
-ln -sf "$SOURCE/scripts/config.lua" .

scripts/eressea/embassy.lua

@@ -27,13 +27,6 @@ function use_ring_of_levitation(u, amount, token, ord)
     return 0
 end
 
--- Muschelplateau
-
-if not config.embassy or config.embassy==0 then return nil end
-
-local embassy = {}
-local home = nil
-
 -- global exports (use item)
 function use_seashell(u, amount)
 -- Muschelplateau...
@@ -50,6 +43,12 @@ function use_seashell(u, amount)
     return -4
 end
 
+-- Muschelplateau
+if not config.embassy or config.embassy==0 then return nil end
+
+local embassy = {}
+local home = nil
+
 function embassy.init()
     home = get_region(165,30)
     if home==nil then

scripts/eressea/path.lua

@@ -1,7 +1,7 @@
-local install = os.getenv("ERESSEA_INSTALL") or config.install
+local install = config.install
 if install then
     eressea.config.add_authority("conf", install .. '/conf')
     eressea.config.add_authority("res", install .. '/res')
 else
-    print("eressea.ini does not set an install directory")
+    print("no install directory set")
 end

scripts/run-turn.lua

@@ -210,4 +210,5 @@ if config.rules then
 elseif not config.config then
   eressea.log.warning('no rule modules loaded, specify a game in eressea.ini or with -r')
 end
+assert(use_seashell)
 run_turn(rules)

scripts/tests/e2/guard.lua

@@ -139,3 +139,25 @@ function test_move_to_same_region_stops_guarding()
     assert_equal(r1, u.region)
     assert_false(u.guard)
 end
+
+function test_flee_guard()
+    local r1 = region.create(0, 0, "plain")
+
+    local f1 = faction.create("human", "[email protected]", "de")
+
+    local u11 = unit.create(f1, r1, 1)
+
+    u11:add_item("sword", 1)
+    u11:set_skill("melee", 1)
+    u11.guard = true
+    u11:add_order("BEWACHE")
+    process_orders()
+    assert_equal(true, u11.guard)
+
+    u11:clear_orders()
+    u11:add_order("K�MPFE FLIEHE")
+
+    process_orders()
+    -- write_reports()
+    assert_equal(false, u11.guard)
+end