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

Makefile

@@ -967,6 +967,8 @@ $(ODIR)/%.o: $(SRC_DIR)/%.cpp $(PCH_P)
 $(ODIR)/%.o: $(SRC_DIR)/%.rc
 	$(RC) $(RFLAGS) $< -o $@
 
+$(ODIR)/resource.o: data/cataicon.ico data/application_manifest.xml
+
 src/version.h: version
 
 src/version.cpp: src/version.h

build-scripts/build.sh

@@ -12,6 +12,10 @@ num_jobs=3
 export PATH=$HOME/.local/bin:$PATH
 
 $COMPILER --version
+if [ -n "$CROSS_COMPILATION" ]
+then
+    "$CROSS_COMPILATION$COMPILER" --version
+fi
 
 if [ -n "$TEST_STAGE" ]
 then

build-scripts/requirements.sh

@@ -124,7 +124,7 @@ then
     do
         if [ -n "${!v}" ]
         then
-            printf "%s='%s'\n" "$v" "${!v}" >> "$GITHUB_ENV"
+            printf "%s=%s\n" "$v" "${!v}" >> "$GITHUB_ENV"
         fi
     done
 fi

data/application_manifest.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+    <assemblyIdentity type="win32" name="com.cleverraven.cataclysmdda" version="0.0.0.0"/>
+    <asmv3:application>
+        <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">
+            <activeCodePage>UTF-8</activeCodePage>
+        </asmv3:windowsSettings>
+    </asmv3:application>
+    <dependency>
+        <dependentAssembly>
+            <assemblyIdentity
+                type="win32"
+                name="Microsoft.Windows.Common-Controls"
+                version="6.0.0.0"
+                processorArchitecture="*"
+                publicKeyToken="6595b64144ccf1df"
+                language="*"
+                />
+        </dependentAssembly>
+    </dependency>
+</assembly>

data/json/effect_on_condition.json

@@ -133,16 +133,16 @@
   {
     "type": "effect_on_condition",
     "id": "ambient_subway",
-    "recurrence_min": "2 hours",
-    "recurrence_max": "4 hours",
+    "recurrence_min": "1 hours",
+    "recurrence_max": "2 hours",
     "condition": { "or": [ { "u_at_om_location": "subway_ns" }, { "u_at_om_location": "subway_ew" } ] },
-    "effect": [ { "u_message": "AMBIENT_SUBWAY", "snippet": true, "sound": true } ]
+    "effect": [ { "u_message": "<AMBIENT_SUBWAY>", "snippet": true, "sound": true } ]
   },
   {
     "type": "effect_on_condition",
     "id": "ambient_lab_subway",
-    "recurrence_min": "2 hours",
-    "recurrence_max": "4 hours",
+    "recurrence_min": "1 hours",
+    "recurrence_max": "2 hours",
     "condition": { "or": [ { "u_at_om_location": "lab_subway_ns" }, { "u_at_om_location": "lab_subway_ew" } ] },
     "effect": [ { "u_message": "AMBIENT_LAB_SUBWAY", "snippet": true, "sound": true } ]
   },

data/json/furniture_and_terrain/furniture-industrial.json

@@ -461,6 +461,37 @@
     },
     "deconstruct": { "items": [ { "item": "cable", "charges": [ 3, 4 ] } ] }
   },
+  {
+    "type": "furniture",
+    "id": "f_electrical_conduit",
+    "name": "electrical conduit",
+    "looks_like": "t_sewer_pipe",
+    "description": "A thick bundle of electrical wiring protected by a metal conduit.",
+    "symbol": "|",
+    "color": "light_gray",
+    "move_cost_mod": 1,
+    "required_str": -1,
+    "flags": [ "TRANSPARENT", "NOCOLLIDE" ],
+    "bash": {
+      "str_min": 10,
+      "str_max": 100,
+      "sound": "smash!",
+      "sound_fail": "thunk!",
+      "items": [
+        { "item": "scrap", "count": [ 1, 4 ] },
+        { "item": "scrap_copper", "count": [ 10, 20 ] },
+        { "item": "cable", "charges": [ 20, 100 ] },
+        { "item": "pipe", "count": [ 1, 2 ] }
+      ]
+    },
+    "deconstruct": {
+      "items": [
+        { "item": "cable", "charges": [ 200, 800 ] },
+        { "item": "pipe_fittings", "count": [ 1, 2 ] },
+        { "item": "pipe", "count": [ 2, 4 ] }
+      ]
+    }
+  },
   {
     "type": "furniture",
     "id": "f_capacitor",

data/json/furniture_and_terrain/furniture-roof.json

@@ -119,6 +119,33 @@
       "items": [ { "item": "pipe", "count": [ 1, 2 ] }, { "item": "scrap", "count": [ 1, 3 ] } ]
     }
   },
