Reality checks Rivtech guns and 8x40mm.

.github/comment-commands.yml

@@ -6,8 +6,11 @@ trigger: specific
 # TODO implement more commands, add more users
 users:
   active:
+    # maintainer
     - casswedson
+    # curator
     - Maleclypse
+    # voluntiers
     - Termineitor244
     - Faalagorn
     - Ilysen
@@ -41,7 +44,23 @@ users:
     - Procyonae
     - harakka
     - Karol1223
+    - Bobtron
 
 keywords:
   - name: confirm-bug
     value: '\/(C|c)onfirm.*'
+
+  - name: close-duplicate
+    value: '\/(D|d)uplicate.*'
+
+  - name: close-invalid
+    value: '\/(I|i)nvalid.*'
+
+  - name: good-first-issue
+    # example: /good-first-issue
+    value: '\/(G|g)ood[\s-]*(F|f)irst[\s-]*(I|i)ssue.*'
+
+  - name: help-wanted
+    # - only works in PRs
+    # example: /help-wanted
+    value: '\/(H|h)elp[\s-]*(W|w)anted.*'

.github/labeler.yml

@@ -62,8 +62,8 @@
 "EOC: Effects On Condition":
   - "**/**effect_on_condition**"
   - "**/effect_on_condition**"
-  - "**/**eocs**"
-  - "**/eocs**"
+  - "**/**eoc**"
+  - "**/eoc**"
   - "**/condition**"
 
 "Fields / Furniture / Terrain / Traps":
@@ -135,13 +135,13 @@
   - "**/appliance**"
 
 "Monsters":
-  - "**/**monsters**"
-  - "**/monsters**"
+  - "**/**monster**"
+  - "**/monster**"
 
 "Mutations / Traits / Professions/ Hobbies":
   - "**/**profession**"
   - "**/profession**"
-  - "**/**mutations**"
+  - "**/**mutation**"
   - "**/mutation**"
   - "**/hobbies**"
 

.github/pull_request_template.md

@@ -20,7 +20,10 @@ https://github.com/CleverRaven/Cataclysm-DDA/blob/master/data/changelog.txt -->
 
 #### Purpose of change
 
