X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FPig.java;h=e37ab3e3d4fe2db20dbff6e2a13052fd5cf96b7d;hb=17c1be4c02b27fefa1bf6abd0547ac7e9743d493;hp=ecc93978ff0bf6e0db87bf0beeec4d526c0bbbac;hpb=84377178320105196ad70bfa798ba8f299f961b2;p=cavedroid.git

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