1
0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2024-09-28 07:20:33 +02:00

Merge branch 'master' of github.com:Ombridride/minetest-minetestforfun-server

This commit is contained in:
LeMagnesium 2015-01-23 20:48:24 +01:00
commit 6537a584db
4 changed files with 48 additions and 36 deletions

View File

@ -28,9 +28,9 @@ minetest.register_tool("default:pick_wood", {
full_punch_interval = 1.2, full_punch_interval = 1.2,
max_drop_level = 0, max_drop_level = 0,
groupcaps = { groupcaps = {
cracky = {times = {[1] = 6.5, [2] = 2.0, [3] = 1.2}, uses = 20, maxlevel = 1}, cracky = {times = [3] = 1.2}, uses = 20, maxlevel = 1},
}, },
damage_groups = {fleshy = 3}, damage_groups = {fleshy = 1},
}, },
}) })
minetest.register_tool("default:pick_stone", { minetest.register_tool("default:pick_stone", {
@ -40,10 +40,10 @@ minetest.register_tool("default:pick_stone", {
full_punch_interval = 1.2, full_punch_interval = 1.2,
max_drop_level = 0, max_drop_level = 0,
groupcaps = { groupcaps = {
cracky = {times = {[1] = 5.5, [2] = 1.6, [3] = 0.9}, uses = 20, maxlevel = 1}, cracky = {times = {[2] = 1.6, [3] = 1}, uses = 20, maxlevel = 1},
crumbly = {times = {[1] = 2.6, [2] = 1.4, [3] = 0.44}, uses = 20, maxlevel = 1}, crumbly = {times = {[1] = 2.6, [2] = 1.4, [3] = 0.44}, uses = 20, maxlevel = 1},
}, },
damage_groups = {fleshy = 3}, damage_groups = {fleshy = 2},
}, },
}) })
minetest.register_tool("default:pick_steel", { minetest.register_tool("default:pick_steel", {
@ -53,10 +53,10 @@ minetest.register_tool("default:pick_steel", {
full_punch_interval = 1.2, full_punch_interval = 1.2,
max_drop_level = 1, max_drop_level = 1,
groupcaps = { groupcaps = {
cracky = {times = {[1] = 4.0, [2] = 1.3, [3] = 0.85}, uses = 20, maxlevel = 2}, cracky = {times = {[1] = 4.0, [2] = 1.4, [3] = 0.8}, uses = 25, maxlevel = 2},
crumbly = {times = {[1] = 2.4, [2] = 1.2, [3] = 0.39}, uses = 20, maxlevel = 1}, crumbly = {times = {[1] = 2.4, [2] = 1.2, [3] = 0.39}, uses = 20, maxlevel = 1},
}, },
damage_groups = {fleshy = 4}, damage_groups = {fleshy = 3},
}, },
}) })
minetest.register_tool("default:pick_bronze", { minetest.register_tool("default:pick_bronze", {
@ -66,10 +66,10 @@ minetest.register_tool("default:pick_bronze", {
full_punch_interval = 1.2, full_punch_interval = 1.2,
max_drop_level = 1, max_drop_level = 1,
groupcaps = { groupcaps = {
cracky = {times = {[1] = 4.0, [2] = 1.3, [3] = 0.85}, uses = 30, maxlevel = 2}, cracky = {times = {[1] = 4.0, [2] = 1.4, [3] = 0.8}, uses = 30, maxlevel = 2},
crumbly = {times = {[1] = 2.4, [2] = 1.2, [3] = 0.39}, uses = 30, maxlevel = 1}, crumbly = {times = {[1] = 2.4, [2] = 1.2, [3] = 0.39}, uses = 30, maxlevel = 1},
}, },
damage_groups = {fleshy = 4}, damage_groups = {fleshy = 3},
}, },
}) })
minetest.register_tool("default:pick_gold", { minetest.register_tool("default:pick_gold", {
@ -79,36 +79,36 @@ minetest.register_tool("default:pick_gold", {
full_punch_interval = 1.2, full_punch_interval = 1.2,
max_drop_level = 3, max_drop_level = 3,
groupcaps = { groupcaps = {
cracky = {times = {[1] = 2.4, [2] = 1.0, [3] = 0.65}, uses = 5, maxlevel = 3}, cracky = {times = {[1] = 2.8, [2] = 1.15, [3] = 0.65}, uses = 15, maxlevel = 3},
crumbly = {times = {[1] = 2.0, [2] = 0.9, [3] = 0.36}, uses = 5, maxlevel = 2}, crumbly = {times = {[1] = 2.0, [2] = 0.9, [3] = 0.36}, uses = 5, maxlevel = 2},
}, },
damage_groups = {fleshy = 5}, damage_groups = {fleshy = 4},
}, },
}) })
minetest.register_tool("default:pick_diamond", { minetest.register_tool("default:pick_diamond", {
description = "Diamond Pickaxe", description = "Diamond Pickaxe",
inventory_image = "default_tool_diamondpick.png", inventory_image = "default_tool_diamondpick.png",
tool_capabilities = { tool_capabilities = {
full_punch_interval = 1.2, full_punch_interval = 0.8,
max_drop_level = 3, max_drop_level = 3,
groupcaps = { groupcaps = {
cracky = {times = {[1] = 2.4, [2] = 1.0, [3] = 0.65}, uses = 25, maxlevel = 3}, cracky = {times = {[1] = 2.0, [2] = 1.0, [3] = 0.5}, uses = 30, maxlevel = 3},
crumbly = {times = {[1] = 2.0, [2] = 0.9, [3] = 0.36}, uses = 25, maxlevel = 2}, crumbly = {times = {[1] = 2.0, [2] = 0.9, [3] = 0.36}, uses = 25, maxlevel = 2},
}, },
damage_groups = {fleshy = 5}, damage_groups = {fleshy = 4},
}, },
}) })
minetest.register_tool("default:pick_nyan", { minetest.register_tool("default:pick_nyan", {
description = "Nyan Pickaxe", description = "Nyan Pickaxe",
inventory_image = "default_tool_nyanpick.png", inventory_image = "default_tool_nyanpick.png",
tool_capabilities = { tool_capabilities = {
full_punch_interval = 1.2, full_punch_interval = 0.9,
max_drop_level = 3, max_drop_level = 3,
groupcaps = { groupcaps = {
cracky = {times = {[1] = 2.4, [2] = 1.0, [3] = 0.65}, uses = 75, maxlevel = 3}, cracky = {times = {[1] = 2.6, [2] = 1.1, [3] = 0.6}, uses = 60, maxlevel = 3},
crumbly = {times = {[1] = 2.0, [2] = 0.9, [3] = 0.36}, uses = 75, maxlevel = 2}, crumbly = {times = {[1] = 2.0, [2] = 0.9, [3] = 0.36}, uses = 75, maxlevel = 2},
}, },
damage_groups = {fleshy = 5}, damage_groups = {fleshy = 4},
}, },
}) })
minetest.register_tool("default:pick_mese", { minetest.register_tool("default:pick_mese", {
@ -118,10 +118,10 @@ minetest.register_tool("default:pick_mese", {
full_punch_interval = 0.9, full_punch_interval = 0.9,
max_drop_level = 3, max_drop_level = 3,
groupcaps = { groupcaps = {
cracky = {times = {[1] = 1.8, [2] = 0.75, [3] = 0.45}, uses = 15, maxlevel = 3}, cracky = {times = {[1] = 2.6, [2] = 1.1, [3] = 0.6}, uses = 20, maxlevel = 3},
crumbly = {times = {[1] = 1.65, [2] = 0.6, [3] = 0.32}, uses = 15, maxlevel = 3}, crumbly = {times = {[1] = 1.65, [2] = 0.6, [3] = 0.32}, uses = 20, maxlevel = 3},
}, },
damage_groups = {fleshy = 5}, damage_groups = {fleshy = 4},
}, },
}) })

