Cleanup.

Move mineral noise to init.lua. Moved peg mineral descr to mineral peg.

mineral/init.lua

@@ -13,6 +13,12 @@ if (minetest.get_modpath("intllib")) then
 	S = function ( s ) return s end
 end
 
+local function GetNoiseParams()
+ return {
+  scale=1, offset=0, seed=rocksl.GetNextSeed(), octaves=1, persist=1,
+  spread={ x=100, y=100, z=100 } }
+end
+
 mineral={}
 mineral.noise={}
 
@@ -22,5 +28,10 @@ end
 
 local modpath=minetest.get_modpath(minetest.get_current_modname())
 
+mineral.noise.Copper=GetNoiseParams()
+mineral.noise.PbZn=GetNoiseParams()
+mineral.noise.Iron=GetNoiseParams()
+mineral.noise.Tin=GetNoiseParams()
+
 dofile(modpath.."/skarn.lua")
 

mineral/skarn.lua

@@ -2,12 +2,6 @@
 -- Skarn deposit
 --
 
-local function GetNoiseParams()
- return {
-  scale=1, offset=0, seed=rocksl.GetNextSeed(), octaves=1, persist=1,
-  spread={ x=100, y=100, z=100 } }
-end
-
 -- ores have to be redefined for skarn background
 
 -- Chalcopyrite
@@ -25,7 +19,6 @@ minetest.register_node( "mineral:skarn_malachyte", {
 	is_ground_content = true, sounds = default.node_sound_stone_defaults(),
 })
 -- Chalcopyrite/Malachyte skarn mix
-mineral.noise.Copper=GetNoiseParams()
 minetest.register_ore({
  wherein="rocks:skarn",
  ore="mineral:skarn_chalcopyrite",
@@ -60,7 +53,6 @@ minetest.register_node( "mineral:skarn_galena", {
 	is_ground_content = true, sounds = default.node_sound_stone_defaults(),
 })
 -- Pb Zn skarn mix
-mineral.noise.PbZn=GetNoiseParams()
 minetest.register_ore({
  wherein="rocks:skarn",
  ore="mineral:skarn_sphalerite",
@@ -93,7 +85,6 @@ minetest.register_node( "mineral:skarn_magnetite", {
 	is_ground_content = true, sounds = default.node_sound_stone_defaults(),
 })
 -- Fe skarn mix
-mineral.noise.Iron=GetNoiseParams()
 minetest.register_ore({
  wherein="rocks:skarn",
  ore="mineral:skarn_magnetite",

rocks/pegmatite.lua

@@ -13,17 +13,6 @@ minetest.register_node( "rocks:pegmatite", {
 
 -- ores have to be redefined for pegmatite background
 
--- Lepidolite         Li    Medium Pegmatite (2.5%)
--- Cassiterite        Sn    Strong Granite, Pegmatite (1.5%)
--- Pollucite          Cs    Strong Pegmatite (0.1%)
--- Scheelite          W     Medium SEDEX, Pegmatite (2%), Skarn
--- Spodumene          Li    Strong Pegmatite (7%)
--- Tantalite          Ta    Strong Pegmatite (2%)
--- Wolframite         W     Medium Pegmatite (1%)
--- Spodumene        7%
--- Muscovite (mica) 7%
--- Kyanite          5%
-
 -- pegmatites are only 1 kind
 rocks.register_vein("rocks:pegmatite",{
   wherein={ "rocks:granite" },