X-Git-Url: https://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2Fmobs%2FPig.java;h=38eac46d69d9b70180df37400c86c70038bfbe34;hp=0fa08bd2a6c928ba3b049ea73e1e5bad73dd3f07;hb=be2690f1dee10f68a5ce6d576ace13c825ac5d15;hpb=bea2a3c5b967bcd90ccd83e08e833d58449e963a diff --git a/core/src/ru/deadsoftware/cavecraft/game/mobs/Pig.java b/core/src/ru/deadsoftware/cavecraft/game/mobs/Pig.java index 0fa08bd..38eac46 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/mobs/Pig.java +++ b/core/src/ru/deadsoftware/cavecraft/game/mobs/Pig.java @@ -10,9 +10,8 @@ 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); + pos = new Vector2(x, y); + move = new Vector2(-1 + dir * 2, 0); width = 25; height = 18; canJump = false; @@ -22,27 +21,27 @@ public class Pig extends Mob { @Override public void changeDir() { dir = -dir + 1; - moveX.set(-1 + 2 * dir, 0); + move.x = -1 + 2 * dir; } @Override public void ai() { if (MathUtils.randomBoolean(.0025f)) changeDir(); else if (MathUtils.randomBoolean(.0025f)) { - if (moveX.x != 0f) moveX.setZero(); - else moveX.set(-1 + 2 * dir, 0); + if (move.x != 0f) move.x = 0; + else move.x = -1 + 2 * dir; } - if (moveX.x != 0f) animation += ANIM_SPEED; - else animation = 0; - if (animation >= 60 || animation <= -60) { + if (move.x != 0f) anim += ANIM_SPEED; + else anim = 0; + if (anim >= 60 || anim <= -60) { ANIM_SPEED = -ANIM_SPEED; } } @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].draw(spriteBatch); @@ -59,7 +58,7 @@ public class Pig extends Mob { @Override public Rectangle getRect() { - return new Rectangle(position.x, position.y, width, height); + return new Rectangle(pos.x, pos.y, width, height); } @Override