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

.github/labeler.yml

@@ -0,0 +1,51 @@
+"C++":
+  - "**/*.cpp"
+  - "**/*.h"
+
+"Json":
+  - "**/*.json"
+
+"Python":
+  - "**/*.py"
+
+"Documentation":
+  - "**/*.md"
+  - doc/**/*
+
+"Code: Tooling":
+  - tools/**/*
+
+"Code: Test":
+  - tests/**/*
+
+"SDL: Tiles / Sound":
+  - gfx/**/*
+  - sound/**/*
+
+"Translation":
+  - lang/**/*
+
+"Mods: Aftershock":
+  - data/mods/Aftershock/**/*
+  - data/mods/aftershock_exoplanet/**/*
+
+"Mods: Dark Days of the Dead":
+  - data/mods/classic_zombies/**/*
+
+"Mods: Dark Skies":
+  - data/mods/Dark-Skies-Above/**/*
+
+"Mods: Dinoclysm":
+  - data/mods/DinoMod/**/*
+
+"Mods: Generic Guns":
+  - data/mods/Generic_Guns/**/*
+
+"Mods: MMA":
+  - data/mods/MMA/**/*
+
+"Mods: Magiclysm":
+  - data/mods/Magiclysm/**/*
+
+"Mods: No Hope":
+  - data/mods/No_Hope/**/*

.github/workflows/assign_mission_target_needs_om_special.yml

@@ -0,0 +1,12 @@
+name: Detect missions that are missing .start.assign_mission_target.om_special
+
+on: pull_request
+
+jobs:
+  run-the-tool:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 1
+    - run: ./tools/json_tools/assign_mission_target_needs_om_special.bash 2>&1

.github/workflows/astyle.yml

@@ -41,5 +41,5 @@ jobs:
     - name: Display Corrections
       if: failure()
       run: |
-        make astyle
+        make astyle-fast
         git diff

.github/workflows/labeler.yml

@@ -0,0 +1,12 @@
+name: "Pull Request Labeler"
+on:
+  - pull_request_target
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/labeler@v3
+        with:
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          sync-labels: true

Makefile

@@ -74,6 +74,8 @@
 #  make NOOPT=1
 # Astyle all source files.
 #  make astyle
+# Astyle all source files as fast as possible.
+#  make astyle-fast
 # Check if source files are styled properly.
 #  make astyle-check
 # Style the whitelisted json files (maintain the current level of styling).
@@ -731,14 +733,7 @@ ifeq ($(TILES), 1)
     ODIR = $(ODIRTILES)
   endif
 else
-  ifeq ($(LOCALIZE),1)
-    NCURSES_PREFIX = ncursesw
-  else
-    NCURSES_PREFIX = ncurses
-  endif
-  ifdef OSXCROSS
-    NCURSES_PREFIX = ncurses
-  endif
+  NCURSES_PREFIX = ncursesw
   # ONLY when not cross-compiling, check for pkg-config or ncurses5-config
   # When doing a cross-compile, we can't rely on the host machine's -configs
   ifeq ($(CROSS),)
@@ -1199,20 +1194,23 @@ $(ODIR)/.astyle-check-stamp: $(ASTYLE_SOURCES)
 
 endif
 
+astyle-fast: $(ASTYLE_SOURCES)
+	$(ASTYLE_BINARY) --options=.astylerc -n $(ASTYLE_SOURCES)
+
 astyle-all: $(ASTYLE_SOURCES)
 	$(ASTYLE_BINARY) --options=.astylerc -n $(ASTYLE_SOURCES)
 	mkdir -p $(ODIR) && touch $(ODIR)/.astyle-check-stamp
 
 # Test whether the system has a version of astyle that supports --dry-run
 ifeq ($(shell if $(ASTYLE_BINARY) -Q -X --dry-run src/game.h > /dev/null; then echo foo; fi),foo)
