Merge branch 'adjust_tools' into 'master'
adjust tools See merge request Illuna-Minetest/moreores!1
This commit is contained in:
commit
64e7dd630a
38
init.lua
38
init.lua
@ -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
|
||||||
@ -261,25 +261,29 @@ 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},
|
--damage_groups = {fleshy = 6},
|
||||||
},
|
},
|
||||||
mithril = {
|
mithril = {
|
||||||
description = "Mithril",
|
description = "Mithril",
|
||||||
@ -293,26 +297,30 @@ local oredefs = {
|
|||||||
},
|
},
|
||||||
tools = {
|
tools = {
|
||||||
pick = {
|
pick = {
|
||||||
cracky = {times = {[1] = 2, [2] = 1, [3] = 0.50}, uses = 300, maxlevel = 3}
|
cracky = {times = {[1] = 2, [2] = 1, [3] = 0.50}, uses = 300, maxlevel = 3},
|
||||||
|
damage_groups = {fleshy = 6},
|
||||||
},
|
},
|
||||||
hoe = {
|
hoe = {
|
||||||
uses = 1500,
|
uses = 1500,
|
||||||
},
|
},
|
||||||
shovel = {
|
shovel = {
|
||||||
crumbly = {times = {[1] = 0.70, [2] = 0.35, [3] = 0.20}, uses = 300, 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 = 300, 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 = 300, maxlevel = 2}
|
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 = 300, maxlevel = 2},
|
fleshy = {times = {[2] = 0.65, [3] = 0.25}, uses = 200, maxlevel = 2},
|
||||||
snappy = {times = {[2] = 0.70, [3] = 0.25}, uses = 300, 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.1,
|
full_punch_interval = 0.45,
|
||||||
damage_groups = {fleshy = 9},
|
--damage_groups = {fleshy = 9},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user