From 95f4ccab51f0065f290733e9a41abea61544c343 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
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 d2569bf1..6f0ed211 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 d01f0511..af94505a 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
zcmV<J0uufH1%w8WBYyw{b3#c}2nYxWd<bNS00009a7bBm000ie000ie0hKEb8vp<T
zrb$FWR5*<_(_cv41sKNh&+m86)Z@{eqbE*jshe(crXyV_i$x4!H;d|G&_ytaNCpL6
z1dCc1;bm9-xvGTPMTD2TSlEh98Cle1q8NFWHPmU-rEKQVj(?uxuZv?>FFY3y@B2L8
zH@HF6dY=8Sy{a^M(T#U`@*IhtHoJEhEl(C~1`K}04jS<c;;2Hr^*L%fV#2jio3l*K
z({h`{(TpImVfE%ciwmT%flYM1NmUi|mkFnbDg0dW@S8c8-lqUDBqG5h`!sZtN>Gav
z*hNrDkgb>PBY&JhVU1rtU>NJjbYXqn{mV;6KI5-ECwrN|0R*j-HXi!%Q{pSwj`$K4
zc=1_^JIsIayLdH6a@0LR_B5U2oPH~-GF24RY^iK1XQ47d4u9Z4H;E3~J3B>NOV%$v
zkiW>nEN6xY!d8+q!uk_>&R!GNpd!1^%cp3={Yip4Vt*}Z@%D_mmq?;!p738vOL@~D
zuZvc$NgO9kBRrHeb+vrL%nyXS$aIs*k*2nVBBCNeDsA*C`Ohhg5P#tU6+Oo-`%W89
zeL@%~*eQsL1tO{&sYc-r@dmaqafQ1x#Ey&^XbS%{e3QOjvV8;zq6ZVA?b|ko*qo=h
z%l>XEpMPq1Ftelz!@m+vV{DK!IdT^WA7$%0v;7oDSiQp1IJ>n>e@)ns(ER%2G7a29
z*opD~;i&5nru!8`R=4=}JX85{J3oz+%n>FJlE_K5(~Q_z209Q`QJ?-B6Dl5~u8HfT
zEMiW1uI4#*a#^tPn}wms&K$w_M7`(uYOvhG(Pl1=y-i_(58q=MtJp?^a+pu=(Y}mu
z2c>(w@(v-!rYNltPjd)8$~vs=eP9(zXhQ4_2L8#@)KB|il1nr`PmrQH%bjr!?->;K
faIe_grV0N6+3DlX9Twj&00000NkvXXu0mjfi<)5s

delta 743
zcmV<D0vP>-2L1(*BYy(LNkl<ZILj^5-D}ka9LMq3?_p<$ojsb{!Krg@rDj@MDwJdx
zXdww@WJCxNqlb&At}|E#C3I0FMs$-EQkFs1-N;BV5SM{OrJKX$mU=e#VAJjFZ0Gmu
z;_Ukee7=0YpZ7a>pLAzC9mif!Jn*RxzGL6kK+Ci3N&^#mkAF@Y3Fy8|8Mk2<GH5`!
zqlV>s>P3A$CjRDR%B2e_<wj9`*7*V_hsYsD5&M?%@*_FTA>mikjQ>(J^yZ+~{$v(H
zf@~^U61jH~`G8t%MS`G;aB0qlJmG0fOe78sa0>rn?fs!-Y|8nASABSmzJ$Foy=X(Y
zg3^syA6+FL!GF|z>T^Ws$}n9>oai1<9kVT@J;TPk`SlEMJ=$W?CZf4HH9_SpjSaEZ
zp|We(-b{XH=&7z%l8G@F4~+W$I%j(M<drJH@@0bXvZ~JYy0)AW=1|vKZGV<L`bUZC
z64~{QYPQt5^ZCGHG^fN#WcI>khxcDM|Hp4y)+NFwWPds{ju)vyPl>ob7PLJ?+ZySz
zz>=Wy+@zF>7S;H=$kF$vP4p1HeLMBL?lFwjc;^ACnlggYEs8TFw8S(8OrD>YlqyyJ
zIK#)oM8o5{*Zq9SXSaAdX2V95=cGetl}82@-c4McVg_w10*#NY)baZ@*=fEh6aIyR
z1)dAp`+p4a!#N|zIre(l^pVuLe>po(IpoNxM0H1v9bYcfk!2L|8l1-JfN1+Fna&-G
z;UWDgKb=Sg7{|?d9<L>8UMro8t!x?AFh#V9?)w%9YwsK5Vy}kHRoZVP4v+E=hEPC%
ziQTPNgoPm|znwKwCU}+fr954QiXht}Ufj+2C1CcPV-nK~3vvq*ZCUVQ7~w2tZ}CM(
zg~T7q6t7Uz$Q`%~fy&G*1mrM}PK0^%++^_+wGOrOWI!%Ywv{(psl$V4QQ>3`gDTK%
Z#{c|3{WFSAS9<^e002ovPDHLkV1fr#c0>RG