nalc/server-nalc
1
0
Fork 0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2024-12-24 17:50:37 +01:00
Code Issues Releases Wiki Activity

Finally fixed maptools' and moreblocks' update

Browse Source 
- Finished pending rebase
- Removed merge garbage
- Fixed merge mistakes
This commit is contained in:
LeMagnesium 2015-01-24 20:27:36 +01:00
parent c6cc85a855
commit 6726dc3a8c
2 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mods/maptools/nodes.lua
View File

@ -411,7 +411,6 @@ minetest.register_node("maptools:igniter", {
minetest.register_node("maptools:superapple", { minetest.register_node("maptools:superapple", {
description = S("Super Apple"), description = S("Super Apple"),
range = 12, range = 12,
<<<<<<< HEAD
stack_max = 99, stack_max = 99,
drawtype = "nodebox", drawtype = "nodebox",
visual_scale = 1.0, visual_scale = 1.0,
@ -442,21 +441,4 @@ minetest.register_node("maptools:superapple", {
minetest.set_node(pos, {name = "maptools:superapple", param2= 1}) minetest.set_node(pos, {name = "maptools:superapple", param2= 1})
end end
end, end,
=======
stack_max = 10000,
drawtype = "plantlike",
visual_scale = 1.0,
tiles = {"maptools_superapple.png"},
inventory_image = "maptools_superapple.png",
paramtype = "light",
sunlight_propagates = true,
selection_box = {
type = "fixed",
fixed = {-0.2, -0.5, -0.2, 0.2, 0, 0.2}
},
walkable = false,
groups = {fleshy=3, dig_immediate=3, not_in_creative_inventory = maptools.creative},
on_use = minetest.item_eat(20),
sounds = default.node_sound_defaults(),
>>>>>>> Maptool's update
}) })

16
mods/moreores/init.lua
View File

@ -241,7 +241,7 @@ local oredefs = {
}, },
tools = { tools = {
pick = { pick = {
cracky = {times = {[1] = 3.0, [2] = 1.20, [3] = 0.70}, uses = 90, maxlevel= 2}}, cracky = {times = {[1] = 3.0, [2] = 1.20, [3] = 0.70}, uses = 90, maxlevel= 2},
damage_groups = {fleshy = 3}, damage_groups = {fleshy = 3},
full_punch_interval = 0.8, full_punch_interval = 0.8,
}, },
@ -249,20 +249,20 @@ local oredefs = {
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}, damage_groups = {fleshy = 3},
full_punch_interval = 0.8, 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}, damage_groups = {fleshy = 3},
full_punch_interval = 0.8, 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}, damage_groups = {fleshy = 5},
full_punch_interval = 0.85, full_punch_interval = 0.85,
} }
@ -290,25 +290,25 @@ local oredefs = {
}, },
tools = { tools = {
pick = { pick = {
cracky = {times = {[1] = 1.5, [2] = 0.8, [3] = 0.35}, uses = 200, maxlevel= 3} cracky = {times = {[1] = 1.5, [2] = 0.8, [3] = 0.35}, uses = 200, maxlevel= 3},
damage_groups = {fleshy = 5}, 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}, 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}, 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}, damage_groups = {fleshy = 9},
} }
}, },