Merge branch 'master' of ssh://git.minetest.land:29418/MineClone2/MineClone2

This commit is contained in:
AFCMS 2021-04-28 09:38:32 +02:00
commit d0f4dd4309

View File

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