Merge branch 'master' of ssh://git.minetest.land:29418/MineClone2/MineClone2
This commit is contained in:
commit
d0f4dd4309
|
@ -59,7 +59,6 @@ local slime_big = {
|
||||||
description = S("Slime"),
|
description = S("Slime"),
|
||||||
type = "monster",
|
type = "monster",
|
||||||
spawn_class = "hostile",
|
spawn_class = "hostile",
|
||||||
pathfinding = 1,
|
|
||||||
group_attack = { "mobs_mc:slime_big", "mobs_mc:slime_small", "mobs_mc:slime_tiny" },
|
group_attack = { "mobs_mc:slime_big", "mobs_mc:slime_small", "mobs_mc:slime_tiny" },
|
||||||
hp_min = 16,
|
hp_min = 16,
|
||||||
hp_max = 16,
|
hp_max = 16,
|
||||||
|
@ -67,7 +66,7 @@ local slime_big = {
|
||||||
xp_max = 4,
|
xp_max = 4,
|
||||||
collisionbox = {-1.02, -0.01, -1.02, 1.02, 2.03, 1.02},
|
collisionbox = {-1.02, -0.01, -1.02, 1.02, 2.03, 1.02},
|
||||||
visual_size = {x=12.5, y=12.5},
|
visual_size = {x=12.5, y=12.5},
|
||||||
textures = {{"mobs_mc_slime.png"}},
|
textures = {{"mobs_mc_slime.png", "mobs_mc_slime.png"}},
|
||||||
visual = "mesh",
|
visual = "mesh",
|
||||||
mesh = "mobs_mc_slime.b3d",
|
mesh = "mobs_mc_slime.b3d",
|
||||||
makes_footstep_sound = true,
|
makes_footstep_sound = true,
|
||||||
|
@ -84,18 +83,15 @@ local slime_big = {
|
||||||
drops = {},
|
drops = {},
|
||||||
-- TODO: Fix animations
|
-- TODO: Fix animations
|
||||||
animation = {
|
animation = {
|
||||||
speed_normal = 24,
|
jump_speed = 17,
|
||||||
speed_run = 48,
|
stand_speed = 17,
|
||||||
stand_start = 0,
|
walk_speed = 17,
|
||||||
stand_end = 23,
|
jump_start = 1,
|
||||||
walk_start = 24,
|
jump_end = 20,
|
||||||
walk_end = 47,
|
stand_start = 1,
|
||||||
run_start = 48,
|
stand_end = 20,
|
||||||
run_end = 62,
|
walk_start = 1,
|
||||||
hurt_start = 64,
|
walk_end = 20,
|
||||||
hurt_end = 86,
|
|
||||||
death_start = 88,
|
|
||||||
death_end = 118,
|
|
||||||
},
|
},
|
||||||
fall_damage = 0,
|
fall_damage = 0,
|
||||||
view_range = 16,
|
view_range = 16,
|
||||||
|
@ -301,7 +297,7 @@ local magma_cube_big = {
|
||||||
xp_max = 4,
|
xp_max = 4,
|
||||||
collisionbox = {-1.02, -0.01, -1.02, 1.02, 2.03, 1.02},
|
collisionbox = {-1.02, -0.01, -1.02, 1.02, 2.03, 1.02},
|
||||||
visual_size = {x=12.5, y=12.5},
|
visual_size = {x=12.5, y=12.5},
|
||||||
textures = {{ "mobs_mc_magmacube.png" }},
|
textures = {{ "mobs_mc_magmacube.png", "mobs_mc_magmacube.png" }},
|
||||||
visual = "mesh",
|
visual = "mesh",
|
||||||
mesh = "mobs_mc_magmacube.b3d",
|
mesh = "mobs_mc_magmacube.b3d",
|
||||||
makes_footstep_sound = true,
|
makes_footstep_sound = true,
|
||||||
|
@ -324,18 +320,15 @@ local magma_cube_big = {
|
||||||
},
|
},
|
||||||
-- TODO: Fix animations
|
-- TODO: Fix animations
|
||||||
animation = {
|
animation = {
|
||||||
speed_normal = 24,
|
jump_speed = 20,
|
||||||
speed_run = 48,
|
stand_speed = 20,
|
||||||
stand_start = 0,
|
walk_speed = 20,
|
||||||
stand_end = 23,
|
jump_start = 1,
|
||||||
walk_start = 24,
|
jump_end = 40,
|
||||||
walk_end = 47,
|
stand_start = 1,
|
||||||
run_start = 48,
|
stand_end = 1,
|
||||||
run_end = 62,
|
walk_start = 1,
|
||||||
hurt_start = 64,
|
walk_end = 40,
|
||||||
hurt_end = 86,
|
|
||||||
death_start = 88,
|
|
||||||
death_end = 118,
|
|
||||||
},
|
},
|
||||||
water_damage = 0,
|
water_damage = 0,
|
||||||
lava_damage = 0,
|
lava_damage = 0,
|
||||||
|
|
Loading…
Reference in New Issue