From 9cb1936fc36019eae7c10252da99b75c368f25eb Mon Sep 17 00:00:00 2001
From: Xeno333 <Xeno333@mailfence.com>
Date: Fri, 8 Nov 2024 22:25:33 -0600
Subject: [PATCH] updates to mapgen

---
 mods/1042_mapgen/init.lua                     |  30 ++++++++++++------
 .../schematics/big_tree_dark_1.mts            | Bin 0 -> 2010 bytes
 .../schematics/big_tree_light_1.mts           | Bin 0 -> 711 bytes
 3 files changed, 20 insertions(+), 10 deletions(-)
 create mode 100644 mods/1042_mapgen/schematics/big_tree_dark_1.mts
 create mode 100644 mods/1042_mapgen/schematics/big_tree_light_1.mts

diff --git a/mods/1042_mapgen/init.lua b/mods/1042_mapgen/init.lua
index ee501e0..dfc6037 100644
--- a/mods/1042_mapgen/init.lua
+++ b/mods/1042_mapgen/init.lua
@@ -141,7 +141,7 @@ local function dec(pr, x, y, z, data, area, place_list, tempv, cave)
     
     -- Land
     if cave == nil and y > water_level then
-        if tempv > 0 and not (tempv >= 20) then
+        if tempv > 0 and not (tempv > 20) then
             -- Grass
             if c <= 20 then
                 data[area:index(x, y+1, z)] = grass_tall
@@ -155,20 +155,23 @@ local function dec(pr, x, y, z, data, area, place_list, tempv, cave)
             elseif c > 995 and y > water_level+3 then
                 place_list[#place_list+1] = 
                     function()
-                        core.place_schematic(vector.new(x-4,y,z-4), schematic_path .. "tree_plain_1.mts", "random", nil, true)
+                        core.place_schematic(vector.new(x-4,y,z-4), schematic_path .. "tree_plain_1.mts", "random", nil, false)
                     end
 
             -- Big tree
-            elseif y >= water_level+10 and tempv >= 15 and tempv <= 25 then
-                if c == 995 then
-                    place_list[#place_list+1] = 
-                        function()
-                            core.place_schematic(vector.new(x-7,y,z-7), schematic_path .. "big_tree_1.mts", "random", nil, true)
-                        end
-                end
+            elseif y >= water_level+10 and tempv >= 15 and c == 995 then
+                place_list[#place_list+1] = 
+                    function()
+                        core.place_schematic(vector.new(x-7,y-1,z-7), schematic_path .. "big_tree_1.mts", "random", nil, false)
+                    end
+            elseif y >= water_level+5 and tempv >= 10 and tempv < 15 and c >= 990 then
+                place_list[#place_list+1] = 
+                    function()
+                        core.place_schematic(vector.new(x-11,y-3,z-11), schematic_path .. "big_tree_dark_1.mts", "random", nil, true)
+                    end
             end
 
-        elseif tempv >= 20 then
+        elseif tempv > 20 then
             if c <= 10 then
                 data[area:index(x, y+1, z)] = grass_short
             end
@@ -177,6 +180,13 @@ local function dec(pr, x, y, z, data, area, place_list, tempv, cave)
             -- Snow grass
             if c >= 990 then
                 data[area:index(x, y+1, z)] = grass_snowy
+
+            elseif y >= water_level+3 and tempv >= -15 and c >= 990+(tempv/4) then
+                place_list[#place_list+1] = 
+                    function()
+                        core.place_schematic(vector.new(x-7,y-1,z-7), schematic_path .. "big_tree_light_1.mts", "random", nil, true)
+                    end
+
             end
         end
 
diff --git a/mods/1042_mapgen/schematics/big_tree_dark_1.mts b/mods/1042_mapgen/schematics/big_tree_dark_1.mts
new file mode 100644
index 0000000000000000000000000000000000000000..f340766d7118880d7bab2cb45db9e692a247b7e6
GIT binary patch
literal 2010
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
P_&=M$D*>3w_Xqy~qbBv9

literal 0
HcmV?d00001

diff --git a/mods/1042_mapgen/schematics/big_tree_light_1.mts b/mods/1042_mapgen/schematics/big_tree_light_1.mts
new file mode 100644
index 0000000000000000000000000000000000000000..0ece1b0518a9a4d2a5d4982f7359376bddaf6b4a
GIT binary patch
literal 711
zcmeYb3HD`RVGv-DWDuyw1sIqam=iOL7{m<?OpN05@>5cat#VQm%TkNub28I2N*F|u
zBua`>Qz60?bKcJE+|;bV<9by7`E~2y=&2K8#6(@*7v9Ux<v6CJW97TVaNTysmJ*id
z`)5B(;dYwWJ@x*(@(p(D4qhzYer#>K-rVblvl_o}e(PbLclM%sy7Jz)Q|^De^z(cA
zdHsm`IWOW;vv)aJ7;jfL70bL>aIAdEX3vXX-x*siTNjf5+E9Lj-L1y!mVE0bPx!}U
zvcY!g#`Wu`Kc3p<*7$b6?)sON6PIUymoV;lF#E|gdGVcl{Z3uJ{^R}K(w}wTH*KB%
zYj$mz*zI4Mzs)R91=f6j`NvMFTtTn$@AB8r^?u$A?sHpsMeesp?Tt^lsoS3JudPi<
z?6YIK{(a6B`#8ng=lq*4e3NxMnRRZJJo~xx3h7r{!}{z0W`B=7^IvSsJ?-Zqi*MJu
z|JplG=IQ%6Tg&{mr1JLoyiQ-6_jgbBw<&9~*HwLUoOiDJp20O6>+@ID{n_`*Z<z19
z^y~4&lHZ>G$IjO~alCAQpL^i6;J@#2|1O*pF>3wyEk5Vx-3i<J`U>_>{}^!SvS^}D
z%H6d+x(C+JKgjFyRPdy};j#tSEfk#UnrwMDTt3BKB-y8Z$*@TAm1*L^86P|H5A9nW
z!0`KKyI@>wSyR!S=`#alCRj+{n%_Nz-)7N?@9L+%Y|8%fRwqaFL}>M%FWYx4%IQ0o
znDzI!xa=3Z>CO|r7<RQ6ynR)FGycK<74?_xa!sf6aES05CWO8-_!9GFqD?*LG-GLz
zbCJqF;sdO;S1b4K6tT!V@jm2C>c*Wv#bugrg}yd2p7TO(uV44_4)cqthi9yK{yfw}
i(m)}&cJEW^g2MmJpPzkf5^&;BY(XOC@+-Ann-2iMHfJIL

literal 0
HcmV?d00001