Merge branch 'master' into unarmed-training-fix

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,8 @@
 blank_issues_enabled: false
 contact_links:
+  - name: Tileset Issues
+    url: https://github.com/I-am-Erk/CDDA-Tilesets/issues
+    about: For issues concerning the built-in tilesets.
   - name: Github Discussion
     url: https://github.com/CleverRaven/Cataclysm-DDA/discussions
     about: For nonspecific feature requests, balance concerns, and questions about the game, prefer opening a discussion to an issue.

.github/workflows/linter.yml

@@ -2,26 +2,25 @@ name: Code Style Reviewer
 
 on:
   pull_request_target:
+    paths:
+      - '**.json'
+      - '**.cpp'
+      - '**.h'
+      - '**.c'
   pull_request:
+    paths:
+      - '**.json'
+      - '**.cpp'
+      - '**.h'
+      - '**.c'
 
-jobs:
-  skip-duplicates:
-    if: ${{ github.event_name == 'pull_request_target' }}
-    continue-on-error: true
-    runs-on: ubuntu-latest
-    # Map a step output to a job output
-    outputs:
-      should_skip: ${{ steps.skip_check.outputs.should_skip }}
-    steps:
-    - id: skip_check
-      uses: fkirc/skip-duplicate-actions@master
-      with:
-        cancel_others: 'true'
-        paths: '[ "**.json", "**.cpp", "**.h", "**.c" ]'
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.run_id }}
+  cancel-in-progress: true
 
+jobs:
   style-code:
-    needs: skip-duplicates
-    if: ${{ needs.skip-duplicates.outputs.should_skip != 'true' && github.event_name == 'pull_request_target' }}
+    if: ${{ github.event_name == 'pull_request_target' }}
 
     runs-on: ubuntu-latest
 
@@ -30,14 +29,12 @@ jobs:
       with:
         ref: '${{ github.event.pull_request.head.sha }}'
 
-    - name: install dependencies
-      run: sudo apt-get install astyle
+    - run: sudo apt-get install astyle
 
-    - run: make astyle-fast
-    - run: make style-all-json-parallel
+    - run: make astyle-check && make astyle-fast && make style-all-json-parallel
 
     - name: 'suggester / JSON & C++'
       uses: reviewdog/action-suggester@v1
-      if: ${{ always() }}
+      if: ${{ failure() }}
       with:
         tool_name: 'JSON & C++ formatters'

.github/workflows/matrix.yml

@@ -68,9 +68,9 @@ jobs:
     steps:
       - id: matrix_vars
         run: |
-          echo "::set-output name=fail_fast::$([ "$GITHUB_REF_NAME" = "master" ] && echo false || echo true)"
-          echo "::set-output name=skip_tests::$([ "$GITHUB_REF_NAME" = "master" ] && echo true || echo false)"
-          echo "::set-output name=max_parallel::$([ "$GITHUB_REF_NAME" = "master" ] && echo 20 || echo 1)"
+          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
   varied_builds:
     needs: [ skip-duplicates-code, skip-duplicates-data, matrix-variables ]
     strategy:
@@ -276,8 +276,8 @@ jobs:
       id: get-vars
       if: ${{ env.SKIP == 'false' }}
       run: |
-        echo "::set-output name=datetime::$(/bin/date -u "+%Y%m%d%H%M")"
-        echo "::set-output name=ccache-path::$([ "$RUNNER_OS" = "macOS" ] && echo '/Users/runner/Library/Caches/ccache' || echo '~/.ccache')"
+        echo "datetime=$(/bin/date -u "+%Y%m%d%H%M")" >> $GITHUB_OUTPUT
+        echo "ccache-path=$([ "$RUNNER_OS" = "macOS" ] && echo '/Users/runner/Library/Caches/ccache' || echo '~/.ccache')" >> $GITHUB_OUTPUT
       shell: bash
     - name: ccache cache files
       if: ${{ env.SKIP == 'false' && ( runner.os == 'Linux' || runner.os == 'macOS' ) }}

.github/workflows/stale.yml

@@ -10,6 +10,9 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
+      - name: get-time
+        run: |
+          echo "time=$(date +%I)" >> $GITHUB_ENV
       - uses: actions/stale@main
         id: stale
         with:
@@ -20,10 +23,10 @@ jobs:
           days-before-stale: 30
           days-before-close: 30
           start-date: '2020-05-07'
