From 22dca431986086f404f70e88ce4d8ae9dd5d0df5 Mon Sep 17 00:00:00 2001 From: D00Med Date: Thu, 21 Sep 2017 08:32:07 +1000 Subject: [PATCH] return of the caves --- mods/hyrule_mapgen/init.lua | 49 +++++++++++++++++- mods/hyrule_mapgen/mapgen.lua | 6 +-- mods/hyrule_mapgen/schematics/cave2 (2).mts | Bin 0 -> 554 bytes .../textures/hyrule_mapgen_ice_waterfall.png | Bin 727 -> 767 bytes mods/moreplants/init.lua | 4 +- 5 files changed, 50 insertions(+), 9 deletions(-) create mode 100644 mods/hyrule_mapgen/schematics/cave2 (2).mts diff --git a/mods/hyrule_mapgen/init.lua b/mods/hyrule_mapgen/init.lua index 48c2cbc..e1308cb 100644 --- a/mods/hyrule_mapgen/init.lua +++ b/mods/hyrule_mapgen/init.lua @@ -151,9 +151,15 @@ sound = false minetest.register_abm({ nodenames = {"default:water_flowing"}, - interval = 2.0, - chance = 2, + interval = 3.0, + chance = 3, action = function(pos, node, active_object_count, active_object_count_wider) + + if minetest.find_node_near(pos, 6, {"default:ice"}) and not minetest.find_node_near(pos, 6, {"hyrule_mapgen:lamp_lit", "fire:basic_flame"}) then + minetest.set_node(pos, {name="hyrule_mapgen:ice_waterfall"}) + return + end + local above = minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}).name local below = minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}).name local above2 = minetest.get_node({x=pos.x, y=pos.y+2, z=pos.z}).name @@ -207,6 +213,36 @@ minetest.register_abm({ end }) +minetest.register_abm({ + nodenames = {"hyrule_mapgen:ice_waterfall"}, + interval = 2.0, + chance = 2, + action = function(pos, node, active_object_count, active_object_count_wider) + + if minetest.find_node_near(pos, 6, {"fire:basic_flame", "hyrule_mapgen:lamp_lit"}) then + minetest.set_node(pos, {name="default:water_flowing"}) + end + --[[ + minetest.add_particlespawner({ + amount = 1, + time = 2, + minpos = {x=pos.x-1.3, y=pos.y+0.3, z=pos.z-1.3}, + maxpos = {x=pos.x+1.3, y=pos.y+0.9, z=pos.z+1.3}, + minvel = {x=0, y=0.1, z=0}, + maxvel = {x=0.1, y=0.3, z=0.1}, + minacc = {x=0, y=0.1, z=0}, + maxacc = {x=0.2, y=0.2, z=0.2}, + minexptime = 0.5, + maxexptime = 1, + minsize = 12, + maxsize = 15, + collisiondetection = false, + vertical = false, + texture = "hyrule_mapgen_mist.png", + })]] + end +}) + --[[ minetest.register_abm({ nodenames = {"fire:basic_flame"}, @@ -980,6 +1016,15 @@ minetest.register_node("hyrule_mapgen:ice_brick", { sounds = default.node_sound_glass_defaults(), }) +minetest.register_node("hyrule_mapgen:ice_waterfall", { + description = "Frozen Waterfall", + drawtype = "glasslike", + use_texture_alpha = true, + tiles = {"hyrule_mapgen_ice_waterfall.png"}, + groups = {cracky = 3, cools_lava = 1}, + sounds = default.node_sound_glass_defaults(), +}) + minetest.register_craft({ output = 'hyrule_mapgen:ice_brick', recipe = { diff --git a/mods/hyrule_mapgen/mapgen.lua b/mods/hyrule_mapgen/mapgen.lua index 87b7cce..1633904 100644 --- a/mods/hyrule_mapgen/mapgen.lua +++ b/mods/hyrule_mapgen/mapgen.lua @@ -1746,21 +1746,17 @@ end) minetest.register_on_newplayer(function(player) - if not village_spawned and minetest.get_day_count() == 0 then local name = player:get_player_name() if name == "singleplayer" then - minetest.after(1, function() local pos = player:getpos() - minetest.place_schematic({x=pos.x-6, y=pos.y-1, z=pos.z-4}, minetest.get_modpath("hyrule_mapgen").."/schematics/cave.mts", 0, {}, true) local obj = minetest.env:add_entity({x=pos.x-2, y=pos.y+1, z=pos.z}, "mobs_npc:npc_custom") local npc = obj:get_luaentity() npc.xdir = 1 npc.item = "default:sword_wood" npc.text = "It's dangerous to go alone, take this!" npc.skin = "mobs_npc_old.png" - end) + minetest.place_schematic({x=pos.x-6, y=pos.y-1, z=pos.z-4}, minetest.get_modpath("hyrule_mapgen").."/schematics/cave.mts", 0, {}, true) end - end end) --villages diff --git a/mods/hyrule_mapgen/schematics/cave2 (2).mts b/mods/hyrule_mapgen/schematics/cave2 (2).mts new file mode 100644 index 0000000000000000000000000000000000000000..e35e4db7e688471dc28380ae7ac1e7bd613ac53a GIT binary patch literal 554 zcmeYb3HD`RVc=$9W8kg_0|p)j=ETe*2Hup^w8YY!6072p{Jc~K@r=r%(wx-z+{A+P z)I6)?qRQfu#GH5|21!&2kZ59hZe~fUA#N!n2I1WNqSS(%#JrMXtK`J8)U?#1JnZUA zfJPZHNTb@4Qks{Znx7Y6l3$dZ!61w(nVgYYT!Py$Lk0;{^$;h6>|qc`a#luSUV3I; zI@pmFbMA&Q@--{)r0jTkNAB%)b*(QNx&n%`)~MYQvsveED7E>fa!f|iwT_)(#T{j} ze1c{_ZL|w7|F~vU;grHZWlPz)XQ~@y{0%QpnYPI?ZE?ej%wy$~7yGT&GRoJSo&3!G z_>;SvtnyQR9;+HYPOjuz$yao=Qa0_x*^{T{E46?A`=QsW^!Y*St;^(NY#dBX=5_}i z-L=#5T}{-rwbyIqOIlv%G5(hc9<%O9@ccZg zDj#gYaKLDT?Ufe^EfL%*;sRO<7r3<8g}kPytUvsZO>h3I3;V=ne=T(O|7LKTb?JBi Uv%cTdQ@7mQtMrHA(a(Y^0LLBaF8}}l literal 0 HcmV?d00001 diff --git a/mods/hyrule_mapgen/textures/hyrule_mapgen_ice_waterfall.png b/mods/hyrule_mapgen/textures/hyrule_mapgen_ice_waterfall.png index e6d611cb388f5b24d8fb7078a382bec249cf6961..7a345e6dd0e6c1be0a9a0e0d3bb2b3588f055f67 100644 GIT binary patch delta 722 zcmV;@0xkX51^)$*Ie)Q9L_t(I%Po>oZz5F~K+pZ|P^cXShO|Jt#u!s|HBnFR^J zzpOvPpW~nK!DJI771~WG!wh8x3Uu$i-}M2{+j&06{QlSU_VDyXC$Sv7a++oAo0?Ox z`0g2gvmrVMBJ}c{dR=40&`C31ni`4qnzk6;etu0y!0)!StbgIR*ViP^&!kx&Y{JFh zoHv)RXj@B~X1p{FY1Tu2`RX-kKj*!NZZGH8>uUzR9EZh-aC13kG#K#B)re(?q`e+L zd_3l2kn_{k81u(scRNUgl~)E9S}lunfl}daQSjMl$j}Nl!rXbz+X-v03X+=yz=j&1TQ2;P*qCj z2*C4Z%~MdK6$+;S$YIkU-m%}-Jj|CM!hX{*tqK(7p{NKZGAk;uf{V)iW5IM$V55*E z-IRCJ89oG>rsQuE@WHXK*DyS1_q<{97}#$cPSP{p-GANToI{K-K@mi7(bLXS+P1~> zrlH%<2{AIOD&k3t!?q#IGB7Q?59EWKlQd(ytr1j7(~OR3@%GCv$g`ZAt1+YgfbT~m zvePynb^H80enpxX(q7J+%PU$fOZTjYoEpoImt$;Vcz^JCp!CYuS0fsQZ^uJU#oz_L z8(z>6gMR}$7;ZipWBx1;w<}e;iLiD`KRK2dCJBq+u~9e|C?ZINfrYg~U!YVFvG75a zm4{%IHXIwjcmO<#v4Tb=7-jjQc%WrKy(04up6RkegJZU+SUN?4`>Mi($bC`q=#~58 z=(AOY0!yddRV9*;u;13)6$QI(jauPhzGTI z-Uqa4P~fg8*fbRpVN#X^A2>7(5tx)EUXQ;_Y(#zJKkC_u>L7H|wEzGB07*qoM6N<$ Eg4wQUlmGw# delta 682 zcmV;b0#*J01=j_TIe&>sL_t(I%Po`JZrfHAMAtr~#GA<2O>GGQir6Ru<;D5^{)FF( zen8MdzQqzH-VQ0Az55`~%V2RE>554N5Z^hOxO?aglHwm6t<{ z02&Ms>M`J+>wlKx2+ws#0NT-b+P4sd$O)=OGX>OO@IBqxFcD7Pz`#v@Kr}G=p0|Aq zPVj!<`Pg7)ywx3Q#>=6@L@64*SeZzmhl%N4W^l-hx`+?oN z;>UqSlJN8CjdKV%5q5jSA;PT6GEG^=5rZEniUL*R<$u^=QOr0Ftnv(qm{qCDf<=DdY|Nc5Zwr3+-2;F293uq^!N*u>g zaR}uSPJa^!uv$VlLlHwWK`ajDV6-Y2M(hMcs0T$H1PpNwMG@fSK_VggV8_*i@?3YQ z1zrvvCvT|1>#;-3cs+E~{^DYnVb$Q|ji=jqVkeUCZeZQtUD%j>-F*}Wg} z{v!_;UQC2>?1^`W6SFEh3@GrlZ|M3M&Kau4|3~?a