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

.github/workflows/gh-pages-rebuild.yml

@@ -0,0 +1,23 @@
+name: Github pages rebuild
+
+on:
+  workflow_run:
+    workflows: ["Experimental Release"]
+    types: [completed]
+    branches: [master]
+
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+jobs:
+  refresh:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    steps:
+      - name: Trigger GitHub pages rebuild
+        shell: bash
+        run: |
+          curl --fail --request POST \
+            --url https://api.github.com/repos/${{ github.repository }}/pages/builds \
+            --header "Authorization: Bearer ${{ secrets.USER_TOKEN }}" \
+            --header "Accept: application/vnd.github.v3+json"

.github/workflows/matrix.yml

@@ -7,6 +7,7 @@ on:
   pull_request:
     branches:
     - master
+    types: [opened, reopened, synchronize, ready_for_review]
 
 # We only care about the latest revision of a PR, so cancel all previous instances.
 # Allow running master builds to complete to help with ccache refreshes.
@@ -262,6 +263,10 @@ jobs:
           sudo apt-get remove --purge -y ccache
           curl -sL https://github.com/ccache/ccache/releases/download/v4.8.3/ccache-4.8.3-linux-x86_64.tar.xz | sudo tar Jxvf - --strip-components 1 -C /usr/bin ccache-4.8.3-linux-x86_64/ccache
           ccache --version
+    - name: install Clang 12 (Ubuntu)
+      if: ${{ env.SKIP == 'false' && runner.os == 'Linux' && (matrix.compiler == 'clang++-12') }}
+      run: |
+          sudo apt-get install clang-12
     - name: set up a mock GCC toolchain root for Clang (Ubuntu)
       if: ${{ env.SKIP == 'false' && runner.os == 'Linux' && (matrix.compiler == 'clang++-12') }}
       run: |

.github/workflows/release.yml

@@ -334,10 +334,3 @@ jobs:
           fi
       - run: |
           gh release upload cdda-experimental-${{ needs.release.outputs.timestamp }} cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.${{ matrix.ext }}
-      - name: Trigger GitHub pages rebuild
-        shell: bash
-        run: |
-          curl --fail --request POST \
-            --url https://api.github.com/repos/${{ github.repository }}/pages/builds \
-            --header "Authorization: Bearer ${{ secrets.USER_TOKEN }}" \
-            --header "Accept: application/vnd.github.v3+json"

CMakeModules/Find/FindSDL2_image.cmake

@@ -129,8 +129,9 @@ if(NOT DYNAMIC_LINKING AND PKG_CONFIG_FOUND)
     )
 elseif(NOT TARGET SDL2_image::SDL2_image)
       add_library(SDL2_image::SDL2_image UNKNOWN IMPORTED)
