diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_witherskeleton.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_witherskeleton.b3d index 2ca3646deb..6f78392fe7 100644 Binary files a/mods/ENTITIES/mobs_mc/models/mobs_mc_witherskeleton.b3d and b/mods/ENTITIES/mobs_mc/models/mobs_mc_witherskeleton.b3d differ diff --git a/mods/ENTITIES/mobs_mc/skeleton+stray.lua b/mods/ENTITIES/mobs_mc/skeleton+stray.lua index 195e833816..bd09131994 100644 --- a/mods/ENTITIES/mobs_mc/skeleton+stray.lua +++ b/mods/ENTITIES/mobs_mc/skeleton+stray.lua @@ -63,23 +63,19 @@ local skeleton = { max = 1,}, }, animation = { + stand_speed = 15, stand_start = 0, stand_end = 40, - stand_speed = 5, + walk_speed = 15, walk_start = 40, walk_end = 60, - walk_speed = 15, - run_start = 40, - run_end = 60, run_speed = 30, - shoot_start = 70, - shoot_end = 90, - punch_start = 70, - punch_end = 90, - -- TODO: Implement and fix death animation - --die_start = 120, - --die_end = 130, - --die_loop = false, + shoot_start = 70, + shoot_end = 90, + die_start = 160, + die_end = 170, + die_speed = 15, + die_loop = false, }, water_damage = 1, lava_damage = 4, diff --git a/mods/ENTITIES/mobs_mc/skeleton_wither.lua b/mods/ENTITIES/mobs_mc/skeleton_wither.lua index 400fa5094a..144d37cf13 100644 --- a/mods/ENTITIES/mobs_mc/skeleton_wither.lua +++ b/mods/ENTITIES/mobs_mc/skeleton_wither.lua @@ -7,15 +7,10 @@ local MP = minetest.get_modpath(minetest.get_current_modname()) local S, NS = dofile(MP.."/intllib.lua") ---dofile(minetest.get_modpath("mobs").."/api.lua") - - --################### --################### WITHER SKELETON --################### - - mobs:register_mob("mobs_mc:witherskeleton", { type = "monster", hp_min = 20, @@ -26,7 +21,10 @@ mobs:register_mob("mobs_mc:witherskeleton", { visual = "mesh", mesh = "mobs_mc_witherskeleton.b3d", textures = { - {"mobs_mc_wither_skeleton.png^mobs_mc_wither_skeleton_sword.png"}, + { + "default_tool_stonesword.png", -- sword + "mobs_mc_wither_skeleton.png", -- wither skeleton + } }, visual_size = {x=3.6, y=3.6}, makes_footstep_sound = true, @@ -59,7 +57,7 @@ mobs:register_mob("mobs_mc:witherskeleton", { animation = { stand_start = 0, stand_end = 40, - stand_speed = 5, + stand_speed = 15, walk_start = 40, walk_end = 60, walk_speed = 15, @@ -68,16 +66,13 @@ mobs:register_mob("mobs_mc:witherskeleton", { run_speed = 30, shoot_start = 70, shoot_end = 90, - punch_start = 70, - punch_end = 90, - -- TODO: Implement and fix death animation - --die_start = 120, - --die_end = 130, - --die_loop = false, - - -- Not supported yet - hurt_start = 100, - hurt_end = 120, + punch_start = 110, + punch_end = 130, + punch_speed = 25, + die_start = 160, + die_end = 170, + die_speed = 15, + die_loop = false, }, water_damage = 0, lava_damage = 0, diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_wither_skeleton_sword.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_wither_skeleton_sword.png deleted file mode 100644 index 43bbec9913..0000000000 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_wither_skeleton_sword.png and /dev/null differ