Merge branch 'CleverRaven:master' into ench_tests

CleverRaven · Apr 9, 2024 · 602a03a · 602a03a
2 parents 306f40e + dc205a2
commit 602a03a
Show file tree

Hide file tree

Showing 121 changed files with 1,157 additions and 892 deletions.
diff --git a/.github/workflows/CBA.yml b/.github/workflows/CBA.yml
@@ -34,7 +34,7 @@ jobs:
         ClangBuildAnalyzer --stop . buildAnalysis
     - name: Analyze
       run: ClangBuildAnalyzer --analyze buildAnalysis
-    - uses: actions/upload-artifact@v3.1.2
+    - uses: actions/upload-artifact@v4
       with:
         name: ClangBuildAnalyzer-traces
         path: "**/obj/*.json"
diff --git a/.github/workflows/astyle.yml b/.github/workflows/astyle.yml
@@ -16,7 +16,7 @@ jobs:
         cancel_others: 'true'
         paths: '[".github/workflows/astyle.yml", "Makefile", ".astylerc", "**.cpp", "**.h", "**.c"]'
     - run: echo ${{ github.event.number }} > pull_request_id
-    - uses: actions/upload-artifact@v3.1.2
+    - uses: actions/upload-artifact@v4
       with:
         name: pull_request_id
         path: pull_request_id

diff --git a/.github/workflows/check-branch-name.yml b/.github/workflows/check-branch-name.yml
@@ -11,7 +11,7 @@ jobs:
     if: github.head_ref == 'master' && github.repository == 'CleverRaven/Cataclysm-DDA'
     steps:
       - name: Post warning
-        uses: actions/github-script@v6.3.3
+        uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |

diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
@@ -84,7 +84,7 @@ jobs:
       run: bash ./build-scripts/requirements.sh
     - name: determine changed files
       if: ${{ github.event_name == 'pull_request' }}
-      uses: actions/github-script@v6.3.3
+      uses: actions/github-script@v7
       with:
         script: |
           var fs = require('fs');

diff --git a/.github/workflows/comment-commands.yml b/.github/workflows/comment-commands.yml
@@ -18,7 +18,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set-up Comvent
-        uses: rytswd/comvent@v0.5.2
+        uses: rytswd/comvent@main
         id: comvent
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -65,7 +65,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set-up Comvent
-        uses: rytswd/comvent@v0.5.2
+        uses: rytswd/comvent@main
         id: comvent
         with:
           token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/detect-translation-file-changes.yml b/.github/workflows/detect-translation-file-changes.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Detect translation file changes"
-        uses: actions/github-script@v6.3.3
+        uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |

diff --git a/.github/workflows/format_emscripten.yml b/.github/workflows/format_emscripten.yml
@@ -31,7 +31,7 @@ jobs:
         run: ls -a
 
       - name: Upload zipped html as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: formatter
           path: formatter.html
@@ -40,7 +40,7 @@ jobs:
         with:
           ref: gh-pages
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v3.1.4
         with:
           name: formatter
 

diff --git a/.github/workflows/json.yml b/.github/workflows/json.yml
@@ -16,7 +16,7 @@ jobs:
         cancel_others: 'true'
         paths: '["**.json", ".github/workflows/json.yml"]'
     - run: echo ${{ github.event.number }} > pull_request_id
-    - uses: actions/upload-artifact@v3.1.2
+    - uses: actions/upload-artifact@v4
       with:
         name: pull_request_id
         path: pull_request_id

diff --git a/.github/workflows/matrix.yml b/.github/workflows/matrix.yml
@@ -333,18 +333,18 @@ jobs:
         echo ${{ github.event.number }} > pull_request_id
         echo "false" > ${{ env.ARCHIVE_SUCCESS }}
       if: ${{ env.ARCHIVE_SUCCESS && failure() }}
-    - uses: actions/upload-artifact@v3.1.2
+    - uses: actions/upload-artifact@v4
       if: ${{ always() && env.ARCHIVE_SUCCESS }}
       with:
         name: pull_request_id
         path: pull_request_id
-    - uses: actions/upload-artifact@v3.1.2
+    - uses: actions/upload-artifact@v4
       if: ${{ always() && env.ARCHIVE_SUCCESS }}
       with:
         name: ${{ env.ARCHIVE_SUCCESS }}
         path: ${{ env.ARCHIVE_SUCCESS }}
     - name: upload artifacts if failed
