From 3801a3e1fd3cb92a7976daf77cdd67d46378bbc5 Mon Sep 17 00:00:00 2001 From: GuglioIsStupid Date: Sun, 15 Dec 2024 22:50:50 -0500 Subject: [PATCH] fixens --- src/love/data/characters/GFDarkCharacter.lua | 8 +++++--- ...s-pico-erect.ogg => Voices-pico-enemy-erect.ogg} | Bin ...s-bf-christmas-erect.ogg => Voices-bf-erect.ogg} | Bin ...ces-parents-christmas.ogg => Voices-parents.ogg} | Bin ...pico-christmas-pico.ogg => Voices-pico-pico.ogg} | Bin 5 files changed, 5 insertions(+), 3 deletions(-) rename src/love/songs/blammed/{Voices-pico-erect.ogg => Voices-pico-enemy-erect.ogg} (100%) rename src/love/songs/eggnog/{Voices-bf-christmas-erect.ogg => Voices-bf-erect.ogg} (100%) rename src/love/songs/eggnog/{Voices-parents-christmas.ogg => Voices-parents.ogg} (100%) rename src/love/songs/eggnog/{Voices-pico-christmas-pico.ogg => Voices-pico-pico.ogg} (100%) diff --git a/src/love/data/characters/GFDarkCharacter.lua b/src/love/data/characters/GFDarkCharacter.lua index d9916781..68de53d6 100644 --- a/src/love/data/characters/GFDarkCharacter.lua +++ b/src/love/data/characters/GFDarkCharacter.lua @@ -45,9 +45,11 @@ function GFDark:beat(beat) self.spr:beat(beat) end -function GFDark:animate(...) - self.child:animate(...) - self.spr:animate(...) +function GFDark:animate(name, ...) + if name == "sad" then return end + + self.child:animate(name, ...) + self.spr:animate(name,...) end function GFDark:isAnimated() diff --git a/src/love/songs/blammed/Voices-pico-erect.ogg b/src/love/songs/blammed/Voices-pico-enemy-erect.ogg similarity index 100% rename from src/love/songs/blammed/Voices-pico-erect.ogg rename to src/love/songs/blammed/Voices-pico-enemy-erect.ogg diff --git a/src/love/songs/eggnog/Voices-bf-christmas-erect.ogg b/src/love/songs/eggnog/Voices-bf-erect.ogg similarity index 100% rename from src/love/songs/eggnog/Voices-bf-christmas-erect.ogg rename to src/love/songs/eggnog/Voices-bf-erect.ogg diff --git a/src/love/songs/eggnog/Voices-parents-christmas.ogg b/src/love/songs/eggnog/Voices-parents.ogg similarity index 100% rename from src/love/songs/eggnog/Voices-parents-christmas.ogg rename to src/love/songs/eggnog/Voices-parents.ogg diff --git a/src/love/songs/eggnog/Voices-pico-christmas-pico.ogg b/src/love/songs/eggnog/Voices-pico-pico.ogg similarity index 100% rename from src/love/songs/eggnog/Voices-pico-christmas-pico.ogg rename to src/love/songs/eggnog/Voices-pico-pico.ogg