Backport #70957

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -22,7 +22,7 @@ body:
     attributes:
       label: Attach save file
       description: |
-        `ESC`Main Menu -> `b`Debug Menu -> `i`Info -> `!`Generate minimized save archive
+        `ESC`Main Menu -> `d`Debug Menu -> `i`Info -> `!`Generate minimized save archive
       placeholder: |
         Write N/A if not applicable.
 
@@ -69,7 +69,7 @@ body:
     attributes:
       label: Versions and configuration
       description: |
-        `ESC`Main Menu -> `b`Debug Menu -> `i`Info -> `r`Generate game report
+        `ESC`Main Menu -> `d`Debug Menu -> `i`Info -> `r`Generate game report
       placeholder: |
         - OS: [e.g. iOS 8 or Windows 10 or Ubuntu 18.04]
         - Game Version: [e.g. d6ec466 (64-bit) ]

.github/workflows/matrix.yml

@@ -2,11 +2,9 @@ name: General build matrix
 
 on:
   push:
-    branches:
-    - master
+    branches: [0.H-branch]
   pull_request:
-    branches:
-    - master
+    branches: [0.H-branch]
     types: [opened, reopened, synchronize, ready_for_review]
 
 # We only care about the latest revision of a PR, so cancel all previous instances.
@@ -71,9 +69,9 @@ jobs:
     steps:
       - id: matrix_vars
         run: |
-          echo "fail_fast=$([ "$GITHUB_REF_NAME" = "master" ] && echo false || echo true)" >> $GITHUB_OUTPUT
-          echo "skip_tests=$([ "$GITHUB_REF_NAME" = "master" ] && echo true || echo false)" >> $GITHUB_OUTPUT
-          echo "max_parallel=$([ "$GITHUB_REF_NAME" = "master" ] && echo 20 || echo 1)" >> $GITHUB_OUTPUT
+          echo "fail_fast=$([ "$GITHUB_REF_NAME" = "0.H-branch" ] && echo false || echo true)" >> $GITHUB_OUTPUT
+          echo "skip_tests=$([ "$GITHUB_REF_NAME" = "0.H-branch" ] && echo true || echo false)" >> $GITHUB_OUTPUT
+          echo "max_parallel=$( [ "$GITHUB_REF_NAME" = "0.H-branch" ] && echo 20 || echo 1)" >> $GITHUB_OUTPUT
   varied_builds:
     needs: [ skip-duplicates-code, skip-duplicates-data, matrix-variables ]
     strategy:
@@ -305,7 +303,7 @@ jobs:
         # double-dash after compiler is not a typo, it is to disambiguate between g++-<date> and g++-11-<date> for restore key prefix matching
         key: ccache-${{ github.ref_name }}-${{ matrix.ccache_key }}--${{ steps.get-vars.outputs.datetime }}
         restore-keys: |
-          ccache-master-${{ matrix.ccache_key }}--
+          ccache-0.H-${{ matrix.ccache_key }}--
     - uses: ammaraskar/gcc-problem-matcher@master
     - name: build
       if: ${{ env.SKIP == 'false' }}
@@ -318,7 +316,7 @@ jobs:
         ccache -c
         ccache --show-stats --verbose
     - name: clear ccache on PRs
-      if: ${{ github.ref_name != 'master' && env.SKIP == 'false' && !failure() && (runner.os == 'Linux' || runner.os == 'macOS') }}
+      if: ${{ github.ref_name != '0.H-branch' && env.SKIP == 'false' && !failure() && (runner.os == 'Linux' || runner.os == 'macOS') }}
       run: |
         ccache -C
     # TODO: post ccache here, however actions/cache@v2 does not support manual upload step

.github/workflows/msvc-full-features.yml

@@ -2,8 +2,7 @@ name: Cataclysm Windows build
 
 on:
   push:
-    branches:
-    - master
+    branches: [ 0.H-build ]
     paths-ignore:
     - 'android/**'
     - 'build-data/osx/**'
@@ -16,8 +15,7 @@ on:
     - '!tools/format/**'
     - 'utilities/**'
   pull_request:
-    branches:
-    - master
+    branches: [ 0.H-build ]
     paths-ignore:
     - 'android/**'
     - 'build-data/osx/**'
@@ -111,7 +109,7 @@ jobs:
         # double-dash after compiler is not a typo, it is to disambiguate between g++-<date> and g++-11-<date> for restore key prefix matching
         key: ccache-${{ github.ref_name }}-${{ runner.os }}-msvc--${{ steps.get-vars.outputs.datetime }}
         restore-keys: |