-          ascending: true
-          operations-per-run: 100
-          exempt-issue-labels: '<Bug>,<Bugfix>,<Crash / Freeze>,Organization: Bounty,Good First Issue,(P1 - Critical),(P2 - High),(P3 - Medium),(P4 - Low),(P5 - Long-term),(S2 - Confirmed),0.E Feature Freeze,0.E Content Freeze,0.F Feature Freeze,0.F Content Freeze,0.F String Freeze,0.G Feature Freeze,0.G Content Freeze'
-          exempt-pr-labels: '<Bug>,<Bugfix>,<Crash / Freeze>,Organization: Bounty,Good First Issue,(P1 - Critical),(P2 - High),(P3 - Medium),(P4 - Low),(P5 - Long-term),(S2 - Confirmed),0.E Feature Freeze,0.E Content Freeze,0.F Feature Freeze,0.F Content Freeze,0.F String Freeze,0.G Feature Freeze,0.G Content Freeze'
+          ascending: ${{ contains(fromJson('["01", "03", "05", "07", "09", "11"]'), env.time) }}
+          operations-per-run: 250
+          exempt-issue-labels: '<Bug>,<Bugfix>,<Crash / Freeze>,Organization: Bounty,Good First Issue,(P1 - Critical),(P2 - High),(P3 - Medium),(P4 - Low),(P5 - Long-term),(S2 - Confirmed),0.G String Freeze,0.G Feature Freeze,0.G Content Freeze'
+          exempt-pr-labels: '<Bug>,<Bugfix>,<Crash / Freeze>,Organization: Bounty,Good First Issue,(P1 - Critical),(P2 - High),(P3 - Medium),(P4 - Low),(P5 - Long-term),(S2 - Confirmed),0.G String Freeze,0.G Feature Freeze,0.G Content Freeze'
           exempt-all-milestones: true
           exempt-all-assignees: true
       - name: Print outputs

.gitignore

@@ -230,3 +230,6 @@ weather.output
 .sass-cache
 .jekyll-metadata
 Gemfile.lock
+
+# VERSION.txt generated by our CMakeLists.txt
+VERSION.txt

CMakeLists.txt

@@ -124,6 +124,9 @@ if ("${CMAKE_SYSTEM_NAME}" MATCHES "(Linux|FreeBSD|Darwin)")
     if (NOT DATA_PREFIX)
         set(DATA_PREFIX ${CMAKE_INSTALL_PREFIX}/share/cataclysm-dda)
     endif ()
+    if (NOT README_DIR)
+        set(README_DIR ${DATA_PREFIX})
+    endif ()
     if (NOT LOCALE_DIR)
         set(LOCALE_DIR ${CMAKE_INSTALL_PREFIX}/share/locale)
     endif ()
@@ -148,6 +151,9 @@ if ("${CMAKE_SYSTEM_NAME}" MATCHES "(Windows|MSYS)")
     if (NOT DATA_PREFIX)
         set(DATA_PREFIX ${CMAKE_INSTALL_PREFIX}/data)
     endif ()
+    if (NOT README_DIR)
+        set(README_DIR ${CMAKE_INSTALL_PREFIX})
+    endif ()
     if (NOT LOCALE_DIR)
         set(LOCALE_DIR ${CMAKE_INSTALL_PREFIX}/lang)
     endif ()
@@ -227,13 +233,7 @@ message(STATUS "USE_HOME_DIR                  : ${USE_HOME_DIR}")
 message(STATUS "LANGUAGES                     : ${LANGUAGES}")
 message(STATUS "See doc/COMPILING/COMPILING-CMAKE.md for details and more info --")
 
-if (MSVC)
-    if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-        add_definitions(-D_AMD64_)
-    else ()
-        add_definitions(-D_X86_)
-    endif ()
-else ()
+if (NOT MSVC)
     set(CATA_WARNINGS
             "-Werror -Wall -Wextra \
              -Wformat-signedness \
@@ -438,7 +438,7 @@ if (CATA_CLANG_TIDY_PLUGIN OR CATA_CLANG_TIDY_EXECUTABLE)
 endif()
 
 install(DIRECTORY doc gfx
-    DESTINATION .
+    DESTINATION ${DATA_PREFIX}
 )
 
 if (RELEASE)
@@ -447,9 +447,9 @@ if (RELEASE)
         ${CMAKE_SOURCE_DIR}/LICENSE.txt
         ${CMAKE_SOURCE_DIR}/LICENSE-OFL-Terminus-Font.txt
         ${CMAKE_SOURCE_DIR}/VERSION.txt
-        DESTINATION .)
+        DESTINATION ${README_DIR})
     if (TILES)
-        install(DIRECTORY ${CMAKE_SOURCE_DIR}/gfx DESTINATION .)
+        install(DIRECTORY ${CMAKE_SOURCE_DIR}/gfx DESTINATION ${DATA_PREFIX})
     endif()
 endif()
 

Makefile

@@ -298,7 +298,7 @@ ifneq ($(CLANG), 0)
   endif
   ifdef USE_LIBCXX
     OTHERS += -stdlib=libc++
-    LDFLAGS += -stdlib=libc++
+    LDFLAGS += -stdlib=libc++ -Wno-unused-command-line-argument
   endif
   ifeq ($(CCACHE), 1)
     CXX = CCACHE_CPP2=1 $(CCACHEBIN) $(CROSS)$(CLANGCMD)