View File

@ -26,5 +26,8 @@ minetest.register_alias("torches:wand", "default:torch")
minetest.register_alias("moreores:copper_rail", "carts:rail_copper") minetest.register_alias("moreores:copper_rail", "carts:rail_copper")
-- Old fishing mod to the new fishing mod -- Old fishing mod to the new fishing mod
minetest.register_alias("fishing:fish", "fishing:fish_cooked") minetest.register_alias("fishing:fish_cooked", "fishing:fish")
minetest.register_alias("fishing:worm", "fishing:bait_worm") minetest.register_alias("fishing:worm", "fishing:bait_worm")
-- Old itemframes mod to the new itemframesv(2) mod
minetest.register_alias("itemframes:pedestral", "itemframes:pedestral_cobble")

View File

@ -235,26 +235,32 @@ local oredefs = {
}, },
tools = { tools = {
pick = { pick = {
cracky = {times = {[1] = 2.60, [2] = 1.00, [3] = 0.60}, uses = 100, maxlevel= 1} cracky = {times = {[1] = 3.0, [2] = 1.20, [3] = 0.70}, uses = 90, maxlevel= 2}
damage_groups = {fleshy = 3},
full_punch_interval = 0.8,
}, },
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},
full_punch_interval = 0.8,
}, },
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 = 3},
full_punch_interval = 0.8,
}, },
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 = {[2] = 0.70, [3] = 0.30}, uses = 100, maxlevel= 1},
choppy = {times = {[3] = 0.80}, uses = 40, maxlevel= 0} choppy = {times = {[3] = 0.80}, uses = 40, maxlevel= 0}
damage_groups = {fleshy = 5},
full_punch_interval = 0.85,
} }
}, },
full_punch_interval = 0.8,
damage_groups = {fleshy = 5},
}, },
tin = { tin = {
desc = "Tin", desc = "Tin",
@ -278,26 +284,29 @@ local oredefs = {
}, },
tools = { tools = {
pick = { pick = {
cracky = {times = {[1] = 2.25, [2] = 0.55, [3] = 0.35}, uses = 200, maxlevel= 1} cracky = {times = {[1] = 1.5, [2] = 0.8, [3] = 0.35}, uses = 200, maxlevel= 3}
damage_groups = {fleshy = 5},
}, },
hoe = { hoe = {
uses = 1000 uses = 1000
}, },
shovel = { shovel = {
crumbly = {times = {[1] = 0.70, [2] = 0.35, [3] = 0.20}, uses = 200, maxlevel= 1} crumbly = {times = {[1] = 0.70, [2] = 0.35, [3] = 0.20}, uses = 200, maxlevel= 1}
damage_groups = {fleshy = 5},
}, },
axe = { axe = {
choppy = {times = {[1] = 1.75, [2] = 0.45, [3] = 0.45}, uses = 200, maxlevel= 1}, choppy = {times = {[1] = 1.75, [2] = 0.45, [3] = 0.45}, uses = 200, maxlevel= 1},
fleshy = {times = {[2] = 0.95, [3] = 0.30}, uses = 200, maxlevel= 1} fleshy = {times = {[2] = 0.95, [3] = 0.30}, uses = 200, maxlevel= 1}
damage_groups = {fleshy = 5},
}, },
sword = { sword = {
fleshy = {times = {[2] = 0.65, [3] = 0.25}, uses = 200, maxlevel= 1}, fleshy = {times = {[2] = 0.65, [3] = 0.25}, uses = 200, maxlevel= 1},
snappy = {times = {[2] = 0.70, [3] = 0.25}, uses = 200, maxlevel= 1}, snappy = {times = {[2] = 0.70, [3] = 0.25}, uses = 200, maxlevel= 1},
choppy = {times = {[3] = 0.65}, uses = 200, maxlevel= 0} choppy = {times = {[3] = 0.65}, uses = 200, maxlevel= 0}
damage_groups = {fleshy = 9},
} }
}, },
full_punch_interval = 0.5, full_punch_interval = 0.5,
damage_groups = {fleshy = 9},
} }
} }

