Merge branch 'development' of https://github.com/NPXcoot/nssm into

local development
This commit is contained in:
npx 2016-04-28 23:51:32 +02:00
commit c2bf75a48e
3 changed files with 18243 additions and 6962 deletions

View File

@ -37,6 +37,7 @@ nssm:register_mob("nssm:masticone", {
drawtype = "front", drawtype = "front",
water_damage = 0, water_damage = 0,
lava_damage = 5, lava_damage = 5,
floats=0,
hydra = true, hydra = true,
light_damage = 0, light_damage = 0,
on_rightclick = nil, on_rightclick = nil,
@ -44,15 +45,15 @@ nssm:register_mob("nssm:masticone", {
reach =1.5, reach =1.5,
animation = { animation = {
speed_normal = 20, speed_normal = 20,
speed_run = 30, speed_run = 25,
stand_start = 80, stand_start = 80,
stand_end = 140, stand_end = 140,
walk_start = 20, walk_start = 20,
walk_end = 40, walk_end = 40,
run_start = 20, run_start = 20,
run_end = 40, run_end = 40,
punch_start = 50, punch_start = 150,
punch_end = 75, punch_end = 180,
}, },
on_die = function(self, pos) on_die = function(self, pos)
core.after(2, function() core.after(2, function()

File diff suppressed because it is too large Load Diff

View File

@ -570,7 +570,7 @@ minetest.register_craft({
output = 'nssm:eyed_tentacle', output = 'nssm:eyed_tentacle',
recipe = { recipe = {
{'', 'nssm:lava_titan_eye', ''}, {'', 'nssm:lava_titan_eye', ''},
{'', 'nssm:kraken_tentacle', ''}, {'', 'nssm:tentacle_curly', ''},
{'', '', ''}, {'', '', ''},
} }
}) })