Merge pull request #76119 from RenechCDDA/digging_clay_gets_clay

Digging clay gets clay
CleverRaven · Sep 11, 2024 · d445f70 · d445f70
2 parents e400e20 + 718877c
commit d445f70
Show file tree

Hide file tree

Showing 2 changed files with 92 additions and 1 deletion.
diff --git a/data/json/construction/terrain.json b/data/json/construction/terrain.json
@@ -242,7 +242,43 @@
   },
   {
     "type": "construction",
-    "id": "constr_pit_shallow",
+    "id": "constr_pit_shallow_sand",
+    "skill": "survival",
+    "group": "dig_a_shallow_pit",
+    "category": "CONSTRUCT",
+    "difficulty": 0,
+    "time": "20m",
+    "on_display": true,
+    "qualities": [ { "id": "DIG", "level": 1 } ],
+    "pre_flags": [ "DIGGABLE", "FLAT" ],
+    "pre_special": "check_empty",
+    "pre_terrain": "t_sand",
+    "post_terrain": "t_pit_shallow",
+    "byproducts": [ { "group": "digging_sand_50L", "count": 1 } ],
+    "activity_level": "EXTRA_EXERCISE",
+    "do_turn_special": "do_turn_shovel"
+  },
+  {
+    "type": "construction",
+    "id": "constr_pit_shallow_clay",
+    "skill": "survival",
+    "group": "dig_a_shallow_pit",
+    "category": "CONSTRUCT",
+    "difficulty": 0,
+    "time": "20m",
+    "on_display": true,
+    "qualities": [ { "id": "DIG", "level": 1 } ],
+    "pre_flags": [ "DIGGABLE", "FLAT" ],
+    "pre_special": "check_empty",
+    "pre_terrain": "t_clay",
+    "post_terrain": "t_pit_shallow",
+    "byproducts": [ { "group": "digging_clay_50L", "count": 1 } ],
+    "activity_level": "EXTRA_EXERCISE",
+    "do_turn_special": "do_turn_shovel"
+  },
+  {
+    "type": "construction",
+    "id": "constr_pit_shallow_gravel",
     "skill": "survival",
     "group": "dig_a_shallow_pit",
     "category": "CONSTRUCT",
@@ -252,6 +288,25 @@
     "qualities": [ { "id": "DIG", "level": 1 } ],
     "pre_flags": [ "DIGGABLE", "FLAT" ],
     "pre_special": "check_empty",
+    "pre_terrain": "t_railroad_rubble",
+    "post_terrain": "t_pit_shallow",
+    "byproducts": [ { "group": "digging_gravel_50L", "count": 1 } ],
+    "activity_level": "EXTRA_EXERCISE",
+    "do_turn_special": "do_turn_shovel"
+  },
+  {
+    "type": "construction",
+    "id": "constr_pit_shallow",
+    "skill": "survival",
+    "group": "dig_a_shallow_pit",
+    "category": "CONSTRUCT",
+    "difficulty": 0,
+    "time": "20m",
+    "on_display": true,
+    "qualities": [ { "id": "DIG", "level": 1 } ],
+    "//": "We specifically require the PLOWABLE flag here so that some diggable terrain will NOT match this construction recipe, and will instead refer to its specific variant (e.g. constr_pit_shallow_sand)",
+    "pre_flags": [ "DIGGABLE", "FLAT", "PLOWABLE" ],
+    "pre_special": "check_empty",
     "post_terrain": "t_pit_shallow",
     "byproducts": [ { "group": "digging_soil_loam_50L", "count": 4 }, { "group": "digging_topsoil_loam_50L", "count": 1 } ],
     "activity_level": "EXTRA_EXERCISE",

diff --git a/data/json/itemgroups/misc.json b/data/json/itemgroups/misc.json
@@ -126,6 +126,42 @@
       [ "ceramic_cup", 10 ]
     ]
   },
+  {
+    "id": "digging_sand_50L",
+    "type": "item_group",
+    "subtype": "collection",
+    "//": "Intended to comprise about 50L of material",
+    "items": [
+      { "item": "material_soil", "count": [ 0, 1 ] },
+      { "item": "material_sand", "count": [ 6000, 7000 ] },
+      { "item": "clay_lump", "count": [ 10, 16 ] },
+      { "item": "rock", "count": [ 0, 4 ] },
+      { "item": "pebble", "count": [ 10, 50 ] }
+    ]
+  },
+  {
+    "id": "digging_clay_50L",
+    "type": "item_group",
+    "subtype": "collection",
+    "//": "Intended to comprise about 50L of material",
+    "items": [
+      { "item": "material_soil", "count": [ 2, 4 ] },
+      { "item": "clay_lump", "count": [ 30, 80 ] },
+      { "item": "rock", "count": [ 0, 4 ] },
+      { "item": "pebble", "count": [ 5, 25 ] }
+    ]
+  },
+  {
+    "id": "digging_gravel_50L",
+    "type": "item_group",
+    "subtype": "collection",
+    "//": "Intended to comprise about 50L of material. Artificial, man-made gravel of varying size.",
+    "items": [
+      { "item": "material_soil", "count": [ 0, 1 ] },
+      { "item": "pebble", "count": [ 150, 200 ] },
+      { "item": "material_gravel", "count": [ 4000, 4500 ] }
+    ]
+  },
   {
     "id": "digging_soil_loam_50L",
     "type": "item_group",