Ores: Add tin ore, lump, ingot and block

Use Calinou's textures from moreores mod.
Craft bronze from tin and copper instead of steel and copper.
Match ore density to the moreores mod but start ore at a depth of
y = -32 to be part of the depth progression of other ores.

diff --git a/mods/default/README.txt b/mods/default/README.txt
index fc6def98d35bdc8d7b3f29d9b7c5de7fdcaa0858..3c104a00f48cb93168f17aa5f8bffb54974c175a 100644 (file)
--- a/mods/default/README.txt
+++ b/mods/default/README.txt
@@ -53,6 +53,10 @@ 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

diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua
index 721f4132bc12917e30d196f444814d93c2a88997..50ffb1ae890eb06ccac2ddc966aee3a21d5adae6 100644 (file)
--- a/mods/default/crafting.lua
+++ b/mods/default/crafting.lua
@@ -392,12 +392,6 @@ minetest.register_craft({
        }
 })
 
-minetest.register_craft({
-       type = "shapeless",
-       output = "default:bronze_ingot",
-       recipe = {"default:steel_ingot", "default:copper_ingot"},
-})
-
 minetest.register_craft({
        output = 'default:coalblock',
        recipe = {
@@ -446,6 +440,31 @@ minetest.register_craft({
        }
 })
 
+minetest.register_craft({
+       output = "default:tinblock",
+       recipe = {
+               {"default:tin_ingot", "default:tin_ingot", "default:tin_ingot"},
+               {"default:tin_ingot", "default:tin_ingot", "default:tin_ingot"},
+               {"default:tin_ingot", "default:tin_ingot", "default:tin_ingot"},
+       }
+})
+
+minetest.register_craft({
+       output = "default:tin_ingot 9",
+       recipe = {
+               {"default:tinblock"},
+       }
+})
+
+minetest.register_craft({
+       output = "default:bronze_ingot 9",
+       recipe = {
+               {"default:copper_ingot", "default:copper_ingot", "default:copper_ingot"},
+               {"default:copper_ingot", "default:tin_ingot", "default:copper_ingot"},
+               {"default:copper_ingot", "default:copper_ingot", "default:copper_ingot"},
+       }
+})
+
 minetest.register_craft({
        output = 'default:bronzeblock',
        recipe = {
@@ -849,6 +868,12 @@ minetest.register_craft({
        recipe = "default:copper_lump",
 })
 
+minetest.register_craft({
+       type = "cooking",
+       output = "default:tin_ingot",
+       recipe = "default:tin_lump",
+})
+
 minetest.register_craft({
        type = "cooking",
        output = "default:gold_ingot",

diff --git a/mods/default/craftitems.lua b/mods/default/craftitems.lua
index a0db65548fc51f059f4add673604071d93635904..0c42fc37806077cb85232711f235f882a411fbd7 100644 (file)
--- a/mods/default/craftitems.lua
+++ b/mods/default/craftitems.lua
@@ -258,6 +258,11 @@ minetest.register_craftitem("default:copper_lump", {
        inventory_image = "default_copper_lump.png",
 })
 
+minetest.register_craftitem("default:tin_lump", {
+       description = "Tin Lump",
+       inventory_image = "default_tin_lump.png",
+})
+
 minetest.register_craftitem("default:mese_crystal", {
        description = "Mese Crystal",
        inventory_image = "default_mese_crystal.png",
@@ -288,6 +293,11 @@ minetest.register_craftitem("default:copper_ingot", {
        inventory_image = "default_copper_ingot.png",
 })
 
+minetest.register_craftitem("default:tin_ingot", {
+       description = "Tin Ingot",
+       inventory_image = "default_tin_ingot.png",
+})
+
 minetest.register_craftitem("default:bronze_ingot", {
        description = "Bronze Ingot",
        inventory_image = "default_bronze_ingot.png",

diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua
index 9e359a33934b0f57a6da861ea1ee989c38fa5647..fff889fadb5d34c322f3f832a91a3d7fe8889974 100644 (file)
--- a/mods/default/mapgen.lua
+++ b/mods/default/mapgen.lua
@@ -357,6 +357,41 @@ function default.register_ores()
                y_max          = -64,
        })
 
+       -- Tin
+
+       minetest.register_ore({
+               ore_type       = "scatter",
+               ore            = "default:stone_with_tin",
+               wherein        = "default:stone",
+               clust_scarcity = 10 * 10 * 10,
+               clust_num_ores = 9,
+               clust_size     = 3,
+               y_min          = 1025,
+               y_max          = 31000,
+       })
+
+       minetest.register_ore({
+               ore_type       = "scatter",
+               ore            = "default:stone_with_tin",
+               wherein        = "default:stone",
+               clust_scarcity = 13 * 13 * 13,
+               clust_num_ores = 7,
+               clust_size     = 3,
+               y_min          = -31000,
+               y_max          = -32,
+       })
+
+       minetest.register_ore({
+               ore_type       = "scatter",
+               ore            = "default:stone_with_tin",
+               wherein        = "default:stone",
+               clust_scarcity = 10 * 10 * 10,
+               clust_num_ores = 9,
+               clust_size     = 3,
+               y_min          = -31000,
+               y_max          = -128,
+       })
+
        -- Gold
 
        minetest.register_ore({

diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index b7309e1204fa3660ef1b9cbdd45b05576264606a..facb28e00c8cf70fff94c6c87de504a5b75476c0 100644 (file)
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -107,6 +107,10 @@ default:steelblock
 
 default:stone_with_copper
 default:copperblock
+
+default:stone_with_tin
+default:tinblock
+
 default:bronzeblock
 
 default:stone_with_gold
@@ -1046,6 +1050,24 @@ minetest.register_node("default:copperblock", {
        sounds = default.node_sound_metal_defaults(),
 })
 
+
+minetest.register_node("default:stone_with_tin", {
+       description = "Tin Ore",
+       tiles = {"default_stone.png^default_mineral_tin.png"},
+       groups = {cracky = 2},
+       drop = "default:tin_lump",
+       sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:tinblock", {
+       description = "Tin Block",
+       tiles = {"default_tin_block.png"},
+       is_ground_content = false,
+       groups = {cracky = 1, level = 2},
+       sounds = default.node_sound_metal_defaults(),
+})
+
+
 minetest.register_node("default:bronzeblock", {
        description = "Bronze Block",
        tiles = {"default_bronze_block.png"},

diff --git a/mods/default/textures/default_mineral_tin.png b/mods/default/textures/default_mineral_tin.png
new file mode 100644 (file)
index 0000000..232d4b5
Binary files /dev/null and b/mods/default/textures/default_mineral_tin.png differ

diff --git a/mods/default/textures/default_tin_block.png b/mods/default/textures/default_tin_block.png
new file mode 100644 (file)
index 0000000..72759b0
Binary files /dev/null and b/mods/default/textures/default_tin_block.png differ

diff --git a/mods/default/textures/default_tin_ingot.png b/mods/default/textures/default_tin_ingot.png
new file mode 100644 (file)
index 0000000..eed5361
Binary files /dev/null and b/mods/default/textures/default_tin_ingot.png differ

diff --git a/mods/default/textures/default_tin_lump.png b/mods/default/textures/default_tin_lump.png
new file mode 100644 (file)
index 0000000..72bd339
Binary files /dev/null and b/mods/default/textures/default_tin_lump.png differ