From 0cfb5a97a8c347ce1cd3352d9438a89597633f13 Mon Sep 17 00:00:00 2001 From: Mat Date: Thu, 24 Jul 2014 01:33:25 +0100 Subject: [PATCH] Overlen variable. Remove autumn trees, freshwater bucket, schem folder --- README.txt | 2 +- functions.lua | 70 -------------- init.lua | 24 ++--- nodes.lua | 129 ++----------------------- schems/flat.mts | Bin 154 -> 0 bytes textures/default_leaves.png | Bin 193 -> 0 bytes textures/riverdev_bucketfreshwater.png | Bin 330 -> 0 bytes textures/riverdev_needles.png | Bin 860 -> 732 bytes textures/riverdev_orangeleaf.png | Bin 250 -> 0 bytes textures/riverdev_redleaf.png | Bin 250 -> 0 bytes textures/riverdev_yellowleaf.png | Bin 250 -> 0 bytes 11 files changed, 23 insertions(+), 202 deletions(-) delete mode 100644 schems/flat.mts delete mode 100644 textures/default_leaves.png delete mode 100644 textures/riverdev_bucketfreshwater.png delete mode 100644 textures/riverdev_orangeleaf.png delete mode 100644 textures/riverdev_redleaf.png delete mode 100644 textures/riverdev_yellowleaf.png diff --git a/README.txt b/README.txt index ec8865a..65d98d6 100644 --- a/README.txt +++ b/README.txt @@ -1,4 +1,4 @@ -riverdev 0.4.4 by paramat +riverdev 0.4.5 by paramat For latest stable Minetest back to 0.4.8 Depends default Licenses: code WTFPL diff --git a/functions.lua b/functions.lua index 5cfff76..ea68c39 100644 --- a/functions.lua +++ b/functions.lua @@ -36,41 +36,6 @@ function riverdev_appletree(x, y, z, area, data) end end -function riverdev_autumntree(x, y, z, area, data) - local c_tree = minetest.get_content_id("default:tree") - local c_yellowleaf = minetest.get_content_id("riverdev:yellowleaf") - local c_yellowleafinit = minetest.get_content_id("riverdev:yellowleafinit") - local top = 3 + math.random(2) - for j = -2, top do - if j == top - 1 or j == top then - for k = -2, 2 do - local vi = area:index(x - 2, y + j, z + k) - for i = -2, 2 do - if math.random() < 0.6 then - data[vi] = c_yellowleaf - end - vi = vi + 1 - end - end - elseif j == top - 2 then - for k = -1, 1 do - local vi = area:index(x - 1, y + j, z + k) - for i = -1, 1 do - if math.abs(i) + math.abs(k) == 2 then - data[vi] = c_tree - end - vi = vi + 1 - end - end - else - local vi = area:index(x, y + j, z) - data[vi] = c_tree - end - end - local vi = area:index(x, y + top, z) - data[vi] = c_yellowleafinit -end - function riverdev_pinetree(x, y, z, area, data) local c_pinetree = minetest.get_content_id("riverdev:pinetree") local c_needles = minetest.get_content_id("riverdev:needles") @@ -193,38 +158,3 @@ minetest.register_abm({ end, }) --- Spawn yellow leaves on ground - -minetest.register_abm({ - nodenames = {"riverdev:yellowleafinit"}, - interval = 13, - chance = 1, - action = function(pos, node) - local x = pos.x - local y = pos.y - local z = pos.z - local c_yellowleaf = minetest.get_content_id("riverdev:yellowleaf") - local c_grass = minetest.get_content_id("riverdev:grass") - local c_yellowleafgrass = minetest.get_content_id("riverdev:yellowleafgrass") - - local vm = minetest.get_voxel_manip() - local pos1 = {x=x-3, y=y-12, z=z-3} - local pos2 = {x=x+3, y=y, z=z+3} - local emin, emax = vm:read_from_map(pos1, pos2) - local area = VoxelArea:new({MinEdge=emin, MaxEdge=emax}) - local data = vm:get_data() - - local vi = area:index(x, y, z) - data[vi] = c_yellowleaf - for vi in area:iterp(pos1, pos2) do - if data[vi] == c_grass then - data[vi] = c_yellowleafgrass - end - end - - vm:set_data(data) - vm:write_to_map() - vm:update_map() - end, -}) - diff --git a/init.lua b/init.lua index 40ebb0f..fa2ff0a 100644 --- a/init.lua +++ b/init.lua @@ -1,11 +1,12 @@ --- riverdev 0.4.4 by paramat +-- riverdev 0.4.5 by paramat -- For latest stable Minetest and back to 0.4.8 -- Depends default -- License: code WTFPL --- mod nodes drop default dirt for farming --- trees now have vi = vi + 1 optimisation --- emerlen used for vertical columns +-- overlen variable +-- remove autumn trees +-- remove freshwater bucket +-- remove unused schem folder -- Parameters @@ -184,10 +185,11 @@ minetest.register_on_generated(function(minp, maxp, seed) local c_mixwaterflow = minetest.get_content_id("riverdev:mixwaterflow") local sidelen = x1 - x0 + 1 -- chunk sidelen + local overlen = sidelen + 1 -- overgeneration sidelen local emerlen = sidelen + 32 -- voxelmanip emerged area sidelen - local chulensxyz = {x=sidelen+1, y=sidelen+2, z=sidelen+1} + local chulensxyz = {x=overlen, y=sidelen+2, z=overlen} local minposxyz = {x=x0-1, y=y0-1, z=z0-1} - local chulensxz = {x=sidelen+1, y=sidelen+1, z=sidelen} -- different because here x=x, y=z + local chulensxz = {x=overlen, y=overlen, z=sidelen} -- different because here x=x, y=z local minposxz = {x=x0-1, y=z0-1} local nvals_terrain = minetest.get_perlin_map(np_terrain, chulensxyz):get3dMap_flat(minposxyz) @@ -224,11 +226,11 @@ minetest.register_on_generated(function(minp, maxp, seed) local n_patha = nvals_patha[nixz] local n_abspatha = math.abs(n_patha) - local n_zprepatha = nvals_patha[(nixz - sidelen - 1)] + local n_zprepatha = nvals_patha[(nixz - overlen)] local n_pathb = nvals_pathb[nixz] local n_abspathb = math.abs(n_pathb) - local n_zprepathb = nvals_pathb[(nixz - sidelen - 1)] + local n_zprepathb = nvals_pathb[(nixz - overlen)] local n_terrain = (nvals_terrain[nixyz] + 2) / 2 local n_absmid = (math.abs(nvals_mid[nixz])) ^ 0.8 @@ -379,7 +381,7 @@ minetest.register_on_generated(function(minp, maxp, seed) local vi = area:index(x, y-2, z) for j = 1, 16 do data[vi] = c_wood - vi = vi - 112 + vi = vi - emerlen end end for k = -1, 1 do @@ -409,9 +411,9 @@ minetest.register_on_generated(function(minp, maxp, seed) viu = viu + 1 si = si + 1 end - nixz = nixz - sidelen - 1 + nixz = nixz - overlen end - nixz = nixz + sidelen + 1 + nixz = nixz + overlen end vm:set_data(data) diff --git a/nodes.lua b/nodes.lua index 95daa60..b3729be 100644 --- a/nodes.lua +++ b/nodes.lua @@ -27,39 +27,6 @@ minetest.register_node("riverdev:grass", { }), }) -minetest.register_node("riverdev:yellowleafgrass", { - description = "Grass With Yellow Leaves", - tiles = {"default_grass.png^riverdev_yellowleaf.png", "default_dirt.png", "default_grass.png"}, - is_ground_content = false, - groups = {crumbly=3}, - drop = "default:dirt", - sounds = default.node_sound_dirt_defaults({ - footstep = {name="default_grass_footstep", gain=0.25}, - }), -}) - -minetest.register_node("riverdev:orangeleafgrass", { - description = "Grass With Orange Leaves", - tiles = {"default_grass.png^riverdev_orangeleaf.png", "default_dirt.png", "default_grass.png"}, - is_ground_content = false, - groups = {crumbly=3}, - drop = "default:dirt", - sounds = default.node_sound_dirt_defaults({ - footstep = {name="default_grass_footstep", gain=0.25}, - }), -}) - -minetest.register_node("riverdev:redleafgrass", { - description = "Grass With Red Leaves", - tiles = {"default_grass.png^riverdev_redleaf.png", "default_dirt.png", "default_grass.png"}, - is_ground_content = false, - groups = {crumbly=3}, - drop = "default:dirt", - sounds = default.node_sound_dirt_defaults({ - footstep = {name="default_grass_footstep", gain=0.25}, - }), -}) - minetest.register_node("riverdev:path", { description = "Dirt Path", tiles = {"riverdev_path.png"}, @@ -87,78 +54,6 @@ minetest.register_node("riverdev:appleleaf", { sounds = default.node_sound_leaves_defaults(), }) -minetest.register_node("riverdev:yellowleaf", { - description = "Yellow Leaves", - drawtype = "allfaces_optional", - visual_scale = 1.3, - tiles = {"riverdev_yellowleaf.png"}, - paramtype = "light", - is_ground_content = false, - groups = {snappy=3, flammable=2}, - drop = "", - sounds = default.node_sound_leaves_defaults(), -}) - -minetest.register_node("riverdev:yellowleafinit", { - description = "Initial Yellow Leaves", - drawtype = "allfaces_optional", - visual_scale = 1.3, - tiles = {"riverdev_yellowleaf.png"}, - paramtype = "light", - is_ground_content = false, - groups = {snappy=3, flammable=2}, - drop = "", - sounds = default.node_sound_leaves_defaults(), -}) - -minetest.register_node("riverdev:orangeleaf", { - description = "Orange Leaves", - drawtype = "allfaces_optional", - visual_scale = 1.3, - tiles = {"riverdev_orangeleaf.png"}, - paramtype = "light", - is_ground_content = false, - groups = {snappy=3, flammable=2}, - drop = "", - sounds = default.node_sound_leaves_defaults(), -}) - -minetest.register_node("riverdev:orangeleafinit", { - description = "Initial Orange Leaves", - drawtype = "allfaces_optional", - visual_scale = 1.3, - tiles = {"riverdev_orangeleaf.png"}, - paramtype = "light", - is_ground_content = false, - groups = {snappy=3, flammable=2}, - drop = "", - sounds = default.node_sound_leaves_defaults(), -}) - -minetest.register_node("riverdev:redleaf", { - description = "Red Leaves", - drawtype = "allfaces_optional", - visual_scale = 1.3, - tiles = {"riverdev_redleaf.png"}, - paramtype = "light", - is_ground_content = false, - groups = {snappy=3, flammable=2}, - drop = "", - sounds = default.node_sound_leaves_defaults(), -}) - -minetest.register_node("riverdev:redleafinit", { - description = "Initial Red Leaves", - drawtype = "allfaces_optional", - visual_scale = 1.3, - tiles = {"riverdev_redleaf.png"}, - paramtype = "light", - is_ground_content = false, - groups = {snappy=3, flammable=2}, - drop = "", - sounds = default.node_sound_leaves_defaults(), -}) - minetest.register_node("riverdev:appling", { description = "Appletree Sapling", drawtype = "plantlike", @@ -391,19 +286,13 @@ minetest.register_craft({ -- Register stairs and slabs -stairs.register_stair_and_slab("pinewood", "riverdev:pinewood", - {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3}, - {"riverdev_pinewood.png"}, - "Pinewood stair", - "Pinewood slab", - default.node_sound_wood_defaults()) - --- Buckets - -bucket.register_liquid( - "riverdev:freshwater", - "riverdev:freshwaterflow", - "riverdev:bucket_freshwater", - "riverdev_bucketfreshwater.png", - "Fresh Water Bucket" +stairs.register_stair_and_slab( + "pinewood", + "riverdev:pinewood", + {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3}, + {"riverdev_pinewood.png"}, + "Pinewood stair", + "Pinewood slab", + default.node_sound_wood_defaults() ) + diff --git a/schems/flat.mts b/schems/flat.mts deleted file mode 100644 index cee275a5b4c76cd62b25119090ec99e721459f8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 154 zcmeYb3HD`RX5e68W#IS^0t_q+VkxOg^VDa9rEd8tW7naSA<9Oe1>IaWof zDF_w$NyV8dnTdJv={bqT#SF}enMD0>f~L**HdyaP{+7k}(DTQhF}>7X#n!?IfwuN diff --git a/textures/default_leaves.png b/textures/default_leaves.png deleted file mode 100644 index 9566dab1c7d63d0e686e5a356e2d5d21eb9ca0a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=6|^8q&&=ie_>;q3VCT zt!#lpOeH~n!3@7+{ybX)W%Rw)> z|4-pNfBg2&D%}-Q)~S8fPBWTc&yD9$mU_n8f4R(C^CnaElRnO8Gt{juD(1l`D%+)>j9Vr7YiE7yoC&mw!PC{xWt~$(69A(LJ){5t diff --git a/textures/riverdev_bucketfreshwater.png b/textures/riverdev_bucketfreshwater.png deleted file mode 100644 index 57500d6b08bdda6332b7384158c505a1d911cc04..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPggKW_b=Z`PctV`+-8IJY5_^EKZ-D zw3qjgfk5kgTNp(cgNv;k(p^48eq|`ShTX(rIhW~uO z_xHP+1M8hb&Q-29?fZ2j(9}9esj>G?{k#|n?PXG{V6ef zzfTBaVwe(S@lO8gvNSf~qajW{0-M%LrOXZWI{PDGRQpA59?cFE`?326!#O4Q VpNY@^oB{fZ!PC{xWt~$(6994}g0BDo diff --git a/textures/riverdev_needles.png b/textures/riverdev_needles.png index b8140575bf6a587ec533161d2880558b3ffe497d..6e046148c8ec49b035321f22a518dbe7db11147d 100644 GIT binary patch delta 719 zcmV;=0xDnky2DeA-wSK z`v6b9M3s0!s0funyqm<%#;nJ;x$wgI2Z!Jy-}K#eD4wrVZGYWO(=~OsT130ICHZ|0 zKz?iq0e(xRT|`b_u9-o1tyIMFBy9gbXil&QXb^L{To~(~t!^eDs&=5uT>fG^O~5HZ?p>A5 z7I0mD4L;56^AurpWdgr+~&rjyEYH+%otrzolI~eP5Sp(4Jkj+9A zToaUUu77b^dp;q4%ogekD}mbs898QMVpv(Q!A)h1o1aD3g7r_qLBBk65NY; zYb}n2wJsPYktVc-9had$Ijzmz1KF!F{MZH-l}KV9p~GbbrEyt5F5;`2RkfmQvH-?+ z_hfSEiL^i@c@_s)`6RZ85#xv001BJ|6u?C00v@9M??TD0961dG7lh1ks%&`+y@!~7!E+q z!gc@v0_jOaK~y-)MUqQz8&v>>zkBE9dBmQFW4mb^nu?}Tg+d4$Bv`-}*dTVS`8WI| z7A)Eoh$vE3QDsw9r?s8NV|%dYap!Sa1c|dhNBYh=g7a7(lm+j5E+>-#O{clZ3bM3d zJoH(-m+c|*DrJbN6HZ7Z%{rSQ;&*O{=s-qQfu zmXJ5R^6Sg0ZYevB+LQoDfKjNqUFF>76@4EL0+*kEJpJ@KD>(l4NRM0xxvEL)hG5S@ z&r6hQ;iRvn6IjU6khar2nGDD($+}Yfx>{Y{D@%U)?krSwOJ^8=JRJ`h?)B(e%^-I1 zeH+1l@;*y+Q8tKFvHv7wal3<6%h74Vo8=a!1;)sxbqtJm1#M(;{3yn>Pa~~NfoeLm zYoLY1whZDyk97GD+ns_|;~cm+wt*Cab!35Oa&?m-N3qA_uAmWMNdd9Rbe2(TP1Fa| zlrXQT49NcYAlAQs--y7oVOkKHCW4c`wzHb?(*yx%VEWs&;55|eJG@|1q4qs`LUJ$) zxcWQA+9>LQjl>YNqaKDKP_re=b#do1CA?gVaqLmncgeP8@cQxt{lKA85binum&kdn z$Gd`s?=torwz(o1xV+uukT;mV1yxJ4s2Ds7@Ol=rU5PY*&tmPK#riPxSY~iM>N6RJ z?B*41r{N+M0L`o->h~bAXavljzZYDj!nB2;S`_HWqq*mD^=^&p?f_V3cW+A~mu!=v z>XymSXP#GB=ZSt0`^a2(v|6yu6+cADS>ReEo{ej?lwC*s#aL%$jj$vdn7^2bec$0D za^9p{gnvGN)b&k{8uc)RAlw#o`+ds1CP$NG1*?IJjiA(bv-Awfez8Nv5pqX|8uhSi zP1Cg8ZUpOG@zc@$Q>TMvZeR+D^;b3|Z{Q*o50ijtYOqXmq)~SOsFy1tYR%x#qXWMD z{Jx9=2PQTLq09H*eEh(%O#t4`G7g_bXjAepwL(}C9-5f`TL1t607*qoM6N<$f*Mwn A761SM diff --git a/textures/riverdev_orangeleaf.png b/textures/riverdev_orangeleaf.png deleted file mode 100644 index a051b01460c258b0cae2a473793a5a5844198b7b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?bb!1>jb~J4ER9+h*xiM1m z)svk8Kq21s z-(wdLvt$vUeM%50l;Y{)7{YN~w6~Fy*@1)k@$QE8+$&-oe!jDh4i+#mbT5d~s%^~o zYJYzC_RcEZ0MoKlGVeH9_;=j<*^=P0lDonpce{wHcP9VNWTv*>D}4V#=E-qbTw;6Y lE_~*CR!80@@8=m?o`JodL9u!PC{xWt~$(69BA~OSu35 diff --git a/textures/riverdev_redleaf.png b/textures/riverdev_redleaf.png deleted file mode 100644 index b81f986184e472b7ef9f6bee9f721f81b5b10fad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?bO=Ms=C8K*>)^LuNMTL#K z!H;Vnfl`bmL4Lsu4$p3+fjCLt?k)@+tg;?J4rhT!WHAE+w=f7ZGR&GI0Tg5}@$_|N zzsD{hW~SzvJlzT?l;Y{)7{YN~w6~Fy*@1((`MtuoLWY%m3cr4zzaqlodq!~1m9EkU z!m~CP7T%q=M=m6C{;Q*T42PMu&+l7oAo_|)&+nVIpUXO@geCy)PEbVv diff --git a/textures/riverdev_yellowleaf.png b/textures/riverdev_yellowleaf.png deleted file mode 100644 index dd05fd282205d24dde01d7717840258d02b1c761..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b6=Yzj$g`OIh+L^k;M!Q+`=Ht$S`Y;1W=H@#M9T6 z{T{o3IIG-@6AFugLMfgujv*Y^MSB}LnH@NoAMb8h&%Gkn;paR1=wJa8L-&Fxt=h(X zulDDMZ||(q4KOV`CG(Dxg@4DrpDhV4E4eEya<_}9dS~+QOlE59y~6h|WS$&{#U-|P m?!srTXLaOl@@_u=hmoU>i)qpt)fqth7(8A5T-G@yGywp@J55Od