-      uses: actions/upload-artifact@v3.1.2
+      uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: cata_test

diff --git a/.github/workflows/msvc-full-features.yml b/.github/workflows/msvc-full-features.yml
@@ -68,7 +68,7 @@ jobs:
           make
 
     - name: Add msbuild to PATH
-      uses: microsoft/setup-msbuild@v1.3.1
+      uses: microsoft/setup-msbuild@v2
 
     - name: Use GNU tar to enable zstd for actions/cache
       run: |
@@ -91,7 +91,7 @@ jobs:
         vcpkg integrate install --vcpkg-root '${{ runner.workspace }}\b\vcpkg'
 
     - name: Download ccache
-      uses: robinraju/release-downloader@v1.4
+      uses: robinraju/release-downloader@v1.9
       with:
         repository: 'ccache/ccache'
         tag: 'v4.6.1'

diff --git a/.github/workflows/post-spell-check-result.yml b/.github/workflows/post-spell-check-result.yml
@@ -16,13 +16,13 @@ jobs:
       github.event.workflow_run.conclusion == 'success' }}
     steps:
       - name: Download pr id artifact
-        uses: dawidd6/action-download-artifact@v2
+        uses: dawidd6/action-download-artifact@v3.1.4
         with:
           workflow: ${{ github.event.workflow_run.name }}
           run_id: ${{ github.event.workflow_run.id }}
           name: pull_request_id
       - name: Download spell check retcode artifact
-        uses: dawidd6/action-download-artifact@v2
+        uses: dawidd6/action-download-artifact@v3.1.4
         with:
           workflow: ${{ github.event.workflow_run.name }}
           run_id: ${{ github.event.workflow_run.id }}
@@ -32,14 +32,14 @@ jobs:
         run: echo "spell-check-retcode=$( cat spell_check_retcode )" >> $GITHUB_OUTPUT
       - name: Download spell check output artifact
         if: steps.set-spell-check-retcode.outputs.spell-check-retcode >= 1
-        uses: dawidd6/action-download-artifact@v2
+        uses: dawidd6/action-download-artifact@v3.1.4
         with:
           workflow: ${{ github.event.workflow_run.name }}
           run_id: ${{ github.event.workflow_run.id }}
           name: spell_check_output
       - name: 'Comment on PR'
         if: steps.set-spell-check-retcode.outputs.spell-check-retcode >= 1
-        uses: actions/github-script@v6.3.3
+        uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |

diff --git a/.github/workflows/pull-translations.yml b/.github/workflows/pull-translations.yml
@@ -15,7 +15,7 @@ jobs:
         run: |
           curl -sL https://github.com/transifex/cli/releases/download/v1.6.4/tx-linux-amd64.tar.gz | sudo tar zxvf - -C /usr/bin tx
       - name: "Delete existing i18n branch"
-        uses: actions/github-script@v6.3.3
+        uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.TX_PR_CREATOR }}
           script: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -195,7 +195,7 @@ jobs:
         uses: lukka/get-cmake@latest
       - name: Install dependencies (windows msvc) (1/4)
         if: runner.os == 'Windows'
-        uses: microsoft/setup-msbuild@v1.3.1
+        uses: microsoft/setup-msbuild@v2
       - name: Install dependencies (windows msvc) (2/4)
         if: runner.os == 'Windows'
         uses: lukka/run-vcpkg@v11
@@ -249,7 +249,7 @@ jobs:
         uses: mymindstorm/setup-emsdk@v13
       - name: Install runtime dependencies (mac)
         if: runner.os == 'macOS'
-        uses: BrettDong/setup-sdl2-frameworks@v1
+        uses: BrettDong/setup-sdl2-frameworks@v2
         with:
           sdl2: latest
           sdl2-ttf: latest
@@ -297,7 +297,7 @@ jobs:
           (cd build && zip ../cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.${{ matrix.ext }} *)
       - name: Login to GitHub Container Registry
         if: matrix.artifact == 'windows-objectcreator-x64' || matrix.artifact == 'linux-objectcreator-x64'
