X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2Fmobs%2FPig.java;h=aaa301998beeb1130f215f4447486cbcb6e23f33;hb=01f293d956e7ad17163c67b8f2a2ebfd8f64ac6d;hp=7b922381c69d3f2c4fe172c5d479444104089cf3;hpb=d7666be4252d5f36969059d04c1c895dea6223d3;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/mobs/Pig.java b/core/src/ru/deadsoftware/cavecraft/game/mobs/Pig.java
index 7b92238..aaa3019 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/mobs/Pig.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/mobs/Pig.java
@@ -4,15 +4,13 @@ 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.Assets;
+import ru.deadsoftware.cavecraft.game.GameWorld;
+import ru.deadsoftware.cavecraft.misc.Assets;
 import ru.deadsoftware.cavecraft.game.GameProc;
 
 public class Pig extends Mob{
 
-    private GameProc gameProc;
-
-    public Pig(int x, int y, GameProc gameProc) {
-        this.gameProc = gameProc;
+    public Pig(int x, int y) {
         position = new Vector2(x, y);
         moveX = new Vector2(0, 0);
         moveY = new Vector2(0, 0);
@@ -20,17 +18,13 @@ public class Pig extends Mob{
         height = 18;
         dir = 0;
         canJump = false;
+        agressive = false;
     }
 
     @Override
     public void ai() {
-        if (canJump && position.x>16 && position.x<(gameProc.world.getWidth()-1)*16 &&
-                gameProc.world.getForeMap((int)(position.x/16)+(dir*2-1), (int)((position.y+height)/16))>0 &&
-                gameProc.world.getForeMap((int)(position.x/16)+(dir*2-1), (int)((position.y)/16))==0)
-            moveY.add(0, -8);
-        if (MathUtils.randomBoolean(.0001f)) dir++;
-        if (dir>1) dir = 0;
-        moveX.set(-1.5f+3*dir,0);
+        if (MathUtils.randomBoolean(.0025f)) dir=-dir+1;
+        moveX.set(-1+2*dir,0);
     }
 
     @Override