-<!-- With a few sentences, describe your reasons for making this change.  If it relates to an existing issue, you can link it with a # followed by the GitHub issue number, like #1234.  If your pull request *fully* resolves an issue, include the word "Fix" or "Fixes" before the issue number, like: Fixes #xxxx
+<!-- With a few sentences, describe your reasons for making this change.
+If it relates to an existing issue, you can link it with a # followed by the GitHub issue number, like #1234.
+When you submit a pull request that completely resolves an issue, use [Github's closing keywords](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests#linking-a-pull-request-to-an-issue)
+to automatically close the issue once your pull request is merged.
 If there is no related issue, explain here what issue, feature, or other concern you are addressing.  If this is a bugfix, include steps to reproduce the original bug, so your fix can be verified. -->
 
 #### Describe the solution

.github/reviewers.yml

@@ -34,6 +34,8 @@ files:
     - ZhilkinSerg
   'data/mods/No_Hope/**':
     - Night-Pryanik
+  'data/mods/Tamable_Wildlife/**':
+    - Termineitor244
 
   '**/.clang-tidy':
     - jbytheway
@@ -53,3 +55,5 @@ files:
     - Qrox
   'data/raw/keybindings{.json,/**}':
     - Qrox
+  'src/math_parser*':
+    - andrei8l

.github/summary-labels.yml

@@ -3,40 +3,40 @@ version: v1
 labels:
   - label: "<Enhancement / Feature>"
     matcher:
-      body: "(\\s|^)#### Summary\\s*Features +\".+\"\\s*(\n|$)"
+      body: ".*Features +\".+\".*"
 
   - label: "Info / User Interface"
     matcher:
-      body: "(\\s|^)#### Summary\\s*Interface +\".+\"\\s*(\n|$)"
+      body: ".*Interface +\".+\".*"
 
   - label: "Mods"
     matcher:
-      body: "(\\s|^)#### Summary\\s*Mods +\".+\"\\s*(\n|$)"
+      body: ".*Mods +\".+\".*"
 
   - label: "Game: Balance"
     matcher:
-      body: "(\\s|^)#### Summary\\s*Balance +\".+\"\\s*(\n|$)"
+      body: ".*Balance +\".+\".*"
 
   - label: "<Bugfix>"
     matcher:
-      body: "(\\s|^)#### Summary\\s*Bugfixes +\".+\"\\s*(\n|$)"
+      body: ".*Bugfixes +\".+\".*"
 
   - label: "<Bugfix>"
     matcher:
-      body: ".*((C|c)lose(s|d)?|(F|f)ix(es|ed)?|(R|r)esolve(s|d)?):? #([1-9][0-9]{3,6})(\\s*|$)"
+      body: ".*((C|c)lose(s|d)?|(F|f)ix(es|ed)?|(R|r)esolve(s|d)?):?.*#([1-9][0-9]{3,8}).*"
 
   - label: "Code: Performance"
     matcher:
-      body: "(\\s|^)#### Summary\\s*Performance +\".+\"\\s*(\n|$)"
+      body: ".*Performance +\".+\".*"
 
   - label: "Code: Infrastructure / Style / Static Analysis"
     matcher:
-      body: "(\\s|^)#### Summary\\s*Infrastructure +\".+\"\\s*(\n|$)"
+      body: ".*Infrastructure +\".+\".*"
 
   - label: "Code: Build"
     matcher:
-      body: "(\\s|^)#### Summary\\s*Build +\".+\"\\s*(\n|$)"
+      body: ".*Build +\".+\".*"
 
   - label: "Translation"
     matcher:
-      body: "(\\s|^)#### Summary\\s*I18N +\".+\"\\s*(\n|$)"
+      body: ".*I18N +\".+\".*"

.github/workflows/comment-commands.yml

@@ -10,7 +10,7 @@ env:
   ISSUE_NUMBER: ${{ github.event.issue.number }}
 
 jobs:
-  confirm-bug:
+  issue-comment-job:
     if: ${{ !github.event.issue.pull_request }}
     runs-on: ubuntu-latest
     steps:
@@ -30,3 +30,50 @@ jobs:
           gh issue edit "$ISSUE_NUMBER" --remove-label "(S1 - Need Confirmation),stale"
           gh issue edit "$ISSUE_NUMBER" --add-label "(S2 - Confirmed)"
           gh issue reopen "$ISSUE_NUMBER"
+
+      - if: steps.comvent.outputs.close-duplicate != ''
+        name: Handle duplicate issue command - Label
+        run: |
+          gh issue edit "$ISSUE_NUMBER" --remove-label "(S1 - Need Confirmation),(S2 - Confirmed),stale"
+          gh issue edit "$ISSUE_NUMBER" --add-label "(S3 - Duplicate)"
+
+      - if: steps.comvent.outputs.close-invalid != ''
+        name: Handle invalid issue command - Label
+        run: |
+          gh issue edit "$ISSUE_NUMBER" --remove-label "(S1 - Need Confirmation),(S2 - Confirmed),stale"
+          gh issue edit "$ISSUE_NUMBER" --add-label "(S4 - Invalid)"
+
+      - if: steps.comvent.outputs.good-first-issue != ''
+        name: Handle good first issue command - Label
+        run: |
+          gh issue edit "$ISSUE_NUMBER" --remove-label "stale"
+          gh issue edit "$ISSUE_NUMBER" --add-label "Good First Issue"
+          gh issue reopen "$ISSUE_NUMBER"
+
+      - if: steps.comvent.outputs.help-wanted != ''
+        name: Handle help wanted command - Label
+        run: |
+          gh issue edit "$ISSUE_NUMBER" --remove-label "stale"
+          gh issue edit "$ISSUE_NUMBER" --add-label "Help Wanted"
+          gh issue reopen "$ISSUE_NUMBER"
+
+  pr-comment-job:
+    if: ${{ github.event.issue.pull_request }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set-up Comvent
+        uses: rytswd/[email protected]
+        id: comvent
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          config-path: .github/comment-commands.yml
+
+      - if: steps.comvent.outputs.help-wanted != ''
+        name: Handle help wanted command - Label
+        run: |
+          gh pr edit "$ISSUE_NUMBER" --remove-label "stale"
+          gh pr edit "$ISSUE_NUMBER" --add-label "Help Wanted"
+          gh pr reopen "$ISSUE_NUMBER"

.github/workflows/linter.yml

@@ -2,12 +2,14 @@ name: Code Style Reviewer
 
 on:
   pull_request_target:
+    types: ['opened', 'reopened', 'synchronize', 'ready_for_review']
     paths:
       - '**.json'
       - '**.cpp'
       - '**.h'
       - '**.c'
   pull_request:
+    types: ['opened', 'reopened', 'synchronize', 'ready_for_review']
     paths:
       - '**.json'
       - '**.cpp'
@@ -20,7 +22,7 @@ concurrency:
 
 jobs:
   style-code:
-    if: ${{ github.event_name == 'pull_request_target' }}
+    if: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.draft == false }}
 
     runs-on: ubuntu-latest
 

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