-        uses: docker/login-action@v2 
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -357,7 +357,7 @@ jobs:
           mv Cataclysm.dmg cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.dmg
       - name: Set up JDK 8 (android)
         if: runner.os == 'Linux' && matrix.android != 'none' && matrix.mxe == 'none'
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '11'
           distribution: 'adopt'   

diff --git a/.github/workflows/test_labeler.yml b/.github/workflows/test_labeler.yml
@@ -24,7 +24,7 @@ jobs:
         fi
     - name: Download success artifact from basic build
       if: ${{ github.event.workflow_run.name == 'General build matrix' }}
-      uses: dawidd6/action-download-artifact@v2
+      uses: dawidd6/action-download-artifact@v3.1.4
       with:
         workflow: ${{ github.event.workflow_run.name }}
         run_id: ${{ github.event.workflow_run.id }}
@@ -33,7 +33,7 @@ jobs:
       id: set-basic-build-success
       run: echo "basic-build-success=$( cat basic-build )" >> $GITHUB_OUTPUT
     - name: Download pr id artifact
-      uses: dawidd6/action-download-artifact@v2
+      uses: dawidd6/action-download-artifact@v3.1.4
       with:
         workflow: ${{ github.event.workflow_run.name }}
         run_id: ${{ github.event.workflow_run.id }}
@@ -43,7 +43,7 @@ jobs:
       run: echo "pr-id=$( cat pull_request_id )" >> $GITHUB_OUTPUT
     - name: set-label
       if: ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.conclusion != 'skipped' || steps.set-basic-build-success.outputs.basic-build-success == 'true' }}
-      uses: actions/github-script@v6.3.3
+      uses: actions/github-script@v7
       with:
         script: |
             if ('${{ steps.set-pr-id.outputs.pr-id }}'.trim().length == 0) {
@@ -58,7 +58,7 @@ jobs:
             }
     - name: remove-label
       if: ${{ github.event.workflow_run.conclusion == 'failure' && steps.set-basic-build-success.outputs.basic-build-success != 'true' }}
-      uses: actions/github-script@v6.3.3
+      uses: actions/github-script@v7
       with:
         script: |
             if ('${{ steps.set-pr-id.outputs.pr-id }}'.trim().length == 0) {

diff --git a/.github/workflows/text-changes-analyzer.yml b/.github/workflows/text-changes-analyzer.yml
@@ -68,15 +68,15 @@ jobs:
           wc -c spell_check_output | grep -o '[0-9]*' > spell_check_retcode
           echo "length=$(cat spell_check_retcode)" >> $GITHUB_OUTPUT
       - run: echo ${{ github.event.number }} > pull_request_id
-      - uses: actions/upload-artifact@v3.1.2
+      - uses: actions/upload-artifact@v4
         with:
           name: pull_request_id
           path: pull_request_id
-      - uses: actions/upload-artifact@v3.1.2
+      - uses: actions/upload-artifact@v4
         with:
           name: spell_check_retcode
           path: spell_check_retcode
-      - uses: actions/upload-artifact@v3.1.2
+      - uses: actions/upload-artifact@v4
         if: steps.get_length.outputs.length >= 1
         with:
           name: spell_check_output

diff --git a/data/json/effects_on_condition/dream_eocs.json b/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" } },

diff --git a/data/json/faults/faults_electronic.json b/data/json/faults/faults_electronic.json
@@ -36,11 +36,8 @@
     "faults_removed": [ "fault_electronic_blown_capacitor" ],
     "skills": { "electronics": 4 },
     "requirements": [
-      {
-        "qualities": [ { "id": "SCREW", "level": 1 } ],
-        "tools": [ [ "soldering_iron" ], [ "soldering_iron_portable" ] ],
-        "components": [ [ [ "e_scrap", 1 ] ] ]
-      }
+      [ "soldering_standard", 5 ],
+      { "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "e_scrap", 1 ] ] ] }
     ]
   },
   {
@@ -61,11 +58,8 @@
     "faults_removed": [ "fault_electronic_shorted_circuit" ],
     "skills": { "electronics": 5 },
     "requirements": [
-      {
-        "qualities": [ { "id": "SCREW", "level": 1 } ],
-        "tools": [ [ "soldering_iron" ], [ "soldering_iron_portable" ] ],
-        "components": [ [ [ "circuit", 1 ] ] ]
-      }
+      [ "soldering_standard", 5 ],
+      { "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "circuit", 1 ] ] ] }
     ]
   }
 ]
diff --git a/data/json/itemgroups/vending_machines.json b/data/json/itemgroups/vending_machines.json
@@ -25,19 +25,6 @@
       { "group": "vending_drink_items", "prob": 20, "count-min": 5, "count-max": 25 }
     ]
   },
