Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA

.github/workflows/matrix.yml

@@ -40,7 +40,7 @@ jobs:
         uses: fkirc/skip-duplicate-actions@master
         with:
           cancel_others: 'true'
-          paths_ignore: '["android/**", "build-data/osx/**", "doc/**", "doxygen_doc/**", "lgtm/**", "msvc-**", "object_creator/**", "tools/**", "utilities/**", "data/**"]'
+          paths_ignore: '["android/**", "build-data/osx/**", "doc/**", "doxygen_doc/**", "lgtm/**", "msvc-**", "object_creator/**", "tools/**", "utilities/**", "data/**", "lang/**"]'
   skip-duplicates-mods:
     continue-on-error: true
     runs-on: ubuntu-latest

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

@@ -100,6 +100,11 @@ jobs:
           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
+      run: |
+          Write-Output "::add-matcher::build-scripts/problem-matchers/catch2.json"
+          Write-Output "::add-matcher::build-scripts/problem-matchers/debugmsg.json"
+
     - name: Run tests
       run: |
           .\Cataclysm-test-vcpkg-static-Release-x64.exe --min-duration 0.2 --rng-seed time

.github/workflows/pull-translations.yml

@@ -6,6 +6,7 @@ on:
 
 jobs:
   pull-translations:
+    if: github.repository == 'CleverRaven/Cataclysm-DDA'
     runs-on: ubuntu-20.04
     steps:
       - name: "Install dependencies"

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

@@ -7,7 +7,8 @@ on:
       - master
     paths:
       - '.github/workflows/text-changes-analyzer.yml'
-      - 'tools/check_po_printf_format.py'
+      - 'tools/pot_diff.py'
+      - 'lang/extract_json_strings.py'
       - 'src/*.h'
       - 'src/*.cpp'
       - '**.json'
@@ -22,28 +23,32 @@ jobs:
           sudo apt-get update
           sudo apt-get install python3-pip gettext
           sudo pip3 install polib
-      - name: "Checkout master branch"
+      - name: "Checkout test merge commit"
         uses: actions/checkout@v2
-        with:
-          ref: master
-      - name: "Generate translation template of master branch"
+      - name: "Compute base commit and test merge commit"
+        id: get-commit-hash
+        run: |
+          echo "::set-output name=test_merge_commit::$(git rev-parse HEAD)"
+          echo "::set-output name=head_commit::$(git log -1 --format='%B' | grep -o -E -e 'Merge\s([0-9a-f]{40})\sinto' | grep -o -E -e '[0-9a-f]{40}')"
+          echo "::set-output name=base_commit::$(git log -1 --format='%B' | grep -o -E -e 'into\s([0-9a-f]{40})$' | grep -o -E -e '[0-9a-f]{40}')"
+      - name: "Generate translation template on test merge commit"
         run: |
           rm -f lang/po/cataclysm-dda.pot
           ./lang/update_pot.sh
-          cp lang/po/cataclysm-dda.pot ~/master.pot
-      - name: "Fetch pull request patches"
-        run: |
-          wget ${{ github.event.pull_request.patch_url }} -O ~/pr.patch
-      - name: "Apply pull request patch"
-        run: |
-          git config user.email "TEST@localhost"
-          git config user.name TEST
-          git am ~/pr.patch
-      - name: "Generate translation template of pull request branch"
+          cp lang/po/cataclysm-dda.pot ~/merge.pot
+      - name: "Checkout base commit"
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ steps.get-commit-hash.outputs.base_commit }}
+      - name: "Generate translation template on base commit"
         run: |
           rm -f lang/po/cataclysm-dda.pot
           ./lang/update_pot.sh
-          cp lang/po/cataclysm-dda.pot ~/pull-request.pot
+          cp lang/po/cataclysm-dda.pot ~/base.pot
+      - name: "Checkout test merge commit"
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ steps.get-commit-hash.outputs.test_merge_commit }}
       - name: "List text changes"
         run: |
-          python3 ./tools/pot_diff.py ~/master.pot ~/pull-request.pot
+          python3 ./tools/pot_diff.py ~/base.pot ~/merge.pot

.gitignore

@@ -51,6 +51,7 @@ json_formatter
 *.opensdf
 *.pdb
 *.lib
+*.manifest
 *.sdf
 *.suo
 *.user

CMakeLists.txt

@@ -245,6 +245,8 @@ endif ()
 set(CMAKE_THREAD_PREFER_PTHREAD True)
 find_package(Threads REQUIRED)
 
+FIND_PACKAGE(ZLIB REQUIRED)
+
 # Check for build types and libraries
 if (TILES)
     # Find SDL, SDL_ttf & SDL_image for graphical install

LICENSE.txt

@@ -2,6 +2,8 @@ Cataclysm is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unpo
 
 GNU Unifont (data/font/unifont.ttf) is licensed under GNU General Public License v2+ with the GNU font embedding exception. Visit http://unifoundry.com/LICENSE.txt for details.
 