-          ccache-master-${{ runner.os }}-msvc--
+          ccache-0.H-${{ runner.os }}-msvc--
 
     - name: Configure ccache
       run: |
@@ -138,7 +136,7 @@ jobs:
         ${{ env.CDDA_CCACHE_PATH }}\ccache.exe -s -v
 
     - name: clear ccache on PRs
-      if: ${{ github.ref_name != 'master' }}
+      if: ${{ github.ref_name != '0.H-build' }}
       run: |
         ${{ env.CDDA_CCACHE_PATH }}\ccache.exe -C
 
@@ -162,20 +160,20 @@ jobs:
         }
 
     - name: Compile .mo files for localization
-      if: ${{ github.ref_name != 'master' }}
+      if: ${{ github.ref_name != '0.H-build' }}
       run: |
           & "C:\msys64\mingw64\bin\mingw32-make" -C lang -j2
           mkdir -p ./data/mods/TEST_DATA/lang/mo/ru/LC_MESSAGES -ErrorAction SilentlyContinue
           msgfmt -f -o ./data/mods/TEST_DATA/lang/mo/ru/LC_MESSAGES/TEST_DATA.mo ./data/mods/TEST_DATA/lang/po/ru.po
 
     - name: Enable GitHub Actions problem matchers
-      if: ${{ github.ref_name != 'master' }}
+      if: ${{ github.ref_name != '0.H-build' }}
       run: |
           Write-Output "::add-matcher::build-scripts/problem-matchers/catch2.json"
           Write-Output "::add-matcher::build-scripts/problem-matchers/debugmsg.json"
 
     - name: Run tests
-      if: ${{ github.ref_name != 'master' }}
+      if: ${{ github.ref_name != '0.H-build' }}
       run: |
           .\Cataclysm-test-vcpkg-static-Release-x64.exe --min-duration 20 --rng-seed time
 
@@ -196,7 +194,7 @@ jobs:
       shell: bash
 
     - name: Don't upload vcpkg cache on failure or PRs
-      if: ${{ failure() || cancelled() || github.ref_name != 'master' }}
+      if: ${{ failure() || cancelled() || github.ref_name != '0.H-build' }}
       run: |
         echo "RUNVCPKG_NO_CACHE=1" >> $GITHUB_ENV
       shell: bash

.github/workflows/pr-validator.yml

@@ -2,7 +2,7 @@ name: PR Validator
 on:
   pull_request:
     branches:
-    - master
+    - 0.H-build
     types: [opened, edited, synchronize]
 jobs:
   validate:

.github/workflows/release.yml

@@ -1,13 +1,14 @@
 name: "Experimental Release"
-concurrency: release
+concurrency: release-candidate
 on:
   push:
     branches:
-      - master
+      - 0.H-branch
     paths:
       - '.github/workflows/release.yml'
       - 'android/**'
       - 'build-data/**'
+      - 'build-scripts/generate-release-notes.js'
       - 'cataclysm-launcher'
       - 'data/**'
       - 'doc/**'
@@ -36,11 +37,16 @@ jobs:
       - name: Generate environmental variables
         id: generate_env_vars
         run: |
-          echo "tag_name=cdda-experimental-${{ steps.get-timestamp.outputs.time }}" >> $GITHUB_OUTPUT
-          echo "release_name=Cataclysm-DDA experimental build ${{ steps.get-timestamp.outputs.time }}" >> $GITHUB_OUTPUT
+          echo "tag_name=cdda-0.H-${{ steps.get-timestamp.outputs.time }}" >> $GITHUB_OUTPUT
+          echo "release_name=Cataclysm-DDA 0.H release candidate ${{ steps.get-timestamp.outputs.time }}" >> $GITHUB_OUTPUT
       - uses: actions/checkout@v3
+      - name: Generate Release Notes
+        id: generate-release-notes
+        run: |
+          npm install @actions/github
+          node build-scripts/generate-release-notes.js '${{ secrets.GITHUB_TOKEN }}' '${{ steps.generate_env_vars.outputs.tag_name }}' "$(git log -1 --format='%H')" > notes.txt
       - run: |
-          gh release create ${{ steps.generate_env_vars.outputs.tag_name }} --generate-notes --prerelease --title "${{ steps.generate_env_vars.outputs.release_name }}"
+          gh release create ${{ steps.generate_env_vars.outputs.tag_name }} --notes-file notes.txt --prerelease --title "${{ steps.generate_env_vars.outputs.release_name }}" --target "$(git log -1 --format='%H')"
 
   builds:
     needs: release