+  {
+    "type": "furniture",
+    "id": "f_wind_vane",
+    "name": "wind vane",
+    "description": "A metal fin that swivels around a central pivot, indicating the direction of prevailing wind.",
+    "symbol": ">",
+    "color": "dark_gray",
+    "move_cost_mod": 2,
+    "coverage": 10,
+    "required_str": -1,
+    "flags": [ "TRANSPARENT" ],
+    "deconstruct": {
+      "items": [
+        { "item": "pipe", "count": 1 },
+        { "item": "pipe_fittings", "count": 1 },
+        { "item": "wire", "count": 4 },
+        { "item": "sheet_metal_small", "count": 2 }
+      ]
+    },
+    "bash": {
+      "str_min": 10,
+      "str_max": 15,
+      "sound": "whack!",
+      "sound_fail": "whump!",
+      "items": [ { "item": "scrap", "count": [ 1, 3 ] }, { "item": "sheet_metal_small", "count": [ 0, 1 ] } ]
+    }
+  },
   {
     "type": "furniture",
     "id": "f_roof_turbine_vent",

data/json/furniture_and_terrain/terrain-floors-indoor.json

@@ -342,6 +342,29 @@
       ]
     }
   },
+  {
+    "type": "terrain",
+    "id": "t_broken_metal_floor",
+    "name": "broken metal floor",
+    "description": "Something has cratered this metal flooring.  It will be difficult to move things across.",
+    "symbol": ".",
+    "color": "light_cyan",
+    "move_cost": 2,
+    "roof": "t_flat_roof",
+    "flags": [ "TRANSPARENT", "INDOORS" ],
+    "bash": {
+      "sound": "thump",
+      "ter_set": "t_null",
+      "str_min": 200,
+      "str_max": 500,
+      "str_min_supported": 200,
+      "items": [
+        { "item": "steel_lump", "count": [ 1, 4 ] },
+        { "item": "steel_chunk", "count": [ 3, 12 ] },
+        { "item": "scrap", "count": [ 9, 36 ] }
+      ]
+    }
+  },
   {
     "type": "terrain",
     "id": "t_floor",

data/json/items/basecamp.json

@@ -7,7 +7,7 @@
     "description": "A fake charcoal smoker used for basecamps.",
     "sub": "char_smoker",
     "ammo": [ "charcoal" ],
-    "max_charges": 2000
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "charcoal": 2000 } } ]
   },
   {
     "id": "fake_fireplace",
@@ -17,7 +17,7 @@
     "description": "A fake fireplace used for basecamps.",
     "sub": "hotplate",
     "ammo": [ "tinder" ],
-    "max_charges": 50000,
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "tinder": 50000 } } ],
     "charge_factor": 25
   },
   {
@@ -28,7 +28,7 @@
     "description": "A fake forge used for basecamps.",
     "sub": "char_forge",
     "ammo": [ "charcoal" ],
-    "max_charges": 2000
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "charcoal": 2000 } } ]
   },
   {
     "id": "fake_char_kiln",
@@ -38,7 +38,7 @@
     "description": "A fake kiln used for basecamps.",
     "sub": "char_kiln",
     "ammo": [ "charcoal" ],
-    "max_charges": 2000
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "charcoal": 2000 } } ]
   },
   {
     "id": "fake_stove",
@@ -48,7 +48,7 @@
     "description": "A fake stove used for basecamps.",
     "sub": "hotplate",
     "ammo": [ "tinder" ],
-    "max_charges": 50000,
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "tinder": 50000 } } ],
     "charge_factor": 10
   },
   {