@@ -1216,7 +1216,7 @@ $(ODIR)/.astyle-check-stamp: $(ASTYLE_SOURCES)
 endif
 
 astyle-fast: $(ASTYLE_SOURCES)
-	$(ASTYLE_BINARY) --options=.astylerc -n $(ASTYLE_SOURCES)
+	echo $(ASTYLE_SOURCES) | xargs -P 0 -L 1 $(ASTYLE_BINARY) --quiet --options=.astylerc -n
 
 astyle-diff: $(ASTYLE_SOURCES)
 	$(ASTYLE_BINARY) --options=.astylerc -n $$(git diff --name-only src/*.h src/*.cpp tests/*.h tests/*.cpp)

README.md

@@ -18,7 +18,6 @@ Cataclysm: Dark Days Ahead is a turn-based survival game set in a post-apocalypt
 
 [![General build matrix](https://github.com/CleverRaven/Cataclysm-DDA/actions/workflows/matrix.yml/badge.svg)](https://github.com/CleverRaven/Cataclysm-DDA/actions/workflows/matrix.yml)
 [![Coverage Status](https://coveralls.io/repos/github/CleverRaven/Cataclysm-DDA/badge.svg?branch=master)](https://coveralls.io/github/CleverRaven/Cataclysm-DDA?branch=master)
-[![Language grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/CleverRaven/Cataclysm-DDA.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/CleverRaven/Cataclysm-DDA/context:cpp)
 [![Open Source Helpers](https://www.codetriage.com/cleverraven/cataclysm-dda/badges/users.svg)](https://www.codetriage.com/cleverraven/cataclysm-dda)
 [![Commit Activity](https://img.shields.io/github/commit-activity/m/CleverRaven/Cataclysm-DDA)](https://github.com/CleverRaven/Cataclysm-DDA/graphs/contributors)
 [![Lines of Code](https://tokei.rs/b1/github/CleverRaven/Cataclysm-DDA?category=code)](https://github.com/XAMPPRocky/tokei)

android/app/src/main/AndroidManifest.xml

@@ -44,6 +44,7 @@
                   android:keepScreenOn="true"
                   android:screenOrientation="userLandscape"
                   android:configChanges="keyboardHidden|keyboard|orientation|screenSize|navigation"
+                  android:exported="true"
                   >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

android/gradle.properties

@@ -54,15 +54,15 @@ version_header_path=./../src/version.h
 
 # This property controls which compileSdkVersion should be used
 # You can override this from the command line by passing "-Poverride_compileSdkVersion=#"
-override_compileSdkVersion=30
+override_compileSdkVersion=31
 
 # This property controls which minSdkVersion should be used
 # You can override this from the command line by passing "-Poverride_minSdkVersion=#"
 override_minSdkVersion=14
 
 # This property controls which targetSdkVersion should be used
 # You can override this from the command line by passing "-Poverride_targetSdkVersion=#"
-override_targetSdkVersion=30
+override_targetSdkVersion=31
 
 # This property controls which ndkBuildAppPlatform should be used
 # You can override this from the command line by passing "-Poverride_ndkBuildAppPlatform=#"

data/credits/hu.credits

@@ -11,8 +11,8 @@
 
 <color_white>Külön köszönet:</color>
 <color_yellow>Aivean</color> - A kiemelkedő teljesítményért.
-<color_yellow>anothersimulacrum</color> - For making me weary.
-<color_yellow>jbytheway</color> - For making me achieve things.
+<color_yellow>anothersimulacrum </color> - Amiért mindig lefáraszt.
+<color_yellow>jbytheway</color> - A CI munkájáért
 <color_yellow>BrettDong</color> - fordítások segítéséért és egyebekért.
 <color_yellow>Qrox</color> - A hibaüzenetek helyének megmutatásáért.
 <color_yellow>LyleSY</color> - A dínókért.
@@ -45,7 +45,7 @@ A <color_light_cyan>Cataclysm</color>: <color_light_blue>Dark Days Ahead</color>
 <color_yellow>Qrox</color> - Windows buildek olvasható backtrace-eiért.
 <color_yellow>ZhilkinSerg</color> - Mergetesztelésért.
 
-<color_white>For a full list of contributors please see the Git repo:</color>
+<color_white>Az összes közreműködő listáját lásd itt:</color>
 <color_cyan>https://github.com/CleverRaven/Cataclysm-DDA</color>
 
 ******************************************************************************
@@ -54,8 +54,8 @@ A <color_light_cyan>Cataclysm</color>: <color_light_blue>Dark Days Ahead</color>
 <color_yellow>KevinGranade</color>, <color_yellow>Rivet-the-Zombie</color>, <color_yellow>BevapDin</color>, <color_yellow>Coolthulu</color>, <color_yellow>i2amroy</color>
 
 <color_white>Special thanks to (<color_cyan>0.D</color>):</color>
-<color_yellow>Narc</color> - For setting up the automatic Jenkins build-bot.
-<color_yellow>Acidia</color> - For wonderful NPC, Quest and Location contributions.
+<color_yellow>Narc</color> - Az automata Jenkins build-bot elkészítéséért.
+Acidia - A csodás NPC-kért, helyszínekért és küldetésekért.
 <color_yellow>Wuzzy</color> and <color_yellow>VlasovVitaly</color> - For herculean translation efforts.
 <color_yellow>HuXTUS</color> - For a huge amount of amazing content.
 
@@ -65,8 +65,8 @@ A <color_light_cyan>Cataclysm</color>: <color_light_blue>Dark Days Ahead</color>
 <color_yellow>KevinGranade</color>, <color_yellow>Rivet-the-Zombie</color>, <color_yellow>KA101</color>, <color_yellow>BevapDin</color>, <color_yellow>Coolthulu</color>, <color_yellow>i2amroy</color>
 
 <color_white>Special thanks to (<color_cyan>0.C</color>):</color>
-<color_yellow>Narc</color> - For setting up the automatic Jenkins build-bot.
-<color_yellow>Acidia</color> - For wonderful NPC, Quest and Location contributions.
+<color_yellow>Narc</color> - Az automata Jenkins build-bot elkészítéséért.
+Acidia - A csodás NPC-kért, helyszínekért és küldetésekért.
 <color_yellow>Wuzzy</color> and <color_yellow>VlasovVitaly</color> - For herculean translation efforts.
 <color_yellow>HuXTUS</color> - For a huge amount of amazing content.
 
@@ -76,8 +76,8 @@ A <color_light_cyan>Cataclysm</color>: <color_light_blue>Dark Days Ahead</color>
 <color_yellow>KevinGranade</color>, <color_yellow>Rivet-the-Zombie</color>, <color_yellow>KA101</color>, <color_yellow>BevapDin</color>
 
 <color_white>Special thanks to (<color_cyan>0.B</color>):</color>
-<color_yellow>Narc</color> - For setting up the automatic Jenkins build-bot.
-<color_yellow>Acidia</color> - For wonderful NPC, Quest and Location contributions.
+<color_yellow>Narc</color> - Az automata Jenkins build-bot elkészítéséért.
+Acidia - A csodás NPC-kért, helyszínekért és küldetésekért.
 <color_yellow>Wuzzy</color> and <color_yellow>VlasovVitaly</color> - For herculean translation efforts.
 <color_yellow>i2amroy</color> - For several large infrastructural overhauls.
 <color_yellow>HuXTUS</color> - For a huge amount of amazing content.
@@ -89,7 +89,7 @@ A <color_light_cyan>Cataclysm</color>: <color_light_blue>Dark Days Ahead</color>
 
 <color_white>Special thanks to (<color_cyan>0.A</color>):</color>
 <color_yellow>TheDarklingWolf</color> - For creating Cataclysm:DDA as we know it.
-<color_yellow>Narc</color> - For setting up the automatic Jenkins build-bot.
+<color_yellow>Narc</color> - Az automata Jenkins build-bot elkészítéséért.
 <color_yellow>BevapDin</color> - For tireless bugfixing efforts.
 <color_yellow>dwarfkoala</color> - For a plethora of bug triage.
 <color_yellow>Ill-kun</color> - For countless UI cleanups.
@@ -101,7 +101,7 @@ A <color_light_cyan>Cataclysm</color>: <color_light_blue>Dark Days Ahead</color>
 
 <color_white>Special thanks to (<color_cyan>0.9</color>):</color>
 <color_yellow>TheDarklingWolf</color> - For creating Cataclysm:DDA as we know it.
-<color_yellow>Narc</color> - For setting up the automatic Jenkins build-bot.
+<color_yellow>Narc</color> - Az automata Jenkins build-bot elkészítéséért.
 <color_yellow>yobbobanana</color> - For working as liason between translators and GitHub.
 <color_yellow>Angela 'Rivet' Graves</color>, Constant Creator of Cataclysmic Content.
 
@@ -112,5 +112,5 @@ A <color_light_cyan>Cataclysm</color>: <color_light_blue>Dark Days Ahead</color>
 
 <color_white>Special thanks to (<color_cyan>0.8</color>):</color>
 <color_yellow>TheDarklingWolf</color> - For creating Cataclysm:DDA as we know it.
-<color_yellow>Narc</color> - For setting up the automatic Jenkins build-bot.
+<color_yellow>Narc</color> - Az automata Jenkins build-bot elkészítéséért.
 <color_yellow>yobbobanana</color> - For working as liason between translators and GitHub.