From 427eb3244845bd82bf8530ae27efdf25885cf4d3 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Tue, 12 Sep 2017 05:35:02 +0200 Subject: [PATCH] Add a second huge jungle tree schematic, tweak the 1st one --- mods/ITEMS/mcl_core/functions.lua | 4 +- .../schematics/mcl_core_jungle_tree_huge.mts | Bin 458 -> 0 bytes .../mcl_core_jungle_tree_huge_1.mts | Bin 0 -> 500 bytes .../mcl_core_jungle_tree_huge_2.mts | Bin 0 -> 509 bytes mods/MAPGEN/mcl_biomes/init.lua | 54 ++++++++++-------- 5 files changed, 33 insertions(+), 25 deletions(-) delete mode 100644 mods/ITEMS/mcl_core/schematics/mcl_core_jungle_tree_huge.mts create mode 100644 mods/ITEMS/mcl_core/schematics/mcl_core_jungle_tree_huge_1.mts create mode 100644 mods/ITEMS/mcl_core/schematics/mcl_core_jungle_tree_huge_2.mts diff --git a/mods/ITEMS/mcl_core/functions.lua b/mods/ITEMS/mcl_core/functions.lua index d6df8cc72..9e57b22ef 100644 --- a/mods/ITEMS/mcl_core/functions.lua +++ b/mods/ITEMS/mcl_core/functions.lua @@ -629,8 +629,10 @@ end -- Generate huge jungle tree with 2×2 trunk. -- With pos being the lower X and the higher Z value of the trunk. function mcl_core.generate_huge_jungle_tree(pos) + -- 2 variants + local r = math.random(1, 2) local path = minetest.get_modpath("mcl_core") .. - "/schematics/mcl_core_jungle_tree_huge.mts" + "/schematics/mcl_core_jungle_tree_huge_"..r..".mts" minetest.place_schematic({x = pos.x - 6, y = pos.y - 1, z = pos.z - 7}, path, "random", nil, false) end diff --git a/mods/ITEMS/mcl_core/schematics/mcl_core_jungle_tree_huge.mts b/mods/ITEMS/mcl_core/schematics/mcl_core_jungle_tree_huge.mts deleted file mode 100644 index 7e5126007b8ff25993b88d6bc3d1be8cfb7ff522..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 458 zcmeYb3HD`RVc=tsV&JQ{2ZMSfU=QIjFf%YGW)?As<|gOFC+8QXT4j~yrRSvPq$ZZ7 z7BdK=36~V5rdG^(JB@KtvjUIn)b8Rfwo=hqYa5i-iYR`VH}_mZicj4?mt~v_6rUYu zy}(~wAZyR4(0SqNzV?qc9#2kOogIAM)?QVH|EuI;{p$Zue^}X`Ua0rHcH%Wd(Vg>W z?b!c)Yu7WUH@|0e9lP?-?zZsPU-#cfS6}n1y`Gd^yN)?FeBH*gODof-?0&8MZEgAU zv`=R`uYNGSlJ?f~j{f|&>;3mM{XVa#&^RUe(Z#SE>7DBpk9`vDFWvTb-t)Pp1*P{r zW?pxHaxTT@uJNSm?(&84AM%1TVy&AUFX+#a7Tx?(YOU?Yzb4ozo_(x7o|C$?c;ox%kmw~_Rxe-D z*{S6A`h`|N`1JbUrE8BSYa4b}n7!lJY3H03Xu$0MQ|NQemHgzU=Qicj?bq5EnjV|9 i>x-r8(gx*PxtR@?Rf diff --git a/mods/ITEMS/mcl_core/schematics/mcl_core_jungle_tree_huge_1.mts b/mods/ITEMS/mcl_core/schematics/mcl_core_jungle_tree_huge_1.mts new file mode 100644 index 0000000000000000000000000000000000000000..ba4f9fa2617e4237a445bd857f1e113fe1972aa7 GIT binary patch literal 500 zcmeYb3HD`RVc=tsV&Jm}gL-6O58*N}GcYG+7BPtCCg;Q_=NF|~WtHZo=cMMOCYGfZ zGYF#zmlUO@R?K-jEn28qfyZ@Xf8EaXY1ftpu3c)Q(zI1V?z_QUO}FDuo|(CFFlZ%3 zi81^&VAZZ;XV4Ygb?du<4S$r%v#i%wlFxUyJZ7{{{*wCM{gD_HC#@^LoBeE8j4yVjIP=Mn_2us>%?Hj7<6Mcr(QetXco8;zfo z1oqWRWc_^g{aR4A)9bmXqt#a|4N3I>KXqN<=dIs@ukN}ux2*iuv1viqvyPUp?s~py zHl-2J!p(~&C@-mfk_pE6~#dr;IAyZZih@6I~JGB7Y4c>eLhxdfSAm#fsw&z$-E gjq$0ZU-q^5!gAv$Jm%N!wp?RixFD&&ZLRWV037P~5C8xG literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_core/schematics/mcl_core_jungle_tree_huge_2.mts b/mods/ITEMS/mcl_core/schematics/mcl_core_jungle_tree_huge_2.mts new file mode 100644 index 0000000000000000000000000000000000000000..df0114f6bdce5634c8d48a524955b62bb5fbfcb5 GIT binary patch literal 509 zcmeYb3HD`RVc=tsW8kYdH8rgV11KX8!~wBA>+9HN8Gm98RbCYx8lkgPXUyB{vP^w7@h==yR#IW6fc-mGzq9;|UInbsDsXIS)tHCy3v)`8}0eI6QR z(|&(*&30eXo0O$2QFGzg&1u}yY20wJ(m_870R5_e5Jmw^3<s+Zi6f s5?RjKyX14tIeSfysBV!ZnI)#FYQ5WvVrL%Qwp5UTVagf#6$cHu02OcU8~^|S literal 0 HcmV?d00001 diff --git a/mods/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua index 11eb2cf9a..07f71254f 100644 --- a/mods/MAPGEN/mcl_biomes/init.lua +++ b/mods/MAPGEN/mcl_biomes/init.lua @@ -1780,18 +1780,36 @@ local function register_decorations() }) -- Jungle tree - minetest.register_decoration({ - deco_type = "schematic", - place_on = {"mcl_core:dirt_with_grass", "mcl_core:dirt"}, - sidelen = 80, - fill_ratio = 0.0025, - biomes = {"jungle"}, - y_min = 4, - y_max = mcl_vars.mg_overworld_max, - schematic = minetest.get_modpath("mcl_core").."/schematics/mcl_core_jungle_tree_huge.mts", - flags = "place_center_x, place_center_z", - rotation = "random", - }) + + -- Huge jungle tree (2 variants) + for i=1, 2 do + minetest.register_decoration({ + deco_type = "schematic", + place_on = {"mcl_core:dirt_with_grass", "mcl_core:dirt"}, + sidelen = 80, + fill_ratio = 0.00125, + biomes = {"jungle"}, + y_min = 4, + y_max = mcl_vars.mg_overworld_max, + schematic = minetest.get_modpath("mcl_core").."/schematics/mcl_core_jungle_tree_huge_"..i..".mts", + flags = "place_center_x, place_center_z", + rotation = "random", + }) + minetest.register_decoration({ + deco_type = "schematic", + place_on = {"mcl_core:dirt_with_grass", "mcl_core:dirt"}, + sidelen = 80, + fill_ratio = 0.004, + biomes = {"jungle_m"}, + y_min = 4, + y_max = mcl_vars.mg_overworld_max, + schematic = minetest.get_modpath("mcl_core").."/schematics/mcl_core_jungle_tree_huge_"..i..".mts", + flags = "place_center_x, place_center_z", + rotation = "random", + }) + end + + -- Common jungle tree minetest.register_decoration({ deco_type = "schematic", place_on = {"mcl_core:dirt_with_grass", "mcl_core:dirt"}, @@ -1817,18 +1835,6 @@ local function register_decorations() rotation = "random", }) - minetest.register_decoration({ - deco_type = "schematic", - place_on = {"mcl_core:dirt_with_grass", "mcl_core:dirt"}, - sidelen = 80, - fill_ratio = 0.008, - biomes = {"jungle_m"}, - y_min = 4, - y_max = mcl_vars.mg_overworld_max, - schematic = minetest.get_modpath("mcl_core").."/schematics/mcl_core_jungle_tree_huge.mts", - flags = "place_center_x, place_center_z", - rotation = "random", - }) minetest.register_decoration({ deco_type = "schematic", place_on = {"mcl_core:dirt_with_grass", "mcl_core:dirt"},