Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
paramat committed Apr 20, 2017
1 parent 6335525 commit 2668619
Show file tree
Hide file tree
Showing 9 changed files with 102 additions and 6 deletions.
4 changes: 4 additions & 0 deletions mods/default/README.txt
Expand Up @@ -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

This comment has been minimized.

Copy link
@kilbith

kilbith Apr 20, 2017

Contributor

These textures are actually from me : minetest-mods/moreores@82cb616

This comment has been minimized.

Copy link
@paramat

paramat Apr 23, 2017

Author Contributor

Ok i'm happy to change the credits, i have some other edits to do to tin ore so will do it then. The README of moreores doesn't credit you for these.

This comment has been minimized.

Copy link
@paramat

paramat Apr 23, 2017

Author Contributor

PR coming.

This comment has been minimized.

Copy link
@paramat

paramat Apr 23, 2017

Author Contributor

This comment has been minimized.

Copy link
@paramat

paramat Apr 23, 2017

Author Contributor

Also credited you, at last, for 4 other blocks.


MirceaKitsune (CC BY-SA 3.0):
character.x
Expand Down
37 changes: 31 additions & 6 deletions mods/default/crafting.lua
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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 = {
Expand Down Expand Up @@ -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",
Expand Down
10 changes: 10 additions & 0 deletions mods/default/craftitems.lua
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
35 changes: 35 additions & 0 deletions mods/default/mapgen.lua
Expand Up @@ -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({
Expand Down
22 changes: 22 additions & 0 deletions mods/default/nodes.lua
Expand Up @@ -107,6 +107,10 @@ default:steelblock
default:stone_with_copper
default:copperblock
default:stone_with_tin
default:tinblock
default:bronzeblock
default:stone_with_gold
Expand Down Expand Up @@ -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"},
Expand Down
Binary file added mods/default/textures/default_mineral_tin.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mods/default/textures/default_tin_block.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mods/default/textures/default_tin_ingot.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mods/default/textures/default_tin_lump.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 2668619

Please sign in to comment.