From: paramat <mat.gregory@virginmedia.com>
Date: Sun, 23 Apr 2017 03:09:46 +0000 (+0100)
Subject: Tin: Tune mapgen, bugfix, fix texture credits
X-Git-Tag: 0.4.16~21
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;ds=sidebyside;h=c2d1a5ed4bebd01a1a9340d55cb2d5edf6d59df2;p=oweals%2Fminetest_game.git

Tin: Tune mapgen, bugfix, fix texture credits

Previously i had matched ore density to moreores, but this density was
too high and out of balance with MTGame, reduce density to be similar
to copper ore.
The 2 levels of underground ore were overlapping, fix.
Textures are actually by kilbith, update credits.

Also credit kilbith for bronze, copper, gold and steel blocks, credits
had not been updated at the time.
---

diff --git a/mods/default/README.txt b/mods/default/README.txt
index 3c104a00..8d1357c8 100644
--- a/mods/default/README.txt
+++ b/mods/default/README.txt
@@ -53,10 +53,6 @@ Calinou (CC BY-SA 3.0):
   default_papyrus.png
   default_mineral_copper.png
   default_glass_detail.png
-  default_mineral_tin.png
-  default_tin_block.png
-  default_tin_ingot.png
-  default_tin_lump.png
 
 MirceaKitsune (CC BY-SA 3.0):
   character.x
@@ -82,10 +78,6 @@ Splizard (CC BY-SA 3.0):
 
 Zeg9 (CC BY-SA 3.0):
   default_coal_block.png
-  default_steel_block.png
-  default_copper_block.png
-  default_bronze_block.png
-  default_gold_block.png
 
 paramat (CC BY-SA 3.0):
   wieldhand.png -- Copied from character.png by Jordach (CC BY-SA 3.0)
@@ -216,6 +208,16 @@ kaeza (CC-BY-SA 3.0):
   default_desert_sandstone_brick.png
   default_desert_sandstone_block.png
 
+kilbith (CC BY-SA 3.0):
+  default_steel_block.png
+  default_copper_block.png
+  default_bronze_block.png
+  default_gold_block.png
+  default_tin_block.png
+  default_mineral_tin.png
+  default_tin_ingot.png
+  default_tin_lump.png
+
 Glass breaking sounds (CC BY 3.0):
   1: http://www.freesound.org/people/cmusounddesign/sounds/71947/
   2: http://www.freesound.org/people/Tomlija/sounds/97669/
diff --git a/mods/default/license.txt b/mods/default/license.txt
index 09e4225f..72af7284 100644
--- a/mods/default/license.txt
+++ b/mods/default/license.txt
@@ -43,6 +43,7 @@ Copyright (C) 2010-2016:
   Mito551
   GreenXenith
   kaeza
+  kilbith
 
 You are free to:
 Share — copy and redistribute the material in any medium or format.
diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua
index fff889fa..1305226a 100644
--- a/mods/default/mapgen.lua
+++ b/mods/default/mapgen.lua
@@ -364,7 +364,7 @@ function default.register_ores()
 		ore            = "default:stone_with_tin",
 		wherein        = "default:stone",
 		clust_scarcity = 10 * 10 * 10,
-		clust_num_ores = 9,
+		clust_num_ores = 5,
 		clust_size     = 3,
 		y_min          = 1025,
 		y_max          = 31000,
@@ -375,9 +375,9 @@ function default.register_ores()
 		ore            = "default:stone_with_tin",
 		wherein        = "default:stone",
 		clust_scarcity = 13 * 13 * 13,
-		clust_num_ores = 7,
+		clust_num_ores = 4,
 		clust_size     = 3,
-		y_min          = -31000,
+		y_min          = -127,
 		y_max          = -32,
 	})
 
@@ -386,7 +386,7 @@ function default.register_ores()
 		ore            = "default:stone_with_tin",
 		wherein        = "default:stone",
 		clust_scarcity = 10 * 10 * 10,
-		clust_num_ores = 9,
+		clust_num_ores = 5,
 		clust_size     = 3,
 		y_min          = -31000,
 		y_max          = -128,