X-Git-Url: https://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FMob.java;h=723a9298acc5d066dd5ada8b3dc01a99ad1a5bcf;hp=716c3df07f44dc8e45b06c048716fc721fedeb52;hb=17c1be4c02b27fefa1bf6abd0547ac7e9743d493;hpb=c7f2798aa4d2191f02dcb26834ef5b9660f76172
diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/Mob.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/Mob.java
index 716c3df..723a929 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/mobs/Mob.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/Mob.java
@@ -7,20 +7,32 @@ import com.badlogic.gdx.math.Vector2;
import java.io.Serializable;
+import static ru.deadsoftware.cavedroid.GameScreen.GP;
+
/**
* Mob class.
*/
-public abstract class Mob implements Serializable {
-
- public static final int LEFT = 0;
- public static final int RIGHT = 1;
+public abstract class Mob extends Rectangle implements Serializable {
- private final float width;
- private final float height;
- private int dir;
+ protected Vector2 move;
+ protected Type type;
+ private Direction dir;
- protected final Vector2 pos;
- protected Vector2 mov;
+ /**
+ * @param x in pixels
+ * @param y in pixels
+ * @param width in pixels
+ * @param height in pixels
+ * @param dir Direction in which mob is looking
+ */
+ protected Mob(float x, float y, float width, float height, Direction dir, Type type) {
+ super(x, y, width, height);
+ move = new Vector2(0, 0);
+ canJump = false;
+ dead = false;
+ this.dir = dir;
+ this.type = type;
+ }
private boolean dead;
@@ -28,145 +40,136 @@ public abstract class Mob implements Serializable {
protected int animDelta = 6;
protected int anim;
- protected static int randomDir() {
- return MathUtils.random(1);
- }
-
- /**
- *
- * @param x in pixels
- * @param y in pixels
- * @param width in pixels
- * @param height in pixels
- * @param dir integer representing a direction where 0 is left and 1 is right.
- * You should use {@link #LEFT} and {@link #RIGHT} constants
- */
- protected Mob(float x, float y, float width, float height, int dir) {
- pos = new Vector2(x, y);
- mov = new Vector2(0, 0);
- this.width = width;
- this.height = height;
- canJump = false;
- dead = false;
- this.dir = dir;
+ protected static Direction randomDir() {
+ return MathUtils.randomBoolean(.5f) ? Direction.LEFT : Direction.RIGHT;
}
/**
- *
* @return The X coordinate of a mob in blocks
*/
- public int getMapX() {
- return (int) (pos.x + (getWidth() / 2)) / 16;
+ public final int getMapX() {
+ return (int) (x + (getWidth() / 2)) / 16;
}
/**
- *
* @return The Y coordinate of mob's upper edge in blocks
*/
- public int getUpperMapY() {
- return (int) (pos.y / 16);
+ public final int getUpperMapY() {
+ return (int) (y / 16);
}
/**
*
* @return The Y coordinate if mob's vertical center in blocks
*/
- public int getMiddleMapY() {
- return (int) (pos.y + (getHeight() / 2)) / 16;
+ public final int getMiddleMapY() {
+ return (int) (y + (getHeight() / 2)) / 16;
}
/**
*
* @return The Y coordinate of mob's legs in blocks
*/
- public int getLowerMapY() {
- return (int) (pos.y + getHeight()) / 16;
+ public final int getLowerMapY() {
+ return (int) (y + getHeight()) / 16;
}
- public float getWidth() {
+ public final float getWidth() {
return width;
}
- public float getHeight() {
+ public final float getHeight() {
return height;
}
/**
- *
* @return Integer representing a direction in which mob is looking, where 0 is left and 1 is right
*/
- public int getDirection() {
+ public final Direction getDirection() {
return dir;
}
- public boolean looksLeft() {
- return getDirection() == LEFT;
+ public final boolean looksLeft() {
+ return dir == Direction.LEFT;
}
- public boolean looksRight() {
- return getDirection() == RIGHT;
+ public final boolean looksRight() {
+ return dir == Direction.RIGHT;
}
/**
* Switches direction in which mob is looking
*/
- protected void switchDir() {
- dir = looksLeft() ? RIGHT : LEFT;
+ protected final void switchDir() {
+ dir = looksLeft() ? Direction.RIGHT : Direction.LEFT;
+ }
+
+ protected final int dirMultiplier() {
+ return looksLeft() ? 0 : 1;
}
- public boolean isDead() {
+ public final boolean isDead() {
return dead;
}
- public int getAnim() {
+ public final int getAnim() {
return anim;
}
/**
- * Set's mob's dead variable to true and nothing else. It doesn't delete the mob.
+ * Set's mob's dead variable to true and nothing else. It doesn't delete the
*/
- public void kill() {
+ public final void kill() {
dead = true;
}
- /**
- *
- * @return A {@link Rectangle} with mob's coordinates and size
- */
- public Rectangle getRect() {
- return new Rectangle(pos.x, pos.y, getWidth(), getHeight());
+ public final void move() {
+ x += move.x;
+ y += move.y;
}
- public Vector2 getPos() {
- return pos;
+ public final Vector2 getMove() {
+ return move;
}
- public Vector2 getMov() {
- return mov;
+ public final boolean canJump() {
+ return canJump;
}
- public float getX() {
- return pos.x;
+ public final void setCanJump(boolean canJump) {
+ this.canJump = canJump;
}
- public float getY() {
- return pos.y;
+ public final boolean isFlyMode() {
+ return flyMode;
}
- public boolean canJump() {
- return canJump;
+ public final void setFlyMode(boolean flyMode) {
+ this.flyMode = flyMode;
}
- public void setCanJump(boolean canJump) {
- this.canJump = canJump;
+ public final Type getType() {
+ return type;
}
- public boolean isFlyMode() {
- return flyMode;
+ public void checkWorldBounds() {
+ if (x + width / 2 < 0) {
+ x += GP.world.getWidthPx();
+ }
+ if (x + width / 2 > GP.world.getWidthPx()) {
+ x -= GP.world.getWidthPx();
+ }
}
- public void setFlyMode(boolean flyMode) {
- this.flyMode = flyMode;
+ public enum Type {
+ MOB,
+ SAND,
+ GRAVEL
+ }
+
+ public enum Direction {
+ LEFT,
+ RIGHT
}
public abstract void draw(SpriteBatch spriteBatch, float x, float y);
@@ -174,11 +177,4 @@ public abstract class Mob implements Serializable {
public abstract void ai();
public abstract void changeDir();
-
- /**
- *
- * @return 0 - if regular mob.
- * 10 - if instance of {@link FallingSand}
11 - if instance of {@link FallingGravel}
- */
- public abstract int getType(); //0 - mob, 10 - sand, 11 - gravel
}