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 d6df8cc72a..9e57b22ef8 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~doRFfcPPCuSBgh~_5e#3$z$rCMc`=B4MP=A(uVzEw)n8S!)}V)`}>8m^b%aLW)n_KbK{k3lyIn zXT88*Tp(-DsL*-g>b~}mHXct-T%8?!-qv1KhX1SNV*Tp>Pk&h1o?fW;ymsO>L(!e{ zXYJVkeQVbM{B3Rd z^R!QAIhAJ|@gMSnGh(fq9WUt5krv(jQfjU3#=w0tQPoN8r~Df~d|DZB zI(mQc+H$?=egWPq5B>WSUUlqmM7DisvQ(^OdFr+q*PeZ>KAw}hw0PtD=#c0oTUIY$ z(%Grx_WFfZK=}0f-=%AhCTkmZR+zox*lFjS6==Zh|5NC5&6WJ*rsp>0)9u&V7@8iN jwCjtd>eD9^r_A%3zu!Ilds=`v0~93i{9}CcR=OMj3s&3q 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-6OZx7}%Ff%YGW)?As<|gOFC+8QXT4j~yrRSvPq$ZZ7 z7BdK=36~V5rdG^(J1ttMS%JrOVt?Jv^l8_Y2CiLdqtdihLhif4Tury*Po9~%axiEm zMTs%|HDJ}QV`tD6+;!`_fen9@%CoH3SCY?nw>)OFPyUkn-u|`s&NapR{LU90I9(VY z^?HWNI(h#)Li?tr=ylBP_cT&ld_FhUbT6-=?ds+G?kBA)znlGRSLC&&!C&s(F+O$o zt76%;-NB}nah-)fqzaO&oPMjmudI8)_0GP%LCnLlt?$|)JMSM-0XIHdimu)M-0=Cc z`KAwE?aNG!JHEqe^23+&GIwtOp!Y(&V!PIqN9Pg*uCPC6N;ZpKJVo7Xihg_0yc><5 zlmzzGN@V?f_5E5P`@Y8Rehl>)}=6zCq_H)Jm zUe0@;@7(>j_0y3n65g*aJ)bgVvU^a}6ubKVb??qP#4<229C-fm!MOyPU6-rW%+H+p h{EhLcq+j;6_`-7ICp_lY?Y3NFV7MTuziqAZW&j-O_YeR8 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!~wBAfiwd%19M_#5rb%Ma!!15eo?AbR%u>( zPHIkSVp(c2gD{$KNl|KQ#hka(949p^2)JH!4ZB$t*LP0BR8ZuCXMj{izt_};)C{}* znM)a@mPt!9)Oc^t{AbRfaORrpy7UhcOO_q`{HXZitDYUluQVQJ_*Sy2f6g?ca~J>Z zS#S4Z`Hz2(7eC(36}7bg%+$i5UkN-PrJr)iw_Xpr9&>u*b<6Aex&3cNtKZoE%Ui8o zxBBP0PW|&S8Fg~s!?h~bJh6wae92}-To!J_)-ME1;$vKeBFHCxaNw{-Jr?8 zwmM(^{3mSp!$p@K+IbyaU(P3|C4I%4HIC7PHEt!-+T!&Li(as1D?H9R(0r}WL!)fk z?{BWz?n`=;vXmuiE*!f#jr-e+&F?3(9b+-MwR2Tw&*j|-!EFcs?aQ9>S!!pIWU;&d z{JPD1=54EPHeBtoS?lxV*FTS{9CduQ+g*9Ly`ZddB=Q_4K zDUaFIHG{I+W*U}RTg_Z3m$Lnos?giTQshw literal 0 HcmV?d00001 diff --git a/mods/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua index 11eb2cf9a5..07f71254fe 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"},