@@ -76,7 +76,7 @@ jobs:
       id: runvcpkg
       with:
         vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
-        vcpkgGitCommitId: '5b1214315250939257ef5d62ecdcbca18cf4fb1c'
+        vcpkgGitCommitId: '66444e13a86da7087ee24c342f91801cc6eb9877'
 
     - name: Integrate vcpkg
       run: |

.github/workflows/pull-translations.yml

@@ -39,6 +39,8 @@ jobs:
         env:
           TX_TOKEN: ${{ secrets.TX_TOKEN }}
         run: tx pull --force
+      - name: "Discard invalid translations"
+        run: ./lang/discard_invalid_po.sh
       - name: "Update stats"
         run: ./lang/update_stats.sh
       - name: Create Pull Request

.github/workflows/release.yml

@@ -180,7 +180,7 @@ jobs:
         id: runvcpkg
         with:
           vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
-          vcpkgGitCommitId: '5b1214315250939257ef5d62ecdcbca18cf4fb1c'
+          vcpkgGitCommitId: '66444e13a86da7087ee24c342f91801cc6eb9877'
       - name: Install dependencies (windows msvc) (3/3)
         if: runner.os == 'Windows'
         run: |
@@ -220,7 +220,7 @@ jobs:
         if: runner.os == 'macOS'
         run: |
           HOMEBREW_NO_AUTO_UPDATE=yes HOMEBREW_NO_INSTALL_CLEANUP=yes brew install gettext ccache parallel
-          pip3 install mac_alias==2.2.0 dmgbuild==1.4.2 biplist
+          pip3 install dmgbuild biplist
       - name: Create VERSION.TXT
         shell: bash
         run: |

.vscode/settings.json

