1
0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2025-06-28 14:16:06 +02:00

Finally fixed maptools' and moreblocks' update

- 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

View File

@ -241,7 +241,7 @@ local oredefs = {
},
tools = {
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},
full_punch_interval = 0.8,
},
@ -249,20 +249,20 @@ local oredefs = {
uses = 300
},
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 = {
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 = {
fleshy = {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,
}
@ -290,25 +290,25 @@ local oredefs = {
},
tools = {
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},
},
hoe = {
uses = 1000
},
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 = {
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 = {
fleshy = {times = {[2] = 0.65, [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},
}
},