From 0f0dd0f6e817f58e6501549ab6d34bbfdc1d6548 Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Tue, 7 Mar 2017 12:00:14 +0000
Subject: [PATCH] Tree schematics: Alter jungletree, aspen, pine, appletree

Denser jungletree for darker rainforest:
Highest 'jungletree' nodes now prob 255.
Add a 5th lower branch layer.
Increase lower branch layer y-slice prob to 191.

Aspen:
Extend trunk upwards by 1 node to reduce leafdecay radius to 2.

Pine:
Make lower trunk 1 node longer so that lowest branches are more often
higher off the ground, also to make pines taller.

Appletree:
Make 2 opposite branches prob 255, the other 2 prob 127, to avoid
trees with 1 or 0 branches. Therefore also add random rotation.
---
 mods/default/mapgen.lua                         |   1 +
 mods/default/nodes.lua                          |   2 +-
 mods/default/schematics/apple_tree.mts          | Bin 163 -> 169 bytes
 .../schematics/apple_tree_from_sapling.mts      | Bin 167 -> 173 bytes
 mods/default/schematics/aspen_tree.mts          | Bin 176 -> 174 bytes
 .../schematics/aspen_tree_from_sapling.mts      | Bin 175 -> 174 bytes
 mods/default/schematics/jungle_tree.mts         | Bin 251 -> 255 bytes
 .../schematics/jungle_tree_from_sapling.mts     | Bin 246 -> 247 bytes
 mods/default/schematics/pine_tree.mts           | Bin 175 -> 176 bytes
 .../schematics/pine_tree_from_sapling.mts       | Bin 172 -> 174 bytes
 mods/default/trees.lua                          |   2 +-
 11 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua
index f8a84efc..d526b767 100644
--- a/mods/default/mapgen.lua
+++ b/mods/default/mapgen.lua
@@ -1296,6 +1296,7 @@ function default.register_decorations()
 		y_max = 31000,
 		schematic = minetest.get_modpath("default") .. "/schematics/apple_tree.mts",
 		flags = "place_center_x, place_center_z",
