From 61c2d30dd79ab7c11532596972fa41a1ec9796f1 Mon Sep 17 00:00:00 2001
From: Simon Brodtmann <github@accounts.brodtmann.info>
Date: Fri, 12 Dec 2025 22:14:31 +0100
Subject: [PATCH] Diversitree: Improve compatibility

---
 lignumis/prototypes/compatibility/data.lua        |  3 ++-
 lignumis/prototypes/compatibility/diversitree.lua | 12 ++++++++++++
 lignumis/prototypes/integrations/vanilla.lua      |  6 +-----
 3 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 lignumis/prototypes/compatibility/diversitree.lua

diff --git a/lignumis/prototypes/compatibility/data.lua b/lignumis/prototypes/compatibility/data.lua
index cd63065..0ed7173 100644
--- a/lignumis/prototypes/compatibility/data.lua
+++ b/lignumis/prototypes/compatibility/data.lua
@@ -7,4 +7,5 @@ require("nuclear-science")
 require("lane-splitters")
 require("wood-industry")
 require("crushing-industry")
-require("canal-excavator")
\ No newline at end of file
+require("canal-excavator")
+require("diversitree")
\ No newline at end of file
diff --git a/lignumis/prototypes/compatibility/diversitree.lua b/lignumis/prototypes/compatibility/diversitree.lua
new file mode 100644
index 0000000..af5e8f1
--- /dev/null
+++ b/lignumis/prototypes/compatibility/diversitree.lua
@@ -0,0 +1,12 @@
+if not mods["Diversitree"] then
+    return
+end
+
+data.raw.plant["s6xdvt-fake-tree"].surface_conditions[1].min = 900
+
+local tree_plant = data.raw.plant["s6xdvt-fake-tree"]
+tree_plant.growth_ticks = 5 * minute
+tree_plant.minable.results = { { type = "item", name = "wood", amount = 5 } }
+tree_plant.minable.count = nil
+tree_plant.surface_conditions[1].min = 900
+table.insert(tree_plant.autoplace.tile_restriction, "natural-gold-soil")
\ No newline at end of file
diff --git a/lignumis/prototypes/integrations/vanilla.lua b/lignumis/prototypes/integrations/vanilla.lua
index 9c51438..61b17a5 100644
--- a/lignumis/prototypes/integrations/vanilla.lua
+++ b/lignumis/prototypes/integrations/vanilla.lua
@@ -111,7 +111,7 @@ for _, tree in pairs(data.raw.tree) do
     if not isRegularTree then goto continue end
     tree.minable.result = nil
     tree.minable.count = nil
-    local woodResult = { type = "item", name = "wood", amount = nil, amount_min = 2, amount_max = 10 }
+    local woodResult = { type = "item", name = "wood", amount = nil, amount_min = 2, amount_max = 8 }
     if minable.results and #woodResults > 0 then
         table.assign(woodResults[1], woodResult)
         woodResults[1].amount = nil
@@ -128,10 +128,6 @@ tree_plant.minable.count = nil
 tree_plant.surface_conditions[1].min = 900
 table.insert(tree_plant.autoplace.tile_restriction, "natural-gold-soil")
 
-if mods["Diversitree"] then
-    data.raw.plant["s6xdvt-fake-tree"].surface_conditions[1].min = 900
-end
-
 table.insert(data.raw["assembling-machine"]["assembling-machine-1"].crafting_categories, "organic-or-assembling")