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

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -55,15 +55,14 @@ body:
     attributes:
       label: Versions and configuration
       description: |
-        Please complete the following information; you can now go to:
-        - "Main menu (ESC) > Debug Menu > Info > Generate game report" to generate this report.
-        - Please update your OS version with a more precise version.
-      value: |
+        The following information should consist only of the automated game report generated by the game; please put further information below.
+        To generate a report: "Main menu (ESC) > Debug Menu > Info > Generate game report".
+      placeholder: |
         - OS: [e.g. iOS 8 or Windows 10 or Ubuntu 18.04]
-        - Game Version: [from the main menu, e.g. 0.C-29938-g90f5268437]
+        - Game Version: [e.g. 0.C-29938-g90f5268437]
         - Graphics version: [Tiles or Terminal]
         - Ingame language: [Arabic or Bulgarian or Chinese (Simplified) or Chinese (Traditional) or Dutch or Esperanto or French or German or Italian (Italy) or Japanese or Korean or Polish or Portuguese (Brazil) or Russian or Serbian or Spanish (Argentina) or Spanish (Spain) or Turkish]
-        - Mods loaded: [e.g.dda, boats, hacktheplanet, StatsThroughSkills]
+        - Mods loaded: [e.g. dda, boats, hacktheplanet, StatsThroughSkills]
     validations:
       required: true
 
@@ -86,4 +85,4 @@ body:
         before the crash happens.
     validations:
       required: false
-
+

.github/workflows/toc.yml

@@ -18,8 +18,11 @@ jobs:
         with:
           commit-message: Update the table of contents
           branch: update-toc
+          token: ${{ secrets.TX_PR_CREATOR }}
           title: Update the table of contents in doc/JSON_INFO.md
           body: |
             ```sh
+            #### Summary
+            None
             npx doctoc doc/JSON_INFO.md --github
             ```

LICENSE.txt

@@ -10,6 +10,8 @@ PLF List and PLF Colony (src/list.h, src/colony.h) are licensed under the zLib l
 
 getpost (tools/json_tools/format/getpost.h) is licensed under the MIT license, see file for text of license.
 
