From 88d6490c9dabbcb4b58b652623de986161b95468 Mon Sep 17 00:00:00 2001 From: Milan* <tchncs@vivaldi.net> Date: Fri, 3 Feb 2017 22:25:28 +0100 Subject: [PATCH] biome adjustments add swamp dirt add things i forgot about very serious commit message --- dirt.lua | 3 ++- mapgen.lua | 22 +++++++++++++--------- schematics/iska_birch1.mts | Bin 0 -> 460 bytes schematics/iska_birch2.mts | Bin 0 -> 367 bytes schematics/pine_tree.mts | Bin 0 -> 175 bytes textures/ethereal_grass_mushroom_side.png | Bin 565 -> 513 bytes textures/ethereal_grass_mushroom_top.png | Bin 702 -> 593 bytes textures/ethereal_grass_swamp_side.png | Bin 0 -> 489 bytes textures/ethereal_grass_swamp_top.png | Bin 0 -> 728 bytes 9 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 schematics/iska_birch1.mts create mode 100644 schematics/iska_birch2.mts create mode 100644 schematics/pine_tree.mts create mode 100644 textures/ethereal_grass_swamp_side.png create mode 100644 textures/ethereal_grass_swamp_top.png diff --git a/dirt.lua b/dirt.lua index 3b5d920..cbc1f2a 100644 --- a/dirt.lua +++ b/dirt.lua @@ -45,7 +45,7 @@ minetest.register_craft({ local dirts = { "Bamboo", "Jungle", "Mesa", "Grove", "Prairie", "Cold", - "Crystal", "Mushroom", "Fiery", "Gray" + "Crystal", "Mushroom", "Fiery", "Gray", "Swamp" } for n = 1, #dirts do @@ -80,6 +80,7 @@ dirts = { "ethereal:mushroom_dirt", "ethereal:fiery_dirt", "ethereal:gray_dirt", "default:dirt_with_grass", "default:dirt_with_dry_grass", "ethereal:green_dirt", "default:dirt_with_snow", "default:dirt_with_dry_grass", "ethereal:mesa_dirt", + "ethereal:swamp_dirt" } -- check surrounding grass and change dirt to same colour diff --git a/mapgen.lua b/mapgen.lua index d869108..0c2088f 100644 --- a/mapgen.lua +++ b/mapgen.lua @@ -85,10 +85,10 @@ add_biome("mesa_ocean", nil, "default:sand", 1, "default:sand", 2, nil, nil, nil, nil, nil, -192, 1, 25, 28, ethereal.mesa) add_biome("alpine", nil, "default:dirt_with_snow", 1, "default:dirt", 2, - nil, nil, 1, "default:ice", nil, 40, 136, 15, 35, ethereal.alpine) + nil, nil, 1, "default:ice", nil, 62, 196, 15, 35, ethereal.alpine) add_biome("snowy", nil, "ethereal:cold_dirt", 1, "default:dirt", 2, - nil, nil, nil, nil, nil, 6, 92, 10, 40, ethereal.snowy) + nil, nil, nil, nil, nil, 6, 82, 10, 40, ethereal.snowy) add_biome("frost", nil, "ethereal:crystal_dirt", 4, "default:dirt", 3, nil, "default:ice", 1, nil, "default:ice", 1, 83, 10, 40, ethereal.frost) @@ -180,7 +180,7 @@ add_biome("fiery_ocean", nil, "default:sand", 1, "default:sand", 2, add_biome("sandclay", nil, "default:sand", 3, "default:clay", 2, nil, nil, nil, nil, nil, 1, 11, 65, 2, ethereal.sandclay) -add_biome("swamp", nil, "ethereal:green_dirt", 1, "default:dirt", 3, +add_biome("swamp", nil, "ethereal:swamp_dirt", 1, "default:dirt", 3, nil, nil, nil, nil, nil, 1, 7, 80, 90, ethereal.swamp) add_biome("swamp_ocean", nil, "default:sand", 2, "default:clay", 2, @@ -247,6 +247,7 @@ add_schem({"ethereal:gray_dirt"}, 0.02, {"grayness"}, 1, 100, path .. "willow.mt -- pine tree (default for lower elevation and ethereal for higher) add_schem({"ethereal:cold_dirt"}, 0.025, {"snowy"}, 10, 40, dpath .. "pine_tree.mts", ethereal.snowy) add_schem({"default:dirt_with_snow"}, 0.025, {"alpine"}, 40, 140, path .. "pinetree.mts", ethereal.alpine) +add_schem({"default:dirt_with_snow"}, 0.015, {"alpine"}, 40, 110, dpath .. "pine_tree.mts", ethereal.alpine) -- default apple tree add_schem({"ethereal:green_dirt"}, 0.02, {"jumble"}, 1, 100, dpath .. "apple_tree.mts", ethereal.grassy) @@ -306,10 +307,9 @@ add_schem({"ethereal:bamboo_dirt"}, 0.025, {"bamboo"}, 1, 100, ethereal.bambootr add_schem({"ethereal:bamboo_dirt"}, 0.08, {"bamboo"}, 1, 100, ethereal.bush, ethereal.bamboo) -- vine tree -add_schem({"ethereal:green_dirt"}, 0.02, {"swamp"}, 1, 100, path .. "vinetree.mts", ethereal.swamp) +add_schem({"ethereal:swamp_dirt"}, 0.02, {"swamp"}, 1, 100, path .. "vinetree.mts", ethereal.swamp) --= simple decorations - local add_node = function(a, b, c, d, e, f, g, h, i, j) if j ~= 1 then return end @@ -395,7 +395,7 @@ local list = { {"grassytwo", "ethereal:green_dirt", ethereal.grassytwo}, {"prairie", "ethereal:prairie_dirt", ethereal.prairie}, {"mushroom", "ethereal:mushroom_dirt", ethereal.mushroom}, - {"swamp", "ethereal:green_dirt", ethereal.swamp}, + {"swamp", "ethereal:swamp_dirt", ethereal.swamp}, } -- wild red and brown mushrooms @@ -452,11 +452,15 @@ add_node({"default:sand"}, 0.25, {"sandclay"}, 3, 4, {"default:grass_2", "defaul -- ferns add_node({"ethereal:grove_dirt","ethereal:jungle_dirt","ethereal:mesa_dirt"}, 0.2, {"grove","junglee","mesa"}, 1, 100, {"ethereal:fern"}, nil, nil, nil, ethereal.grove) -add_node({"ethereal:green_dirt"}, 0.1, {"swamp"}, 1, 100, {"ethereal:fern"}, nil, nil, nil, ethereal.swamp) +add_node({"ethereal:swamp_dirt"}, 0.1, {"swamp"}, 1, 100, {"ethereal:fern"}, nil, nil, nil, ethereal.swamp) -- snow -add_node({"ethereal:cold_dirt"}, 0.8, {"snowy"}, 4, 40, {"default:snow"}, nil, nil, nil, ethereal.snowy) +add_node({"ethereal:cold_dirt"}, 0.6, {"snowy"}, 4, 40, {"default:snow"}, nil, nil, nil, ethereal.snowy) add_node({"default:dirt_with_snow"}, 0.8, {"alpine"}, 40, 140, {"default:snow"}, nil, nil, nil, ethereal.alpine) +add_node({"ethereal:green_dirt"}, 0.8, {"clearing","grassytwo"}, 86, 140, {"default:snow"}, nil, nil, nil, ethereal.alpine) +add_node({"ethereal:green_dirt"}, 0.4, {"clearing","grassytwo"}, 76, 86, {"default:snow"}, nil, nil, nil, ethereal.alpine) +add_node({"ethereal:green_dirt"}, 0.1, {"clearing","grassytwo"}, 72, 76, {"default:snow"}, nil, nil, nil, ethereal.alpine) +add_node({"ethereal:green_dirt"}, 0.04, {"clearing","grassytwo"}, 68, 72, {"default:snow"}, nil, nil, nil, ethereal.alpine) -- wild onion add_node({"ethereal:green_dirt"}, 0.25, {"grassy"}, 1, 100, {"ethereal:onion_4"}, nil, nil, nil, ethereal.grassy) @@ -467,7 +471,7 @@ add_node({"ethereal:prairie_dirt"}, 0.25, {"prairie"}, 1, 100, {"ethereal:onion_ -- papyrus add_node({"ethereal:green_dirt"}, 0.1, {"grassy"}, 1, 1, {"default:papyrus"}, 4, "default:water_source", 1, ethereal.grassy) add_node({"ethereal:jungle_dirt"}, 0.1, {"junglee"}, 1, 1, {"default:papyrus"}, 4, "default:water_source", 1, ethereal.junglee) -add_node({"ethereal:green_dirt"}, 0.1, {"swamp"}, 1, 1, {"default:papyrus"}, 4, "default:water_source", 1, ethereal.swamp) +add_node({"ethereal:swamp_dirt"}, 0.1, {"swamp"}, 1, 1, {"default:papyrus"}, 4, "default:water_source", 1, ethereal.swamp) --= Farming Redo plants diff --git a/schematics/iska_birch1.mts b/schematics/iska_birch1.mts new file mode 100644 index 0000000000000000000000000000000000000000..dc48e0455076fc47f5f5ea6a67e450a48da23864 GIT binary patch literal 460 zcmeYb3HD`RVc=%qW8khw0SwFx%!!#r45Fze8L367i8)qDnMKJN@j0o9WvRssB51-T zMWuP!6?5K(HI}s~@M!<3u-_{^#c9H$n%h@C_f@E?E@%q~ShU^k#+16(%asmD?tHK% z()LZ<*P1u|PRBF#7Fbtosk<e1(7b4!<j?Td<!7Xw?{DAPIA^Dj_my{PsVe&J>HqG$ zjheH=;8Wpax0YgQ{Y^6}uk3W?b9R0mSpMj3PD`Zx@4tJjj@#bfbY_P`vfaK<vwqud z`**C7U$*<ENcNqu^wrA!*7q*YwVAg3^WQb^8@0>!`P<z!=8sd$Soib&*?+SSpI*JU z_Fd<Uy`Hvt=e~ch-fv^obaVUhf95AYA9%`t)%sv4({tzSl~4A)<WjAjI+<na;uCku zeK(n{(lxbn=R4ecbIDW<Pr;M2n@pxX)A;|`gxh1qMiI$L^*?t?t*X>I5Mvx@cK)#N zKdG)8xveK=o}2aaq>=H&lWTT!Fr{9c>AY2wx6#$u{^y+JXK9aq9#VMoX^lY2Ylg|M uwSLdyT+=6bQ%l#{t=I7RIgt?Myg>2%mir8MY;Pori-CY#n|{ZJ`XvB{X5YpD literal 0 HcmV?d00001 diff --git a/schematics/iska_birch2.mts b/schematics/iska_birch2.mts new file mode 100644 index 0000000000000000000000000000000000000000..1221858086174fed482b8589b73fdc703485f8e8 GIT binary patch literal 367 zcmeYb3HD`RVc=vCWZ<Yr2Mo*%%!!#r45Fze8L367i8)qDnMKJN@j0o9WvRssB51-T zMWuP!6?5K(bc;1BaER8=@h{hQuDqFbeAep<Yg3n&(}!C>TyNmF+ReW%uVzj<?=iM* z?zcl^Pb!>qxqjZ#Ed21Ni!!<I?nPZcWY26Jx2X77*&~TZxl-#-Uwk4MTDwU;A^V1n z^Utu~2}>5_+?L9(HUE}Bd9JvD)!N2Sr%r8qzbZ{3d{^?W<&Upk*e_YVIbd_svSXif z7FW-Tzy4h6Mb?&ow~x)9URY4F$c;^F<r=}Yp5GVTGM&UG*y%rQn*Ou7A-PtDI&}d% z)Ak=}db_~DGj+Mj!xpdm9HviQ3@;sfp4)7h7RCJRfySn!y>DX-wb;2BXKwhQxM|Vq xCkvh^8^1j^!PGe{k+(Hw#j$f8-}bZm3h>(H-hFk6HEy9A5Xkk3Z!S%q0sv%Fs(Jtb literal 0 HcmV?d00001 diff --git a/schematics/pine_tree.mts b/schematics/pine_tree.mts new file mode 100644 index 0000000000000000000000000000000000000000..3a3fa7ad0e7f7c3bbd3282856d1985734b62d702 GIT binary patch literal 175 zcmeYb3HD`RVPIw8V_>bXx3{kc5@1x%z|6p$m|4Uil9HO1SejE}RgjsN8lRV%nv#=R z%piy&T2hpnS}`X%K|#{skmA<Vlf~RdCp}Cf1rn4xk8-3so=I++?Y>LrknWQ<;oQTm zCEG8U?>+MT`t#$$r;l=edM)|tv*fGSuR9+a8T>i!cZHdA!KMFSf9yyIexMfkPE4l3 P>Y)+W3I>L{ohG~h4u?sD literal 0 HcmV?d00001 diff --git a/textures/ethereal_grass_mushroom_side.png b/textures/ethereal_grass_mushroom_side.png index a5adde02ff9746fcc50795835c56ed70b021b558..ebc1e3d2746815f51b4be5eae1e4bf9a18bd04aa 100644 GIT binary patch delta 461 zcmV;;0W$uz1c3yQBo78+OGiWiw*a>Qx6ZJk!I3c@f8hZi6bu&-pUs&700E9kL_t(I z%k9j)iW5;7hw<l}IWw8b*K8Davk8J15G<@L1&i&x3K6ft##`_fwy@Mn#8$Af%3>A~ zR>`8~Yc@NsIhl`~nK?EaL=Y5gEc}%(|Mw9GH}2Ss4ZUEG0x(62MUs^{o+A+mN(8>F z;W{1ye}Tjjr4ij`7nzlYmfPZDv%=Z}AzhSmY1Qf|<zo?OvqC9_r6eyC)>V$L>P+<% zi4d4_L)&iwf<SqAj>qS9#3DPV8}{&}M_Cv$lkz25Qj~^^VnxFbkqx&&QW>Ol0E;U< z*14t^?9sq~JU;(a1zt!_#V~sJWUgn=+qEXXe+tM<ibP7r%MTA;jbA@>WZmjb##GOr zj-t_{<Fn(1>nJ(T=A<UU6V4k`WY6*{=c*r)ZjwWl7lz&D{@t0L9F3y4_nNAHWuhl9 z0Rx;K&4$C9*KWP|mY&^i`|U8%N&H@)h+VaBPvVbD(eL-~Uycs}3kX2*!*yT*(CKu( zGj5M@9Pa>13<d*!=W_g0U`z1_e)YH|`Ah!;|3ct9`1Y-Dk?1H_00000NkvXXu0mjf D;i}km delta 540 zcmV+%0^|LG1hoW^B!2{FK}|sb0I`n?{9y$E000SaNLh0L01FWS01FWTe`H^g00007 zbV*G`2iy!44FL}_-{igk000_vMObuGZ)S9NVRB^vP+@6qbS_RsR3LUUE;TMOF-P-4 zHvj+uo=HSOR5(wS&CM^va2&_+au7!ce*>3|c#04+Cua6Q*MF?*y0IDE;$dT&Sv_>B zv)b5f!-10oH#hO;@$ub4BGHI8d8Pfm`^)#s$O~zt+zB*<3NC~)H0}^5tP0teh05ko z2<+pKRbcQ%)Ws?qkveW7HDtY8xQktbk>=KM%;upi$~X^cDDtN;!X=ywI*MTpDyKkN zNT3$IKvk@u#D5o{)4c+BgkA3jn50XhZ5h;~6&g@PGkS@}avh>8j+kd1&zp~s{b^K! z8cw(a2(vL91rCt%q@dFhMp?{b&7DMZrG|1y$NkD}d-@q)Le`VL+VRWpdgu&luz-=F z@u#uj$=Bv`6>=bl+|nKm;Epk9A4uA4Hl-G6ei(ciyni$J;uxJ)TP;u9qV6~{{tTu@ zrqa~nhN!g{O0L8Mv+dnOz{$VSkJ8-4{Hib`$n@QM`bjsLS49JoC*@?FtdGtP!fg3= zV7J?=3>_pAC!M6@>)rK3AL;qhy8o?p?)@45Vm6@dSFp-7T45TkFpXB2Mk`FC6{gV& e)A)Zj<`okFT@;d=h%3qf0000<MNUMnLSTZ>lJ$-N diff --git a/textures/ethereal_grass_mushroom_top.png b/textures/ethereal_grass_mushroom_top.png index 90772a7cc520c8478f3a501a7c4d63ab4ff12662..70f1433707a076bbc3c064b23ff8d4efb2dbbaf8 100644 GIT binary patch delta 542 zcmV+(0^$9>1<?eMBo78+OGiWiw*a>Qx6ZJk!I3c@f8hZi6bvA!B50NX00G`fL_t(2 z&n3@WlG88{1<>0s$xdc~D)?dx>;m?`6)46@EKB|1gR_G}zkd7_NM>Xu6KCc7{+?CW zx~gKc+jBe!W!eFln9g;5ef#F=$LntpHEEu~EC9y3nC!m4Wfe1L1gYqz8xt>I9uCmG zzcVufe`am(x5ympm6bxOs&fsV;n$kWr;2s!&DvboaUR{er+ZFjR&7<;v@<IM^%x%_ zYGzy8r(d4F^&1t=@v1@s0Mz<eCqRsXuqIMSBK<iY9^Rxy6$vG>Yp=@8r~(1nY-1(> z*BVvX+Gb*>zdUBs-P1iiB87Qx`|wjubj1a*f0tJ#tx14~d-~RR<2`aQ@vZM!@Cf<- z<vT-IMOjUo=RD32fIi>95K*SD@I*4}iUpJws;HJP6D?G?&7=WjYyey+d`3iMc&yCi z);be6vB+rJ@7t$tJAh*xkMl!CKJA~C<#`@so<+rLO;!fL01+XR3JiFxMEyB_Kd%Ri ze{|bS?R7o0kSKtl($*ZSNLc?br?2HRD@>Y*N{LD1$c%`p%ya-Cdd@?{G6CSW-M4nD zOk-mrW7YTVEg~vw#;VGuP1VNr3S_r#*4(|dcKN6%VP<7x2r~n;**4}tB^Xf=xsd6x g#&t3nD9`u@naEr|g9Vo200000NkvXX1g=70g2eFv0ssI2 delta 678 zcmV;X0$Kgh1il53B!2{FK}|sb0I`n?{9y$E000SaNLh0L01FWS01FWTe`H^g00007 zbV*G`2iyZ34Jj;&0fblp000_vMObuGZ)S9NVRB^vP+@6qbS_RsR3LUUE;TMOF-P-4 zHvj+vCrLy>R2Ufr!C7t`ISc?$ilRzOE$-N9C&))GkaOfT1Aok+2N=Lkr|pz$l|+$w z&;0xIA2MBQrHNQX7P&rLMP)r#X*|Wt+sEC2#x4OsaDn!7|Ni+}rM$kq7&OVH!j;H@ zn)Tcq`p3&tYhsDG6yqI@ey~W(@lm+|n8)EtL<kT=ocf0*^0B`+Z4SNn-El6s*SsD3 zkq_@eABO1Dc7Lw7`If>^Tg|)^QRt!wN7q~GP(knOt8<+XVMx<ax59bqA5dXl-<v1{ zC>S66^;|%aK!BWY%FcGRm2F!TAh^gXXiWnde81;SSpf_gpgxU=2%vl3q}7zB(1kV6 zXFXDwGMB=oR(8})aa!_1o_www7@H+)V?1{QkZUe2kAIdX8w#Hm?L&VN(aOdC`1ZpZ zht7KIeHU{(Zu5&#^X2iIHCVZ1E=|Nzm+PS*Bp_m>mNPi70DTyPO9o890LFmBHSf&K zt>$`iV@#<hW21|ex%b1<_&kJ30e-Ky`~2#hd%k>i*4^h{^ZrMT;&~p{I|Q(x#u(vd z6s$t7Cx3(dfBWx!y_2IMPRXbD^*0Hysu)D?(s3+@n9h1@>EbU(J(go{!rn#aJQ)gI zL}q5@Cd^U*01@BzUmbaApbDSHr!ierS|m>vBSpH7&$Sg5IZ9UH=#%fl$38dZ6#5WS z%^5>l&sCZbB6iMOAd41^>EpQUi>d%Zk;0szwI5v1Wt#~tfYw(30#gxb-LJiZ00000 M07*qoM6N<$f{k-D%m4rY diff --git a/textures/ethereal_grass_swamp_side.png b/textures/ethereal_grass_swamp_side.png new file mode 100644 index 0000000000000000000000000000000000000000..791fbe15c202cf6a90440c53d41f0a48b69c7b5b GIT binary patch literal 489 zcmV<F0T%v=P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0Ji|Q z0JqMtp}_zE010qNS#tmY3ljhU3ljkVnw%H_000McNliru;Q|2%0Utu_e6s)m0d`45 zK~y-)?aj?<6Hyq(@&7q<;+bhOlQB(gp@s-z0;RYsb<=iTP?uhS3+V-T3w0-W3thN$ zr)&2vvyc{JrPQ{zi{@kUF`1cjP8TgGB3?m%@W9K%1FvYUm)&$!&}c<i>zIxT0H&iH z9VmnVYaBsXLi-*<fbayT-xC_GDx$HXU3EcY4a`LfXFw_efGr$(X6T)#G};l)K|V8B z<1ofC?q^6LugiErBc&jyDEz?Vq?>SYJZ8ChkGV);3d?wq@w1zdXO`Z1O117I!@HVv zV(`4{uR16(>}4!J4Dl=K-QoV34Qra&#L)RXc>n8L{xPm=DshR?AVaA;lA}(#bJR&| zn=cl3$HSR8J{W$uJhdGx`RZ0APr3=^umplHIFjk4csjon@Z)QLkM@(YtKFBMfHykg zWxXk11FJwA@PY01XY;Q4*x!m4c@As<JX$L|;H>~&0XeV-I6wf3-yQ%LH+TP!KK^U> fU-3<D-TJ31qUeok6t;+!00000NkvXXu0mjfxjxSx literal 0 HcmV?d00001 diff --git a/textures/ethereal_grass_swamp_top.png b/textures/ethereal_grass_swamp_top.png new file mode 100644 index 0000000000000000000000000000000000000000..01a47b1bfc7d61d493813ad13c29835dd777ec55 GIT binary patch literal 728 zcmV;}0w?{6P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0Ji|Q z0JqMtp}_zE010qNS#tmY3ljhU3ljkVnw%H_000McNliru;Q|2%0Viti#4P{-0%b`= zK~y-)HIi9w8%Yoaqq4Gk6-jHEk&XG8E6gG0{)aFOSRf&ZG<&J8CH>KG0tw__;Jpm@ z-~Ughjl&9*T=6QTt@8NVQH!xm2`ez30-xs<5l7Q|0GiGtan78-&-4dni-l#%gjPtg z;v4|XzY=lDoL)M{Q$sf>q49VXbT|fTHBv0(WPs839t{pBj;>e6V}n)W{<%>rXya&F z&pIV!TMEzL2I5=@tuQ<&ZLiGt#K+r8+XYIhY-?q@B|hF3tU%i<UOif?alNc`qwd5( zS?5fOmGKmC&hzVYBDBKcOT+Q0CA7kF&v<o+8E7MvZ1~{FxpM!A<gL<lo@xc>98~BJ z0mIm0!EEnHhoj=0!_0_Np%i0yP(tTf?ul(#>Bd0X3TZ9m%?OP!90JR|AWf^(Y@EN( z<WxypVT*;d72>?#8XOO&fb$L!I6QVZgtQg(dRb{Y&)0uPN-_*s?uqLq(v8aVw;mj9 zYbC`3K*^bHtvEmd%plGM4T1yuF%Vjh_l~yrfJ3CR&Y6;poc10{sz^5~ULEb=snr;c zfyci_#$!XRaJ@u6&nv2)=hp|kI^KUS+}<Mw=sIT(Us}v6f2P!o2#7$61ySMr<4%7F zgjVoAu*J&tvZ5H&TDe{#Pp>`8lmXBn_#m|X?!|P^<YY9xCj>#fBeWjLsgk$KI%VG9 z7GNh|FA)tw&Xrn?!&A$63|NJx-(z>ZB9DLfIB~rEGwgo<A$6YVnwW2i5ca=o5ZZqC z<MLz12SGGAyzUFoJt*@nff>$0PL-SuGgz0xblVW`IK6bFSojU8E@5zlC#W_60000< KMNUMnLSTYvHcBx7 literal 0 HcmV?d00001 -- GitLab