1
0
mirror of https://gitlab.com/echoes91/spears.git synced 2025-07-29 03:10:19 +02:00

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
2023-06-07 22:47:09 +02:00
9 changed files with 167 additions and 140 deletions

View File

@ -48,18 +48,18 @@ function spears_register_spear(spear_type, desc, base_damage, toughness, materia
minetest.register_craft({
output = 'spears:spear_' .. spear_type,
recipe = {
{'', '', material},
{'', 'group:stick', ''},
{'group:stick', '', ''},
{"", "", material},
{"", "group:stick", ""},
{"group:stick", "", ""}
}
})
minetest.register_craft({
output = 'spears:spear_' .. spear_type,
recipe = {
{material, '', ''},
{'', 'group:stick', ''},
{'', '', 'group:stick'},
{material, "", ""},
{"", "group:stick", ""},
{"", "", "group:stick"}
}
})
end
@ -68,17 +68,31 @@ if not DISABLE_STONE_SPEAR then
spears_register_spear('stone', 'Stone', 4, 20, 'group:stone')
end
if not DISABLE_STEEL_SPEAR then
spears_register_spear('steel', 'Steel', 6, 30, 'default:steel_ingot')
if minetest.get_modpath("pigiron") then
if not DISABLE_IRON_SPEAR then
spears_register_spear('iron', 'Iron', 5.5, 30, 'pigiron:iron_ingot')
end
if not DISABLE_STEEL_SPEAR then
spears_register_spear('steel', 'Steel', 6, 35, 'default:steel_ingot')
end
if not DISABLE_COPPER_SPEAR then
spears_register_spear('copper', 'Copper', 4.8, 30, 'default:copper_ingot')
end
if not DISABLE_BRONZE_SPEAR then
spears_register_spear('bronze', 'Bronze', 5.5, 35, 'default:bronze_ingot')
end
else
if not DISABLE_STEEL_SPEAR then
spears_register_spear('steel', 'Steel', 6, 30, 'default:steel_ingot')
end
if not DISABLE_COPPER_SPEAR then
spears_register_spear('copper', 'Copper', 5, 30, 'default:copper_ingot')
end
if not DISABLE_BRONZE_SPEAR then
spears_register_spear('bronze', 'Bronze', 6, 35, 'default:bronze_ingot')
end
end
if not DISABLE_COPPER_SPEAR then
spears_register_spear('copper', 'Copper', 5, 35, 'default:copper_ingot')
end
if not DISABLE_BRONZE_SPEAR then
spears_register_spear('bronze', 'Bronze', 6, 35, 'default:bronze_ingot')
end
if not DISABLE_OBSIDIAN_SPEAR then
spears_register_spear('obsidian', 'Obsidian', 8, 30, 'default:obsidian')