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

Maleclypse · Sep 18, 2021 · d4ff2d7 · d4ff2d7
2 parents 577024f + 3576ee8
commit d4ff2d7
Show file tree

Hide file tree

Showing 202 changed files with 61,493 additions and 36,900 deletions.
diff --git a/.github/workflows/msvc-full-features.yml b/.github/workflows/msvc-full-features.yml
@@ -9,10 +9,15 @@ on:
     - 'build-data/osx/**'
     - 'doc/**'
     - 'doxygen_doc/**'
+    - 'gfx/**'
+    - 'lang/**'
     - 'lgtm/**'
     - 'msvc-object_creator/**'
+    - 'object_creator/**'
     - 'tools/**'
     - 'utilities/**'
+    - 'data/**'
+    - 'tests/**'
   pull_request:
     branches:
     - master
@@ -21,10 +26,15 @@ on:
     - 'build-data/osx/**'
     - 'doc/**'
     - 'doxygen_doc/**'
+    - 'gfx/**'
+    - 'lang/**'
     - 'lgtm/**'
     - 'msvc-object_creator/**'
+    - 'object_creator/**'
     - 'tools/**'
     - 'utilities/**'
+    - 'data/**'
+    - 'tests/**'
 
 env:
   # There's not enough disk space to build both release and debug versions of

diff --git a/.github/workflows/object_creator.yml b/.github/workflows/object_creator.yml
@@ -7,9 +7,13 @@ on:
     paths-ignore:
     - 'android/**'
     - 'build-data/osx/**'
+    - 'data/**'
     - 'doc/**'
     - 'doxygen_doc/**'
+    - 'gfx/**'
+    - 'lang/**'
     - 'lgtm/**'
+    - 'tests/**'
     - 'tools/**'
     - 'utilities/**'
   pull_request:
@@ -18,9 +22,15 @@ on:
     paths-ignore:
     - 'android/**'
     - 'build-data/osx/**'
+    - 'data/**'
     - 'doc/**'
     - 'doxygen_doc/**'
+    - 'gfx/**'
+    - 'lang/**'
     - 'lgtm/**'
+    - 'src/**'
+    - '!src/messages.*'
+    - 'tests/**'
     - 'tools/**'
     - 'utilities/**'
 

diff --git a/README.md b/README.md
@@ -69,8 +69,7 @@ GitHub repo:
 https://github.com/CleverRaven/Cataclysm-DDA
 
 IRC:
