This commit is contained in:
root 2021-09-22 11:53:40 +02:00
parent c5dcd77f43
commit c62e0c5989
2 changed files with 20 additions and 14 deletions

View file

@ -216,7 +216,7 @@ elseif minetest.global_exists("sfinv") then -- sfinv installed
end end
end end
else else
error( return minetest.log("error",
"worldedit_gui requires a supported gui management mod to be installed.\n".. "worldedit_gui requires a supported gui management mod to be installed.\n"..
"To use the it you need to either:\n".. "To use the it you need to either:\n"..
"* use minetest_game or another sfinv-compatible subgame\n".. "* use minetest_game or another sfinv-compatible subgame\n"..

View file

@ -185,25 +185,25 @@ local function add_ore(modname, description, mineral_name, oredef)
if tool_name == "sword" then if tool_name == "sword" then
tdef.tool_capabilities.full_punch_interval = oredef.full_punch_interval tdef.tool_capabilities.full_punch_interval = oredef.full_punch_interval
tdef.tool_capabilities.damage_groups = oredef.damage_groups tdef.tool_capabilities.damage_groups = oredef.tools.sword.damage_groups
tdef.description = S("@1 Sword", S(description)) tdef.description = S("@1 Sword", S(description))
end end
if tool_name == "pick" then if tool_name == "pick" then
tdef.tool_capabilities.full_punch_interval = oredef.full_punch_interval tdef.tool_capabilities.full_punch_interval = oredef.full_punch_interval
tdef.tool_capabilities.damage_groups = oredef.damage_groups tdef.tool_capabilities.damage_groups = oredef.tools.pick.damage_groups
tdef.description = S("@1 Pickaxe", S(description)) tdef.description = S("@1 Pickaxe", S(description))
end end
if tool_name == "axe" then if tool_name == "axe" then
tdef.tool_capabilities.full_punch_interval = oredef.full_punch_interval tdef.tool_capabilities.full_punch_interval = oredef.full_punch_interval
tdef.tool_capabilities.damage_groups = oredef.damage_groups tdef.tool_capabilities.damage_groups = oredef.tools.axe.damage_groups
tdef.description = S("@1 Axe", S(description)) tdef.description = S("@1 Axe", S(description))
end end
if tool_name == "shovel" then if tool_name == "shovel" then
tdef.full_punch_interval = oredef.full_punch_interval tdef.full_punch_interval = oredef.full_punch_interval
tdef.tool_capabilities.damage_groups = oredef.damage_groups tdef.tool_capabilities.damage_groups = oredef.tools.shovel.damage_groups
tdef.description = S("@1 Shovel", S(description)) tdef.description = S("@1 Shovel", S(description))
tdef.wield_image = toolimg_base .. tool_name .. ".png^[transformR90" tdef.wield_image = toolimg_base .. tool_name .. ".png^[transformR90"
end end
@ -260,25 +260,28 @@ local oredefs = {
tools = { tools = {
pick = { pick = {
cracky = {times = {[1] = 2.60, [2] = 1.00, [3] = 0.60}, uses = 100, maxlevel = 1}, cracky = {times = {[1] = 2.60, [2] = 1.00, [3] = 0.60}, uses = 100, maxlevel = 1},
damage_groups = {fleshy = 4},
}, },
hoe = { hoe = {
uses = 300, uses = 300,
}, },
shovel = { shovel = {
crumbly = {times = {[1] = 1.10, [2] = 0.40, [3] = 0.25}, uses = 100, maxlevel = 1}, crumbly = {times = {[1] = 1.10, [2] = 0.40, [3] = 0.25}, uses = 100, maxlevel = 1},
damage_groups = {fleshy = 3},
}, },
axe = { axe = {
choppy = {times = {[1] = 2.50, [2] = 0.80, [3] = 0.50}, uses = 100, maxlevel = 1}, choppy = {times = {[1] = 2.50, [2] = 0.80, [3] = 0.50}, uses = 100, maxlevel = 1},
fleshy = {times = {[2] = 1.10, [3] = 0.60}, uses = 100, maxlevel = 1} fleshy = {times = {[2] = 1.10, [3] = 0.60}, uses = 100, maxlevel = 1},
damage_groups = {fleshy = 5},
}, },
sword = { sword = {
fleshy = {times = {[2] = 0.70, [3] = 0.30}, uses = 100, maxlevel = 1}, fleshy = {times = {[2] = 0.70, [3] = 0.30}, uses = 100, maxlevel = 1},
snappy = {times = {[2] = 0.70, [3] = 0.30}, uses = 100, maxlevel = 1}, snappy = {times = {[1] = 1.70, [2] = 0.70, [3] = 0.30}, uses = 100, maxlevel = 1},
choppy = {times = {[3] = 0.80}, uses = 100, maxlevel = 0}, choppy = {times = {[3] = 0.80}, uses = 100, maxlevel = 0},
damage_groups = {fleshy = 6},
}, },
}, },
full_punch_interval = 1.0, full_punch_interval = 1.0,
damage_groups = {fleshy = 6},
}, },
mithril = { mithril = {
description = "Mithril", description = "Mithril",
@ -292,26 +295,29 @@ local oredefs = {
}, },
tools = { tools = {
pick = { pick = {
cracky = {times = {[1] = 2.25, [2] = 0.55, [3] = 0.35}, uses = 200, maxlevel = 2} cracky = {times = {[1] = 2.25, [2] = 0.55, [3] = 0.35}, uses = 200, maxlevel = 3},
damage_groups = {fleshy = 6},
}, },
hoe = { hoe = {
uses = 1000, uses = 1000,
}, },
shovel = { shovel = {
crumbly = {times = {[1] = 0.70, [2] = 0.35, [3] = 0.20}, uses = 200, maxlevel = 2}, crumbly = {times = {[1] = 0.70, [2] = 0.35, [3] = 0.20}, uses = 200, maxlevel = 3},
damage_groups = {fleshy = 5},
}, },
axe = { axe = {
choppy = {times = {[1] = 1.75, [2] = 0.45, [3] = 0.45}, uses = 200, maxlevel = 2}, choppy = {times = {[1] = 1.75, [2] = 0.45, [3] = 0.45}, uses = 200, maxlevel = 3},
fleshy = {times = {[2] = 0.95, [3] = 0.30}, uses = 200, maxlevel = 1} fleshy = {times = {[2] = 0.95, [3] = 0.30}, uses = 200, maxlevel = 2},
damage_groups = {fleshy = 8},
}, },
sword = { sword = {
fleshy = {times = {[2] = 0.65, [3] = 0.25}, uses = 200, maxlevel = 2}, fleshy = {times = {[2] = 0.65, [3] = 0.25}, uses = 200, maxlevel = 2},
snappy = {times = {[2] = 0.70, [3] = 0.25}, uses = 200, maxlevel = 2}, snappy = {times = {[1] = 1.70, [2] = 0.70, [3] = 0.25}, uses = 200, maxlevel = 3},
choppy = {times = {[3] = 0.65}, uses = 200, maxlevel = 0}, choppy = {times = {[3] = 0.65}, uses = 200, maxlevel = 0},
damage_groups = {fleshy = 10},
}, },
}, },
full_punch_interval = 0.45, full_punch_interval = 0.45,
damage_groups = {fleshy = 9},
} }
} }