diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/Pig.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/Pig.java
index 5bc0426eaac7c86e28edce896cd5d69a3124a4fb..ecc93978ff0bf6e0db87bf0beeec4d526c0bbbac 100644 (file)
import com.badlogic.gdx.math.Vector2;
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) {
- super(x, y, 25, 18, MathUtils.random(1));
- mov = new Vector2(-1 + getDir() * 2, 0);
+ super(x, y, 25, 18, Mob.randomDir());
+ mov = new Vector2(looksLeft() ? -1 : 1, 0);
}
@Override
public void changeDir() {
switchDir();
- mov.x = -1 + 2 * getDir();
+ mov.x = -1 + 2 * getDirection();
}
@Override
if (MathUtils.randomBoolean(.0025f)) changeDir();
else if (MathUtils.randomBoolean(.0025f)) {
if (mov.x != 0f) mov.x = 0;
- else mov.x = -1 + 2 * getDir();
+ else mov.x = -1 + 2 * getDirection();
}
if (mov.x != 0f) anim += animDelta;
else anim = 0;
}
}
+ @Override
+ public int getType() {
+ return 0;
+ }
+
@Override
public void draw(SpriteBatch spriteBatch, float x, float y) {
- Assets.pigSprite[0][1].setRotation(anim);
- Assets.pigSprite[1][1].setRotation(-anim);
+ 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
- Assets.pigSprite[1][1].setPosition(x - 4 + (9 - getDir() * 9), y + 6);
- Assets.pigSprite[1][1].draw(spriteBatch);
- Assets.pigSprite[1][1].setPosition(x + 17 - (9 * getDir()), y + 6);
- Assets.pigSprite[1][1].draw(spriteBatch);
+ pigSprite[1][1].setPosition(x - 4 + (9 - getDirection() * 9), y + 6);
+ pigSprite[1][1].draw(spriteBatch);
+ pigSprite[1][1].setPosition(x + 17 - (9 * getDirection()), y + 6);
+ pigSprite[1][1].draw(spriteBatch);
//front legs
- Assets.pigSprite[0][1].setPosition(x - 4 + (9 - getDir() * 9), y + 6);
- Assets.pigSprite[0][1].draw(spriteBatch);
- Assets.pigSprite[0][1].setPosition(x + 17 - (9 * getDir()), y + 6);
- Assets.pigSprite[0][1].draw(spriteBatch);
+ pigSprite[0][1].setPosition(x - 4 + (9 - getDirection() * 9), y + 6);
+ pigSprite[0][1].draw(spriteBatch);
+ pigSprite[0][1].setPosition(x + 17 - (9 * getDirection()), y + 6);
+ pigSprite[0][1].draw(spriteBatch);
//head & body
- spriteBatch.draw(Assets.pigSprite[getDir()][0], x, y);
+ spriteBatch.draw(Assets.pigSprite[getDirection()][0], x, y);
}
-
- @Override
- public int getType() {
- return 0;
- }
-
}