From a0e98c680313344cc8b2676ad86648398773fa9a Mon Sep 17 00:00:00 2001
From: tchncs <tchncs@vivaldi.net>
Date: Sun, 27 Nov 2016 17:29:06 +0100
Subject: [PATCH] update redwood_tree.mts use individual redwood_tree
 decoration function update y for redwood_tree placement from sapling update
 node check for redwood sapling

---
 mapgen.lua                  |  13 ++++++++++++-
 sapling.lua                 |   8 ++------
 schematics/redwood_tree.mts | Bin 1373 -> 1850 bytes
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/mapgen.lua b/mapgen.lua
index 47ae44d..85766c3 100644
--- a/mapgen.lua
+++ b/mapgen.lua
@@ -191,7 +191,18 @@ local add_schem = function(a, b, c, d, e, f, g)
 end
 
 -- redwood tree
-add_schem({"ethereal:mesa_dirt"}, 0.0025, {"mesa"}, 1, 100, path .. "redwood.mts", ethereal.mesa)
+minetest.register_decoration({
+    deco_type = "schematic",
+    place_on = {"ethereal:mesa_dirt"},
+    sidelen = 80,
+    fill_ratio = 0.0025,
+    biomes = mesa,
+    rotation = "random",
+    y_min = 1,
+    y_max = 100,
+    schematic = path .. "redwood_tree.mts",
+    flags = "place_center_y",
+})
 
 -- banana tree
 add_schem({"ethereal:grove_dirt"}, 0.015, {"grove"}, 1, 100, ethereal.bananatree, ethereal.grove)
diff --git a/sapling.lua b/sapling.lua
index 57247ac..8172f35 100644
--- a/sapling.lua
+++ b/sapling.lua
@@ -107,11 +107,7 @@ function ethereal.grow_willow_tree(pos)
 end
 
 function ethereal.grow_redwood_tree(pos)
-	if math.random(1, 2) == 1 then
-		ethereal.add_tree(pos, 9, 3, 9, path .. "redwood.mts") -- shinji
-	else
-		ethereal.add_tree(pos, 8, 6, 8, path .. "redwood_tree.mts") -- iska
-	end
+		ethereal.add_tree(pos, 8, 34, 8, path .. "redwood_tree.mts") -- iska
 end
 
 function ethereal.grow_orange_tree(pos)
@@ -189,7 +185,7 @@ ethereal.grow_sapling = function (pos, node)
 		ethereal.grow_willow_tree(pos)
 
 	elseif node.name == "ethereal:redwood_sapling"
-	and under == "bakedclay:red" then
+	and under == "ethereal:mesa_dirt" then
 		ethereal.grow_redwood_tree(pos)
 
 	elseif node.name == "ethereal:orange_tree_sapling"
