From b1dec6438af1e97bd949c7619fa8e1da758f2ada Mon Sep 17 00:00:00 2001
From: NetSysFire <59517351+NetSysFire@users.noreply.github.com>
Date: Tue, 12 Nov 2024 21:30:57 +0100
Subject: [PATCH 1/2] Forest trash updates, add fieldstone to digging results,
 also can be turned to rock

---
 data/json/itemgroups/misc.json             |  1 +
 data/json/itemgroups/trash_and_debris.json |  9 ++++++---
 data/json/recipes/other/parts.json         | 14 ++++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/data/json/itemgroups/misc.json b/data/json/itemgroups/misc.json
index 638bc61c574fc..c595333c83ef7 100644
--- a/data/json/itemgroups/misc.json
+++ b/data/json/itemgroups/misc.json
@@ -175,6 +175,7 @@
       { "item": "rock_flaking", "count": [ 1, 4 ], "prob": 2 },
       { "item": "flint", "prob": 1 },
       { "item": "rock_large", "prob": 10 },
+      { "item": "field_stone", "prob": 10, "count": [ 1, 4 ] },
       { "item": "pebble", "count": [ 1, 4 ], "prob": 15 }
     ]
   },
diff --git a/data/json/itemgroups/trash_and_debris.json b/data/json/itemgroups/trash_and_debris.json
index bb9a6011e8b11..73255491012fc 100644
--- a/data/json/itemgroups/trash_and_debris.json
+++ b/data/json/itemgroups/trash_and_debris.json
@@ -98,8 +98,8 @@
     "type": "item_group",
     "id": "trash_forest",
     "items": [
-      { "item": "twig", "prob": 100, "count": [ 5, 20 ] },
-      [ "rock", 80 ],
+      { "item": "twig", "prob": 100, "count": [ 5, 40 ] },
+      { "item": "rock", "prob": 80, "count": [ 1, 3 ] },
       [ "rock_flaking", 80 ],
       [ "flint", 20 ],
       [ "stick", 80 ],
@@ -110,9 +110,10 @@
       [ "straw_pile", 80 ],
       [ "tanbark", 80 ],
       [ "rock_large", 70 ],
+      [ "field_stone", 70 ],
       [ "ceramic_shard", 10 ],
       [ "pine_bough", 70 ],
-      [ "splinter", 70 ],
+      { "item": "splinter", "prob": 70, "count": [ 1, 5 ] },
       [ "hickory_root", 65 ],
       [ "hickory_nut", 65 ],
       [ "tinder", 50 ],
@@ -159,10 +160,12 @@
       [ "steel_chunk", 3 ],
       { "item": "scrap", "prob": 3 },
       { "item": "glass_shard", "prob": 3 },
+      { "item": "pebble", "prob": 30, "count": [ 1, 5 ] },
       [ "wire_barbed", 3 ],
       [ "syringe", 3 ],
       [ "spike", 3 ],
       [ "thermos", 3 ],
+      [ "log", 3 ],
       [ "bag_body_bag", 1 ]
     ]
   },
diff --git a/data/json/recipes/other/parts.json b/data/json/recipes/other/parts.json
index 90cc225a3cd5b..c10b598053850 100644
--- a/data/json/recipes/other/parts.json
+++ b/data/json/recipes/other/parts.json
@@ -925,6 +925,20 @@
     "qualities": [ { "id": "HAMMER", "level": 1 } ],
     "components": [ [ [ "rock_flaking", 1 ] ] ]
   },
+  {
+    "type": "recipe",
+    "activity_level": "MODERATE_EXERCISE",
+    "result": "rock",
+    "charges": 3,
+    "byproducts": [ [ "pebble", 9 ] ],
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_MATERIALS",
+    "skill_used": "survival",
+    "time": "5 m",
+    "autolearn": true,
+    "qualities": [ { "id": "HAMMER", "level": 1 } ],
+    "components": [ [ [ "field_stone", 1 ] ] ]
+  },
   {
     "type": "recipe",
     "activity_level": "MODERATE_EXERCISE",

From 0ac234a6938fb22cc1ad296b155d60e922efe4b0 Mon Sep 17 00:00:00 2001
From: NetSysFire <59517351+NetSysFire@users.noreply.github.com>
Date: Tue, 12 Nov 2024 21:37:45 +0100
Subject: [PATCH 2/2] update innawoods forest trash, too

---
 data/mods/innawood/itemgroups/trash_and_debris.json | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/data/mods/innawood/itemgroups/trash_and_debris.json b/data/mods/innawood/itemgroups/trash_and_debris.json
index c58c50f13a451..e51d679392017 100644
--- a/data/mods/innawood/itemgroups/trash_and_debris.json
+++ b/data/mods/innawood/itemgroups/trash_and_debris.json
@@ -3,7 +3,8 @@
     "type": "item_group",
     "id": "trash_forest",
     "items": [
-      [ "rock", 80 ],
+      { "item": "twig", "prob": 100, "count": [ 5, 40 ] },
+      { "item": "rock", "prob": 80, "count": [ 1, 3 ] },
       [ "rock_flaking", 80 ],
       [ "stick", 80 ],
       [ "acorns", 80 ],
@@ -13,15 +14,19 @@
       [ "straw_pile", 80 ],
       [ "tanbark", 80 ],
       [ "rock_large", 70 ],
+      [ "field_stone", 70 ],
       [ "pine_bough", 70 ],
-      [ "splinter", 70 ],
+      { "item": "splinter", "prob": 70, "count": [ 1, 5 ] },
       [ "hickory_root", 65 ],
       [ "hickory_nut", 65 ],
       [ "tinder", 50 ],
       { "item": "feather", "prob": 40, "count": [ 1, 10 ] },
+      { "item": "pebble", "prob": 30, "count": [ 1, 5 ] },
       [ "bone", 30 ],
+      [ "flint", 20 ],
       [ "chunk_copper", 1 ],
       [ "chunk_cassiterite", 1 ],
+      [ "log", 2 ],
       [ "chunk_hematite", 2 ]
     ]
   }