View File

@ -803,8 +803,8 @@ minetest.register_tool("nether:pick_mushroom", {
tool_capabilities = { tool_capabilities = {
max_drop_level=0, max_drop_level=0,
groupcaps={ groupcaps={
cracky = {times={[3]=3}, uses=1, maxlevel=1}, cracky = {times={[3]=3}, uses=5, maxlevel=1},
nether = {times={[3]=3}, uses=1, maxlevel=1}, nether = {times={[3]=3}, uses=5, maxlevel=1},
}, },
}, },
}) })
@ -817,7 +817,7 @@ minetest.register_tool("nether:pick_wood", {
max_drop_level=0, max_drop_level=0,
groupcaps={ groupcaps={
cracky = {times={[3]=1.6}, uses=10, maxlevel=1}, cracky = {times={[3]=1.6}, uses=10, maxlevel=1},
nether = {times={[2]=6, [3]=1.6}, uses=10, maxlevel=1}, nether = {times={[3]=1.6}, uses=10, maxlevel=1},
}, },
damage_groups = {fleshy=2}, damage_groups = {fleshy=2},
}, },
@ -827,11 +827,11 @@ minetest.register_tool("nether:pick_netherrack", {
description = "Netherrack Pickaxe", description = "Netherrack Pickaxe",
inventory_image = "nether_pick_netherrack.png", inventory_image = "nether_pick_netherrack.png",
tool_capabilities = { tool_capabilities = {
full_punch_interval = 1.3, full_punch_interval = 1.2,
max_drop_level=0, max_drop_level=0,
groupcaps={ groupcaps={
cracky = {times={[2]=2.0, [3]=1.20}, uses=20, maxlevel=1}, cracky = {times={[2]=2.0, [3]=1.20}, uses=20, maxlevel=1},
nether = {times={[1]=16, [2]=2, [3]=1.20}, uses=20, maxlevel=1}, nether = {times={[2]=2.0, [3]=1.20}, uses=20, maxlevel=1},
}, },
damage_groups = {fleshy=3}, damage_groups = {fleshy=3},
}, },
@ -841,7 +841,7 @@ minetest.register_tool("nether:pick_netherrack_blue", {
description = "Blue Netherrack Pickaxe", description = "Blue Netherrack Pickaxe",
inventory_image = "nether_pick_netherrack_blue.png", inventory_image = "nether_pick_netherrack_blue.png",
tool_capabilities = { tool_capabilities = {
full_punch_interval = 1.0, full_punch_interval = 0.8,
max_drop_level=1, max_drop_level=1,
groupcaps={ groupcaps={
cracky = {times={[1]=4.00, [2]=1.60, [3]=0.80}, uses=30, maxlevel=2}, cracky = {times={[1]=4.00, [2]=1.60, [3]=0.80}, uses=30, maxlevel=2},
@ -855,11 +855,11 @@ minetest.register_tool("nether:pick_white", {
description = "Siwtonic Pickaxe", description = "Siwtonic Pickaxe",
inventory_image = "nether_pick_white.png", inventory_image = "nether_pick_white.png",
tool_capabilities = { tool_capabilities = {
full_punch_interval = 0.9, full_punch_interval = 0.5,
max_drop_level=3, max_drop_level=3,
groupcaps={ groupcaps={
cracky = {times={[1]=1, [2]=0.8, [3]=0.3}, uses=180, maxlevel=3}, cracky = {times={[1]=1.75, [2]=0.85, [3]=0.40}, uses=125, maxlevel=3},
nether = {times={[1]=1, [2]=0.5, [3]=0.3}, uses=180, maxlevel=3}, nether = {times={[1]=1, [2]=0.5, [3]=0.3}, uses=125, maxlevel=3},
}, },
damage_groups = {fleshy=5}, damage_groups = {fleshy=5},
}, },
@ -982,7 +982,7 @@ minetest.register_tool("nether:sword_white", {
groupcaps={ groupcaps={
snappy={times={[1]=1.7, [2]=0.8, [3]=0.2}, uses=100, maxlevel=3}, snappy={times={[1]=1.7, [2]=0.8, [3]=0.2}, uses=100, maxlevel=3},
}, },
damage_groups = {fleshy=8}, damage_groups = {fleshy=9},
}, },
}) })