fix some anims

hybridlabs · Dec 4, 2023 · 070bf1e · 070bf1e
1 parent 9286c1f
commit 070bf1e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/GouramiEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/GouramiEntity.kt
@@ -21,20 +21,8 @@ class GouramiEntity(entityType: EntityType<out GouramiEntity>, world: World) :
         }
     }
 
-    override fun <E : GeoAnimatable> predicate(event: AnimationState<E>): PlayState {
-        if (isSubmergedInWater) {
-            event.controller.setAnimation(RawAnimation.begin().then("swim", Animation.LoopType.LOOP))
-            return PlayState.CONTINUE
-        }
-        if (!isSubmergedInWater) {
-            event.controller.setAnimation(RawAnimation.begin().then("flop", Animation.LoopType.LOOP))
-            return PlayState.CONTINUE
-        }
-        if (isWet && isFallFlying) {
-            event.controller.setAnimation(RawAnimation.begin().then("swim", Animation.LoopType.LOOP))
-            return PlayState.CONTINUE
-        }
-        return PlayState.STOP
+    override fun shouldFlopOnLand(): Boolean {
+        return true
     }
 
     override fun getMaxSize(): Int {

diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/HybridAquaticFishEntity.kt b/src/main/kotlin/dev/hybridlabs/aquatic/entity/fish/HybridAquaticFishEntity.kt
@@ -149,11 +149,11 @@ open class HybridAquaticFishEntity(
         if (isSubmergedInWater) {
             event.controller.setAnimation(SWIM_ANIMATION)
             return PlayState.CONTINUE
-        }
-        if (!isSubmergedInWater && shouldFlopOnLand()) {
+        } else if (shouldFlopOnLand()) {
             event.controller.setAnimation(FLOP_ANIMATION)
             return PlayState.CONTINUE
         }
+
         if (isWet && isFallFlying) {
             event.controller.setAnimation(SWIM_ANIMATION)
             return PlayState.CONTINUE