@@ -1,5 +1,13 @@
 {
     "C_Cpp.default.configurationProvider": "ms-vscode.makefile-tools",
+    "makefile.launchConfigurations": [
+        {
+            "cwd": "${workspaceRoot}",
+            "binaryPath": "${workspaceRoot}/${buildTarget}",
+            "binaryArgs": [],
+            "stopAtEntry": true
+        }
+  ],
     "makefile.configurations": [
         {
             "name" : "Linux - X64 - Tiles/Sound - Release",

CMakeLists.txt

@@ -222,7 +222,10 @@ if (NOT MSVC)
              -Wpedantic \
              -Wsuggest-override \
              -Wunused-macros \
-             -Wzero-as-null-pointer-constant")
+             -Wzero-as-null-pointer-constant \
+             -Wno-unknown-warning-option \
+             -Wno-dangling-reference \
+             -Wno-c++20-compat")
     if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
         set(CATA_WARNINGS "${CATA_WARNINGS} -Wno-unknown-warning-option")
     else()

ISSUES.md

@@ -42,6 +42,10 @@ Please first search if something like what you have on mind has been already pro
 
 Remember to take part in the discussion of your suggestions.
 
+### Labels
+
+You can update issues with labels using comment-commands. First, open a PR adding your username to a list of allowed users [here](.github/comment-commands.yml), under the `active` section. Then you can add labels to issues, such as marking them confirmed with `/confirmed`, or requesting help with `/help-wanted`. A list of comments you can use is under the `keywords` section [here](.github/comment-commands.yml), and what each of these comment-commands do is described [here](.github/workflows/comment-commands.yml).
+
 ### Questions
 
 You should direct your questions to the forum or ask on IRC. You should also read the included documentation and additional text files, e.g. [COMPILING.md](doc/COMPILING/COMPILING.md) if you have problems building.

Makefile

@@ -1031,7 +1031,7 @@ $(CHKJSON_BIN): $(CHKJSON_SOURCES)
 json-check: $(CHKJSON_BIN)
 	./$(CHKJSON_BIN)
 
-clean: clean-tests clean-object_creator clean-pch
+clean: clean-tests clean-object_creator clean-pch clean-lang
 	rm -rf *$(TARGET_NAME) *$(TILES_TARGET_NAME)
 	rm -rf *$(TILES_TARGET_NAME).exe *$(TARGET_NAME).exe *$(TARGET_NAME).a
 	rm -rf *obj *objwin
@@ -1318,6 +1318,9 @@ clean-pch:
 	rm -f pch/*pch.hpp.d
 	$(MAKE) -C tests clean-pch
 
-.PHONY: tests check ctags etags clean-tests clean-object_creator clean-pch install lint
+clean-lang:
+	$(MAKE) -C lang clean
+
+.PHONY: tests check ctags etags clean-tests clean-object_creator clean-pch clean-lang install lint
 
 -include ${OBJS:.o=.d}

android/app/build.gradle

@@ -104,6 +104,13 @@ if (localProperties.getProperty('override_ndkVersion') != null) {
     override_ndkVersion = localProperties.getProperty('override_ndkVersion')
 }
 
+def override_versionCode = getProperty("override_versionCode")
+if (localProperties.getProperty('override_versionCode') != null) {
+    override_versionCode = localProperties.getProperty('override_versionCode')
+} else {
+    override_versionCode=Integer.valueOf(System.env.UPSTREAM_BUILD_NUMBER ?: 1)
+}
+
 println("Using [              njobs]: $njobs")
 println("Using [           localize]: $localize")
 println("Using [               deps]: $deps")
@@ -114,6 +121,7 @@ println("Using [      minSdkVersion]: $override_minSdkVersion")
 println("Using [   targetSdkVersion]: $override_targetSdkVersion")
 println("Using [ndkBuildAppPlatform]: $override_ndkBuildAppPlatform")
 println("Using [         ndkVersion]: $override_ndkVersion")
+println("Using [        versionCode]: $override_versionCode")
 println("Using [         abi_arm_32]: $abi_arm_32")
 println("Using [         abi_arm_64]: $abi_arm_64")
 println("Using [         abi_x86_32]: $abi_x86_32")
@@ -245,7 +253,7 @@ android {
     defaultConfig {
         minSdkVersion override_minSdkVersion
         targetSdkVersion override_targetSdkVersion
-        versionCode Integer.valueOf(System.env.UPSTREAM_BUILD_NUMBER ?: 1)
+        versionCode Integer.valueOf(override_versionCode)
         versionName new File("$version_header_path").text.split('\"')[1]
         if (buildAsApplication) {
             applicationId "com.cleverraven.cataclysmdda"

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=31
+override_compileSdkVersion=33
 
 # This property controls which minSdkVersion should be used
 # You can override this from the command line by passing "-Poverride_minSdkVersion=#"
 override_minSdkVersion=21
 
 # This property controls which targetSdkVersion should be used
 # You can override this from the command line by passing "-Poverride_targetSdkVersion=#"
-override_targetSdkVersion=31
+override_targetSdkVersion=33
 
 # This property controls which ndkBuildAppPlatform should be used
 # You can override this from the command line by passing "-Poverride_ndkBuildAppPlatform=#"
@@ -71,3 +71,7 @@ override_ndkBuildAppPlatform=android-21
 # This property controls which ndkVersion should be used
 # You can override this from the command line by passing "-Poverride_ndkVersion=#"
 override_ndkVersion=25.2.9519653
+
+# This property controls which versionCode should be used
+# You can override this from the command line by passing "-Poverride_versionCode=#"
+override_versionCode=1

build-data/osx/dmgsettings.py

@@ -37,7 +37,7 @@ def icon_from_app(app_path):
 format = defines.get('format', 'UDBZ')
 
 # Volume size (must be large enough for your files)
-size = defines.get('size', '300M')
+size = defines.get('size', '400M')
 
 # Files to include
 files = [application]