From c10f4311f7708ee921dc7aa098735eb380a7ba83 Mon Sep 17 00:00:00 2001 From: Wuzzy 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 5e6b9aa9..64e0e349 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 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr z;4JWnEM{QfI|Ravq8eTe3=9lXC9V-A!TD(=<%vb93;~Imc_n&&t|1C##(JiDh6V;- ziWV|3Fg)>eaSXBWpE}8qi^)*HwOD@p-E$313YuF*wrsrNq@#1>+^IvSjv3$JoOjS` zPiyPE-az&~qc#d`n!|oY&K3qYu>;F3c4_)^#VzF4-tkA=YCeck=sttWU)ryv~T; zbwDo7lUcBB>nxt1Z!MUG4u>^o*(68=uMeJo?ulezYk~)lO4Fomvo~mDUSM+$WOiuy zIQh!T1x;)_4Zb8ZNI0KvR6OsH{a2i)lI@s;R+o}=+dj4>_muu;YlRm~xyr!6z~JfX K=d#Wzp$Pz#Vu(@z diff --git a/mods/ENTITIES/mobs_mc/villager.lua b/mods/ENTITIES/mobs_mc/villager.lua index d4fdfcd8..5cb9783c 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 05ac68d4..45b50d05 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 52d84c6d..7d50ecd2 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 821e4e0d..15983f71 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,