+gulrak filesystem (src/third-party/ghc/*) is licensed under the MIT license, see file for text of license.
+
 libintl-lite is licensed under Boost Software License 1.0. Visit https://www.boost.org/users/license.html to read the license.
 
 libbacktrace is licensed under a BSD license (https://github.com/ianlancetaylor/libbacktrace/blob/master/LICENSE). The full license text is as follows:

Makefile

@@ -453,6 +453,7 @@ ifeq ($(PCH), 1)
   endif
 endif
 
+CPPFLAGS += -isystem ${SRC_DIR}/third-party
 CXXFLAGS += $(WARNINGS) $(DEBUG) $(DEBUGSYMS) $(PROFILE) $(OTHERS) -MMD -MP
 TOOL_CXXFLAGS = -DCATA_IN_TOOL
 

android/app/jni/src/Android.mk

@@ -2,6 +2,8 @@ LOCAL_PATH := $(call my-dir)/../../../../src
 
 include $(CLEAR_VARS)
 
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/third-party
+
 LOCAL_MODULE := main
 
 LOCAL_CPP_FEATURES := exceptions rtti

build-scripts/build.sh

@@ -41,7 +41,7 @@ function run_test
 {
     set -eo pipefail
     test_exit_code=0 sed_exit_code=0 exit_code=0
-    $WINE $1 --min-duration 0.2 --use-colour yes --rng-seed time $EXTRA_TEST_OPTS "$2" 2>&1 | sed -E 's/^(::(warning|error|debug)[^:]*::)?/\1'"$3"'/' || test_exit_code="${PIPESTATUS[0]}" sed_exit_code="${PIPESTATUS[1]}"
+    $WINE $1 --min-duration 0.2 --use-colour yes --rng-seed time $EXTRA_TEST_OPTS $4 $5 "$2" 2>&1 | sed -E 's/^(::(warning|error|debug)[^:]*::)?/\1'"$3"'/' || test_exit_code="${PIPESTATUS[0]}" sed_exit_code="${PIPESTATUS[1]}"
     if [ "$test_exit_code" -ne "0" ]
     then
         echo "$3test exited with code $test_exit_code"
@@ -179,8 +179,8 @@ then
         make -j$num_jobs
         cd ..
         # Run regular tests
-        [ -f "${bin_path}cata_test" ] && parallel --verbose --linebuffer "run_test $(printf %q "${bin_path}")'/cata_test' {} '('{}')=> '" ::: "crafting_skill_gain" "[slow] ~crafting_skill_gain" "~[slow] ~[.]"
-        [ -f "${bin_path}cata_test-tiles" ] && parallel --verbose --linebuffer "run_test $(printf %q "${bin_path}")'/cata_test-tiles' {} '('{}')=> '" ::: "crafting_skill_gain" "[slow] ~crafting_skill_gain" "~[slow] ~[.]"
+        [ -f "${bin_path}cata_test" ] && parallel --verbose --linebuffer "run_test $(printf %q "${bin_path}")'/cata_test' {} '('{}')=> ' --user-dir=test_user_dir_{#}" ::: "crafting_skill_gain" "[slow] ~crafting_skill_gain" "~[slow] ~[.]"
+        [ -f "${bin_path}cata_test-tiles" ] && parallel --verbose --linebuffer "run_test $(printf %q "${bin_path}")'/cata_test-tiles' {} '('{}')=> ' --user-dir=test_user_dir_{#}" ::: "crafting_skill_gain" "[slow] ~crafting_skill_gain" "~[slow] ~[.]"
     fi
 elif [ "$NATIVE" == "android" ]
 then
@@ -201,10 +201,10 @@ else
 
     export ASAN_OPTIONS=detect_odr_violation=1
     export UBSAN_OPTIONS=print_stacktrace=1
-    parallel -j "$num_test_jobs" --verbose --linebuffer "run_test './tests/cata_test' {} '('{}')=> '" ::: "crafting_skill_gain" "[slow] ~crafting_skill_gain" "~[slow] ~[.]"
+    parallel -j "$num_test_jobs" --verbose --linebuffer "run_test './tests/cata_test' {} '('{}')=> ' --user-dir=test_user_dir_{#}" ::: "crafting_skill_gain" "[slow] ~crafting_skill_gain" "~[slow] ~[.]"
     if [ -n "$MODS" ]
     then
-        parallel -j "$num_test_jobs" --verbose --linebuffer "run_test './tests/cata_test --user-dir=modded '$(printf %q "${MODS}") {} 'Mods-('{}')=> '" ::: "crafting_skill_gain" "[slow] ~crafting_skill_gain" "~[slow] ~[.]"
+        parallel -j "$num_test_jobs" --verbose --linebuffer "run_test './tests/cata_test '$(printf %q "${MODS}") {} 'Mods-('{}')=> ' --user-dir=modded_{#}" ::: "crafting_skill_gain" "[slow] ~crafting_skill_gain" "~[slow] ~[.]"
     fi
 
     if [ -n "$TEST_STAGE" ]
@@ -216,7 +216,7 @@ else
         ./build-scripts/get_all_mods.py | \
             while read mods
             do
-                run_test './tests/cata_test --user-dir=all_modded --mods='"${mods}" '~*' ''
+                run_test './tests/cata_test '~*' ' --user-dir=all_modded --mods='"${mods}"'
             done
     fi
 fi

data/json/construction_group.json

@@ -1168,5 +1168,95 @@
     "type": "construction_group",
     "id": "remove_gravel",
     "name": "Remove Gravel"
+  },
+  {
+    "type": "construction_group",
+    "id": "remove_empty_window",
+    "name": "Remove an empty window frame"
+  },
+  {
+    "type": "construction_group",
+    "id": "remove_linoleum_tiles",
+    "name": "Remove linoleum tiles"
+  },
+  {
+    "type": "construction_group",
+    "id": "advanced_object_deconstruction",
+    "name": "Advanced Object Deconstruction"
+  },
+  {
+    "type": "construction_group",
+    "id": "remove_reinforced_concrete_floor",
+    "name": "Remove a reinforced concrete floor"
+  },
+  {
+    "type": "construction_group",
+    "id": "remove_concrete_floor",
+    "name": "Remove a concrete floor"
+  },
+  {
+    "type": "construction_group",
+    "id": "remove_floor",
+    "name": "Remove a wooden floor"
+  },
+  {
+    "type": "construction_group",
+    "id": "remove_concrete_wall",
+    "name": "Remove a concrete wall"
+  },
+  {
+    "type": "construction_group",
+    "id": "remove_brick_wall",
+    "name": "Remove a brick wall"
+  },
+  {
+    "type": "construction_group",
+    "id": "remove_wooden_wall",
+    "name": "Remove a wooden wall"
+  },
+  {
+    "type": "construction_group",
+    "id": "remove_wall",
+    "name": "Remove a wall"
+  },
+  {
+    "type": "construction_group",
+    "id": "remove_rock_wall",
+    "name": "Remove a rock wall"
+  },
+  {
+    "type": "construction_group",
+    "id": "remove_roadway",
+    "name": "Remove a segment of the road/sidewalk"
+  },
+  {
+    "type": "construction_group",
+    "id": "remove_metal_door",
+    "name": "Remove metal door"
+  },
+  {
+    "type": "construction_group",
+    "id": "remove_concrete_column",
+    "name": "Remove concrete column"
+  },
+  {
+    "type": "construction_group",
+    "id": "remove_reinforced_concrete_wall",
+    "name": "Remove reinforced concrete wall"
+  },
+  {
+    "type": "construction_group",
+    "id": "remove_rebar_cage",
+    "name": "Remove rebar cage"
+  },
+  {
+    "type": "construction_group",
+    "id": "remove_glass_wall",
+    "name": "Remove glass wall"
+  },
+  {
+    "type": "construction_group",
+    "id": "remove_glass_door",
+    "name": "Remove glass door"
   }
 ]