From 95f4ccab51f0065f290733e9a41abea61544c343 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Wed, 4 Apr 2012 15:43:17 +0300 Subject: [PATCH] Move map generator stuff around a bit and generate coal and iron deep underground --- mods/default/init.lua | 24 ----------------- mods/default/mapgen.lua | 35 ++++++++++++++++++++++--- mods/default/textures/default_lava.png | Bin 766 -> 772 bytes 3 files changed, 31 insertions(+), 28 deletions(-) diff --git a/mods/default/init.lua b/mods/default/init.lua index d2569bf..6f0ed21 100644 --- a/mods/default/init.lua +++ b/mods/default/init.lua @@ -1290,30 +1290,6 @@ minetest.add_to_creative_inventory('default:water_source') minetest.add_to_creative_inventory('default:lava_source') minetest.add_to_creative_inventory('default:ladder') --- --- Aliases for map generator outputs --- (required at least by an in-development branch) --- - -minetest.register_alias("mapgen_air", "air") -minetest.register_alias("mapgen_stone", "default:stone") -minetest.register_alias("mapgen_tree", "default:tree") -minetest.register_alias("mapgen_leaves", "default:leaves") -minetest.register_alias("mapgen_apple", "default:apple") -minetest.register_alias("mapgen_water_source", "default:water_source") -minetest.register_alias("mapgen_dirt", "default:dirt") -minetest.register_alias("mapgen_sand", "default:sand") -minetest.register_alias("mapgen_gravel", "default:gravel") -minetest.register_alias("mapgen_clay", "default:clay") -minetest.register_alias("mapgen_lava_source", "default:lava_source") -minetest.register_alias("mapgen_cobble", "default:cobble") -minetest.register_alias("mapgen_mossycobble", "default:mossycobble") -minetest.register_alias("mapgen_dirt_with_grass", "default:dirt_with_grass") -minetest.register_alias("mapgen_junglegrass", "default:junglegrass") -minetest.register_alias("mapgen_stone_with_coal", "default:stone_with_coal") -minetest.register_alias("mapgen_stone_with_iron", "default:stone_with_iron") -minetest.register_alias("mapgen_mese", "default:mese") - -- -- Some common functions -- diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua index d01f051..af94505 100644 --- a/mods/default/mapgen.lua +++ b/mods/default/mapgen.lua @@ -1,5 +1,32 @@ -- minetest/default/mapgen.lua +-- +-- Aliases for map generator outputs +-- + +minetest.register_alias("mapgen_air", "air") +minetest.register_alias("mapgen_stone", "default:stone") +minetest.register_alias("mapgen_tree", "default:tree") +minetest.register_alias("mapgen_leaves", "default:leaves") +minetest.register_alias("mapgen_apple", "default:apple") +minetest.register_alias("mapgen_water_source", "default:water_source") +minetest.register_alias("mapgen_dirt", "default:dirt") +minetest.register_alias("mapgen_sand", "default:sand") +minetest.register_alias("mapgen_gravel", "default:gravel") +minetest.register_alias("mapgen_clay", "default:clay") +minetest.register_alias("mapgen_lava_source", "default:lava_source") +minetest.register_alias("mapgen_cobble", "default:cobble") +minetest.register_alias("mapgen_mossycobble", "default:mossycobble") +minetest.register_alias("mapgen_dirt_with_grass", "default:dirt_with_grass") +minetest.register_alias("mapgen_junglegrass", "default:junglegrass") +minetest.register_alias("mapgen_stone_with_coal", "default:stone_with_coal") +minetest.register_alias("mapgen_stone_with_iron", "default:stone_with_iron") +minetest.register_alias("mapgen_mese", "default:mese") + +-- +-- Ore generation +-- + local function generate_ore(name, wherein, minp, maxp, seed, chunks_per_volume, ore_per_chunk, height_min, height_max) if maxp.y < height_min or minp.y > height_max then return @@ -42,10 +69,10 @@ local function generate_ore(name, wherein, minp, maxp, seed, chunks_per_volume, end minetest.register_on_generated(function(minp, maxp, seed) - generate_ore("default:stone_with_coal", "default:stone", minp, maxp, seed, 1/8/8/8, 5, -64, 64) - generate_ore("default:stone_with_iron", "default:stone", minp, maxp, seed+1, 1/16/16/16, 5, 3, 7) - generate_ore("default:stone_with_iron", "default:stone", minp, maxp, seed+2, 1/12/12/12, 5, -16, 2) - generate_ore("default:stone_with_iron", "default:stone", minp, maxp, seed+3, 1/9/9/9, 5, -64, -17) + generate_ore("default:stone_with_coal", "default:stone", minp, maxp, seed, 1/8/8/8, 5, -31000, 64) + generate_ore("default:stone_with_iron", "default:stone", minp, maxp, seed+1, 1/16/16/16, 5, -5, 7) + generate_ore("default:stone_with_iron", "default:stone", minp, maxp, seed+2, 1/12/12/12, 5, -16, -5) + generate_ore("default:stone_with_iron", "default:stone", minp, maxp, seed+3, 1/9/9/9, 5, -31000, -17) -- Generate clay if maxp.y >= 2 and minp.y <= 0 then -- Assume X and Z lengths are equal diff --git a/mods/default/textures/default_lava.png b/mods/default/textures/default_lava.png index 2c7d9ad9931acc4ec391ac1c56fa432651831ed3..9cf9fa81afa4f33cff9a8b4b1109cc767cbca6f2 100644 GIT binary patch delta 749 zcmeyz+QK$Lxt@Wg*vT`5gM)*kh9jkefq{Xuz$3Dlfr0M`2s2LA=96Y%U|Qzs;uvDl zYkE1}<1VYjv5)89m!G@x_~P8f>VBCkXXh0yQ;yZ>cI8Pl?|zkZ!PTI{gN-$or8`Re zVQTo_ovT`IxwcH-9dV<}S2FTS$|8x%X{J{)FE7n`cA>9+-sAP%$>I7o;{5M_+uS$b z;drHL-rx0mSD92^>@BbSB-1(1YFbfq;QDV;GkIU! zrdk%xMeM?h-rhEAzcFX|j?@40wC2}ml^bkc!gYARkY94n1Y^r0aSr*^*H)YVinvGY zJ#@)p_g0^J-y0Jy{Q33Ri1&`ujn0q%AFg;Uuuw-2r?&Rd!m6{R&LMIu9y zGd0D9LvV3>_lkAK5v-~ufhuk#lSPB3IbOSa!oxsddZWwI*@vG_t1|nZaQW?65bMS;dFpmwWyPnS6P+ z;QGH5F{h>+ttg?L<$^yOqH{^*{0L--RhTr+zkv*H-lI zYuRhKH^X^H)1}@>`B+uCgY{QxUKP8%IAsv)G3SL`fb3@7CANo;?f&_dC*Sr~(nYmJ zJ1tEepX&7TZoIZ|Q}&H}K6U9YR;~-3)M+Tr-}CFAReIIWCsVZ!eoAfnuxZt~ue-L* z5qcJIJu0_;n$0iw&R0S=zxHNryR!51&jU#&%a3@bd^?od{ypCO|MC2&YpRFTQtGXY z`@~l|`FHNH6We0za$D-#w`t8TMSQc+R+L zmQm9s-7aI5Ek{gPedf)dK1D0^pT*(hhg}Xo-gW(N&B^rb6;^47-KIQW;+#I!olW$f zZ_L~zwp?wd-u|^$KK?ennYm9>_+M)?>pbq8zw3EE9=23IZuzb1=9h_AcGg>3`&&La zvC^f~y;n9~@AAY{k&jYyj=gHg_^mbboNU)a#lM>Nb3Irkj-RcRTd$fGr#-iOZI0wM z1J^B`?|zGMWWSewoV32}Z0N0g6~6vY{A~da^__RuhPSjTs_&m`8l+Y+^~+M5*w!wE z+e&eF&i+tM_%Se_X4 z`?XYlxs&oycq`x5&nXUi{@bRSN3A^EoDujig|AubLhiBuf9(Gnclm`^GcYhPc)I$z JtaD0e0sse9c0>RG