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

…into CleverRaven-master

.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/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,6 +1194,9 @@ $(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

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,

data/json/construction.json

@@ -141,6 +141,25 @@
     "pre_special": "check_empty",
     "post_terrain": "t_door_curtain_c"
   },
+  {
+    "type": "construction",
+    "id": "constr_door_grass_curtain",
+    "group": "build_door_grass_curtain",
+    "//": "Door frame not required",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "tailor", 1 ] ],
+    "time": "30 m",
+    "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
+    "components": [
+      [ [ "nail", 4 ], [ "pointy_stick", 2 ], [ "spike", 2 ] ],
+      [ [ "grass_sheet", 2 ] ],
+      [ [ "stick", 1 ] ],
+      [ [ "string_36", 1 ], [ "cordage_36", 1 ], [ "string_6", 6 ], [ "cordage_6", 6 ] ]
+    ],
+    "pre_note": "Can be deconstructed without tools.",
+    "pre_special": "check_empty",
+    "post_terrain": "t_door_grass_curtain_c"
+  },
   {
     "type": "construction",
     "id": "constr_beaded_door",
@@ -3107,6 +3126,17 @@
     "pre_special": "check_empty",
     "post_special": "done_appliance"
   },
+  {
+    "type": "construction",
+    "id": "app_arcade_machine",
+    "group": "place_arcade_machine",
+    "category": "APPLIANCE",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "time": "5 m",
+    "components": [ [ [ "arcade_machine", 1 ] ] ],
+    "pre_special": "check_empty",
+    "post_special": "done_appliance"
+  },
   {
     "type": "construction",
     "id": "app_forge",

data/json/construction_group.json

@@ -229,6 +229,11 @@
     "id": "build_door_curtain",
     "name": "Build Door Curtain"
   },
+  {
+    "type": "construction_group",
+    "id": "build_door_grass_curtain",
+    "name": "Build Door Curtain from Grass"
+  },
   {
     "type": "construction_group",
     "id": "build_double_glazed_glass_window",
@@ -1114,6 +1119,11 @@
     "id": "place_oven",
     "name": "Place Oven"
   },
+  {
+    "type": "construction_group",
+    "id": "place_arcade_machine",
+    "name": "Place Arcade Machine"
+  },
   {
     "type": "construction_group",
     "id": "place_electric_forge",

data/json/effects.json

@@ -779,7 +779,7 @@
       "hurt_min": [ 1 ],
       "hurt_max": [ 2 ],
       "hurt_chance": [ 500 ],
-      "hurt_tick": [ 100 ],
+      "hurt_tick": [ 150 ],
       "pain_min": [ 1 ],
       "pain_max": [ 2 ],
       "pain_chance": [ 90 ],
@@ -792,7 +792,7 @@
       "dex_mod": [ 1 ],
       "int_mod": [ 1 ],
       "hurt_chance": [ -240, -50 ],
-      "hurt_tick": [ -60 ],
+      "hurt_tick": [ -25 ],
       "pain_chance": [ -30 ]
     },
     "rating": "bad",

data/json/flags.json

@@ -863,6 +863,11 @@
     "//": "Allows wielding with unarmed fighting styles and trains unarmed when used.",
     "info": "This weapon <good>can be used with</good> <info>unarmed fighting styles</info>."
   },
+  {
+    "id": "NANOFAB_REPAIR",
+    "type": "json_flag",
+    "info": "This item has a holographic patch that reflects the light oddly.  It was constructed in a nanofabricator and can be <info>repaired in one</info>."
+  },
   {
     "id": "NANOFAB_TEMPLATE",
     "type": "json_flag",
@@ -1131,8 +1136,21 @@
   },
   {
     "id": "COLLAPSIBLE_STOCK",
+    "//": "this is deprecated for the COLLAPSED_STOCK and FOLDED_STOCK, kept around for mod support",
     "type": "json_flag"
   },
+  {
+    "id": "FOLDED_STOCK",
+    "//": "for weapons that stock folds to one side, no change in volume.",
+    "type": "json_flag",
+    "info": "This items stock is folded it will be hard to shoot with."
+  },
+  {
+    "id": "COLLAPSED_STOCK",
+    "//": "for weapons that stock collapses into the body reducing volume as well.",
+    "type": "json_flag",
+    "info": "This items stock is collapsed it will be hard to shoot with."
+  },
   {
     "id": "CONDUCTIVE",
     "type": "json_flag"
@@ -1364,6 +1382,7 @@
   },
   {
     "id": "NEEDS_UNFOLD",
+    "//": "should not be used for folding mods, use a transforming mod instead",
     "type": "json_flag"
   },
   {

data/json/furniture_and_terrain/appliances.json

@@ -80,6 +80,36 @@
     "size": 200,
     "type": "vehicle_part"
   },
+  {
+    "id": "ap_arcade_machine",
+    "name": { "str": "arcade machine" },
+    "categories": [ "utility" ],
+    "description": "A bulky upright arcade cabinet, brightly painted and slightly worn with age.  Ready to be played.",
+    "symbol": "6",
+    "color": "red",
+    "location": "structure",
+    "broken_color": "red",
+    "broken_symbol": "x",
+    "damage_modifier": 10,
+    "damage_reduction": { "all": 10 },
+    "durability": 80,
+    "flags": [ "OBSTACLE", "COVERED", "APPLIANCE", "ENABLED_DRAINS_EPOWER", "ARCADE", "CTRL_ELECTRONIC" ],
+    "epower": -150,
+    "item": "arcade_machine",
+    "looks_like": "f_arcade_machine",
+    "breaks_into": [
+      { "item": "splinter", "count": [ 0, 6 ] },
+      { "item": "television", "prob": 50 },
+      { "item": "2x4", "count": [ 2, 6 ] },
+      { "item": "nail", "charges": [ 4, 10 ] },
+      { "item": "cable", "charges": [ 4, 10 ] },
+      { "item": "circuit", "count": [ 0, 4 ] },
+      { "item": "power_supply", "prob": 50 },
+      { "item": "RAM", "count": [ 0, 2 ] }
+    ],
+    "size": 200,
+    "type": "vehicle_part"
+  },
   {
     "type": "vehicle_part",
     "id": "ap_forge",

data/json/furniture_and_terrain/furniture-recreation.json

@@ -144,7 +144,7 @@
     "type": "furniture",
     "id": "f_arcade_machine",
     "name": "arcade machine",
-    "description": "A bulky upright arcade cabinet, brightly painted and slightly worn with age.  Useless for its intended purpose, it's bound to have valuable parts.",
+    "description": "A bulky upright arcade cabinet, brightly painted and slightly worn with age.  Useless for its intended purpose without power, it's bound to have valuable parts.",
     "symbol": "6",
     "color": "red",
     "move_cost_mod": -1,