-  {
-    "type": "item_group",
-    "subtype": "collection",
-    "id": "vending_ammo",
-    "entries": [
-      { "group": "ammo_pistol_common", "count-min": 3, "count-max": 8 },
-      { "group": "ammo_rifle_common", "prob": 50, "count-min": 2, "count-max": 6 },
-      { "group": "ammo_shotgun_common", "prob": 50, "count-min": 2, "count-max": 6 },
-      { "group": "ammo_pistol_rare", "prob": 20, "count-min": 1, "count-max": 2 },
-      { "group": "ammo_rifle_rare", "prob": 20, "count-min": 1, "count-max": 2 },
-      { "group": "ammo_shotgun_rare", "prob": 20, "count-min": 1, "count-max": 2 }
-    ]
-  },
   {
     "id": "vending_drink_home_impr",
     "type": "item_group",

diff --git a/data/json/items/armor/storage.json b/data/json/items/armor/storage.json
@@ -2637,8 +2637,8 @@
     "pocket_data": [
       {
         "pocket_type": "CONTAINER",
-        "max_contains_volume": "25 L",
-        "max_contains_weight": "30 kg",
+        "max_contains_volume": "15 L",
+        "max_contains_weight": "15 kg",
         "max_item_length": "60 cm",
         "moves": 300
       }

diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json
@@ -100,7 +100,7 @@
       [ "underbarrel mount", 1 ]
     ],
     "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
-    "flags": [ "RELOAD_ONE" ],
+    "flags": [ "RELOAD_ONE", "NO_TURRET" ],
     "pocket_data": [
       {
         "pocket_type": "MAGAZINE",

diff --git a/data/json/items/gun/270win.json b/data/json/items/gun/270win.json
@@ -30,7 +30,7 @@
     "clip_size": 4,
     "barrel_volume": "750 ml",
     "barrel_length": "610 mm",
-    "flags": [ "RELOAD_ONE", "NEVER_JAMS", "EASY_CLEAN" ],
+    "flags": [ "RELOAD_ONE", "NEVER_JAMS", "EASY_CLEAN", "NO_TURRET" ],
     "valid_mod_locations": [
       [ "barrel", 1 ],
       [ "brass catcher", 1 ],

diff --git a/data/json/items/gun/300.json b/data/json/items/gun/300.json
@@ -19,7 +19,7 @@
     "dispersion": 90,
     "durability": 8,
     "barrel_volume": "500 ml",
-    "flags": [ "NEVER_JAMS", "EASY_CLEAN" ],
+    "flags": [ "NEVER_JAMS", "EASY_CLEAN", "NO_TURRET" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "m2010mag" ] } ],
     "melee_damage": { "bash": 12 }
   },
@@ -46,7 +46,7 @@
     "blackpowder_tolerance": 24,
     "clip_size": 3,
     "barrel_volume": "750 ml",
-    "flags": [ "RELOAD_ONE", "EASY_CLEAN" ],
+    "flags": [ "RELOAD_ONE", "EASY_CLEAN", "NO_TURRET" ],
     "valid_mod_locations": [
       [ "barrel", 1 ],
       [ "brass catcher", 1 ],
@@ -84,7 +84,7 @@
     "blackpowder_tolerance": 24,
     "clip_size": 3,
     "barrel_volume": "750 ml",
-    "flags": [ "RELOAD_ONE", "EASY_CLEAN" ],
+    "flags": [ "RELOAD_ONE", "EASY_CLEAN", "NO_TURRET" ],
     "valid_mod_locations": [
       [ "barrel", 1 ],
       [ "brass catcher", 1 ],
@@ -136,7 +136,7 @@
       [ "stock accessory", 2 ],
       [ "stock", 1 ]
     ],
-    "flags": [ "EASY_CLEAN" ],
+    "flags": [ "EASY_CLEAN", "NO_TURRET" ],
     "pocket_data": [
       {
         "magazine_well": "300 ml",