Code cleanup; added damage for swords.

This commit is contained in:
Calinou 2014-06-24 17:49:10 +02:00
parent 0f08da9a4e
commit 691adc7893

View File

@ -35,33 +35,22 @@ local function hoe_on_use(itemstack, user, pointed_thing, uses)
end end
local under = minetest.get_node(pt.under) local under = minetest.get_node(pt.under)
local p = {x=pt.under.x, y=pt.under.y+1, z=pt.under.z} local pos = {x = pt.under.x, y = pt.under.y + 1, z = pt.under.z}
local above = minetest.get_node(p) local above = minetest.get_node(pos)
-- return if any of the nodes is not registered -- Return if any of the nodes is not registered:
if not minetest.registered_nodes[under.name] then if not minetest.registered_nodes[under.name] then return end
return if not minetest.registered_nodes[above.name] then return end
end
if not minetest.registered_nodes[above.name] then
return
end
-- check if the node above the pointed thing is air -- Check if the node above the pointed thing is air:
if above.name ~= "air" then if above.name ~= "air" then return end
return
end
-- check if pointing at dirt -- Check if pointing at dirt:
if minetest.get_item_group(under.name, "soil") ~= 1 then if minetest.get_item_group(under.name, "soil") ~= 1 then return end
return
end
-- turn the node into soil, wear out item and play sound -- Turn the node into soil, wear out item and play sound:
minetest.set_node(pt.under, {name ="farming:soil"}) minetest.set_node(pt.under, {name ="farming:soil"})
minetest.sound_play("default_dig_crumbly", { minetest.sound_play("default_dig_crumbly", {pos = pt.under, gain = 0.5})
pos = pt.under,
gain = 0.5,
})
itemstack:add_wear(65535 / (uses - 1)) itemstack:add_wear(65535 / (uses - 1))
return itemstack return itemstack
end end
@ -158,14 +147,14 @@ local function add_ore(modname, description, mineral_name, oredef)
if oredef.makes.chest then if oredef.makes.chest then
minetest.register_craft( { minetest.register_craft( {
output = "default:chest_locked 1", output = "default:chest_locked",
recipe = { recipe = {
{ingot}, {ingot},
{"default:chest"} {"default:chest"}
} }
}) })
minetest.register_craft( { minetest.register_craft( {
output = "default:chest_locked 1", output = "default:chest_locked",
recipe = get_recipe(ingot, "lockedchest") recipe = get_recipe(ingot, "lockedchest")
}) })
end end
@ -187,19 +176,23 @@ local function add_ore(modname, description, mineral_name, oredef)
} }
if toolname == "sword" then if toolname == "sword" then
tdef.full_punch_interval = oredef.punchint tdef.full_punch_interval = oredef.full_punch_interval
tdef.damage_groups = oredef.damage_groups
tdef.description = S("%s Sword"):format(S(description)) tdef.description = S("%s Sword"):format(S(description))
end end
if toolname == "pick" then if toolname == "pick" then
tdef.full_punch_interval = oredef.full_punch_interval
tdef.description = S("%s Pickaxe"):format(S(description)) tdef.description = S("%s Pickaxe"):format(S(description))
end end
if toolname == "axe" then if toolname == "axe" then
tdef.full_punch_interval = oredef.full_punch_interval
tdef.description = S("%s Axe"):format(S(description)) tdef.description = S("%s Axe"):format(S(description))
end end
if toolname == "shovel" then if toolname == "shovel" then
tdef.full_punch_interval = oredef.full_punch_interval
tdef.description = S("%s Shovel"):format(S(description)) tdef.description = S("%s Shovel"):format(S(description))
end end
@ -224,8 +217,7 @@ local function add_ore(modname, description, mineral_name, oredef)
end end
end end
-- Add everything (compact(ish)!) -- Add everything:
local modname = "moreores" local modname = "moreores"
local oredefs = { local oredefs = {
@ -258,7 +250,8 @@ local oredefs = {
choppy = {times = {[3] = 0.80}, uses = 100, maxlevel= 0} choppy = {times = {[3] = 0.80}, uses = 100, maxlevel= 0}
} }
}, },
punchint = 1.0 full_punch_interval = 1.0,
damage_groups = {fleshy = 6},
}, },
tin = { tin = {
desc = "Tin", desc = "Tin",
@ -300,7 +293,8 @@ local oredefs = {
choppy = {times = {[3] = 0.65}, uses = 200, maxlevel= 0} choppy = {times = {[3] = 0.65}, uses = 200, maxlevel= 0}
} }
}, },
punchint = 0.45 full_punch_interval = 0.45,
damage_groups = {fleshy = 9},
} }
} }
@ -319,8 +313,7 @@ minetest.register_craft({
} }
}) })
-- Bronze has some special cases, because it is made from copper and tin -- Bronze has some special cases, because it is made from copper and tin:
minetest.register_craft( { minetest.register_craft( {
type = "shapeless", type = "shapeless",
output = "default:bronze_ingot 3", output = "default:bronze_ingot 3",
@ -331,8 +324,7 @@ minetest.register_craft( {
} }
}) })
-- Unique node -- Unique node:
minetest.register_node("moreores:copper_rail", { minetest.register_node("moreores:copper_rail", {
description = S("Copper Rail"), description = S("Copper Rail"),
drawtype = "raillike", drawtype = "raillike",
@ -360,7 +352,7 @@ minetest.register_node("moreores:copper_rail", {
}, },
}) })
-- mg suppport -- mg support:
if minetest.get_modpath("mg") then if minetest.get_modpath("mg") then
dofile(moreores_modpath.."/mg.lua") dofile(moreores_modpath.."/mg.lua")
end end