diff --git a/schematics/redwood_tree.mts b/schematics/redwood_tree.mts
index 50c367a893d3820377dcc44af627aa220268d125..f4a509e4205c3634b6c1d289132469b008a43892 100644
GIT binary patch
delta 1742
zcmV;<1~K{F3c3yqO;l4&00aOL06_o|kr5%0AQF)v4v{iSf1GW)qaX~0ZD$Ma*PYGM
zd}iAE0ZB-L0!4e?`^TmcB9)VX&I|(p008hqJl=nn4*&oF06;q)+n?nF00000(27^>
z@w`lh(oZA+006E4vc`3}QibB#@4*u(0KnaO7V)rr>^81}Cu{VP<23q@@Cepjc(n>8
z73*s4B~}0ce~|fOdYrF7d=-lB<@4yDPu|cy>gJ8Ob>16adtWz;<&LC%2bKGEJbN5z
zj#pEAzgqt#uF|)QgDMFCP#ak<pAL`kFV(jGeU67l3y(*mYAo&X*uHrVgOJC<yz<;E
zw2jqLW(Vz<$HR!@VS2>Z*0REV1b@1hj1_CT^|f}ff6n&csXnx}&W!;8;Qq9EN|Qd%
zs!;N3m=Yd#wAc2aqaNq0HD`q1%KI!OB0W>}?b%K8h-(13jktm-RiD~pKWyVC<=_3>
zRQC2%sHxn(|8i;8G1Jj1od@}|eXMr$NB{sJq*P_2tGeycejnyu9(Mha$`9Ya7VX}M
zYXG^8e|W!09u3-?hTntdW~r7+*C)P8Nh17p&s^=^M!J{B)<>#V@>VDscv1uau#l<?
z+oMGNVb>=;WYa!9(v<M1`{c~KhZ4rhtC)BX#m?DUHuR5}T%YKB7va@dJdJjSpmxxn
zB<as+w5LV(E{a{Bc;D7Rg#rMmgI!;g$jEKpe==$1@!j`7@;qwd$!;ZETz!u5RO*I(
z$LCyZaeq4L=S<!{?K6G#2i`*g08o5cP|x~4551Ruvieo9-*s&DZ2mrD+6wL2%la>D
zWJ*8Hs9zuWp3ndQKt0Z`w12C*C_&AYejfHO=i8_M9rR~7`@0)yN{uIe82|tPcSf&J
ze_CeTJAm;500015fQ*|5#tQ%d0BC{tT?b^`51#SD|Nj91007u{{v{|fDgXfd0Mj&4
z%U9w609>DGqKd*51^@tDOw(LLP@qZx$lQBs)DaY3_h2CfS~J@QYGED~;8UZx#5B|_
zI)t?ZC2aL|h>`^q<}Wpv0wM^?Y#I(kf2Q+)ZV*G}+*sVV)3)qgb&92eWCP^79A0t6
zjcPLWJ~uw!?oudmAW0yXnI49Q4+F6bmVxw;ZI}+oSY()9ALe13W1qP)2h-|(;3&`(
z!$jJcsA1{tnBY#*-mMZ@<UR?KEOeo?AR2DI76m2;mNe0KR8SHMV;fkrl?`j?fAcOV
zpN~P!VmGQw-+Q|4hD8Aak40cSddi}IX+ltPyuS^nx3CnARy<6jCoVyAT)|KYV+QQg
z00ocOkXxM@4%aY^3`{@5`Ea_Icr+FT2t1a$C<tRcZHN#J+ic!dD$)}{l=e@b%hkJ`
zHo4t`og=}J1tsnliy}ao=|PTue=t4iN>GM8L+0X4s!*apwhD#K?06cAfdzU(s*82`
zMj|6V!%XF1CMy=QEMg@JUvvrEIuI0)!GZeYz?R7o!^!=Rgdq<;-F%LNzEYUycpqja
z`yr`*_>#tWn#8`u9tuzprr>NE$SFmpdJWjF<B`>TlSq#cuU@8sE<9X~e`M={u%K~u
z1i*@ww7(=5HhD=u0lPTkQEfBG3g_6HE4^F{0KWnelu9qfpQhKi000WTPTXGO0stsT
zyAC}}T)h7Qz!l&RK`~JQ0GDDMM{4;>8~}jpGmcbIxWWJcfQw3k0#yP)=H64Ij-c>X
zv5*3-VYeJNd}F!Kr$%v!e`%;$!o^e<l-D6j7El<6UYHK%+^%rjo)(nFeLHQNY*nXN
zDoA@!<<?X$Ri@s@@%eU_LWu)O0=bOzFf@!bo3iXG8b}Y>23H${Vt9WT108uEjDgqU
zK^w_2jHHc`8kXLUO-eTO^b#e15=!b^xe5EXz4=-cm>gKrMBmZ7e>$Nswt+QU*)VR9
zk73Q?nLvuLkuqRuFP_#`8(}Q5M{Hv)2}@BD8j}J+f_M;l=>+>UV8bIeBfYKZP3E}i
zzG-0k!6wX^UZgI<;^1>AjnEJw8n)ARm5RG&r$~CL^difL`P&+ygP&)l2RZt|?zyf6
zWymvRF3wi{h$Dz4e`XMdND7q)7U&77F2-f~Mj|6VLcfFBZQ{pffst+@D8P?vGUO~1
ziWyGse<Tcf7`mW+qxBr?hhu;fZJK8a6^r@Xro#qzN4SYc(?CusGSzEPq}y(%2N9Hk
zin_0nTs;teTUSQ_tXN6=OLAdTMo^@rel((zu%gggr4XMkFfImwUqRT}%%8aR=`}6@
kfI_bmx7WA;01CZMTpm|1D^CExj<ARFl{jv|KfW_!A9=1e*Z=?k

delta 1282
zcmV+d1^xQE4&4e2O;l4&00aOL044wtkr5`5O-g^ATX&=?5QVusWvzKkGCz0z`gBX%
zLUE}=0ny%H9?qn?EK1yL(Up@Z1pr8*moESS_+<3^i^~B30G}&4gX=WktveS}JR{yK
zM>10{0NfdFrAhWte3emfPIomg#4h%#7(qrk$FLcaQGguH%=o>$Q0jDZoQ>psj(OoY
z-=BX)A#)&e$~JBZzpSA=TUT=riFeEcKllB-P%FuuuFZViaepguw7nU|`{FY4wWS&5
z4tr*-x+v9fx;VSj))^dQGUkDwll2W~52si)$nT>iwaVjgXE5K}fPPAo?+Wu?#eFWx
zXzQo@GBzJ9`(=%<=TvgO^QSV>s-Cga4S#>Fj_G4vH6<@8&#0e~VpUlwgR9}PjL7G5
zJ@Ogyw>3vN?tk)ke70Dl>|}gKtrwo>mb}x|d7;T_(f^#w*mo|pkMdpWNm|w6(J9sQ
zzJ4?#e-`0dZReJJH|ni~+>Fq%{qIM(_SRqS^X*x`uNTg@bKK*ucXGOM8UA|7X<&cE
zYVb44Zm86{c1kNd_f**XTue4&^Oc+zhHJG|r>WZh@#%X<=-WBAUOAT;xi2h@!aLn@
zFP!5&&1nBXhU6(}t<f%nf8xvQzKv2PZ|QU*;>Y9eLN9DddLLcRU+*`$>%Udpc5Pe-
zrO!+7PABuiYam$*k{WG%>}V&S!@7TFN*S%6Jla>RrQQqEPoYOg=rsrOeb)Nlo<F%G
zJN{fnv}feIN6><G9dJ4K(kaLBGcK!C;#9||sW0p1Xs@59A#gopZ(%?kychP~iPi9V
zcRK*U49w<*003|XW1dO@0AO~o>l?&B0000000000000000000000000004gg0001{
z<LsZZ1wLBiN4vqvXia4ZS%Nox#GuLl)$$xg(@2xQ=>#ob5PH#KkBU<E4P$~by;OK>
zi~WfL-)FSZf#|m)j!|JsbZxAVwp&)=F6~dE>qvreTlT8IQLvXhOr(wmRpVi_tx=&)
zd8c5IQGWYN1F;>_fF=J9WT<~t{MU8ze{DyS(Z{qz%;5z|7Bdu2gv$;isoxJyGU8*}
z$TAXL$;tlGfE&_onz8EZD{w<6LK_}q1CiAR+^PE+QNSG%s8jRek0vlPqy2VV86EMf
zc0HI^*83wGNEVFi>p~#8ttmGh>5m4!sUYL~@$2$iFQC5u*gzpcLN<S(N&&@)E~7$g
zi3%;1Wq63Ti9k5cQxM)%yMTAOUV)&IFhDYvTGsn!d8oF*$59QnoLo@GJl34`PVgCc
zi+U+*Xk&38yx>}e8q(B2B`R!Yj(NF0`ZmfKZ$6B9o~}Re5+L(#$i?mucs>>=GDBol
zJw!$VNd;MN@hv5^uV#Pq8a)j7lmo^OEV9=@z*RQ12wkPFv3DOvuYs*fxKGkcQYews
zpDzlINqV6oIkX6;!bo0`*|E2RMTNnj#xMazzdt9S>C#VJ>vTXzqVwlopu*^CZ`S%M
zt-X(Qd6yK{(Wx<AS^xZ<!?F)F+{>(l3T2&E@k<{>VxxROJSb|u`t+CvogL@VXT15A
z9eH$Lm{p;73*`=|=^*J@s`}+l;`33Dh3xKeQjxJdoq$G8dIYW=IPna?A0R5jRh{I8
s;f+XaVNU5oK(wKa-$Cx_{j_BVZa^y)0<fPQw^9IFb4ly_4;#={A#I9wng9R*

-- 
GitLab