Merge pull request #77518 from Maleclypse/Adjust-fieldstone-walls-and…

…-make-them-deconstructable

Field Stone Addition and accompanying audit of field stone walls

data/json/construction/floors_indoors.json

@@ -465,9 +465,9 @@
     "//": "Step 2: the full wall",
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 3 ] ],
-    "time": "180 m",
+    "time": "580 m",
     "qualities": [ [ { "id": "DIG", "level": 2 } ] ],
-    "components": [ [ [ "rock", 20 ] ] ],
+    "components": [ [ [ "field_stone", 500 ] ] ],
     "pre_terrain": "t_drystone_wall_half",
     "post_terrain": "t_drystone_wall"
   },
@@ -478,9 +478,9 @@
     "//": "Step 1: half the wall",
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 1 ] ],
-    "time": "180 m",
+    "time": "280 m",
     "qualities": [ [ { "id": "DIG", "level": 1 } ] ],
-    "components": [ [ [ "rock", 20 ] ] ],
+    "components": [ [ [ "field_stone", 500 ] ] ],
     "pre_special": "check_empty",
     "post_terrain": "t_drystone_wall_half"
   },

data/json/deconstruction.json

@@ -462,6 +462,30 @@
     "pre_terrain": "t_rock_wall_half",
     "post_terrain": "t_dirt"
   },
+  {
+    "type": "construction",
+    "id": "constr_remove_dry_rock_wall_halfway",
+    "group": "remove_rock_wall",
+    "//": "Cuts out a segment of half complete stone wall, and then breaks it apart for disposal.",
+    "category": "DECONSTRUCT",
+    "time": "180 m",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "byproducts": [ { "item": "field_stone", "count": 500 } ],
+    "pre_terrain": "t_drystone_wall_half",
+    "post_terrain": "t_dirt"
+  },
+  {
+    "type": "construction",
+    "id": "constr_remove_dry_rock_wall",
+    "group": "remove_rock_wall",
+    "//": "Cuts out a segment of half complete stone wall, and then breaks it apart for disposal.",
+    "category": "DECONSTRUCT",
+    "time": "360 m",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "byproducts": [ { "item": "field_stone", "count": 1000 } ],
+    "pre_terrain": "t_drystone_wall",
+    "post_terrain": "t_dirt"
+  },
   {
     "type": "construction",
     "id": "constr_remove_brick_wall",

data/json/furniture_and_terrain/terrain-walls.json

@@ -3166,7 +3166,7 @@
       "sound": "crash!",
       "sound_fail": "whump!",
       "ter_set": "t_null",
-      "items": [ { "item": "rock", "count": [ 8, 18 ] }, { "item": "pebble", "count": [ 20, 38 ] } ]
+      "items": [ { "item": "field_stone", "count": [ 900, 980 ] }, { "item": "pebble", "count": [ 200, 380 ] } ]
     }
   },
   {
@@ -3188,7 +3188,7 @@
       "sound": "crash!",
       "sound_fail": "whump!",
       "ter_set": "t_null",
-      "items": [ { "item": "rock", "count": [ 3, 8 ] }, { "item": "pebble", "count": [ 20, 38 ] } ]
+      "items": [ { "item": "rock", "count": [ 400, 480 ] }, { "item": "pebble", "count": [ 50, 120 ] } ]
     }
   },
   {

data/json/itemgroups/SUS/creek_bed.json

@@ -0,0 +1,7 @@
+[
+  {
+    "id": "creek_bed",
+    "type": "item_group",
+    "items": [ [ "rock", 5 ], [ "field_stone", 20 ], [ "stick", 10 ], [ "stick_long", 2 ], [ "log", 1 ] ]
+  }
+]

data/json/items/resources/stone.json

@@ -29,6 +29,20 @@
     "name": { "str": "flint" },
     "description": "A chunk of flint, the kind of rock that can make sparks if stuck against high-carbon steel.  It also chips in a semi-predictable way if struck, leaving a sharp edge."
   },
+  {
+    "type": "GENERIC",
+    "id": "field_stone",
+    "symbol": ";",
+    "color": "brown",
+    "name": { "str": "field stone" },
+    "description": "A medium, flatish, heavy rock, big enough and flat enough to be used as a block in field stone walls.",
+    "category": "spare_parts",
+    "material": "stone",
+    "weight": "2628 g",
+    "volume": "1 L",
+    "longest_side": "35 cm",
+    "melee_damage": { "bash": 7 }
+  },
   {
     "type": "GENERIC",
     "id": "rock_large",

data/json/mapgen_palettes/stream.json

@@ -31,6 +31,18 @@
         [ "f_boulder_medium", 2 ],
         [ "f_boulder_large", 1 ]
       ]
+    },
+    "items": {
+      "1": [
+        { "item": "trash", "chance": 5, "repeat": 2 },
+        { "item": "creek_bed", "chance": 50, "repeat": 3 },
+        { "item": "wheels", "chance": 1 }
+      ],
+      "2": [
+        { "item": "trash", "chance": 25, "repeat": 2 },
+        { "item": "creek_bed", "chance": 40, "repeat": 5 },
+        { "item": "wheels", "chance": 1 }
+      ]
     }
   }
 ]