@@ -168,23 +174,31 @@ jobs:
         run: |
           git clone --depth=1 --shallow-submodules --recurse-submodules https://github.com/Fris0uman/CDDA-Soundpacks '${{ github.workspace }}/CDDA-Soundpacks'
           mv '${{ github.workspace }}/CDDA-Soundpacks/sound/CC-Sounds' '${{ github.workspace }}/data/sound'
-      - name: Install dependencies (windows msvc) (0/3)
+      - name: Install dependencies (windows msvc) (0/4)
         if: runner.os == 'Windows'
         uses: lukka/get-cmake@latest
-      - name: Install dependencies (windows msvc) (1/3)
+      - name: Install dependencies (windows msvc) (1/4)
         if: runner.os == 'Windows'
         uses: microsoft/[email protected]
-      - name: Install dependencies (windows msvc) (2/3)
+      - name: Install dependencies (windows msvc) (2/4)
         if: runner.os == 'Windows'
         uses: lukka/run-vcpkg@v11
         id: runvcpkg
         with:
           vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
           vcpkgGitCommitId: '66444e13a86da7087ee24c342f91801cc6eb9877'
-      - name: Install dependencies (windows msvc) (3/3)
+      - name: Install dependencies (windows msvc) (3/4)
         if: runner.os == 'Windows'
         run: |
           vcpkg integrate install --vcpkg-root '${{ runner.workspace }}\b\vcpkg'
+      - name: Install dependencies (windows msvc) (4/4)
+        if: runner.os == 'Windows'
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: mingw64
+          install: >-
+            gettext
+            make
       - name: Install dependencies (windows mxe)
         if: matrix.mxe != 'none' && matrix.artifact != 'windows-objectcreator-x64'
         run: |
@@ -232,14 +246,14 @@ jobs:
           EOL
       - name: Compile translations (windows)
         if: runner.os == 'Windows'
-        shell: bash
+        shell: msys2 {0}
         run: |
           lang/compile_mo.sh all
       - name: Build CDDA (linux)
         if: runner.os == 'Linux' && matrix.mxe == 'none' && matrix.android == 'none' && matrix.artifact != 'linux-objectcreator-x64'
         run: |
           make -j$((`nproc`+0)) TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} RELEASE=1 LOCALIZE=1 LANGUAGES=all BACKTRACE=1 PCH=0 bindist
-          mv cataclysmdda-0.F.tar.gz cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.tar.gz
+          mv cataclysmdda-0.H.tar.gz cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.tar.gz
       - name: Login to GitHub Container Registry
         if: matrix.artifact == 'windows-objectcreator-x64' || matrix.artifact == 'linux-objectcreator-x64'
         uses: docker/login-action@v2 
@@ -281,7 +295,7 @@ jobs:
           PLATFORM: /opt/mxe/usr/bin/${{ matrix.mxe }}-w64-mingw32.static.gcc12-
         run: |
           make -j$((`nproc`+0)) CROSS="${PLATFORM}" TILES=1 SOUND=1 RELEASE=1 LOCALIZE=1 LANGUAGES=all BACKTRACE=1 PCH=0 bindist
-          mv cataclysmdda-0.F.zip cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.zip
+          mv cataclysmdda-0.H.zip cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.zip
       - name: Build CDDA (windows msvc)
         if: runner.os == 'Windows'
         env:
@@ -292,7 +306,7 @@ jobs:
         run: |
           msbuild -m -p:Configuration=Release -p:Platform=${{ matrix.arch }} "-target:Cataclysm-vcpkg-static;JsonFormatter-vcpkg-static" msvc-full-features\Cataclysm-vcpkg-static.sln
           .\build-scripts\windist.ps1
-          mv cataclysmdda-0.F.zip cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.zip
+          mv cataclysmdda-0.H.zip cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.zip
       - name: Build CDDA (osx)
         if: runner.os == 'macOS'
         run: |
