X-Git-Url: https://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2Fmobs%2FPig.java;h=aa3f79763f8791d87f3d90847317cdf6c1483827;hp=10c4242429f221641c1e0ec501545b1311127350;hb=cef4b5a9985bcbdfea6dc652147ecde0721d7fdc;hpb=d5e611f9fb8deb93a9403b41f17dc000b9fa63ce

diff --git a/core/src/ru/deadsoftware/cavecraft/game/mobs/Pig.java b/core/src/ru/deadsoftware/cavecraft/game/mobs/Pig.java
index 10c4242..aa3f797 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/mobs/Pig.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/mobs/Pig.java
@@ -2,63 +2,57 @@ package ru.deadsoftware.cavecraft.game.mobs;
 
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.math.MathUtils;
-import com.badlogic.gdx.math.Rectangle;
 import com.badlogic.gdx.math.Vector2;
-import ru.deadsoftware.cavecraft.game.GameWorld;
 import ru.deadsoftware.cavecraft.misc.Assets;
-import ru.deadsoftware.cavecraft.game.GameProc;
 
-public class Pig extends Mob{
+public class Pig extends Mob {
 
-    public Pig(int x, int y) {
-        dir = MathUtils.random(1);
-        position = new Vector2(x, y);
-        moveX = new Vector2(-1+dir*2, 0);
-        moveY = new Vector2(0, 0);
-        width = 25;
-        height = 18;
-        canJump = false;
-        agressive = false;
+    public Pig(float x, float y) {
+        super(x, y, 25, 18, MathUtils.random(1));
+        mov = new Vector2(-1 + getDir() * 2, 0);
     }
 
     @Override
     public void changeDir() {
-        dir=-dir+1;
-        moveX.set(-1+2*dir,0);
-        if (MathUtils.randomBoolean(.0025f)) {
-            moveX.set(0, 0);
-        }
+        switchDir();
+        mov.x = -1 + 2 * getDir();
     }
 
     @Override
     public void ai() {
         if (MathUtils.randomBoolean(.0025f)) changeDir();
-        if (moveX.x != 0f) animation+=ANIM_SPEED; else animation=0;
-        if (animation>=60 || animation<=-60) {
-            ANIM_SPEED = -ANIM_SPEED;
+        else if (MathUtils.randomBoolean(.0025f)) {
+            if (mov.x != 0f) mov.x = 0;
+            else mov.x = -1 + 2 * getDir();
+        }
+        if (mov.x != 0f) anim += animSpeed;
+        else anim = 0;
+        if (anim >= 60 || anim <= -60) {
+            animSpeed = -animSpeed;
         }
     }
 
     @Override
     public void draw(SpriteBatch spriteBatch, float x, float y) {
-        Assets.pigSprite[0][1].setRotation(animation);
-        Assets.pigSprite[1][1].setRotation(-animation);
+        Assets.pigSprite[0][1].setRotation(anim);
+        Assets.pigSprite[1][1].setRotation(-anim);
         //back legs
-        Assets.pigSprite[1][1].setPosition(x-4+(9-dir*9),y+6);
+        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*dir),y+6);
+        Assets.pigSprite[1][1].setPosition(x + 17 - (9 * getDir()), y + 6);
         Assets.pigSprite[1][1].draw(spriteBatch);
         //front legs
-        Assets.pigSprite[0][1].setPosition(x-4+(9-dir*9),y+6);
+        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*dir),y+6);
+        Assets.pigSprite[0][1].setPosition(x + 17 - (9 * getDir()), y + 6);
         Assets.pigSprite[0][1].draw(spriteBatch);
         //head & body
-        spriteBatch.draw(Assets.pigSprite[dir][0], x, y);
+        spriteBatch.draw(Assets.pigSprite[getDir()][0], x, y);
     }
 
     @Override
-    public Rectangle getRect() {
-        return new Rectangle(position.x, position.y, width, height);
+    public int getType() {
+        return 0;
     }
+
 }