diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/Mob.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/Mob.java
index feb5ceb08a0165f58c00538678dbcc982e4a6812..fc9d61bbe778e37f1c1186fa1387f0be207fb8d6 100644 (file)
import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.math.Rectangle;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.math.Rectangle;
import com.badlogic.gdx.math.Vector2;
+import ru.deadsoftware.cavedroid.game.GameItemsHolder;
import ru.deadsoftware.cavedroid.game.world.GameWorld;
import java.io.Serializable;
import ru.deadsoftware.cavedroid.game.world.GameWorld;
import java.io.Serializable;
}
protected final void updateAnimation(float delta) {
}
protected final void updateAnimation(float delta) {
- if (mVelocity.x != 0f || Math.abs(mAnim) > mAnimDelta * delta) {
- mAnim += mAnimDelta * delta;
+ final float velocityMultiplier = (Math.abs(getVelocity().x) / getSpeed());
+ final float animMultiplier = (velocityMultiplier == 0f ? 1f : velocityMultiplier) * delta;
+ final float maxAnim = 60f * (velocityMultiplier == 0f ? 1f : velocityMultiplier);
+
+ if (mVelocity.x != 0f || Math.abs(mAnim) > mAnimDelta * animMultiplier) {
+ mAnim += mAnimDelta * animMultiplier;
} else {
mAnim = 0;
}
} else {
mAnim = 0;
}
- if (mAnim > 60f) {
- mAnim = 60f;
+ if (mAnim > maxAnim) {
+ mAnim = maxAnim;
mAnimDelta = -ANIMATION_SPEED;
mAnimDelta = -ANIMATION_SPEED;
- } else if (mAnim < -60f) {
- mAnim = -60f;
+ } else if (mAnim < -maxAnim) {
+ mAnim = -maxAnim;
mAnimDelta = ANIMATION_SPEED;
}
mAnimDelta = ANIMATION_SPEED;
}
}
public void damage(int damage) {
}
public void damage(int damage) {
+ if (damage == 0) {
+ return;
+ }
+
if (damage < 0) {
Gdx.app.error(this.getClass().getSimpleName(), "Damage cant be negative!");
return;
if (damage < 0) {
Gdx.app.error(this.getClass().getSimpleName(), "Damage cant be negative!");
return;
public abstract void draw(SpriteBatch spriteBatch, float x, float y, float delta);
public abstract void draw(SpriteBatch spriteBatch, float x, float y, float delta);
- public abstract void ai(GameWorld gameWorld, float delta);
+ public abstract void ai(GameWorld gameWorld, GameItemsHolder gameItemsHolder, float delta);
public abstract void changeDir();
public abstract void changeDir();