diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/Pig.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/Pig.java
index ecc93978ff0bf6e0db87bf0beeec4d526c0bbbac..b362da73a38f6d831aa1fa54b9f2a2e6a9679a58 100644 (file)
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.math.Vector2;
+import ru.deadsoftware.cavedroid.game.GameWorld;
import ru.deadsoftware.cavedroid.misc.Assets;
import ru.deadsoftware.cavedroid.misc.Assets;
-import static ru.deadsoftware.cavedroid.GameScreen.GP;
import static ru.deadsoftware.cavedroid.misc.Assets.pigSprite;
public class Pig extends Mob {
public Pig(float x, float y) {
import static ru.deadsoftware.cavedroid.misc.Assets.pigSprite;
public class Pig extends Mob {
public Pig(float x, float y) {
- super(x, y, 25, 18, Mob.randomDir());
- mov = new Vector2(looksLeft() ? -1 : 1, 0);
+ super(x, y, 25, 18, randomDir(), Type.MOB);
+ mMove = new Vector2(looksLeft() ? -1 : 1, 0);
}
@Override
public void changeDir() {
switchDir();
}
@Override
public void changeDir() {
switchDir();
- mov.x = -1 + 2 * getDirection();
+ mMove.x = -1 + 2 * dirMultiplier();
}
@Override
}
@Override
- public void ai() {
- if (MathUtils.randomBoolean(.0025f)) changeDir();
- else if (MathUtils.randomBoolean(.0025f)) {
- if (mov.x != 0f) mov.x = 0;
- else mov.x = -1 + 2 * getDirection();
+ public void ai(GameWorld gameWorld) {
+ if (MathUtils.randomBoolean(.0025f)) {
+ if (mMove.x != 0f) {
+ mMove.x = 0;
+ } else {
+ changeDir();
+ }
}
}
- if (mov.x != 0f) anim += animDelta;
- else anim = 0;
- if (anim >= 60 || anim <= -60) {
- animDelta = -animDelta;
+
+ if (mMove.x != 0f) {
+ mAnim += mAnimDelta;
+ } else {
+ mAnim = 0;
}
}
- }
- @Override
- public int getType() {
- return 0;
+ if (mAnim >= 60 || mAnim <= -60) {
+ mAnimDelta = -mAnimDelta;
+ }
}
@Override
public void draw(SpriteBatch spriteBatch, float x, float y) {
}
@Override
public void draw(SpriteBatch spriteBatch, float x, float y) {
- if (x + getWidth() - GP.world.getWidthPx() >= 0 && x - GP.world.getWidthPx() <= getWidth()) {
- x -= GP.world.getWidthPx();
- } else if (x + getWidth() + GP.world.getWidthPx() >= 0 && x + GP.world.getWidthPx() <= getWidth()) {
- x += GP.world.getWidthPx();
- }
-
pigSprite[0][1].setRotation(getAnim());
pigSprite[1][1].setRotation(-getAnim());
//back legs
pigSprite[0][1].setRotation(getAnim());
pigSprite[1][1].setRotation(-getAnim());
//back legs
- pigSprite[1][1].setPosition(x - 4 + (9 - getDirection() * 9), y + 6);
+ pigSprite[1][1].setPosition(x + (9 - dirMultiplier() * 9), y + 12);
pigSprite[1][1].draw(spriteBatch);
pigSprite[1][1].draw(spriteBatch);
- pigSprite[1][1].setPosition(x + 17 - (9 * getDirection()), y + 6);
+ pigSprite[1][1].setPosition(x + 21 - (9 * dirMultiplier()), y + 12);
pigSprite[1][1].draw(spriteBatch);
pigSprite[1][1].draw(spriteBatch);
+ //head & body
+ spriteBatch.draw(Assets.pigSprite[dirMultiplier()][0], x, y);
//front legs
//front legs
- pigSprite[0][1].setPosition(x - 4 + (9 - getDirection() * 9), y + 6);
+ pigSprite[0][1].setPosition(x + (9 - dirMultiplier() * 9), y + 12);
pigSprite[0][1].draw(spriteBatch);
pigSprite[0][1].draw(spriteBatch);
- pigSprite[0][1].setPosition(x + 17 - (9 * getDirection()), y + 6);
+ pigSprite[0][1].setPosition(x + 21 - (9 * dirMultiplier()), y + 12);
pigSprite[0][1].draw(spriteBatch);
pigSprite[0][1].draw(spriteBatch);
- //head & body
- spriteBatch.draw(Assets.pigSprite[getDirection()][0], x, y);
}
}
}
}