1
0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2024-12-25 02:00:37 +01:00

Merge branch 'Ataron-master'

This commit is contained in:
LeMagnesium 2014-11-14 22:24:33 +01:00
commit cb53cfe1a2
18 changed files with 5 additions and 175 deletions

View File

@ -505,6 +505,11 @@ minetest.register_craft({
recipe = {{"default:bronzeblock"},}
})
<<<<<<< HEAD
=======
>>>>>>> 6af63a7e5d47ce158443a7a59da2954f046f7129
minetest.register_craft({
output = "default:goldblock",
recipe = {

View File

@ -32,13 +32,6 @@ minetest.register_craftitem("default:iron_lump", {
groups = {ingot_lump = 1},
})
minetest.register_craftitem("default:tin_lump", {
description = "Tin Lump",
wield_scale = {x = 1, y = 1, z = 2},
inventory_image = "default_tin_lump.png",
groups = {ingot_lump = 1},
})
minetest.register_craftitem("default:copper_lump", {
description = "Copper Lump",
wield_scale = {x = 1, y = 1, z = 2},
@ -51,13 +44,6 @@ minetest.register_craftitem("default:mese_crystal", {
inventory_image = "default_mese_crystal.png",
})
minetest.register_craftitem("default:silver_lump", {
description = "Silver Lump",
wield_scale = {x = 1, y = 1, z = 2},
inventory_image = "default_silver_lump.png",
groups = {ingot_lump = 1},
})
minetest.register_craftitem("default:gold_lump", {
description = "Gold Lump",
wield_scale = {x = 1, y = 1, z = 2},
@ -84,13 +70,6 @@ minetest.register_craftitem("default:steel_ingot", {
groups = {ingot = 1},
})
minetest.register_craftitem("default:tin_ingot", {
description = "Tin Ingot",
wield_scale = {x = 1, y = 1, z = 2},
inventory_image = "default_tin_ingot.png",
groups = {ingot = 1},
})
minetest.register_craftitem("default:copper_ingot", {
description = "Copper Ingot",
wield_scale = {x = 1, y = 1, z = 2},
@ -105,13 +84,6 @@ minetest.register_craftitem("default:bronze_ingot", {
groups = {ingot = 1},
})
minetest.register_craftitem("default:silver_ingot", {
description = "Silver Ingot",
wield_scale = {x = 1, y = 1, z = 2},
inventory_image = "default_silver_ingot.png",
groups = {ingot = 1},
})
minetest.register_craftitem("default:gold_ingot", {
description = "Gold Ingot",
wield_scale = {x = 1, y = 1, z = 2},

View File

@ -229,30 +229,6 @@ minetest.register_ore({
flags = "absheight",
})
minetest.register_ore({
ore_type = "scatter",
ore = "default:stone_with_silver",
wherein = "default:stone",
clust_scarcity = 14 * 14 * 14,
clust_num_ores = 3,
clust_size = 2,
height_min = -127,
height_max = -16,
flags = "absheight",
})
minetest.register_ore({
ore_type = "scatter",
ore = "default:stone_with_silver",
wherein = "default:stone",
clust_scarcity = 12 * 12 * 12,
clust_num_ores = 5,
clust_size = 3,
height_min = -30000,
height_max = -128,
flags = "absheight",
})
minetest.register_ore({
ore_type = "scatter",
ore = "default:stone_with_gold",
@ -335,18 +311,6 @@ minetest.register_ore({
flags = "absheight",
})
minetest.register_ore({
ore_type = "scatter",
ore = "default:stone_with_tin",
wherein = "default:stone",
clust_scarcity = 15 * 15 * 15,
clust_num_ores = 5,
clust_size = 3,
height_min = -30000,
height_max = 64,
flags = "absheight",
})
minetest.register_ore({
ore_type = "scatter",
ore = "default:stone_with_coal",

View File

@ -119,21 +119,6 @@ minetest.register_node("default:desert_stone_with_copper", {
sounds = default.node_sound_stone_defaults(),
})
minetest.register_node("default:stone_with_tin", {
description = "Tin Ore",
tiles = {"default_stone.png^default_mineral_tin.png"},
is_ground_content = true,
groups = {cracky = 3},
drop = {
items = {
{items = {"default:cobble"}},
{items = {"default:tin_lump"}},
{items = {"maptools:copper_coin 2"}},
},
},
sounds = default.node_sound_stone_defaults(),
})
minetest.register_node("default:stone_with_mese", {
description = "Mese Ore",
tiles = {"default_stone.png^default_mineral_mese.png"},
@ -149,21 +134,6 @@ minetest.register_node("default:stone_with_mese", {
sounds = default.node_sound_stone_defaults(),
})
minetest.register_node("default:stone_with_silver", {
description = "Silver Ore",
tiles = {"default_stone.png^default_mineral_silver.png"},
is_ground_content = true,
groups = {cracky = 3},
drop = {
items = {
{items = {"default:cobble"}},
{items = {"default:silver_lump"}},
{items = {"maptools:copper_coin 3"}},
},
},
sounds = default.node_sound_stone_defaults(),
})
minetest.register_node("default:stone_with_gold", {
description = "Gold Ore",
tiles = {"default_stone.png^default_mineral_gold.png"},
@ -2037,14 +2007,6 @@ minetest.register_node("default:steelblock", {
sounds = default.node_sound_metal_defaults(),
})
minetest.register_node("default:tinblock", {
description = "Tin Block",
tiles = {"default_tin_block.png"},
is_ground_content = true,
groups = {cracky = 1, level = 2, ingot_block = 1},
sounds = default.node_sound_metal_defaults(),
})
minetest.register_node("default:copperblock", {
description = "Copper Block",
tiles = {"default_copper_block.png"},
@ -2100,14 +2062,6 @@ minetest.register_node("default:meze", {
})
minetest.register_alias("default:meze_block", "default:meze")
minetest.register_node("default:silverblock", {
description = "Silver Block",
tiles = {"default_silver_block.png"},
is_ground_content = true,
groups = {cracky = 1, ingot_block = 1},
sounds = default.node_sound_metal_defaults(),
})
minetest.register_node("default:goldblock", {
description = "Gold Block",
tiles = {"default_gold_block.png"},
@ -2401,9 +2355,7 @@ if minetest.setting_getbool("xray") then
-- Nodes to make partially see-through:
minetest.override_item("default:stone_with_coal", {tiles = {"default_mineral_coal.png"}})
minetest.override_item("default:stone_with_iron", {tiles = {"default_mineral_iron.png"}})
minetest.override_item("default:stone_with_tin", {tiles = {"default_mineral_tin.png"}})
minetest.override_item("default:stone_with_copper", {tiles = {"default_mineral_copper.png"}})
minetest.override_item("default:stone_with_silver", {tiles = {"default_mineral_silver.png"}})
minetest.override_item("default:stone_with_gold", {tiles = {"default_mineral_gold.png"}})
minetest.override_item("default:stone_with_mese", {tiles = {"default_mineral_mese.png"}})
minetest.override_item("default:stone_with_diamond", {tiles = {"default_mineral_diamond.png"}})

Binary file not shown.

Before

Width:  |  Height:  |  Size: 142 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 142 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 604 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 283 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 188 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 486 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 259 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 225 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 142 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 142 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 186 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 148 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 169 B

View File

@ -72,19 +72,6 @@ minetest.register_tool("default:pick_bronze", {
damage_groups = {fleshy = 4},
},
})
minetest.register_tool("default:pick_silver", {
description = "Silver Pickaxe",
inventory_image = "default_tool_silverpick.png",
tool_capabilities = {
full_punch_interval = 1.2,
max_drop_level = 1,
groupcaps = {
cracky = {times = {[1] = 2.4, [2] = 1.0, [3] = 0.65}, uses = 20, maxlevel = 2},
crumbly = {times = {[1] = 2.0, [2] = 0.9, [3] = 0.36}, uses = 20, maxlevel = 1},
},
damage_groups = {fleshy = 4},
},
})
minetest.register_tool("default:pick_gold", {
description = "Golden Pickaxe",
inventory_image = "default_tool_goldpick.png",
@ -194,19 +181,6 @@ minetest.register_tool("default:shovel_bronze", {
damage_groups = {fleshy = 3},
},
})
minetest.register_tool("default:shovel_silver", {
description = "Silver Shovel",
inventory_image = "default_tool_silvershovel.png",
wield_image = "default_tool_silvershovel.png^[transformR90",
tool_capabilities = {
full_punch_interval = 1.2,
max_drop_level = 1,
groupcaps = {
crumbly = {times = {[1] = 1.65, [2] = 0.6, [3] = 0.32}, uses = 30, maxlevel = 2},
},
damage_groups = {fleshy = 3},
},
})
minetest.register_tool("default:shovel_gold", {
description = "Golden Shovel",
inventory_image = "default_tool_goldshovel.png",
@ -316,19 +290,6 @@ minetest.register_tool("default:axe_bronze", {
damage_groups = {fleshy = 5},
},
})
minetest.register_tool("default:axe_silver", {
description = "Silver Axe",
inventory_image = "default_tool_silveraxe.png",
tool_capabilities = {
full_punch_interval = 1.2,
max_drop_level = 1,
groupcaps = {
choppy = {times = {[1] = 2.2, [2] = 1.0, [3] = 0.55}, uses = 20, maxlevel = 2},
snappy = {times = {[3] = 0.125}, uses = 0, maxlevel = 1},
},
damage_groups = {fleshy = 5},
},
})
minetest.register_tool("default:axe_gold", {
description = "Golden Axe",
inventory_image = "default_tool_goldaxe.png",
@ -434,18 +395,6 @@ minetest.register_tool("default:sword_bronze", {
damage_groups = {fleshy = 5},
}
})
minetest.register_tool("default:sword_silver", {
description = "Silver Sword",
inventory_image = "default_tool_silversword.png",
tool_capabilities = {
full_punch_interval = 0.9,
max_drop_level = 1,
groupcaps = {
snappy = {times = {[1] = 1.9, [2] = 0.85, [3] = 0.125}, uses = 30, maxlevel = 2},
},
damage_groups = {fleshy = 5},
}
})
minetest.register_tool("default:sword_gold", {
description = "Golden Sword",
inventory_image = "default_tool_goldsword.png",
@ -494,15 +443,3 @@ minetest.register_tool("default:sword_mese", {
damage_groups = {fleshy = 6},
}
})
minetest.register_tool("default:knife_silver", {
description = "Knife",
inventory_image = "default_tool_silverknife.png",
wield_image = "default_tool_silverknife.png^[transformR90",
tool_capabilities = {
full_punch_interval = 0.4,
damage_groups = {fleshy = 3},
}
})