Create pages.yml

.github/workflows/pages.yml

@@ -0,0 +1,75 @@
+# Sample workflow for building and deploying a Jekyll site to GitHub Pages
+name: Deploy Jekyll with GitHub Pages dependencies preinstalled
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches: ["stm-web"]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow one concurrent deployment
+concurrency:
+  group: "pages"
+  cancel-in-progress: true
+
+jobs:
+  # Build job
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      - name: Get latest CMake and ninja
+        uses: lukka/get-cmake@latest
+      - name: Update APT
+        run: sudo apt update
+      - name: Install dependencies
+        run: |
+          sudo apt install libutf8proc-dev libexpat1-dev liblua5.2-dev lua5.2 luarocks libtolua-dev libncurses5-dev libsqlite3-dev libiniparser-dev libcjson-dev libbsd-dev cppcheck shellcheck clang-tools iwyu
+          luarocks install lunitx --local
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+      - name: Build and Test
+        uses: threeal/[email protected]
+        with:
+          build-dir: ${{ runner.workspace }}/server/build
+          args: "-DCMAKE_BUILD_TYPE=Debug"
+          run-test: true
+
+      - name: Setup Pages
+        uses: actions/configure-pages@v3
+      - name: Create demos
+        run: |
+          cd stm-jekyll
+          bash scripts/create_demos.sh
+      - name: Build with Jekyll
+        uses: actions/jekyll-build-pages@v1
+        with:
+          source: ./stm-jekyll
+          destination: ./_site
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v2
+
+  # Deployment job
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v2

demo/eressea.ini

@@ -0,0 +1,12 @@
+[game]
+name = Eressea
+id = 2
+email = [email protected]
+verbose                        = 0
+locales                        = de,en
+
+[lua]
+install                        = ..
+paths                          = scripts
+maxnmrs                        = 20
+rules                          = e2

demo/run_demo

@@ -0,0 +1,21 @@
+#!/bin/bash
+set -ex
+
+eval $(luarocks path)
+ROOT=$(git rev-parse --show-toplevel)
+export LUA_PATH="$ROOT/scripts/?.lua;$LUA_PATH"
+BUILD=$ROOT/build
+
+if [ ! -e $BUILD ]; then
+  echo "cannot find build directory $BUILD in $ROOT. did you run cmake-init?"
+  exit
+fi
+
+RUN_ERESSEA="$BUILD/eressea/eressea"
+
+cd $ROOT/demo
+rm -rf reports orders.txt score score.alliances datum turn
+$RUN_ERESSEA -v1 ../scripts/run-demo.lua
+$RUN_ERESSEA --version
+
+cd $OLDWPD

res/core/messages.xml

@@ -5447,6 +5447,7 @@
     <type>
       <arg name="dead" type="int"/>
       <arg name="peasants" type="resource"/>
+      <arg name="round" type="int"/>
     </type>
   </message>
   <message name="error131" section="errors">

res/translations/messages.de.po

@@ -2416,7 +2416,7 @@ msgid "confusion_effect_0"
 msgstr "\"$unit($mage) stimmt einen seltsamen Gesang an. Ein plötzlicher Tumult entsteht, der sich jedoch schnell wieder legt.\""
 
 msgid "pest"
-msgstr "\"Hier wütete die Pest, und $int($dead) $resource($peasants,$dead) $if($eq($dead,1), \"starb\", \"starben\").\""
+msgstr "\"Hier wütete die Pest, und $int($dead) $resource($peasants,$dead) $if($eq($dead,1), \"starb\", \"starben\") ($int($round)).\""
 
 msgid "wormhole_exit"
 msgstr "\"$unit($unit) reist durch ein Wurmloch nach $region($region).\""