-      set_property(TARGET SDL2_image::SDL2_image
-        PROPERTY IMPORTED_LOCATION ${SDL2_IMAGE_LIBRARY}
+      set_target_properties(SDL2_image::SDL2_image PROPERTIES
+          IMPORTED_LOCATION ${SDL2_IMAGE_LIBRARY}
+          INTERFACE_INCLUDE_DIRECTORIES ${SDL2_IMAGE_INCLUDE_DIRS}
       )
     target_link_libraries(SDL2_image::SDL2_image INTERFACE
       z

CMakeModules/Find/FindSDL2_mixer.cmake

@@ -99,25 +99,28 @@ mark_as_advanced(SDL2_MIXER_LIBRARY SDL2_MIXER_INCLUDE_DIR)
 if(NOT DYNAMIC_LINKING)
   if (NOT TARGET SDL2_mixer::SDL2_mixer-static)
     add_library(SDL2_mixer::SDL2_mixer-static STATIC IMPORTED)
-    set_property(TARGET SDL2_mixer::SDL2_mixer-static
-      PROPERTY IMPORTED_LOCATION ${SDL2_MIXER_LIBRARY}
+    set_target_properties(SDL2_mixer::SDL2_mixer-static PROPERTIES
+      IMPORTED_LOCATION ${SDL2_MIXER_LIBRARY}
+      INTERFACE_INCLUDE_DIRECTORIES ${SDL2_MIXER_INCLUDE_DIRS}
     )
   endif()
 elseif(NOT TARGET SDL2_mixer::SDL2_mixer)
     add_library(SDL2_mixer::SDL2_mixer STATIC IMPORTED)
-    set_property(TARGET SDL2_mixer::SDL2_mixer
-      PROPERTY IMPORTED_LOCATION ${SDL2_MIXER_LIBRARY}
+    set_target_properties(SDL2_mixer::SDL2_mixer PROPERTIES
+      IMPORTED_LOCATION ${SDL2_MIXER_LIBRARY}
+      INTERFACE_INCLUDE_DIRECTORIES ${SDL2_MIXER_INCLUDE_DIRS}
     )
 endif()
 
 if(PKG_CONFIG_FOUND)
     message(STATUS "Searching for SDL_mixer deps libraries --")
-    pkg_check_modules(FLAC REQUIRED IMPORTED_TARGET flac)
     if(TARGET SDL2_mixer::SDL2_mixer-static)
+        pkg_check_modules(FLAC REQUIRED IMPORTED_TARGET flac)
         target_link_libraries(SDL2_mixer::SDL2_mixer-static INTERFACE
             PkgConfig::FLAC
         )
     elseif(TARGET SDL2_mixer::SDL2_mixer)
+        pkg_check_modules(FLAC REQUIRED IMPORTED_TARGET flac)
         target_link_libraries(SDL2_mixer::SDL2_mixer INTERFACE
             PkgConfig::FLAC
         )

CMakeModules/Find/FindSDL2_ttf.cmake

@@ -98,8 +98,9 @@ mark_as_advanced(SDL2_TTF_LIBRARY SDL2_TTF_INCLUDE_DIR)
 if (NOT DYNAMIC_LINKING AND PKG_CONFIG_FOUND)
   if (NOT TARGET SDL2_ttf::SDL2_ttf-static)
     add_library(SDL2_ttf::SDL2_ttf-static STATIC IMPORTED)
-    set_property(TARGET SDL2_ttf::SDL2_ttf-static
-      PROPERTY IMPORTED_LOCATION ${SDL2_TTF_LIBRARY}
+    set_target_properties(SDL2_ttf::SDL2_ttf-static PROPERTIES
+      IMPORTED_LOCATION ${SDL2_TTF_LIBRARY}
+      INTERFACE_INCLUDE_DIRECTORIES ${SDL2_TTF_INCLUDE_DIRS}
     )
   endif()
   message(STATUS "Searching for SDL_ttf deps libraries --")
@@ -115,7 +116,8 @@ if (NOT DYNAMIC_LINKING AND PKG_CONFIG_FOUND)
   )
 elseif(NOT TARGET SDL2_ttf::SDL2_ttf)
     add_library(SDL2_ttf::SDL2_ttf UNKNOWN IMPORTED)
-    set_property(TARGET SDL2_ttf::SDL2_ttf
-      PROPERTY IMPORTED_LOCATION ${SDL2_TTF_LIBRARY}
+    set_target_properties(SDL2_ttf::SDL2_ttf PROPERTIES
+      IMPORTED_LOCATION ${SDL2_TTF_LIBRARY}
+      INTERFACE_INCLUDE_DIRECTORIES ${SDL2_TTF_INCLUDE_DIRS}
     )
 endif()

CMakePresets.json

@@ -20,7 +20,7 @@
         "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/build-scripts/MSVC.cmake",
         "VCPKG_TARGET_TRIPLET": "x64-windows-static",
         "DYNAMIC_LINKING": "False", "CMAKE_BUILD_TYPE": "RelWithDebInfo",
-        "CURSES": "False", "LOCALIZE": "True", "TILES": "True", "SOUND": "True", "TESTS": "False",
+        "CURSES": "False", "LOCALIZE": "True", "TILES": "True", "SOUND": "True", "TESTS": "True",
         "CMAKE_INSTALL_MESSAGE": "NEVER"
       }
     },
@@ -32,7 +32,7 @@
       "generator": "Ninja Multi-Config",
       "cacheVariables": {
         "DYNAMIC_LINKING": "True", "CMAKE_BUILD_TYPE": "RelWithDebInfo",
-        "CURSES": "False", "LOCALIZE": "True", "TILES": "True", "SOUND": "True", "TESTS": "False",
+        "CURSES": "False", "LOCALIZE": "True", "TILES": "True", "SOUND": "True", "TESTS": "True",
         "CMAKE_INSTALL_MESSAGE": "NEVER"
       }
     },
@@ -61,5 +61,15 @@
       "name": "linux-tiles-sounds-x64-vcpkg",
       "configurePreset": "linux-tiles-sounds-x64-vcpkg"
     }
+  ],
+  "testPresets": [
+    {
+      "name": "windows-tiles-sounds-x64-msvc",
+      "configurePreset": "windows-tiles-sounds-x64-msvc"
+    },
+    {
+      "name": "linux-tiles-sounds-x64",
+      "configurePreset": "linux-tiles-sounds-x64"
+    }
   ]
 }

data/changelog.txt

@@ -49,6 +49,8 @@ Adds basic vehicle proficiencies for driving and boating, as well as athletic pr
 Add overheat mechanics to energy guns.
 Sound-triggered traps
 Item transformation can now pick variant items to transform into
+You can now collect grappling hooks and ladders from the ledge above.
+Adds priority parameter for special placement
 
 
 ## Content:
@@ -112,6 +114,7 @@ Enable/disable showing several non-player-related messages in the log
 Walking into ledges examines them.
 Accessible item insert menu
 Show insertion failure reasons in Insert menu and AIM
+Select default bodypart when applying bandage
 
 
 ## Mods:
@@ -195,6 +198,7 @@ Climbing down stepladders is now safe; climbing down ledges tells you how risky
 Add NO_SPELLCASTING flag to Stunned effect
 Improve pets' ability to use stairs
 Make ferals actually feel like human enemies instead of weaker zombies with range attacks
+Allow metal wreckage to be used for cutting
 
 
 ## Bugfixes:
@@ -271,6 +275,7 @@ Monsters can go down ramps
 Don't teleport items to the ground if the vehicle storage destination is full
 Fix Free Merchants Broker price calculation of non charge based item
 Skip auto sorting items that don't belong to you
+Use correct actor in bulk trade messages
 
 
 ## Performance:
@@ -304,6 +309,8 @@ New item categories for martial arts manuals and traps
 Update all active items to new tick action system and remove old system
 Add ability to merge appliance into grid
 Add JSON-based system for climbing aids.
+EVENT EOCs provide beta talker
+[EOC]Inventory selector
 
 
 ## Build: