Merge branch 'CleverRaven:master' into master

.github/CODEOWNERS

@@ -7,7 +7,6 @@
 /data/mods/DinoMod/ @ephemeralstoryteller @damien @LyleSY
 /data/mods/Graphical_Overmap/ @Kilvoctu @Larwck
 /data/mods/MMA/ @Hymore246
-/data/mods/No_Fungi/ @I-am-Erk
 /data/mods/blazemod/ @SouP
 /data/mods/classic_zombies/ @I-am-Erk
 /data/mods/crt_expansion/ @Soupster89
@@ -21,14 +20,10 @@
 /data/mods/Dark-Skies-Above/ @ephemeralstoryteller
 /data/mods/No_Hope/ @Night-Pryanik
 /data/mods/innawood/ @Light-Wave
+/data/mods/MA/ @ZhilkinSerg
 
 magic*.cpp @KorGgenT
 magic*.h @KorGgenT
-/data/json/itemgroups/SUS/ @I-am-Erk
-/data/json/npcs/refugee_center/ @I-am-Erk
-/data/json/npcs/Backgrounds/ @I-am-Erk
-/data/json/snippets/ @I-am-Erk
-/gfx/ @I-am-Erk
 /tools/ @int-ua
 /lang/ @BrettDong
 widget.cpp @wapcaplet @dseguin

.github/labeler.yml

@@ -5,6 +5,16 @@
 "[JSON]":
   - "**/*.json"
 
+"[Markdown]":
+  - "**/*.md"
+
+"Game: Achievements / Conducts / Scores":
+  - "**/scores**"
+  - "**/statistics**"
+  - "**/achievements**"
+  - "**/conducts**"
+  - "**/event_statistics.*"
+
 "[Python]":
   - "**/*.py"
 
@@ -21,6 +31,10 @@
 "Code: Tests":
   - tests/**/*
 
+"Character / World Generation":
+  - src/newcharacter.cpp
+  - "**/worldfactory.*"
+
 "Code: Build":
   - build-data/**/*
   - build-scripts/**/*
@@ -35,21 +49,43 @@
   - data/json/construction_group.json
   - data/json/deconstruction.json
 
+"Fields / Furniture / Terrain / Traps":
+  - "**/furniture**"
+
+"Items: Food / Vitamins":
+  - "**/food**"
+  - "**/comestibles**"
+
 "NPC / Factions":
-  - "**/npcs/**/*"
+  - "**/npc**"
+
+"Melee":
+  - "**/**melee**"
 
 "Info / User Interface":
   - "**/ui/**/*"
+  - "src/**ui**"
   - "**/widget/**/*"
   - "src/list_view.*"
   - "src/surroundings_menu.*"
 
+"Items: Armor / Clothing":
+  - "**/armor/**/*"
+
+"Items: Containers":
+  - "**/**containers**"
+
 "Appliance/Power Grid":
   - "**/appliance**"
 
 "Monsters":
   - "**/monsters/**/*"
 
+"Mutations / Traits / Professions/ Hobbies":
+  - "**/professions.json"
+  - "**mutations**"
+  - "**hobbies**"
+
 "Lore":
   - data/json/npcs/BG_trait_groups.json
   - data/json/npcs/Personality_trait_groups.json
@@ -72,6 +108,7 @@
   - "**/mapgen/**/*"
   - "**/mapgen_palettes/**/*"
   - "**/overmap/**/*"
+  - "**/overmap**"
 
 "Player Faction Base / Camp":
   - "src/basecamp.*"
@@ -86,6 +123,9 @@
   - gfx/**/*
   - sound/**/*
 
+"Scenarios":
+  - "**/scenario**"
+
 "Translation":
   - lang/**/*
   - "src/translation.*"
@@ -106,6 +146,9 @@
 "Mods: Generic Guns":
   - data/mods/Generic_Guns/**/*
 
+"Mods: MA":
+  - data/mods/MA/**/*
+
 "Mods: MMA":
   - data/mods/MMA/**/*
 
@@ -118,5 +161,18 @@
 "Mods: No Hope":
   - data/mods/No_Hope/**/*
 
+"Mods: TropiCataclysm 🌴":
+  - data/mods/TropiCataclysm/**/*
+
 "Mods":
   - data/mods/**/*
+
+"Mechanics: Enchantments / Spells":
+  - "**/enchantments**"
+  - "**/spells**"
+
+"Mechanics: Weather":
+  - "**/weather**"
+
+"Vehicles":
+  - "**/vehicle**"

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

@@ -62,18 +62,18 @@ jobs:
       uses: microsoft/[email protected]
 
     - name: Restore artifacts, or run vcpkg, build and cache artifacts
-      uses: lukka/run-vcpkg@v10
+      uses: lukka/run-vcpkg@v10.2
       id: runvcpkg
       with:
         # run-vcpkg tries to hash vcpkg.json but complans if it finds more than one.
         # That said, we also have our custom vcpkg_triplets to hash, so we keep everything the same.
-        appendedCacheKey: ${{ hashFiles( 'msvc-full-features/vcpkg.json', '.github/vcpkg_triplets/**' ) }}-x64-1
+        appendedCacheKey: ${{ hashFiles( 'msvc-full-features/vcpkg.json', '.github/vcpkg_triplets/**' ) }}-x64
         vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
         # We have to use at least this version of vcpkg to include fixes for yasm-tool's
         # availability only as an x86 host tool. Keep it in sync with the builtin-baseline
         # field in vcpkg.json. Caching happens as a post-action which runs at the end of
         # the whole workflow, after vcpkg install happens during msbuild run.
-        vcpkgGitCommitId: '49b67d9cb856424ff69f10e7721aec5299624268'
+        vcpkgGitCommitId: 'bd1ef2df46303989eeb048eb7aa9b816aa46365e'
 
     - name: Integrate vcpkg
       run: |

.github/workflows/object_creator.yml

@@ -61,18 +61,18 @@ jobs:
       uses: microsoft/[email protected]
 
     - name: Restore artifacts, or run vcpkg, build and cache artifacts
-      uses: lukka/run-vcpkg@v10
+      uses: lukka/run-vcpkg@v10.2
       id: runvcpkg
       with:
         # run-vcpkg tries to hash vcpkg.json but complans if it finds more than one.
         # That said, we also have our custom vcpkg_triplets to hash, so we keep everything the same.
-        appendedCacheKey: ${{ hashFiles( 'msvc-full-features/vcpkg.json', 'msvc-object_creator/vcpkg.json',  '.github/vcpkg_triplets/**' ) }}-x64-1
+        appendedCacheKey: ${{ hashFiles( 'msvc-full-features/vcpkg.json', 'msvc-object_creator/vcpkg.json',  '.github/vcpkg_triplets/**' ) }}-x64
         vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
         # We have to use at least this version of vcpkg to include fixes for yasm-tool's
         # availability only as an x86 host tool. Keep it in sync with the builtin-baseline
         # field in vcpkg.json. Caching happens as a post-action which runs at the end of
         # the whole workflow, after vcpkg install happens during msbuild run.
-        vcpkgGitCommitId: '49b67d9cb856424ff69f10e7721aec5299624268'
+        vcpkgGitCommitId: 'bd1ef2df46303989eeb048eb7aa9b816aa46365e'
 
     - name: Integrate vcpkg
       run: |

.github/workflows/release.yml

@@ -162,16 +162,16 @@ jobs:
         uses: microsoft/[email protected]
       - name: Install dependencies (windows msvc) (2/3)
         if: runner.os == 'Windows'
-        uses: lukka/run-vcpkg@v10
+        uses: lukka/run-vcpkg@v10.2
         id: runvcpkg
         with:
-          appendedCacheKey: ${{ hashFiles( 'msvc-full-features/vcpkg.json', '.github/vcpkg_triplets/**' ) }}-${{ matrix.arch }}-1
+          appendedCacheKey: ${{ hashFiles( 'msvc-full-features/vcpkg.json', '.github/vcpkg_triplets/**' ) }}-${{ matrix.arch }}
           vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
           # We have to use at least this version of vcpkg to include fixes for yasm-tool's
           # availability only as an x86 host tool. Keep it in sync with the builtin-baseline
           # field in vcpkg.json. Caching happens as a post-action which runs at the end of
           # the whole workflow, after vcpkg install happens during msbuild run.
-          vcpkgGitCommitId: '49b67d9cb856424ff69f10e7721aec5299624268'
+          vcpkgGitCommitId: 'bd1ef2df46303989eeb048eb7aa9b816aa46365e'
       - name: Install dependencies (windows msvc) (3/3)
         if: runner.os == 'Windows'
         run: |

CMakeLists.txt

@@ -42,7 +42,7 @@ add_definitions(-DCMAKE)
 
 include(GetGitRevisionDescription)
 git_describe(GIT_VERSION --tags --always --match "[0-9A-Z]*.[0-9A-Z]*")
-if (NOT ${GIT_VERSION} MATCHES GIT-NOTFOUND)
+if (NOT "${GIT_VERSION}" MATCHES "GIT-NOTFOUND")
     string(REPLACE "-NOTFOUND" "" GIT_VERSION ${GIT_VERSION})
     file(WRITE ${CMAKE_SOURCE_DIR}/src/version.h
             "// NOLINT(cata-header-guard)\n\#define VERSION \"${GIT_VERSION}\"\n")
@@ -51,18 +51,18 @@ if (NOT ${GIT_VERSION} MATCHES GIT-NOTFOUND)
 endif ()
 
 #OS Check Placeholders. Will be used for BINDIST
-if (${CMAKE_SYSTEM_NAME} MATCHES Linux)
+if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
     set(_OS_LINUX_ 1)
 endif ()
 
-if (${CMAKE_SYSTEM_NAME} MATCHES FreeBSD)
+if ("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
     set(_OS_FREEBSD_ 1)
 endif ()
 
-if (${CMAKE_SYSTEM_NAME} MATCHES Darwin)
+if ("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
     set(_OS_DARWIN_ 1)
     add_definitions(-DMACOSX)
-    if (${TILES})
+    if (TILES)
         add_definitions(-DOSX_SDL2_LIBS)
     endif ()
 endif ()
@@ -91,15 +91,14 @@ if (NOT DYNAMIC_LINKING)
     set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS)    # remove -rdynamic
     set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS)
 else ()
-    if (MINGW AND NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    if (MINGW AND NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
         # Avoid depending on MinGW runtime DLLs
         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
     endif ()
 endif ()
 
 # System specific actions
-if (${CMAKE_SYSTEM_NAME} MATCHES Linux OR ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD
-    OR ${CMAKE_SYSTEM_NAME} MATCHES Darwin)
+if ("${CMAKE_SYSTEM_NAME}" MATCHES "(Linux|FreeBSD|Darwin)")
     if (NOT DATA_PREFIX)
         set(DATA_PREFIX ${CMAKE_INSTALL_PREFIX}/share/cataclysm-dda)
     endif ()
@@ -123,7 +122,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES Linux OR ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD
     endif ()
 endif ()
 
-if (${CMAKE_SYSTEM_NAME} MATCHES Windows)
+if ("${CMAKE_SYSTEM_NAME}" MATCHES "(Windows|MSYS)")
     if (NOT DATA_PREFIX)
         set(DATA_PREFIX ${CMAKE_INSTALL_PREFIX})
     endif ()
@@ -159,7 +158,7 @@ if (TILES)
 endif ()
 
 # Set build types and display info
-if (CMAKE_BUILD_TYPE STREQUAL Debug)
+if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
     set(RELEASE 0)
     message(STATUS "Build ${PROJECT} in development mode --")
     message(STATUS "Binaries will be located in: " ${CMAKE_SOURCE_DIR})
@@ -202,7 +201,7 @@ 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)
+    if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
         add_definitions(-D_AMD64_)
     else ()
         add_definitions(-D_X86_)
@@ -222,7 +221,7 @@ else ()
              -Wunused-macros \
              -Wzero-as-null-pointer-constant \
              -Wno-unknown-warning-option")
-    if (NOT ${CMAKE_SYSTEM_NAME} MATCHES Windows)
+    if (NOT "${CMAKE_SYSTEM_NAME}" MATCHES "Windows")
         set(CATA_WARNINGS "${CATA_WARNINGS} -Wredundant-decls")
     endif ()
     set(CATA_OTHER_FLAGS "${CATA_OTHER_FLAGS} -fsigned-char")
@@ -235,7 +234,7 @@ endif ()
 set(CMAKE_CXX_STANDARD 14)
 
 # Force out-of-source build
-if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+if ("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
     message(FATAL_ERROR
             "This project requires an out of source build. \
              Remove the file 'CMakeCache.txt' found in this directory before continuing; \
@@ -307,6 +306,9 @@ if (CURSES)
                  or try compiling with -DTILES=1 for a graphical compilation. \
                  See doc/COMPILING/COMPILING-CMAKE.md for details and more info")
     endif ()
+    if (NOT DYNAMIC_LINKING)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNCURSES_STATIC")
+    endif ()
 endif ()
 
 if (SOUND)

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', '200M')
+size = defines.get('size', '220M')
 
 # Files to include
 files = [application]