Some mobs refactor

[cavedroid.git] / core / src / ru / deadsoftware / cavedroid / game / mobs / Mob.java

diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/Mob.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/Mob.java
index 4ad04e8538affb3b49e3bbf2eb0f80a796ce4510..f19d247c4d9df9a972eb4d423cedbd3ea8c35ac1 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/mobs/Mob.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/Mob.java
@@ -22,8 +22,31 @@ public abstract class Mob extends Rectangle implements Serializable {
     }
 
     public enum Direction {
     }
 
     public enum Direction {

-        LEFT,
-        RIGHT
+
+        LEFT(0, -1),
+        RIGHT(1, 1);
+
+        private final int index;
+        private final int basis;
+
+        /**
+         * Index for this direction (left = 0, right = 1)
+         */
+        public final int getIndex() {
+            return index;
+        }
+
+        /**
+         * Basis for this direction (left = -1, right = 1)
+         */
+        public final int getBasis() {
+            return basis;
+        }
+
+        Direction(int index, int basis) {
+            this.index = index;
+            this.basis = basis;
+        }

     }
 
     protected Vector2 mVelocity;
     }
 
     protected Vector2 mVelocity;


@@ -32,7 +55,7 @@ public abstract class Mob extends Rectangle implements Serializable {
     protected float mAnim;
 
     private Direction mDirection;
     protected float mAnim;
 
     private Direction mDirection;

-    private boolean mDead;
+    protected boolean mDead;

     private boolean mCanJump;
     private boolean mFlyMode;
 
     private boolean mCanJump;
     private boolean mFlyMode;
 


@@ -56,6 +79,30 @@ public abstract class Mob extends Rectangle implements Serializable {
         return MathUtils.randomBoolean(.5f) ? Direction.LEFT : Direction.RIGHT;
     }
 
         return MathUtils.randomBoolean(.5f) ? Direction.LEFT : Direction.RIGHT;
     }
 

+    private boolean isAnimationIncreasing() {
+        return mAnim > 0 && mAnimDelta > 0 || mAnim < 0 && mAnimDelta < 0;
+    }
+
+    protected final void updateAnimation(float delta) {
+        if (mVelocity.x != 0f || Math.abs(mAnim) > mAnimDelta * delta) {
+            mAnim += mAnimDelta * delta;
+        } else {
+            mAnim = 0;
+        }
+
+        if (mAnim > 60f) {
+            mAnim = 60f;
+            mAnimDelta = -ANIMATION_SPEED;
+        } else if (mAnim < -60f) {
+            mAnim = -60f;
+            mAnimDelta = ANIMATION_SPEED;
+        }
+
+        if (mVelocity.x == 0f && isAnimationIncreasing()) {
+            mAnimDelta = -mAnimDelta;
+        }
+    }
+

     /**
      * @return The X coordinate of a mob in blocks
      */
     /**
      * @return The X coordinate of a mob in blocks
      */


@@ -114,10 +161,6 @@ public abstract class Mob extends Rectangle implements Serializable {
         mDirection = looksLeft() ? Direction.RIGHT : Direction.LEFT;
     }
 
         mDirection = looksLeft() ? Direction.RIGHT : Direction.LEFT;
     }
 

-    protected final int dirMultiplier() {
-        return looksLeft() ? 0 : 1;
-    }
-

     public final boolean isDead() {
         return mDead;
     }
     public final boolean isDead() {
         return mDead;
     }


@@ -142,6 +185,10 @@ public abstract class Mob extends Rectangle implements Serializable {
         return mVelocity;
     }
 
         return mVelocity;
     }
 

+    protected final void setVelocity(Vector2 velocity) {
+        mVelocity = velocity;
+    }
+

     public final boolean canJump() {
         return mCanJump;
     }
     public final boolean canJump() {
         return mCanJump;
     }


@@ -162,7 +209,7 @@ public abstract class Mob extends Rectangle implements Serializable {
         return mType;
     }
 
         return mType;
     }
 

-    public void checkWorldBounds(GameWorld gameWorld) {
+    public final void checkWorldBounds(GameWorld gameWorld) {

         if (x + width / 2 < 0) {
             x += gameWorld.getWidthPx();
         }
         if (x + width / 2 < 0) {
             x += gameWorld.getWidthPx();
         }


@@ -176,4 +223,8 @@ public abstract class Mob extends Rectangle implements Serializable {
     public abstract void ai(GameWorld gameWorld, float delta);
 
     public abstract void changeDir();
     public abstract void ai(GameWorld gameWorld, float delta);
 
     public abstract void changeDir();

+
+    public abstract float getSpeed();
+
+    public abstract void jump();

 }
 }