+Terminus Font (data/font/terminus.ttf) is licensed under the SIL Open Font License (see LICENSE-OFL-Terminus-Font.txt).
+
 Vecterminus Font (data/font/VecTerminus12Medium.otf) is licensed under the SIL Open Font License (see LICENSE-OFL-Terminus-Font.txt).
 
 CATCH unit-test framework (tests/catch/catch.hpp) is licensed under the Boost Software License. Visit https://github.com/philsquared/Catch/blob/master/LICENSE.txt to read the license.

Makefile

@@ -904,6 +904,8 @@ ifeq ($(LTO), 1)
   endif
 endif
 
+LDFLAGS += -lz
+
 all: version $(CHECKS) $(TARGET) $(L10N) $(TESTS)
 	@
 

android/app/jni/src/Android.mk

@@ -14,7 +14,7 @@ LOCAL_SRC_FILES := $(sort $(FILE_LIST:$(LOCAL_PATH)/%=%))
 
 LOCAL_SHARED_LIBRARIES := libhidapi SDL2 SDL2_mixer SDL2_image SDL2_ttf mpg123
 
-LOCAL_LDLIBS := -lGLESv1_CM -lGLESv2 -llog
+LOCAL_LDLIBS := -lGLESv1_CM -lGLESv2 -llog -lz
 
 LOCAL_CFLAGS += -DTILES=1 -DSDL_SOUND=1 -DBACKTRACE=1 -DLOCALIZE=1 -Wextra -Wall -fsigned-char
 

data/core/game_balance.json

@@ -15,15 +15,22 @@
   },
   {
     "type": "EXTERNAL_OPTION",
-    "name": "PLAYER_MAX_STAMINA",
-    "info": "Sets max stamina value of the player.",
+    "name": "PLAYER_MAX_STAMINA_BASE",
+    "info": "Sets the base max stamina value of the player, before cardio modifiers.",
     "stype": "int",
-    "value": 10000
+    "value": 3500
+  },
+  {
+    "type": "EXTERNAL_OPTION",
+    "name": "PLAYER_CARDIOFIT_STAMINA_SCALING",
+    "info": "Sets the effect of cardio on maximum stamina.",
+    "stype": "int",
+    "value": 3
   },
   {
     "type": "EXTERNAL_OPTION",
     "name": "PLAYER_BASE_STAMINA_REGEN_RATE",
-    "info": "Sets base stamina regeneration per turn of the player.  May be used as an offset in stamina draining effects.",
+    "info": "Sets base stamina regeneration per turn of the player, before cardio modifiers.  May be used as an offset in stamina draining effects.",
     "stype": "float",
     "value": 20
   },

data/fontdata.json

@@ -2,15 +2,15 @@
   "//1": "If more than one font is specified for a typeface the list is treated as a fallback order.",
   "//2": "unifont will always be used as a 'last resort' fallback even if not listed here.",
   "typeface": [
-    "data/font/VecTerminus12Medium.otf",
+    "data/font/Terminus.ttf",
     "data/font/unifont.ttf"
   ],
   "map_typeface": [
-    "data/font/VecTerminus12Medium.otf",
+    "data/font/Terminus.ttf",
     "data/font/unifont.ttf"
   ],
   "overmap_typeface": [
-    "data/font/VecTerminus12Medium.otf",
+    "data/font/Terminus.ttf",
     "data/font/unifont.ttf"
   ]
 }

data/json/achievements.json

@@ -823,7 +823,7 @@
     "id": "achievement_lvl_10_tailor",
     "type": "achievement",
     "name": "Fashion Designer",
-    "description": "Male, female, and mutant fashion alike.",
+    "description": "From catwalk to cataclysm.",
     "requirements": [ { "event_statistic": "num_gains_tailor_level_10", "is": ">=", "target": 1 } ],
     "hidden_by": [ "achievement_lvl_7_tailor" ]
   },

data/json/bionics.json

@@ -37,6 +37,7 @@
     "name": { "str": "Squeaky Ankles" },
     "description": "In a cruel twist of fate, a poorly executed CBM surgery has given you a pair of useless bionics which make squeaking noises when you walk.",
     "occupied_bodyparts": [ [ "leg_l", 3 ], [ "leg_r", 3 ] ],
+    "enchantments": [ "SQUEAKY_ANKLES" ],
     "flags": [ "BIONIC_FAULTY" ]
   },
   {

data/json/body_parts.json

@@ -41,6 +41,7 @@
     "connected_to": "head",
     "opposite_part": "head",
     "limb_type": "head",
+    "reaction_score": 0.3,
     "is_vital": true,
     "hit_size": 6,
     "hit_size_relative": [ 0, 2.33, 5.71 ],
@@ -73,6 +74,8 @@
     "hit_difficulty": 1.15,
     "limb_type": "sensor",
     "vision_score": 1.0,
+    "nightvision_score": 1.0,
+    "reaction_score": 0.7,
     "side": "both",
     "legacy_id": "EYES",
     "stylish_bonus": 2,