+		rotation = "random",
 	})
 
 	minetest.register_decoration({
diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index 34136cb3..67790dd6 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -2198,5 +2198,5 @@ default.register_leafdecay({
 default.register_leafdecay({
 	trunks = {"default:aspen_tree"},
 	leaves = {"default:aspen_leaves"},
-	radius = 3,
+	radius = 2,
 })
diff --git a/mods/default/schematics/apple_tree.mts b/mods/default/schematics/apple_tree.mts
index ac09b46694037b0824dd4c0e3762d66d0fff1a76..2bd57c1fc4aa36e2f03c6ac2989c86b575e2784e 100644
GIT binary patch
delta 33
rcmV++0N($j0jU9yd;|aT`;mVa6Cb;I`{n;*nn%9-h9Up}c91F27*-Hl

delta 27
jcmZ3<xR`N54fF3$-zV0K^Ui1ae4_k*01HFe1kH;8u@DS?

diff --git a/mods/default/schematics/apple_tree_from_sapling.mts b/mods/default/schematics/apple_tree_from_sapling.mts
index 5d35a1545f38836395782ea132c4fc582725b11f..d258ab1a80a20520986cd0d37f560aeebac359f8 100644
GIT binary patch
delta 34
scmV+-0Nwwm0j&X$d<A-W`~3WofEp6)=Gn{FW12_4`-UO_08!K?Q8X1182|tP

delta 28
kcmZ3>xSVl94NFDkf~JX$QoKTEl<(I%3o<YSUQr7K0GVwH00000

diff --git a/mods/default/schematics/aspen_tree.mts b/mods/default/schematics/aspen_tree.mts
index 724aae08d67834daea27dcfdcc9c2def13b435bd..429a831c775320ace3f86c566380abea4dafb162 100644
GIT binary patch
delta 74
zcmV-Q0JZ<H0j>d%YePY-7{V>o2q)@?3$@%t`}AU;U!QM}lSK>wDhA?uFo~T71^@98
g_5bS`>VZT(b`}r=)lknZ1OesYG72aH04DA`jmYI6RR910

delta 76
zcmV-S0JHzD0k8p(Yej)y44Yf15l++(7izhQ_UXkwzdqj{CyN*WR1C!RU=lkE3jX6G
i>i^d>)B}ln3|4(Tm;|Yzo?8e4%EM(8Py_%cayty#a~{C}

diff --git a/mods/default/schematics/aspen_tree_from_sapling.mts b/mods/default/schematics/aspen_tree_from_sapling.mts
index b7ca161903056454f78f4672000947d2ebf60035..b7ab3ee6b71ff54ed06229486b50a9dd4f918479 100644
GIT binary patch
delta 74
zcmV-Q0JZ<G0j>d%YePY-7{V>o2q)@?3$@%t`}AU;U!QM}lSK>wDhA?uFo~T71@$1}
gKb(b102PBUgv82%DyEKG2m;E(WfV{Z0L!{I4W+Ffga7~l

delta 75
zcmV-R0JQ(E0j~j&Yea!x44Yf15l++(7izhQ_UXkwzdqj{CyN*WR1C!RU=lkE3hF_`
he>e-304fGy2#J*iRZJbX5CoKm%P61-0076$HVk1=8^!<t

diff --git a/mods/default/schematics/jungle_tree.mts b/mods/default/schematics/jungle_tree.mts
index 329364a87ed26d90edad83c4f88e029ef1d742c0..01a1b11a05f8bc1032b1188ae803281349871fa4 100644
GIT binary patch
delta 189
zcmV;u07C!!0sjGz6a-&iUtf_JI)7~r!ypK4xoD5T5jdJhW6EF?k<}k&$&x)&K+DJT
z#pCz_PFeF^%=60wK1Ms3f@2CPQ_!zx`eqEWvgqy}^T_6aGC0HEF|xd<X|L^WO-+|f
zJD)f1b4~Xne`mA2dEH9=4Un*NPh5z2iO~aonX=TBm^!C}m>7|$4yv7NJ1%B5g^Qap
r8meX7DB9LcJ0r5Da)VW-m6~JM(;b;E0~;3%XX1mVfBXa<$QDa9du3V%

delta 185
zcmV;q07n1+0s8@v6a+s%KR=NeI)4EUgD?nGKI#*A0#EBxd<s@ZC$vSIrCG9MN2Jtx
zaJ{%JU%)ES-?iWQ@PONDhEi}!Ayf+bSf!U@kcg_Md-SU^2UNk@oc6eVPp!AJJuSXO
z-re(JPv;~4&&GM5@GBspSzg!>ag(Gk_?^;FQ(`iU4%%r)B+7$w=iH82Q!3)*X4Hu?
njZcYXd!0%@Z7MeyRhp$abr!YKVc@AHAT*x-@e?=zvUf&fMvquW

diff --git a/mods/default/schematics/jungle_tree_from_sapling.mts b/mods/default/schematics/jungle_tree_from_sapling.mts
index babaa45f7a11de1fc017b341cea0751974ce2ab4..f93f01419c5dc002519f603b5620dcaa58ecd819 100644
GIT binary patch
delta 181
zcmV;m080P%0rvrr6a-&iUtf_JI)7~r!ypK?T+E~N2pr)ZeQOzRBGCH7ELpN=ilBTv
zUs}o+u*r%epJ$f^U3x2+l3_|IQ_`<z`e976GVkskvDfC1GT7Yh=(RkrX|L^SO`9&6
zb~bN}b4}MH|IeblxNfHY1`O`D7j|ae#pnUvrcN~l&~0rHz+%eLSugQ8OeRG&Ge#q2
j(m=yzY*Tr`EK>+V){f~k_$*_0CcD%0kDtI3@{u|;Tu4`J

delta 180
zcmV;l089V(0rmlq6a+s%KR=NeI)4ie!ypK?T+E|*1di~IzA3}j4|HZROP1`BB1(bh
ziy?dghnT&a|Ld&>-9|f@Qpc2BrleoX^kPh6Ui9uBc2wt(GB~EJRcmY7YP(z0s*9)H
zeVwoAe)#Wfz3!9x0Ss=I7ZNikae9E$#igbInnedC<d*q}L+-3eJhF?3-6f3Cp_CPh
ib$ex{pEi{ntTKhb&W%i$!G()cFlqY7Pv8mX0X5@*gIR(A

diff --git a/mods/default/schematics/pine_tree.mts b/mods/default/schematics/pine_tree.mts
index 3a3fa7ad0e7f7c3bbd3282856d1985734b62d702..6f27d83921216011779cb297d1a771de9fdd0f85 100644
GIT binary patch
delta 123
zcmV->0EGXq0k8oNO;l4&00aO901p5Ke}6xb4nAY;Qd<hZFbIpiXpi6#a`diy;QA%q
zwCraoh#@6}AP|7q%T}YQ#wls)j`DJoYdf8bIX_qLRPpZCb`?qW!Ch6Q)>-O92`Wg=
dP@p-3ef0m09zCqgE-96V#IAlU!UhRpH4Zn*He3Jz

delta 122
zcmV-=0EPds0j~iLO;l4&00aO901f~Je}9n=K4W8GAQ>>iA+=@6a|<%bNHtjyU?Pdd
z2xURcV}hGUx-7yi<c1S%!-aIW&^Nur=hx@Q6U)U3^6MGu^BL;v>xtnqF#N|()B_2i
c(*O1NxL{M@CQ<Gd9Dq9EG76{w0DieN4Rduh-~a#s

diff --git a/mods/default/schematics/pine_tree_from_sapling.mts b/mods/default/schematics/pine_tree_from_sapling.mts
index 629c5da027a0c3d1532a867b611a27357499c0df..e42a9965cda4e177a5acac0b2c6753684085b5cf 100644
GIT binary patch
delta 119
zcmV--0Eqvr0j>cLO;l4&00aO901p5Ke}6xb4nSX^05HNKwPh)F6*9?4HCYf~B9p}k
zWkF14f}2dbEW%ZkhaGLhiV{~1K)Q<0ug{MsmWv<c*E7`TGt}4D6T@X-05kr>Stvw3
Z1cDV4<WkjD_y85dY8222006}gFAk_mEU5qh

delta 117
zcmV-*0E+*v0jvQIO;l4&00aO901f~Je}9n=KwcmjFv20VWyy03GRa6aSrA|%iNy$I
zLCj-<n@74V!Y$;66K%tVbhpqqy~O9&=f@Mv#R>B38S3*H>g(%?;W99Q8UNud7*P*_
XV08q!)N%_BK%H<I1yle4Ba|+UDIhPc

diff --git a/mods/default/trees.lua b/mods/default/trees.lua
index 2b676e75..5f4d3f1e 100644
--- a/mods/default/trees.lua
+++ b/mods/default/trees.lua
@@ -372,7 +372,7 @@ function default.grow_new_apple_tree(pos)
 	local path = minetest.get_modpath("default") ..
 		"/schematics/apple_tree_from_sapling.mts"
 	minetest.place_schematic({x = pos.x - 2, y = pos.y - 1, z = pos.z - 2},
-		path, "0", nil, false)
+		path, "random", nil, false)
 end