From edc4c95f6d64001b6ac2a4e75efd6fbfefc4e725 Mon Sep 17 00:00:00 2001 From: bakawun Date: Sat, 9 Dec 2023 09:52:14 +0100 Subject: [PATCH] mobs:animations:align animation to movement speed change walk speed of evoker and enderman to match mc make enderman walk less --- mods/ENTITIES/mobs_mc/chicken.lua | 8 ++++---- mods/ENTITIES/mobs_mc/cow+mooshroom.lua | 8 ++++---- mods/ENTITIES/mobs_mc/creeper.lua | 16 ++++++++-------- mods/ENTITIES/mobs_mc/enderman.lua | 11 ++++++----- mods/ENTITIES/mobs_mc/iron_golem.lua | 2 +- mods/ENTITIES/mobs_mc/llama.lua | 8 ++++---- mods/ENTITIES/mobs_mc/ocelot.lua | 8 ++++---- mods/ENTITIES/mobs_mc/parrot.lua | 4 ++-- mods/ENTITIES/mobs_mc/piglin.lua | 16 ++++++++-------- mods/ENTITIES/mobs_mc/pillager.lua | 6 +++--- mods/ENTITIES/mobs_mc/polar_bear.lua | 6 +++--- mods/ENTITIES/mobs_mc/rabbit.lua | 8 ++++---- mods/ENTITIES/mobs_mc/sheep.lua | 8 ++++---- mods/ENTITIES/mobs_mc/skeleton+stray.lua | 4 ++-- mods/ENTITIES/mobs_mc/skeleton_wither.lua | 4 ++-- mods/ENTITIES/mobs_mc/spider.lua | 4 ++-- mods/ENTITIES/mobs_mc/strider.lua | 4 ++-- mods/ENTITIES/mobs_mc/villager_evoker.lua | 6 +++--- mods/ENTITIES/mobs_mc/villager_illusioner.lua | 4 ++-- mods/ENTITIES/mobs_mc/villager_vindicator.lua | 4 ++-- mods/ENTITIES/mobs_mc/zombie.lua | 8 ++++---- 21 files changed, 74 insertions(+), 73 deletions(-) diff --git a/mods/ENTITIES/mobs_mc/chicken.lua b/mods/ENTITIES/mobs_mc/chicken.lua index 5702db4c7..0a9e0ed10 100644 --- a/mods/ENTITIES/mobs_mc/chicken.lua +++ b/mods/ENTITIES/mobs_mc/chicken.lua @@ -65,13 +65,13 @@ mcl_mobs.register_mob("mobs_mc:chicken", { }, animation = { stand_start = 0, stand_end = 0, - walk_start = 0, walk_end = 20, walk_speed = 25, - run_start = 0, run_end = 20, run_speed = 50, + walk_start = 0, walk_end = 20, walk_speed = 100, + run_start = 0, run_end = 20, run_speed = 200, }, child_animations = { stand_start = 31, stand_end = 31, - walk_start = 31, walk_end = 51, walk_speed = 37, - run_start = 31, run_end = 51, run_speed = 75, + walk_start = 31, walk_end = 51, walk_speed = 100, + run_start = 31, run_end = 51, run_speed = 200, }, follow = { "mcl_farming:wheat_seeds", diff --git a/mods/ENTITIES/mobs_mc/cow+mooshroom.lua b/mods/ENTITIES/mobs_mc/cow+mooshroom.lua index 86b94eea3..ed85aa0eb 100644 --- a/mods/ENTITIES/mobs_mc/cow+mooshroom.lua +++ b/mods/ENTITIES/mobs_mc/cow+mooshroom.lua @@ -50,13 +50,13 @@ local cow_def = { }, animation = { stand_start = 0, stand_end = 0, - walk_start = 0, walk_end = 40, walk_speed = 30, - run_start = 0, run_end = 40, run_speed = 40, + walk_start = 0, walk_end = 40, walk_speed = 100, + run_start = 0, run_end = 40, run_speed = 200, }, child_animations = { stand_start = 41, stand_end = 41, - walk_start = 41, walk_end = 81, walk_speed = 45, - run_start = 41, run_end = 81, run_speed = 60, + walk_start = 41, walk_end = 81, walk_speed = 100, + run_start = 41, run_end = 81, run_speed = 200, }, on_rightclick = function(self, clicker) if self:feed_tame(clicker, 1, true, false) then return end diff --git a/mods/ENTITIES/mobs_mc/creeper.lua b/mods/ENTITIES/mobs_mc/creeper.lua index a36550a93..b45c86b7c 100644 --- a/mods/ENTITIES/mobs_mc/creeper.lua +++ b/mods/ENTITIES/mobs_mc/creeper.lua @@ -115,14 +115,14 @@ mcl_mobs.register_mob("mobs_mc:creeper", { max = 1,}, }, animation = { - speed_normal = 24, - speed_run = 48, stand_start = 0, stand_end = 23, - walk_start = 24, - walk_end = 49, - run_start = 24, - run_end = 49, + walk_speed = 100 + walk_start = 0, + walk_end = 40, + run_speed = 100, + run_start = 0, + run_end = 40, hurt_start = 110, hurt_end = 139, death_start = 140, @@ -241,12 +241,12 @@ mcl_mobs.register_mob("mobs_mc:creeper_charged", { max = 1,}, }, animation = { - speed_normal = 24, - speed_run = 48, stand_start = 0, stand_end = 23, + walk_speed = 100, walk_start = 24, walk_end = 49, + run_speed = 200 run_start = 24, run_end = 49, hurt_start = 110, diff --git a/mods/ENTITIES/mobs_mc/enderman.lua b/mods/ENTITIES/mobs_mc/enderman.lua index a57160e4d..3fd45acbd 100644 --- a/mods/ENTITIES/mobs_mc/enderman.lua +++ b/mods/ENTITIES/mobs_mc/enderman.lua @@ -205,8 +205,8 @@ local select_enderman_animation = function(animation_type) -- Enderman holds a block if animation_type == "block" then return { - walk_speed = 25, - run_speed = 50, + walk_speed = 80, + run_speed = 160, stand_speed = 25, stand_start = 200, stand_end = 200, @@ -220,8 +220,8 @@ local select_enderman_animation = function(animation_type) -- Enderman doesn't hold a block elseif animation_type == "normal" or animation_type == nil then return { - walk_speed = 25, - run_speed = 50, + walk_speed = 80, + run_speed = 160, stand_speed = 25, stand_start = 40, stand_end = 80, @@ -292,7 +292,8 @@ mcl_mobs.register_mob("mobs_mc:enderman", { random = {name="mobs_mc_enderman_random", gain=0.5}, distance = 16, }, - walk_velocity = 0.2, + walk_velocity = 1.0, + walk_chance = 10, run_velocity = 3.4, damage = 7, reach = 2, diff --git a/mods/ENTITIES/mobs_mc/iron_golem.lua b/mods/ENTITIES/mobs_mc/iron_golem.lua index b79971b9b..dc8a179fe 100644 --- a/mods/ENTITIES/mobs_mc/iron_golem.lua +++ b/mods/ENTITIES/mobs_mc/iron_golem.lua @@ -80,7 +80,7 @@ mcl_mobs.register_mob("mobs_mc:iron_golem", { }, fall_damage = 0, animation = { - stand_speed = 15, walk_speed = 15, run_speed = 25, punch_speed = 15, + stand_speed = 15, walk_speed = 50, run_speed = 100, punch_speed = 15, stand_start = 0, stand_end = 0, walk_start = 0, walk_end = 40, run_start = 0, run_end = 40, diff --git a/mods/ENTITIES/mobs_mc/llama.lua b/mods/ENTITIES/mobs_mc/llama.lua index 578e7c88a..b828b1f7b 100644 --- a/mods/ENTITIES/mobs_mc/llama.lua +++ b/mods/ENTITIES/mobs_mc/llama.lua @@ -102,13 +102,13 @@ mcl_mobs.register_mob("mobs_mc:llama", { }, animation = { stand_start = 0, stand_end = 0, - walk_start = 0, walk_end = 40, walk_speed = 35, - run_start = 0, run_end = 40, run_speed = 50, + walk_start = 0, walk_end = 40, walk_speed = 100, + run_start = 0, run_end = 40, run_speed = 200, }, child_animations = { stand_start = 41, stand_end = 41, - walk_start = 41, walk_end = 81, walk_speed = 50, - run_start = 41, run_end = 81, run_speed = 75, + walk_start = 41, walk_end = 81, walk_speed = 200, + run_start = 41, run_end = 81, run_speed = 400, }, follow = { "mcl_farming:wheat_item", "mcl_farming:hay_block" }, view_range = 16, diff --git a/mods/ENTITIES/mobs_mc/ocelot.lua b/mods/ENTITIES/mobs_mc/ocelot.lua index 7aadda492..1a363928f 100644 --- a/mods/ENTITIES/mobs_mc/ocelot.lua +++ b/mods/ENTITIES/mobs_mc/ocelot.lua @@ -63,14 +63,14 @@ local ocelot = { }, animation = { stand_start = 0, stand_end = 0, - walk_start = 0, walk_end = 40, walk_speed = 40, - run_start = 0, run_end = 40, run_speed = 50, + walk_start = 0, walk_end = 40, walk_speed = 100, + run_start = 0, run_end = 40, run_speed = 200, sit_start = 50, sit_end = 50, }, child_animations = { stand_start = 51, stand_end = 51, - walk_start = 51, walk_end = 91, walk_speed = 60, - run_start = 51, run_end = 91, run_speed = 75, + walk_start = 51, walk_end = 91, walk_speed = 200, + run_start = 51, run_end = 91, run_speed = 400, sit_start = 101, sit_end = 101, }, follow = follow, diff --git a/mods/ENTITIES/mobs_mc/parrot.lua b/mods/ENTITIES/mobs_mc/parrot.lua index 7d4c50f1c..1e9ec5b27 100644 --- a/mods/ENTITIES/mobs_mc/parrot.lua +++ b/mods/ENTITIES/mobs_mc/parrot.lua @@ -166,8 +166,8 @@ mcl_mobs.register_mob("mobs_mc:parrot", { fly_speed = 50, stand_start = 0, stand_end = 0, - fly_start = 30, - fly_end = 45, + fly_start = 130, + fly_end = 150, walk_start = 0, walk_end = 20, -- TODO: actual walk animation diff --git a/mods/ENTITIES/mobs_mc/piglin.lua b/mods/ENTITIES/mobs_mc/piglin.lua index 27f5a72f4..e3a930125 100644 --- a/mods/ENTITIES/mobs_mc/piglin.lua +++ b/mods/ENTITIES/mobs_mc/piglin.lua @@ -77,8 +77,8 @@ local piglin = { }, animation = { stand_speed = 30, - walk_speed = 30, - run_speed = 30, + walk_speed = 100, + run_speed = 200, stand_start = 0, stand_end = 79, walk_start = 168, @@ -200,9 +200,9 @@ sword_piglin.drops = { sword_piglin.attack_type = "dogfight" sword_piglin.animation = { stand_speed = 30, - walk_speed = 30, + walk_speed = 100, punch_speed = 45, - run_speed = 30, + run_speed = 200, stand_start = 0, stand_end = 79, walk_start = 168, @@ -288,8 +288,8 @@ local zombified_piglin = { }, animation = { stand_speed = 25, - walk_speed = 25, - run_speed = 50, + walk_speed = 100, + run_speed = 200, stand_start = 40, stand_end = 80, walk_start = 0, @@ -361,9 +361,9 @@ piglin_brute.textures = {"extra_mobs_piglin_brute.png", "default_tool_goldaxe.pn piglin_brute.attack_type = "dogfight" piglin_brute.animation = { stand_speed = 30, - walk_speed = 30, + walk_speed = 100, punch_speed = 45, - run_speed = 30, + run_speed = 200, stand_start = 0, stand_end = 79, walk_start = 168, diff --git a/mods/ENTITIES/mobs_mc/pillager.lua b/mods/ENTITIES/mobs_mc/pillager.lua index 5e07d8dc5..8d7b92912 100644 --- a/mods/ENTITIES/mobs_mc/pillager.lua +++ b/mods/ENTITIES/mobs_mc/pillager.lua @@ -82,8 +82,8 @@ pillager = { unloaded_stand_start = 41, unloaded_stand_end = 60, reload_stand_start = 61, reload_stand_end = 100, reload_stand_speed = 20, stand_start = 101, stand_end = 109, stand_speed = 6, - walk_start = 111, walk_end = 150, walk_speed = 30, - run_start = 111, run_end = 150, run_speed = 50, + walk_start = 111, walk_end = 150, walk_speed = 200, + run_start = 111, run_end = 150, run_speed = 400, reload_run_start = 151, reload_run_end = 190, reload_run_speed = 20, die_start = 191, die_end = 192, die_speed = 15, stand_unloaded_start = 40, stand_unloaded_end = 59, @@ -122,4 +122,4 @@ pillager = { mcl_mobs.register_mob("mobs_mc:pillager", pillager) mcl_mobs.register_egg("mobs_mc:pillager", S("Pillager"), "#532f36", "#959b9b", 0) -mcl_mobs:non_spawn_specific("mobs_mc:pillager","overworld",0,7) +mcl_mobs:non_spawn_specific("mobs_mc:pillager","overworld",0,7) diff --git a/mods/ENTITIES/mobs_mc/polar_bear.lua b/mods/ENTITIES/mobs_mc/polar_bear.lua index 18d6f3a13..8b843cb63 100644 --- a/mods/ENTITIES/mobs_mc/polar_bear.lua +++ b/mods/ENTITIES/mobs_mc/polar_bear.lua @@ -64,10 +64,10 @@ mcl_mobs.register_mob("mobs_mc:polar_bear", { distance = 16, }, animation = { - speed_normal = 25, speed_run = 50, + speed_normal = 25, stand_start = 0, stand_end = 0, - walk_start = 0, walk_end = 40, - run_start = 0, run_end = 40, + walk_start = 0, walk_end = 40, walk_speed = 100, + run_start = 0, run_end = 40, run_speed = 200, }, view_range = 16, diff --git a/mods/ENTITIES/mobs_mc/rabbit.lua b/mods/ENTITIES/mobs_mc/rabbit.lua index 38fae935f..f914dd80e 100644 --- a/mods/ENTITIES/mobs_mc/rabbit.lua +++ b/mods/ENTITIES/mobs_mc/rabbit.lua @@ -54,13 +54,13 @@ local rabbit = { fear_height = 4, animation = { stand_start = 0, stand_end = 0, - walk_start = 0, walk_end = 20, walk_speed = 20, - run_start = 0, run_end = 20, run_speed = 30, + walk_start = 0, walk_end = 20, walk_speed = 100, + run_start = 0, run_end = 20, run_speed = 200, }, child_animations = { stand_start = 21, stand_end = 21, - walk_start = 21, walk_end = 41, walk_speed = 30, - run_start = 21, run_end = 41, run_speed = 45, + walk_start = 21, walk_end = 41, walk_speed = 200, + run_start = 21, run_end = 41, run_speed = 400, }, -- Follow (yellow) dangelions, carrots and golden carrots follow = { diff --git a/mods/ENTITIES/mobs_mc/sheep.lua b/mods/ENTITIES/mobs_mc/sheep.lua index 4a5e924d8..1ea6b7bde 100644 --- a/mods/ENTITIES/mobs_mc/sheep.lua +++ b/mods/ENTITIES/mobs_mc/sheep.lua @@ -101,14 +101,14 @@ mcl_mobs.register_mob("mobs_mc:sheep", { }, animation = { stand_start = 0, stand_end = 0, - walk_start = 0, walk_end = 40, walk_speed = 30, - run_start = 0, run_end = 40, run_speed = 40, + walk_start = 0, walk_end = 40, walk_speed = 80, + run_start = 0, run_end = 40, run_speed = 160, eat_start = 40, eat_end = 80, eat_loop = false, }, child_animations = { stand_start = 81, stand_end = 81, - walk_start = 81, walk_end = 121, walk_speed = 45, - run_start = 81, run_end = 121, run_speed = 60, + walk_start = 81, walk_end = 121, walk_speed = 160, + run_start = 81, run_end = 121, run_speed = 320, eat_start = 121, eat_start = 161, eat_loop = false, }, follow = { "mcl_farming:wheat_item" }, diff --git a/mods/ENTITIES/mobs_mc/skeleton+stray.lua b/mods/ENTITIES/mobs_mc/skeleton+stray.lua index 215047fdd..3a2d73dd0 100644 --- a/mods/ENTITIES/mobs_mc/skeleton+stray.lua +++ b/mods/ENTITIES/mobs_mc/skeleton+stray.lua @@ -76,10 +76,10 @@ local skeleton = { stand_speed = 15, stand_start = 0, stand_end = 40, - walk_speed = 15, + walk_speed = 45, walk_start = 40, walk_end = 60, - run_speed = 30, + run_speed = 90, shoot_start = 70, shoot_end = 90, jockey_start = 172, diff --git a/mods/ENTITIES/mobs_mc/skeleton_wither.lua b/mods/ENTITIES/mobs_mc/skeleton_wither.lua index 865fa13f0..ffd1e425f 100644 --- a/mods/ENTITIES/mobs_mc/skeleton_wither.lua +++ b/mods/ENTITIES/mobs_mc/skeleton_wither.lua @@ -71,10 +71,10 @@ mcl_mobs.register_mob("mobs_mc:witherskeleton", { stand_speed = 15, walk_start = 40, walk_end = 60, - walk_speed = 15, + walk_speed = 45, run_start = 40, run_end = 60, - run_speed = 30, + run_speed = 90, shoot_start = 70, shoot_end = 90, punch_start = 110, diff --git a/mods/ENTITIES/mobs_mc/spider.lua b/mods/ENTITIES/mobs_mc/spider.lua index 38138a71c..ae03f1f4f 100644 --- a/mods/ENTITIES/mobs_mc/spider.lua +++ b/mods/ENTITIES/mobs_mc/spider.lua @@ -98,8 +98,8 @@ local spider = { fear_height = 4, animation = { stand_speed = 10, - walk_speed = 25, - run_speed = 50, + walk_speed = 100, + run_speed = 200, stand_start = 20, stand_end = 40, walk_start = 0, diff --git a/mods/ENTITIES/mobs_mc/strider.lua b/mods/ENTITIES/mobs_mc/strider.lua index 142025e06..9a8ae3702 100644 --- a/mods/ENTITIES/mobs_mc/strider.lua +++ b/mods/ENTITIES/mobs_mc/strider.lua @@ -44,8 +44,8 @@ local strider = { }, animation = { stand_speed = 15, - walk_speed = 15, - run_speed = 30, + walk_speed = 30, + run_speed = 60, stand_start = 5, stand_end = 5, walk_start = 1, diff --git a/mods/ENTITIES/mobs_mc/villager_evoker.lua b/mods/ENTITIES/mobs_mc/villager_evoker.lua index a34f0ffe9..bb54b3b03 100644 --- a/mods/ENTITIES/mobs_mc/villager_evoker.lua +++ b/mods/ENTITIES/mobs_mc/villager_evoker.lua @@ -38,7 +38,7 @@ mcl_mobs.register_mob("mobs_mc:evoker", { } }, makes_footstep_sound = true, damage = 6, - walk_velocity = 0.2, + walk_velocity = 1.0, run_velocity = 1.4, group_attack = true, attack_type = "dogfight", @@ -80,8 +80,8 @@ mcl_mobs.register_mob("mobs_mc:evoker", { -- TODO: sounds animation = { stand_start = 0, stand_end = 0, - walk_start = 0, walk_end = 40, walk_speed = 6, - run_start = 0, run_end = 40, run_speed = 24, + walk_start = 0, walk_end = 40, walk_speed =100, + run_start = 0, run_end = 40, run_speed = 140, shoot_start = 142, shoot_end = 152, -- Magic arm swinging }, view_range = 16, diff --git a/mods/ENTITIES/mobs_mc/villager_illusioner.lua b/mods/ENTITIES/mobs_mc/villager_illusioner.lua index 930a1edfe..8f883720f 100644 --- a/mods/ENTITIES/mobs_mc/villager_illusioner.lua +++ b/mods/ENTITIES/mobs_mc/villager_illusioner.lua @@ -49,10 +49,10 @@ mcl_mobs.register_mob("mobs_mc:illusioner", { stand_speed = 25, stand_start = 40, stand_end = 59, - walk_speed = 25, + walk_speed = 100, walk_start = 0, walk_end = 40, - run_speed = 25, + run_speed = 200, shoot_start = 150, shoot_end = 170, die_speed = 15, diff --git a/mods/ENTITIES/mobs_mc/villager_vindicator.lua b/mods/ENTITIES/mobs_mc/villager_vindicator.lua index 9ccb8509c..93c0d0fbd 100644 --- a/mods/ENTITIES/mobs_mc/villager_vindicator.lua +++ b/mods/ENTITIES/mobs_mc/villager_vindicator.lua @@ -60,10 +60,10 @@ mcl_mobs.register_mob("mobs_mc:vindicator", { stand_speed = 25, stand_start = 40, stand_end = 59, - walk_speed = 25, + walk_speed = 100, walk_start = 0, walk_end = 40, - run_speed = 25, + run_speed = 200, punch_speed = 25, punch_start = 90, punch_end = 110, diff --git a/mods/ENTITIES/mobs_mc/zombie.lua b/mods/ENTITIES/mobs_mc/zombie.lua index 6a4f5d48a..aeed152b1 100644 --- a/mods/ENTITIES/mobs_mc/zombie.lua +++ b/mods/ENTITIES/mobs_mc/zombie.lua @@ -90,8 +90,8 @@ local zombie = { drops = drops_zombie, animation = { stand_start = 40, stand_end = 49, stand_speed = 2, - walk_start = 0, walk_end = 39, speed_normal = 25, - run_start = 0, run_end = 39, speed_run = 50, + walk_start = 0, walk_end = 39, walk_speed = 80, + run_start = 0, run_end = 39, run_speed = 150, punch_start = 50, punch_end = 59, punch_speed = 20, }, ignited_by_sunlight = true, @@ -118,8 +118,8 @@ baby_zombie.child = 1 baby_zombie.reach = 1 baby_zombie.animation = { stand_start = 100, stand_end = 109, stand_speed = 2, - walk_start = 60, walk_end = 99, speed_normal = 40, - run_start = 60, run_end = 99, speed_run = 80, + walk_start = 60, walk_end = 99, walk_speed = 150, + run_start = 60, run_end = 99, run_speed = 300, punch_start = 109, punch_end = 119 }