From 20b433881b733409e13729d6d7b9df3607c9ca82 Mon Sep 17 00:00:00 2001
From: Paramat <paramat@users.noreply.github.com>
Date: Mon, 20 Aug 2018 23:56:00 +0100
Subject: [PATCH] New wider apple tree schematic
Precisely reduce trees and logs per mapchunk division to compensate.
---
mods/default/mapgen.lua | 8 +-
mods/default/nodes.lua | 4 +-
mods/default/schematics/apple_tree.mts | Bin 169 -> 209 bytes
.../schematics/apple_tree_from_sapling.mts | Bin 173 -> 208 bytes
mods/default/trees.lua | 2 +-
schematic_tables.txt | 211 ++++++++++--------
6 files changed, 128 insertions(+), 97 deletions(-)
diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua
index f0da5d5..7e1cf7d 100644
--- a/mods/default/mapgen.lua
+++ b/mods/default/mapgen.lua
@@ -1621,8 +1621,8 @@ function default.register_decorations()
place_on = {"default:dirt_with_grass"},
sidelen = 16,
noise_params = {
- offset = 0.036,
- scale = 0.022,
+ offset = 0.024,
+ scale = 0.015,
spread = {x = 250, y = 250, z = 250},
seed = 2,
octaves = 3,
@@ -1643,8 +1643,8 @@ function default.register_decorations()
place_offset_y = 1,
sidelen = 16,
noise_params = {
- offset = 0.0018,
- scale = 0.0011,
+ offset = 0.0012,
+ scale = 0.0007,
spread = {x = 250, y = 250, z = 250},
seed = 2,
octaves = 3,
diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index 4f427f4..9b01456 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -684,8 +684,8 @@ minetest.register_node("default:sapling", {
"default:sapling",
-- minp, maxp to be checked, relative to sapling pos
-- minp_relative.y = 1 because sapling pos has been checked
- {x = -2, y = 1, z = -2},
- {x = 2, y = 6, z = 2},
+ {x = -3, y = 1, z = -3},
+ {x = 3, y = 6, z = 3},
-- maximum interval of interior volume check
4)
diff --git a/mods/default/schematics/apple_tree.mts b/mods/default/schematics/apple_tree.mts
index 2bd57c1fc4aa36e2f03c6ac2989c86b575e2784e..d56cd54b8efb295ccb5ab11b99cc914c8627dca1 100644
GIT binary patch
literal 209
zcmeYb3HD`RVPI$AU|_GWx332QAfGugvxtE&B{eOvG^fNWCpEDwwU~hy#!oCL$Vp}3
zfpJTUQd2ADyq$QFx50peHIVIPN6!bh<3X(^QI|8W>Srn?70vPQWXsZ8KJUIx@!7;V
zkG9-@$|-$(Zv4+9`_7-6u6}x(-)F_^(wTFg8x(xqGX4F!kGub0zh${6ULkvb8zZNI
zRO@%$+SzGgMt)Hb^R91hn-bmBU?!9HKASgydCG+kw)5V9`~K(k<|u|ZPwndfaEDza
literal 169
zcmeYb3HD`RVPIw8U|_AUx333bAfGugvxtE&B{eOvG^fNWCpEDwwU~hi#xE&KO=aMP
z@e&IPa#AbiBqt~c89ZuT!tBPT#+IgVELCpPPM?C<9g#f_mlbAgsJv1pU-)dIY~9D7
zKYxDYU|PQG&;L)qKYxDx`n4hpbAVyM7kg%_iTd&S{fpMw$?vZG{q%qGEcboC+msj>
J$|h)D1OV1LMcM!W
diff --git a/mods/default/schematics/apple_tree_from_sapling.mts b/mods/default/schematics/apple_tree_from_sapling.mts
index d258ab1a80a20520986cd0d37f560aeebac359f8..232510034d7d858e36a8a9fcfdd96c76d988f07e 100644
GIT binary patch
literal 208
zcmeYb3HD`RVPI$AU|_GWx332QAfGugvxtE&B{eOvG^fNWCpEDwwU~hy#!oCL$Vp}3
zfpJTUQd2ADyq$QLw?ToYrIGJYM^C|G?bay^oH+LTPdl=>?e+1MLBdN9pZY!bsLtdL
ztF@nE!!BsNec~zl%i6lMe2#9}v&q@+Q6Gbq0={jVnm?uD-T$d+e&@>z0)OW;u-@o>
yFkLfumif=kaYef?2tKVU(b*8E6LVv;Y)*di%?7Ld%6$*t|Gd6&7o&!g`gH((_g#ko
literal 173
zcmeYb3HD`RVPIw8U|_AUx333bAfGugvxtE&B{eOvG^fNWCpEDwwU~hi#xE&KO=aMP
z@e&IPa#AbiBqt~c89ZuT!tBPT#+IgVELCpPPM?C<9g#f_mlbAgsJv1pU-)dIY~9D7
zKYxDYU|PQGPgUjbKYxDxs^U1v5W*v}mfiDjdc(#Bmwh#RZMt^-s(JJ5=IQInv)uRn
NZc}1l2)v>e2mk;gNd5o-
diff --git a/mods/default/trees.lua b/mods/default/trees.lua
index a46ac5a..dc18ea4 100644
--- a/mods/default/trees.lua
+++ b/mods/default/trees.lua
@@ -387,7 +387,7 @@ end
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},
+ minetest.place_schematic({x = pos.x - 3, y = pos.y - 1, z = pos.z - 3},
path, "random", nil, false)
end
diff --git a/schematic_tables.txt b/schematic_tables.txt
index cb9d82f..ee25b82 100644
--- a/schematic_tables.txt
+++ b/schematic_tables.txt
@@ -30,66 +30,80 @@ local _ = {name = "air", prob = 0}
-- Mapgen Apple tree
-local L = {name = "default:leaves", prob = 191}
-local N = {name = "default:leaves", prob = 223}
local M = {name = "default:leaves", prob = 255}
+local N = {name = "default:leaves", prob = 223}
local F = {name = "default:apple", prob = 63}
-local T = {name = "default:tree", prob = 255}
local Y = {name = "default:tree", prob = 255, force_place = true}
-local U = {name = "default:tree", prob = 127}
-local I = {name = "default:tree", prob = 127, force_place = true}
+local T = {name = "default:tree", prob = 255}
mts_save("apple_tree", {
- size = {x = 5, y = 8, z = 5},
+ size = {x = 7, y = 8, z = 7},
data = {
- _, _, _, _, _,
- _, _, _, _, _,
- _, _, _, _, _,
- _, _, _, _, _,
- L, N, N, N, L,
- L, N, N, N, L,
- L, N, N, N, L,
- _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, N, M, N, _, _,
+ _, _, _, N, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
- _, _, _, _, _,
- _, _, _, _, _,
- _, _, _, _, _,
- _, _, _, _, _,
- N, Y, F, I, N,
- N, M, M, M, N,
- N, M, M, M, N,
- _, N, N, N, _,
-
- _, _, Y, _, _,
- _, _, Y, _, _,
- _, _, Y, _, _,
- _, _, Y, _, _,
- N, F, M, F, N,
- N, M, M, M, N,
- N, M, M, M, N,
- _, N, M, N, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, M, M, F, M, M, _,
+ _, N, M, M, M, N, _,
+ _, _, N, M, N, _, _,
+ _, _, _, _, _, _, _,
- _, _, _, _, _,
- _, _, _, _, _,
- _, _, _, _, _,
- _, _, _, _, _,
- N, I, F, Y, N,
- N, M, M, M, N,
- N, M, M, M, N,
- _, N, N, N, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ N, M, Y, _, _, M, N,
+ _, M, M, _, Y, M, _,
+ _, N, M, M, M, N, _,
+ _, _, _, N, _, _, _,
- _, _, _, _, _,
- _, _, _, _, _,
- _, _, _, _, _,
- _, _, _, _, _,
- L, N, N, N, L,
- L, N, N, N, L,
- L, N, N, N, L,
- _, _, _, _, _,
+ _, _, _, Y, _, _, _,
+ _, _, _, Y, _, _, _,
+ _, _, _, Y, _, _, _,
+ _, _, _, Y, _, _, _,
+ M, F, _, Y, _, F, M,
+ N, M, _, _, _, M, N,
+ _, M, M, M, M, M, _,
+ _, _, N, M, N, _, _,
+
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ N, M, _, _, Y, M, N,
+ _, M, Y, _, M, M, _,
+ _, N, M, M, M, N, _,
+ _, _, _, N, _, _, _,
+
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, M, M, F, M, M, _,
+ _, N, M, M, M, N, _,
+ _, _, N, M, N, _, _,
+ _, _, _, _, _, _, _,
+
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, N, M, N, _, _,
+ _, _, _, N, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
},
yslice_prob = {
{ypos = 2, prob = 127},
- {ypos = 6, prob = 127},
},
})
@@ -97,56 +111,73 @@ mts_save("apple_tree", {
-- Apple tree from sapling
mts_save("apple_tree_from_sapling", {
- size = {x = 5, y = 8, z = 5},
+ size = {x = 7, y = 8, z = 7},
data = {
- _, _, _, _, _,
- _, _, _, _, _,
- _, _, _, _, _,
- _, _, _, _, _,
- L, N, N, N, L,
- L, N, N, N, L,
- L, N, N, N, L,
- _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, N, M, N, _, _,
+ _, _, _, N, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
- _, _, _, _, _,
- _, _, _, _, _,
- _, _, _, _, _,
- _, _, _, _, _,
- N, T, F, U, N,
- N, M, M, M, N,
- N, M, M, M, N,
- _, N, N, N, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, M, M, F, M, M, _,
+ _, N, M, M, M, N, _,
+ _, _, N, M, N, _, _,
+ _, _, _, _, _, _, _,
- _, _, T, _, _,
- _, _, Y, _, _,
- _, _, T, _, _,
- _, _, T, _, _,
- N, F, M, F, N,
- N, M, M, M, N,
- N, M, M, M, N,
- _, N, M, N, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ N, M, T, _, _, M, N,
+ _, M, M, _, T, M, _,
+ _, N, M, M, M, N, _,
+ _, _, _, N, _, _, _,
- _, _, _, _, _,
- _, _, _, _, _,
- _, _, _, _, _,
- _, _, _, _, _,
- N, U, F, T, N,
- N, M, M, M, N,
- N, M, M, M, N,
- _, N, N, N, _,
+ _, _, _, T, _, _, _,
+ _, _, _, Y, _, _, _,
+ _, _, _, T, _, _, _,
+ _, _, _, T, _, _, _,
+ M, F, _, T, _, F, M,
+ N, M, _, _, _, M, N,
+ _, M, M, M, M, M, _,
+ _, _, N, M, N, _, _,
- _, _, _, _, _,
- _, _, _, _, _,
- _, _, _, _, _,
- _, _, _, _, _,
- L, N, N, N, L,
- L, N, N, N, L,
- L, N, N, N, L,
- _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ N, M, _, _, T, M, N,
+ _, M, T, _, M, M, _,
+ _, N, M, M, M, N, _,
+ _, _, _, N, _, _, _,
+
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, M, M, F, M, M, _,
+ _, N, M, M, M, N, _,
+ _, _, N, M, N, _, _,
+ _, _, _, _, _, _, _,
+
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, N, M, N, _, _,
+ _, _, _, N, _, _, _,
+ _, _, _, _, _, _, _,
+ _, _, _, _, _, _, _,
},
yslice_prob = {
{ypos = 2, prob = 127},
- {ypos = 6, prob = 127},
},
})