From c10f4311f7708ee921dc7aa098735eb380a7ba83 Mon Sep 17 00:00:00 2001
From: Wuzzy <Wuzzy2@mail.ru>
Date: Wed, 30 May 2018 17:34:38 +0200
Subject: [PATCH] Update death animations of some mobs

---
 mods/ENTITIES/mobs_mc/bat.lua                 |  19 ++++++++++++++----
 .../mobs_mc/textures/mobs_mc_iron_axe.png     | Bin 360 -> 0 bytes
 mods/ENTITIES/mobs_mc/villager.lua            |  17 ++++++++++++----
 mods/ENTITIES/mobs_mc/villager_evoker.lua     |  17 ++++++++--------
 mods/ENTITIES/mobs_mc/villager_illusioner.lua |  14 ++++++-------
 mods/ENTITIES/mobs_mc/villager_vindicator.lua |  16 +++++++--------
 6 files changed, 51 insertions(+), 32 deletions(-)
 delete mode 100644 mods/ENTITIES/mobs_mc/textures/mobs_mc_iron_axe.png

diff --git a/mods/ENTITIES/mobs_mc/bat.lua b/mods/ENTITIES/mobs_mc/bat.lua
index 5e6b9aa97..64e0e349e 100644
--- a/mods/ENTITIES/mobs_mc/bat.lua
+++ b/mods/ENTITIES/mobs_mc/bat.lua
@@ -24,10 +24,21 @@ mobs:register_mob("mobs_mc:bat", {
 	run_velocity = 6.0,
 	-- TODO: Hang upside down
 	animation = {
-		walk_speed = 80, stand_speed = 80, run_speed = 80,
-		stand_start = 0,		stand_end = 40,
-		walk_start = 0,		walk_end = 40,
-		run_start = 0,		run_end = 40,
+		stand_speed = 80,
+		stand_start = 0,
+		stand_end = 40,
+		walk_speed = 80,
+		walk_start = 0,
+		walk_end = 40,
+		run_speed = 80,
+		run_start = 0,
+		run_end = 40,
+		-- TODO: Less ugly death animation
+--[[		die_speed = 60,
+		die_start = 40,
+		die_end = 80,
+		die_loop = false,
+]]
 	},
 
 	water_damage = 1,
diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_iron_axe.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_iron_axe.png
deleted file mode 100644
index 2fd16d0919456edf70812d6563e82bd0cfc8f2a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 360
zcmV-u0hj)XP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006O%
z3;baP00009a7bBm000ic000ic0Tn1pfB*mh8gxZibW?9;ba!ELWdKlNX>N2bPDNB8
zb~7$DE-^4L^m3s90087kL_t(IPnD7}3IZ_@MROmw-Ohl5AStyJw6WMiEG)#%%EHRV
zGuR29!AiV^g`Q)~A9gfZlWhDjB$>?nI~i6HQ8Hf72i<R1j?4LEQ~teoXa-<Fh~r_;
ztFjvPN}8IkEy*+hjM!~Av|d)6>z5r{!hUg~Z5PIh++sdsGHD=PNRbO;@7@LF7U1h>
zTe`p=W=R7PhP9du`RzCZ62n%5YCK>VQ?FB>&g2<Ug<wbwB!ZH*o3JQp&;~<M13-ZB
zlhmo8f(E%T^kV=RL(737&p>Pa7Yum@#uzG!A{&Oj2Bh91|7$8&aFo>m0000<MNUMn
GLSTZFVu(@z

diff --git a/mods/ENTITIES/mobs_mc/villager.lua b/mods/ENTITIES/mobs_mc/villager.lua
index d4fdfcd81..5cb9783c0 100644
--- a/mods/ENTITIES/mobs_mc/villager.lua
+++ b/mods/ENTITIES/mobs_mc/villager.lua
@@ -59,10 +59,19 @@ mobs:register_mob("mobs_mc:villager", {
 		distance = 16,
 	},
 	animation = {
-		stand_speed = 25, walk_speed = 25, run_speed = 50,
-		stand_start = 40,		stand_end = 59,
-		walk_start = 0,		walk_end = 40,
-		run_start = 0,		run_end = 40,
+		stand_speed = 25,
+		stand_start = 40,
+		stand_end = 59,
+		walk_speed = 25,
+		walk_start = 0,
+		walk_end = 40,
+		run_speed = 25,
+		run_start = 0,
+		run_end = 40,
+		die_speed = 15,
+		die_start = 210,
+		die_end = 220,
+		die_loop = false,
 	},
 	water_damage = 0,
 	lava_damage = 4,
diff --git a/mods/ENTITIES/mobs_mc/villager_evoker.lua b/mods/ENTITIES/mobs_mc/villager_evoker.lua
index 05ac68d41..45b50d05e 100644
--- a/mods/ENTITIES/mobs_mc/villager_evoker.lua
+++ b/mods/ENTITIES/mobs_mc/villager_evoker.lua
@@ -69,20 +69,19 @@ mobs:register_mob("mobs_mc:evoker", {
 		distance = 16,
 	},
 	animation = {
-		walk_speed = 25,
-		run_speed = 25,
+		stand_speed = 25,
 		stand_start = 40,
 		stand_end = 59,
-		stand_speed = 5,
+		walk_speed = 25,
 		walk_start = 0,
 		walk_end = 40,
-		shoot_start = 120,
+		run_speed = 25,
+		shoot_start = 120, --magic arm swinging
 		shoot_end = 140,
-		-- TODO: Implement and fix death animation
-		--die_start = 190,
-		--die_end = 200,
-	        --die_speed = 15,
-		--die_loop = false,
+		die_speed = 15,
+		die_start = 190,
+		die_end = 200,
+		die_loop = false,
 	},
 	water_damage = 0,
 	lava_damage = 4,
diff --git a/mods/ENTITIES/mobs_mc/villager_illusioner.lua b/mods/ENTITIES/mobs_mc/villager_illusioner.lua
index 52d84c6d6..7d50ecd20 100644
--- a/mods/ENTITIES/mobs_mc/villager_illusioner.lua
+++ b/mods/ENTITIES/mobs_mc/villager_illusioner.lua
@@ -28,19 +28,19 @@ mobs:register_mob("mobs_mc:illusioner", {
 	run_velocity = 2,
 	jump = true,
 	animation = {
-		walk_speed = 25,
-		run_speed = 25,
+		stand_speed = 25,
 		stand_start = 40,
 		stand_end = 59,
+		walk_speed = 25,
 		walk_start = 0,
 		walk_end = 40,
+		run_speed = 25,
 		shoot_start = 150,
 		shoot_end = 170,
-		-- TODO: Implement and fix death animation
-		--die_start = 170,
-		--die_end = 180,
-	        --die_speed = 15,
-		--die_loop = false,
+		die_speed = 15,
+		die_start = 170,
+		die_end = 180,
+		die_loop = false,
 		-- 120-140 magic arm swinging, 140-150 transition between magic to bow shooting
 	},
 	view_range = 16,
diff --git a/mods/ENTITIES/mobs_mc/villager_vindicator.lua b/mods/ENTITIES/mobs_mc/villager_vindicator.lua
index 821e4e0dc..15983f715 100644
--- a/mods/ENTITIES/mobs_mc/villager_vindicator.lua
+++ b/mods/ENTITIES/mobs_mc/villager_vindicator.lua
@@ -26,7 +26,7 @@ mobs:register_mob("mobs_mc:vindicator", {
         {
             "mobs_mc_vindicator_base.png",
             "blank.png", --no hat
-            "mobs_mc_iron_axe.png",
+            "default_tool_steelaxe.png",
             -- TODO: Glow when attacking (mobs_mc_vindicator.png)
         },
     },
@@ -54,19 +54,19 @@ mobs:register_mob("mobs_mc:vindicator", {
 	},
 	animation = {
 		stand_speed = 25,
-		walk_speed = 25,
-		run_speed = 25,
-		punch_speed = 25,
 		stand_start = 40,
 		stand_end = 59,
+		walk_speed = 25,
 		walk_start = 0,
 		walk_end = 40,
+		run_speed = 25,
+		punch_speed = 25,
 		punch_start = 90,
 		punch_end = 110,
-		-- TODO: Implement and fix death animation
-		--die_start = 170,
-		--die_end = 180,
-		--die_loop = false,
+		die_speed = 25,
+		die_start = 170,
+		die_end = 180,
+		die_loop = false,
 	},
 	water_damage = 1,
 	lava_damage = 4,