-  ASTYLE_CHECK=$(shell $(ASTYLE_BINARY) --options=.astylerc --dry-run -X -Q --ascii $(ASTYLE_SOURCES))
+  ASTYLE_CHECK=$(shell $(ASTYLE_BINARY) --options=.astylerc --dry-run -X -Q --ascii $(ASTYLE_SOURCES) | sed -E "s/Formatted[[:space:]]+(.*)/Needs formatting: \1\\\n/" | tr -d '\n')
 endif
 
 astyle-check:
 ifdef ASTYLE_CHECK
 	$(info $(ASTYLE_BINARY) -V: $(shell $(ASTYLE_BINARY) -V))
-	@if [ "$(findstring Formatted,$(ASTYLE_CHECK))" = "" ]; then echo "no astyle regressions";\
-        else printf "astyle regressions found.\n$(ASTYLE_CHECK)\n" && false; fi
+	@if [ "$(findstring Needs formatting:,$(ASTYLE_CHECK))" = "" ]; then echo "no astyle regressions";\
+        else printf "astyle regressions found.\n$(ASTYLE_CHECK)" && false; fi
 else
 	@echo Cannot run an astyle check, your system either does not have astyle, or it is too old.
 endif

build-scripts/get_all_mods.py

@@ -41,7 +41,7 @@ def print_modlist(modlist, master_list):
 total_conversions = set()
 
 for info in glob.glob('data/mods/*/modinfo.json'):
-    mod_info = json.load(open(info))
+    mod_info = json.load(open(info, encoding='utf-8'))
     for e in mod_info:
         if(e["type"] == "MOD_INFO" and
                 ("obsolete" not in e or not e["obsolete"])):

data/json/artifact/relic_procgen_data.json

@@ -158,6 +158,14 @@
         "increment": 0.1,
         "power_per_increment": -500
       },
+      {
+        "weight": 50,
+        "min_value": -0.4,
+        "max_value": 0.2,
+        "type": "MOVE_COST",
+        "increment": 0.1,
+        "power_per_increment": -500
+      },
       {
         "weight": 100,
         "min_value": -0.5,
@@ -209,14 +217,6 @@
         "increment": 5,
         "power_per_increment": 250
       },
-      {
-        "weight": 50,
-        "min_value": -50,
-        "max_value": 20,
-        "type": "MOVE_COST",
-        "increment": 5,
-        "power_per_increment": -250
-      },
       {
         "weight": 50,
         "min_value": -2500,
@@ -418,6 +418,14 @@
         "increment": 0.1,
         "power_per_increment": -500
       },
+      {
+        "weight": 50,
+        "min_value": -0.4,
+        "max_value": 0.2,
+        "type": "MOVE_COST",
+        "increment": 0.1,
+        "power_per_increment": -500
+      },
       {
         "weight": 100,
         "min_value": -0.5,
@@ -469,14 +477,6 @@
         "increment": 5,
         "power_per_increment": 250
       },
-      {
-        "weight": 50,
-        "min_value": -50,
-        "max_value": 20,
-        "type": "MOVE_COST",
-        "increment": 5,
-        "power_per_increment": -250
-      },
       {
         "weight": 50,
         "min_value": -2500,
@@ -678,6 +678,14 @@
         "increment": 0.1,
         "power_per_increment": -500
       },
+      {
+        "weight": 50,
+        "min_value": -0.4,
+        "max_value": 0.2,
+        "type": "MOVE_COST",
+        "increment": 0.1,
+        "power_per_increment": -500
+      },
       {
         "weight": 100,
         "min_value": -0.5,
@@ -729,14 +737,6 @@
         "increment": 5,
         "power_per_increment": 250
       },
-      {
-        "weight": 50,
-        "min_value": -50,
-        "max_value": 20,
-        "type": "MOVE_COST",
-        "increment": 5,
-        "power_per_increment": -250
-      },
       {
         "weight": 50,
         "min_value": -2500,