Merge branch 'ElCeejo:main' into main

2025-04-30 13:31:39 -04:00 · 2024-10-29 18:57:12 -05:00 · 2024-10-29 18:57:12 -05:00 · 2b58e6f59d
commit 2b58e6f59d
parent 7f80a3a92a 259e741282
15 changed files with 1 additions and 1 deletions
--- a/api/mob_ai.lua
+++ b/api/mob_ai.lua
@ -756,7 +756,7 @@ creatura.register_utility("animalia:basic_idle", function(self, timeout, anim)
 	local init = false
 	local function func(mob)
 		if not init then
-			creatura.action_idle(mob, timeout, anim)
+			creatura.action_idle(mob, timer, anim)
 		end
 		timer = timer - mob.dtime
 		if timer <= 0 then
--- a/sounds/cat/animalia_cat_hurt.ogg
+++ b/sounds/cat/animalia_cat_hurt.ogg
--- a/sounds/cat/animalia_cat_idle.ogg
+++ b/sounds/cat/animalia_cat_idle.ogg
--- a/sounds/cat/animalia_cat_purr.ogg
+++ b/sounds/cat/animalia_cat_purr.ogg
--- a/sounds/frog/animalia_frog_1.ogg
+++ b/sounds/frog/animalia_frog_1.ogg
--- a/sounds/frog/animalia_frog_2.ogg
+++ b/sounds/frog/animalia_frog_2.ogg
--- a/sounds/frog/animalia_frog_3.ogg
+++ b/sounds/frog/animalia_frog_3.ogg
--- a/sounds/horse/animalia_horse_death.ogg
+++ b/sounds/horse/animalia_horse_death.ogg
--- a/sounds/horse/animalia_horse_hurt.ogg
+++ b/sounds/horse/animalia_horse_hurt.ogg
--- a/sounds/horse/animalia_horse_idle.1.ogg
+++ b/sounds/horse/animalia_horse_idle.1.ogg
--- a/sounds/horse/animalia_horse_idle.2.ogg
+++ b/sounds/horse/animalia_horse_idle.2.ogg
--- a/sounds/horse/animalia_horse_idle.3.ogg
+++ b/sounds/horse/animalia_horse_idle.3.ogg
--- a/sounds/sheep/animalia_sheep_death.ogg
+++ b/sounds/sheep/animalia_sheep_death.ogg
--- a/sounds/sheep/animalia_sheep_hurt.ogg
+++ b/sounds/sheep/animalia_sheep_hurt.ogg
--- a/sounds/sheep/animalia_sheep_idle.ogg
+++ b/sounds/sheep/animalia_sheep_idle.ogg