-`irc.libera.chat` ; `#CataclysmDDA`
-https://kiwiirc.com/nextclient/irc.libera.chat#CataclysmDDA
+`#CataclysmDDA` on [Libera Chat](https://libera.chat), https://web.libera.chat/#CataclysmDDA
 
 Official Discord:
 https://discord.gg/jFEc7Yp

diff --git a/data/json/furniture_and_terrain/furniture-storage.json b/data/json/furniture_and_terrain/furniture-storage.json
@@ -510,6 +510,11 @@
     "move_cost_mod": -1,
     "coverage": 70,
     "required_str": 8,
+    "hacksaw": {
+      "duration": "2 minutes",
+      "message": "You finish cutting the metal.",
+      "byproducts": [ { "item": "pipe", "count": [ 1, 3 ] }, { "item": "steel_chunk", "count": 1 } ]
+    },
     "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "PLACE_ITEM", "BLOCKSDOOR", "MOUNTABLE" ],
     "oxytorch": { "duration": "1 seconds", "byproducts": [ { "item": "steel_chunk", "count": [ 2, 6 ] } ] },
     "deconstruct": {

diff --git a/data/json/furniture_and_terrain/terrain-doors.json b/data/json/furniture_and_terrain/terrain-doors.json
@@ -2386,6 +2386,12 @@
     "move_cost": 0,
     "roof": "t_flat_roof",
     "flags": [ "TRANSPARENT", "NOITEM", "PERMEABLE", "CONNECT_TO_WALL", "THIN_OBSTACLE" ],
+    "hacksaw": {
+      "result": "t_mdoor_frame",
+      "duration": "15 minutes",
+      "message": "You finish cutting the metal.",
+      "byproducts": [ { "item": "pipe", "count": 12 } ]
+    },
     "open": "t_door_bar_o",
     "oxytorch": {
       "result": "t_mdoor_frame",
@@ -2447,6 +2453,12 @@
     "roof": "t_flat_roof",
     "lockpick_result": "t_door_bar_o",
     "lockpick_message": "The door swings open…",
+    "hacksaw": {
+      "result": "t_mdoor_frame",
+      "duration": "15 minutes",
+      "message": "You finish cutting the metal.",
+      "byproducts": [ { "item": "pipe", "count": 12 } ]
+    },
     "flags": [ "TRANSPARENT", "NOITEM", "PERMEABLE", "CONNECT_TO_WALL", "LOCKED", "THIN_OBSTACLE", "PICKABLE" ],
     "examine_action": "locked_object_pickable",
     "oxytorch": {

diff --git a/data/json/furniture_and_terrain/terrain-fences-gates.json b/data/json/furniture_and_terrain/terrain-fences-gates.json
@@ -80,6 +80,12 @@
       "duration": "9 seconds",
       "byproducts": [ { "item": "pipe", "count": [ 1, 4 ] }, { "item": "wire", "count": [ 4, 16 ] } ]
     },
+    "hacksaw": {
+      "result": "t_dirt",
+      "duration": "10 minutes",
+      "message": "You finish cutting the metal.",
+      "byproducts": [ { "item": "pipe", "count": 6 }, { "item": "steel_chunk", "count": 20 } ]
+    },
     "bash": {
       "str_min": 10,
       "str_max": 150,
@@ -107,6 +113,12 @@
       "byproducts": [ { "item": "pipe", "count": [ 1, 4 ] }, { "item": "wire", "count": [ 4, 16 ] } ]
     },
     "open": "t_chaingate_o",
+    "hacksaw": {
+      "result": "t_dirt",
+      "duration": "10 minutes",
+      "message": "You finish cutting the metal.",
+      "byproducts": [ { "item": "pipe", "count": 6 }, { "item": "steel_chunk", "count": 20 } ]
+    },
     "bash": {
       "str_min": 10,
       "str_max": 150,
@@ -154,6 +166,12 @@
     "symbol": "+",
     "color": "cyan",
     "move_cost": 0,
+    "hacksaw": {
+      "result": "t_strconc_floor",
+      "duration": "10 minutes",
+      "message": "You finish cutting the metal.",
+      "byproducts": [ { "item": "chain", "count": [ 1, 2 ] }, { "item": "wire", "count": [ 8, 22 ] } ]
+    },
     "flags": [ "TRANSPARENT", "PERMEABLE", "LOCKED", "PICKABLE", "THIN_OBSTACLE" ],
     "connects_to": "WALL",
     "examine_action": "locked_object_pickable",
@@ -189,6 +207,12 @@
     "move_cost": 0,
     "flags": [ "TRANSPARENT", "DOOR", "PERMEABLE", "THIN_OBSTACLE" ],
     "connects_to": "WALL",
+    "hacksaw": {
+      "result": "t_strconc_floor",
+      "duration": "10 minutes",
+      "message": "You finish cutting the metal.",
+      "byproducts": [ { "item": "chain", "count": [ 1, 2 ] }, { "item": "wire", "count": [ 8, 22 ] } ]
+    },
     "open": "t_retractable_gate_o",
     "oxytorch": {
       "result": "t_strconc_floor",
@@ -546,6 +570,12 @@
       "duration": "9 seconds",
       "byproducts": [ { "item": "pipe", "count": [ 1, 4 ] }, { "item": "wire", "count": [ 4, 16 ] } ]
     },
+    "hacksaw": {
+      "result": "t_dirt",
+      "duration": "10 minutes",
+      "message": "You finish cutting the metal.",
+      "byproducts": [ { "item": "pipe", "count": 6 }, { "item": "steel_chunk", "count": 20 } ]
+    },
     "bash": {
       "str_min": 10,
       "str_max": 150,
@@ -563,6 +593,12 @@
     "symbol": "#",
     "color": "cyan",
     "move_cost": 2,
+    "hacksaw": {
+      "result": "t_dirt",
+      "duration": "2 minutes",
+      "message": "You finish cutting the metal.",
+      "byproducts": [ { "item": "pipe", "count": 6 } ]
+    },
     "flags": [ "TRANSPARENT", "THIN_OBSTACLE" ],
     "oxytorch": { "result": "t_dirt", "duration": "1 seconds", "byproducts": [ { "item": "pipe", "count": [ 1, 4 ] } ] },
     "bash": {

diff --git a/data/json/furniture_and_terrain/terrain-floors-indoor.json b/data/json/furniture_and_terrain/terrain-floors-indoor.json
@@ -6,6 +6,7 @@
     "description": "A bare and cold concrete floor with matching roof, could still insulate from the outdoors but roof collapse is possible if supporting walls are broken down.",
     "symbol": ".",
     "color": "cyan",
+    "connects_to": "CONCRETE",
     "move_cost": 2,
     "roof": "t_flat_roof",
     "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "ROAD" ],
@@ -30,6 +31,7 @@
     "symbol": ".",
     "color": "yellow",
     "looks_like": "t_pavement_y",
+    "connects_to": "CONCRETE",
     "move_cost": 2,
     "roof": "t_flat_roof",
     "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "ROAD" ],
@@ -53,6 +55,7 @@
     "description": "A bare and cold concrete floor with a streak of red paint, could still insulate from the outdoors but roof collapse is possible if supporting walls are broken down.",
     "symbol": ".",
     "color": "red",
+    "connects_to": "CONCRETE",
     "looks_like": "t_floor_red",
     "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "ROAD" ],
     "move_cost": 2,
@@ -68,6 +71,7 @@
     "color": "yellow",
     "light_emitted": 120,
     "looks_like": "t_thconc_y",
+    "connects_to": "CONCRETE",
     "move_cost": 2,
     "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "INDOORS", "FLAT", "ROAD" ],
     "roof": "t_flat_roof",
@@ -90,6 +94,7 @@
     "description": "A bare and cold concrete floor with a still-functioning light attached to the ceiling above.",
     "symbol": ".",
     "color": "white",
+    "connects_to": "CONCRETE",
     "move_cost": 2,
     "light_emitted": 120,
     "roof": "t_flat_roof",
@@ -113,6 +118,7 @@
     "description": "Interlocking wooden tiles that are more than likely treated against fire, with a still-functioning light attached to the ceiling above.",
     "symbol": ".",
     "color": "white",
+    "connects_to": "WOODFLOOR",
     "move_cost": 2,
     "light_emitted": 120,
     "roof": "t_flat_roof",
@@ -138,6 +144,7 @@
     "description": "High-quality and tough checkered flooring to reduce risk of slips and falls, with a still-functioning light attached to the ceiling above.",
     "symbol": ".",
     "color": "light_cyan",
+    "connects_to": "METALFLOOR",
     "move_cost": 2,
     "light_emitted": 120,
     "roof": "t_flat_roof",
@@ -163,6 +170,7 @@
     "description": "Extremely resilient floor made from carefully placed rebar and poured concrete with a still-functioning light attached to the ceiling above.",
     "symbol": ".",
     "color": "white",
+    "connects_to": "CONCRETE",
     "move_cost": 2,
     "light_emitted": 120,
     "roof": "t_flat_roof",
@@ -186,6 +194,7 @@
     "description": "Linoleum flooring with a still-functioning light attached to the ceiling above.",
     "symbol": ".",
     "color": "white",
+    "connects_to": "LINOLEUM",
     "move_cost": 2,
     "light_emitted": 120,
     "roof": "t_flat_roof",
@@ -209,6 +218,7 @@
     "description": "Linoleum flooring with a still-functioning light attached to the ceiling above.",
     "symbol": ".",
     "color": "white",
+    "connects_to": "LINOLEUM",
     "move_cost": 2,
     "light_emitted": 120,
     "roof": "t_flat_roof",
@@ -251,6 +261,7 @@
     "description": "Extremely resilient floor made from carefully placed rebar and poured concrete, capable of providing protection from the elements.  As for the matching roof, it still requires supporting walls, otherwise it may very well cave in.",
     "symbol": ".",
     "color": "cyan",
+    "connects_to": "CONCRETE",
     "move_cost": 2,
     "roof": "t_flat_roof",
     "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "ROAD" ],
@@ -314,6 +325,7 @@
     "description": "A relatively flat area of rock and stone.  Looks stable enough to be mined with the proper mining gear.",
     "symbol": ".",
     "color": "light_gray",
+    "connects_to": "ROCKFLOOR",
     "move_cost": 2,
     "roof": "t_flat_roof",
     "flags": [ "TRANSPARENT", "INDOORS", "COLLAPSES", "SUPPORTS_ROOF", "FLAT", "ROAD" ],
@@ -326,6 +338,7 @@
     "description": "High-quality and tough checkered flooring to reduce risk of slips and falls, with a matching roof.",
     "symbol": ".",
     "color": "light_cyan",
+    "connects_to": "METALFLOOR",
     "move_cost": 2,
     "roof": "t_flat_roof",
     "flags": [ "TRANSPARENT", "INDOORS", "FLAT", "ROAD" ],
@@ -372,6 +385,7 @@
     "description": "Interlocking wooden tiles that are more than likely treated against fire, with wooden posts and beams supporting a roof.",
     "symbol": ".",
     "color": "cyan",
+    "connects_to": "WOODFLOOR",
     "move_cost": 2,
     "roof": "t_flat_roof",
     "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "ROAD" ],
@@ -433,6 +447,7 @@
     "description": "Hardwood flooring that has been treated with chemicals to improve slip resistance and sliding, commonly for recreational sports.",
     "symbol": ".",
     "color": "light_red",
+    "connects_to": "WOODFLOOR",
     "move_cost": 2,
     "roof": "t_flat_roof",
     "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "ROAD" ],
@@ -452,6 +467,7 @@
     "description": "Floor consisting of finely mixed earth that has been tamped down, with a wooden ceiling above it.",
     "symbol": ".",
     "color": "brown",
+    "connects_to": "DIRT",
     "move_cost": 2,
     "roof": "t_shingle_flat_roof",
     "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "DIGGABLE" ],
@@ -471,6 +487,7 @@
     "description": "Floor consisting of finely mixed earth that has been tamped down, with thatched roof above it.",
     "symbol": ".",
     "color": "brown",
+    "connects_to": "DIRT",
     "move_cost": 2,
     "roof": "t_thatch_roof",
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "DIGGABLE" ],
@@ -500,6 +517,7 @@
     "description": "An industrial flood light set up to illuminate the surroundings.  Smashing it doesn't seem like it'd produce any worthwhile salvage.",
     "symbol": ".",
     "color": "white",
+    "connects_to": "WOODFLOOR",
     "move_cost": 2,
     "roof": "t_flat_roof",
     "light_emitted": 240,
@@ -591,6 +609,7 @@
     "name": "carpet",
     "symbol": ".",
     "color": "red",
+    "connects_to": "CARPET",
     "move_cost": 2,
     "roof": "t_flat_roof",
     "description": "Soft red carpet.",
@@ -785,6 +804,7 @@
     "description": "A section of flooring made out of a tough, rubbery material.  Colored a simple white.",
     "symbol": ".",
     "color": "white",
+    "connects_to": "LINOLEUM",
     "move_cost": 2,
     "roof": "t_flat_roof",
     "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "ROAD" ],
@@ -805,6 +825,7 @@
     "description": "A section of flooring made out of a tough, gray, rubbery material.",
     "symbol": ".",
     "color": "light_gray",
+    "connects_to": "LINOLEUM",
     "move_cost": 2,
     "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "ROAD" ],
     "bash": {
@@ -823,6 +844,7 @@
     "description": "This section of wax flooring has been painted.",
     "symbol": ".",
     "color": "yellow",
+    "connects_to": "WOODFLOOR",
     "move_cost": 2,
     "roof": "t_flat_roof",
     "bash": {
@@ -896,6 +918,7 @@
     "description": "It's dirt.  Looks like some fine soil for tillage.  Could also be dug out for construction projects.",
     "symbol": ".",
     "color": "brown",
+    "connects_to": "DIRT",
     "move_cost": 2,
     "looks_like": "t_dirt",
     "roof": "t_rock_roof",
@@ -911,6 +934,7 @@
     "symbol": ".",
     "color": "yellow",
     "looks_like": "t_sand",
+    "connects_to": "SAND",
     "move_cost": 3,
     "roof": "t_rock_roof",
     "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "INDOORS", "FLAT", "DIGGABLE" ],
@@ -952,6 +976,7 @@
     "description": "A field full of malleable clay, suitable for kiln firing if it was extracted properly.",
     "symbol": ".",
     "color": "light_red",
+    "connects_to": "CLAY",
     "move_cost": 2,
     "roof": "t_rock_roof",
     "flags": [ "TRANSPARENT", "DIGGABLE", "FLAT", "SUPPORTS_ROOF", "INDOORS" ],
@@ -965,6 +990,7 @@
     "//": "for caverns and other natural underground formations.",
     "symbol": "#",
     "color": "brown",
+    "connects_to": "CLAY",
     "move_cost": 5,
     "roof": "t_rock_roof",
     "flags": [ "TRANSPARENT", "BURROWABLE", "SUPPORTS_ROOF", "INDOORS" ],