X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FPig.java;h=22903876fd393dd01469d1cad38355927e8c66a2;hb=855c0d5893371fa9ee164bd69a782a8071933578;hp=b2760c24624a7d0c402f4727f6101fd4bf23f561;hpb=3992892d92be0c4ea654de3b4e10c32bf4552d9c;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 b2760c2..2290387 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/mobs/Pig.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/Pig.java
@@ -1,10 +1,13 @@
 package ru.deadsoftware.cavedroid.game.mobs;
 
+import com.badlogic.gdx.graphics.g2d.Sprite;
 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.game.GamePhysics;
+import ru.deadsoftware.cavedroid.game.world.GameWorld;
 import ru.deadsoftware.cavedroid.misc.Assets;
+import ru.deadsoftware.cavedroid.misc.utils.SpriteUtilsKt;
 
 import static ru.deadsoftware.cavedroid.misc.Assets.pigSprite;
 
@@ -12,51 +15,38 @@ public class Pig extends Mob {
 
     public Pig(float x, float y) {
         super(x, y, 25, 18, randomDir(), Type.MOB);
-        mVelocity = new Vector2(looksLeft() ? -1 : 1, 0);
+        mVelocity = new Vector2((looksLeft() ? -1 : 1) * GamePhysics.PL_SPEED, 0);
     }
 
     @Override
     public void changeDir() {
         switchDir();
-        mVelocity.x = -1 + 2 * dirMultiplier();
+        mVelocity.x = (-1 + 2 * dirMultiplier()) * GamePhysics.PL_SPEED;
     }
 
     @Override
-    public void ai(GameWorld gameWorld) {
-        if (MathUtils.randomBoolean(.0025f)) {
+    public void ai(GameWorld gameWorld, float delta) {
+        if (MathUtils.randomBoolean(delta)) {
             if (mVelocity.x != 0f) {
                 mVelocity.x = 0;
             } else {
                 changeDir();
             }
         }
-
-        if (mVelocity.x != 0f) {
-            mAnim += mAnimDelta;
-        } else {
-            mAnim = 0;
-        }
-
-        if (mAnim >= 60 || mAnim <= -60) {
-            mAnimDelta = -mAnimDelta;
-        }
     }
 
     @Override
-    public void draw(SpriteBatch spriteBatch, float x, float y) {
-        pigSprite[0][1].setRotation(getAnim());
-        pigSprite[1][1].setRotation(-getAnim());
-        //back legs
-        pigSprite[1][1].setPosition(x + (9 - dirMultiplier() * 9), y + 12);
-        pigSprite[1][1].draw(spriteBatch);
-        pigSprite[1][1].setPosition(x + 21 - (9 * dirMultiplier()), y + 12);
-        pigSprite[1][1].draw(spriteBatch);
-        //head & body
-        spriteBatch.draw(Assets.pigSprite[dirMultiplier()][0], x, y);
-        //front legs
-        pigSprite[0][1].setPosition(x + (9 - dirMultiplier() * 9), y + 12);
-        pigSprite[0][1].draw(spriteBatch);
-        pigSprite[0][1].setPosition(x + 21 - (9 * dirMultiplier()), y + 12);
-        pigSprite[0][1].draw(spriteBatch);
+    public void draw(SpriteBatch spriteBatch, float x, float y, float delta) {
+        updateAnimation(delta);
+
+        final Sprite frontLeg = pigSprite[0][1];
+        final Sprite backLeg = pigSprite[1][1];
+        final Sprite body = pigSprite[dirMultiplier()][0];
+
+        SpriteUtilsKt.draw(spriteBatch, backLeg, x + (9 - dirMultiplier() * 9), y + 12, -mAnim);
+        SpriteUtilsKt.draw(spriteBatch, backLeg, x + 21 - (9 * dirMultiplier()), y + 12, -mAnim);
+        SpriteUtilsKt.draw(spriteBatch, body, x, y);
+        SpriteUtilsKt.draw(spriteBatch, frontLeg, x + (9 - dirMultiplier() * 9), y + 12, mAnim);
+        SpriteUtilsKt.draw(spriteBatch, frontLeg, x + 21 - (9 * dirMultiplier()), y + 12, mAnim);
     }
 }