@@ -333,4 +347,4 @@ jobs:
                mv ./app/build/outputs/bundle/experimentalRelease/*.aab ../cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.aab     
           fi
       - run: |
-          gh release upload cdda-experimental-${{ needs.release.outputs.timestamp }} cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.${{ matrix.ext }}
+          gh release upload cdda-0.H-${{ needs.release.outputs.timestamp }} cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.${{ matrix.ext }}

.github/workflows/text-changes-analyzer.yml

@@ -4,7 +4,7 @@ name: Text Changes Analyzer
 on:
   pull_request:
     branches:
-      - master
+      - 0.H-branch
     paths:
       - '.github/workflows/text-changes-analyzer.yml'
       - 'tools/pot_diff.py'

LICENSE-OFL-Terminus-Font.txt

@@ -1,10 +1,10 @@
-Copyright (c) 2019 Dimitar Toshkov Zhekov,
+Copyright (C) 2020 Dimitar Toshkov Zhekov,
 with Reserved Font Name "Terminus Font".
 
 Copyright (c) 2017 tisimst
 with Reserved Font Name "Vecterminus"
 
-Copyright (c) 2011 Tilman Blumenbach,
+Copyright (c) 2011-2023 Tilman Blumenbach,
 with Reserved Font Name "Terminus (TTF)".
 
 This Font Software is licensed under the SIL Open Font License, Version 1.1.

Makefile

@@ -140,7 +140,7 @@ export CCACHE_COMMENTS=1
 # Explicitly let 'char' to be 'signed char' to fix #18776
 OTHERS += -fsigned-char
 
-VERSION = 0.F
+VERSION = 0.H
 
 TARGET_NAME = cataclysm
 TILES_TARGET_NAME = $(TARGET_NAME)-tiles

build-scripts/generate-release-notes.js

@@ -0,0 +1,86 @@
+// ./tools/scripts/generate-release-notes.js
+
+const github = require('@actions/github');
+
+/**
+ * Generates the release notes for a github release.
+ *
+ * Arguments:
+ * 1 - github_token
+ * 2 - new version
+ * 3 - commit SHA of new release
+ */
+const token = process.argv[2];
+const version = process.argv[3];
+const comittish = process.argv[4];
+const repo = process.env.REPOSITORY_NAME
+const owner = process.env.GITHUB_REPOSITORY_OWNER
+
+async function main() {
+  const client = github.getOctokit(token);
+
+  const latestReleaseResponse = await client.request(
+    'GET /repos/{owner}/{repo}/releases',
+    {
+      owner: owner,
+      repo: repo,
+      headers: {
+        'X-GitHub-Api-Version': '2022-11-28',
+      },
+    }
+  );
+
+  let previousTag = null;
+  if (latestReleaseResponse.data) {
+    for (const responseData of latestReleaseResponse.data) {
+      if (responseData.draft == false && responseData.prerelease == true) {
+        previousTag = responseData.tag_name;
+	break;
+      }
+    }
+  }
+
+  const response = await client.request(
+    'POST /repos/{owner}/{repo}/releases/generate-notes',
+    {
+      owner: owner,
+      repo: repo,
+      tag_name: version,
+      previous_tag_name: previousTag,
+      target_commitish: comittish,
+      headers: {
+        'X-GitHub-Api-Version': '2022-11-28',
+      },
+    }
+  );
+
+  const noteSections = response.data.body?.split('\n\n');
+  const trimmedSections = [];
+  const githubNotesMaxCharLength = 125000;
+  const maxSectionLength = githubNotesMaxCharLength / noteSections.length;
+  for (let i = 0; i < noteSections.length; i++) {
+    if (noteSections[i].length > githubNotesMaxCharLength) {
+      const lastLineIndex =
+        noteSections[i].substring(0, maxSectionLength).split('\n').length - 1;
+      const trimmed =
+        noteSections[i]
+          .split('\n')
+          .slice(0, lastLineIndex - 1)
+          .join('\n') +
+        `\n... (+${
+          noteSections[i].split('\n').length - (lastLineIndex + 1)
+        } others)`;
+      trimmedSections.push(trimmed);
+      continue;
+    }
+
+    trimmedSections.push(noteSections[i]);
+  }
+
+  console.log(trimmedSections.join('\n\n'));
+}
+
+main().catch((e) => {
+  console.error(`Failed generating release notes with error: ${e}`);
+  process.exit(0);
+});

build-scripts/windist.ps1

@@ -14,4 +14,4 @@ $extras = "data", "doc", "gfx", "LICENSE.txt", "LICENSE-OFL-Terminus-Font.txt",
 ForEach ($extra in $extras) {
 	cp -r $extra bindist
 }
-Compress-Archive -Force -Path bindist/* -DestinationPath "cataclysmdda-0.F.zip"
+Compress-Archive -Force -Path bindist/* -DestinationPath "cataclysmdda-0.H.zip"

data/json/effects_on_condition/dream_eocs.json

@@ -26,7 +26,7 @@
     "condition": {
       "and": [
         {
-          "or": [
+          "and": [
             { "not": { "u_has_effect": "pre_common_cold" } },
             { "not": { "u_has_effect": "common_cold" } },
             { "not": { "u_has_effect": "pre_flu" } },