Slowed down the speed of Dummy(NPC) and Reduced the area in which the NPC follows the player

Author: redomar

src/com/redomar/game/entities/Dummy.java

@@ -12,27 +12,28 @@ public class Dummy extends Mob {
 
 	private int colour, shirtCol, faceCol; // = Colours.get(-1, 111, 240, 310);
 	private int tickCount = 0;
-	private int xa = 0;
-	private int ya = 0;
+	private double xa = 0;
+	private double ya = 0;
 	private boolean[] swimType;
 	private int[] swimColour;
+	private static double speed = 0.75;
 
 	private Swim swim;
 
 	public Dummy(LevelHandler level, String name, int x, int y, int shirtCol,
 			int faceCol) {
-		super(level, "h", x, y, 1);
+		super(level, "h", x, y, speed);
 		this.faceCol = faceCol;
 		this.shirtCol = shirtCol;
 		this.colour = Colours.get(-1, 111, shirtCol, faceCol);
 	}
 
 	public void tick() {
 
-		List<Player> players = level.getPlayers(this, 10);
+		List<Player> players = level.getPlayers(this, 8);
 		if (players.size() > 0) {
 			followMovementAI((int) getX(), (int) getY(), (int) Game.getPlayer().getX(), (int) Game
-					.getPlayer().getY(), xa, ya, this);
+					.getPlayer().getY(), xa, ya, speed, this);
 		}else{
 			isMoving = false;
 		}

src/com/redomar/game/entities/Mob.java

@@ -28,7 +28,7 @@ public Mob(LevelHandler level, String name, int x, int y, double speed) {
 		this.speed = speed;
 	}
 
-	public void move(int xa, int ya) {
+	public void move(double xa, double ya) {
 		if (xa != 0 && ya != 0) {
 			move(xa, 0);
 			move(0, ya);
@@ -55,46 +55,63 @@ public void move(int xa, int ya) {
 		if (xa > 0) {
 			movingDir = 3;
 		}
-		
-		for (int x = 0; x < Math.abs(xa); x++) {
-			if (!hasCollided(abs(xa), ya)) {
-				this.x += abs(xa) * (int) speed;
+
+		while (xa != 0){
+			if (Math.abs(xa) > 1){
+				if (!hasCollided(abs(xa), ya)) {
+					this.x += abs(xa);
+				}
+				xa -= abs(xa);
+			} else {
+				if (!hasCollided(abs(xa), ya)) {
+					this.x += xa;
+				}
+				xa = 0;
 			}
 		}
 
-		for (int y = 0; y < Math.abs(ya); y++) {
-			if (!hasCollided(xa, abs(ya))) {
-				this.y += abs(ya) * (int) speed;
+		while (ya != 0){
+			if (Math.abs(ya) > 1){
+				if (!hasCollided(xa, abs(ya))) {
+					this.y += abs(ya);
+				}
+				ya -= abs(ya);
+			} else {
+				if (!hasCollided(xa, abs(ya))) {
+					this.y += ya;
+				}
+				ya = 0;
 			}
 		}
+		
 	}
 
-	public boolean hasCollided(int xa, int ya){
+	public boolean hasCollided(double xa, double ya){
 		int xMin = 0;
 		int xMax = 7;
 		int yMin = 3;
 		int yMax = 7;
 
 		for (int x = xMin; x < xMax; x++) {
-			if (isSolid(xa, ya, x, yMin)) {
+			if (isSolid((int) xa, (int) ya, x, yMin)) {
 				return true;
 			}
 		}
 
 		for (int x = xMin; x < xMax; x++) {
-			if (isSolid(xa, ya, x, yMax)) {
+			if (isSolid((int) xa, (int) ya, x, yMax)) {
 				return true;
 			}
 		}
 
 		for (int y = yMin; y < yMax; y++) {
-			if (isSolid(xa, ya, xMin, y)) {
+			if (isSolid((int) xa, (int) ya, xMin, y)) {
 				return true;
 			}
 		}
 
 		for (int y = yMin; y < yMax; y++) {
-			if (isSolid(xa, ya, xMax, y)) {
+			if (isSolid((int) xa, (int) ya, xMax, y)) {
 				return true;
 			}
 		}
@@ -116,7 +133,7 @@ public boolean hasCollidedAlt(int xa, int ya){
 		return solid;
 	}
 
-	private int abs(int i){
+	private int abs(double i){
 		if (i < 0) return -1;
 		return 1;
 	}
@@ -139,22 +156,22 @@ protected boolean isSolid(int xa, int ya, int x, int y) {
 		return false;
 	}
 
-	protected void followMovementAI(int x, int y, int px, int py, int xa,
-			int ya, Mob mob) {
+	protected void followMovementAI(int x, int y, int px, int py, double xa,
+			double ya, double speed, Mob mob) {
 		ya = 0;
 		xa = 0;
 		if (px > x)
-			xa++;
+			xa+=speed;
 		if (px < x)
-			xa--;
+			xa-=speed;
 		if (py > y)
-			ya++;
+			ya+=speed;
 		if (py < y)
-			ya--;
+			ya-=speed;
 		moveMob(xa, ya, mob);
 	}
 
-	protected void moveMob(int xa, int ya, Mob mob) {
+	protected void moveMob(double xa, double ya, Mob mob) {
 		if (xa != 0 || ya != 0) {
 			mob.move(xa, ya);
 			mob.isMoving = true;

src/com/redomar/game/entities/Player.java

@@ -38,21 +38,21 @@ public Player(LevelHandler level, int x, int y, InputHandler input,
 	}
 
 	public void tick() {
-		int xa = 0;
-		int ya = 0;
+		double xa = 0;
+		double ya = 0;
 
 		if (input != null) {
 			if (input.getUp().isPressed()) {
-				ya--;
+				ya -= speed;
 			}
 			if (input.getDown().isPressed()) {
-				ya++;
+				ya += speed;
 			}
 			if (input.getLeft().isPressed()) {
-				xa--;
+				xa -= speed;
 			}
 			if (input.getRight().isPressed()) {
-				xa++;
+				xa += speed;
 			}
 		}