diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/Mob.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/Mob.java
index 9f14a698cd526b6a5ce0e00d8fa7b91a20f54977..f19d247c4d9df9a972eb4d423cedbd3ea8c35ac1 100644 (file)
import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.math.Rectangle;
import com.badlogic.gdx.math.Vector2;
-import ru.deadsoftware.cavedroid.game.GameWorld;
+import ru.deadsoftware.cavedroid.game.world.GameWorld;
import java.io.Serializable;
}
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 float mAnim;
private Direction mDirection;
- private boolean mDead;
+ protected boolean mDead;
private boolean mCanJump;
private boolean mFlyMode;
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
*/
mDirection = looksLeft() ? Direction.RIGHT : Direction.LEFT;
}
- protected final int dirMultiplier() {
- return looksLeft() ? 0 : 1;
- }
-
public final boolean isDead() {
return mDead;
}
return mVelocity;
}
+ protected final void setVelocity(Vector2 velocity) {
+ mVelocity = velocity;
+ }
+
public final boolean canJump() {
return mCanJump;
}
return mType;
}
- public void checkWorldBounds(GameWorld gameWorld) {
+ public final void checkWorldBounds(GameWorld gameWorld) {
if (x + width / 2 < 0) {
x += gameWorld.getWidthPx();
}
public abstract void ai(GameWorld gameWorld, float delta);
public abstract void changeDir();
+
+ public abstract float getSpeed();
+
+ public abstract void jump();
}