Merge remote-tracking branch 'origin/aside'

Author: redomar

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

@@ -1,6 +1,7 @@
 package com.redomar.game.entities;
 
 import com.redomar.game.Game;
+import com.redomar.game.entities.efx.Swim;
 import com.redomar.game.gfx.Colours;
 import com.redomar.game.gfx.Screen;
 import com.redomar.game.level.LevelHandler;
@@ -11,6 +12,9 @@ public class Dummy extends Mob {
 	private int tickCount = 0;
 	private int xa = 0;
 	private int ya = 0;
+	private boolean[] swimType;
+
+	private Swim swim;
 
 	public Dummy(LevelHandler level, String name, int x, int y, int shirtCol,
 			int faceCol) {
@@ -25,32 +29,11 @@ public void tick() {
 		followMovementAI(getX(), getY(), Game.getPlayer().getX(), Game
 				.getPlayer().getY(), xa, ya, this);
 
-		if (level.getTile(this.getX() >> 3, this.getY() >> 3).getId() == 4) {
-			isSwimming = true;
-		}
-
-		if (isSwimming
-				&& level.getTile(this.getX() >> 3, this.getY() >> 3).getId() != 4) {
-			isSwimming = false;
-		}
-
-		if (level.getTile(this.getX() >> 3, this.getY() >> 3).getId() == 12) {
-			isMagma = true;
-		}
-
-		if (isMagma
-				&& level.getTile(this.getX() >> 3, this.getY() >> 3).getId() != 12) {
-			isMagma = false;
-		}
-		
-		if (level.getTile(this.getX() >> 3, this.getY() >> 3).getId() == 14){
-			isMuddy = true;
-		}
-		
-		if(isMuddy
-				&& level.getTile(this.getX() >> 3, this.getY() >> 3).getId() != 14){
-			isMuddy = false;
-		}
+		setSwim(new Swim(level, getX(), getY()));
+		swimType = getSwim().swimming(isSwimming, isMagma, isMuddy);
+		isSwimming = swimType[0];
+		isMagma = swimType[1];
+		isMuddy = swimType[2];
 
 		tickCount++;
 
@@ -121,12 +104,12 @@ public void render(Screen screen) {
 			screen.render(xOffset + 8, yOffset + 3, 31 + 31 * 32, waterColour,
 					0x01, 1);
 		}
-		
+
 		if (isMuddy) {
 			int waterColour = 0;
 			yOffset += 4;
 
-			colour = Colours.get(-1, 111, -1, 310);
+			colour = Colours.get(-1, 111, -1, faceCol);
 
 			if (tickCount % 60 < 15) {
 				waterColour = Colours.get(-1, -1, 422, -1);
@@ -193,4 +176,12 @@ public boolean hasCollided(int xa, int ya) {
 
 		return false;
 	}
+
+	public Swim getSwim() {
+		return swim;
+	}
+
+	public void setSwim(Swim swim) {
+		this.swim = swim;
+	}
 }

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

@@ -19,7 +19,7 @@ public class Player extends Mob {
 	private int colour = Colours.get(-1, 111, 240, 310);
 	private int tickCount = 0;
 	private String userName;
-	
+	private boolean[] swimType;
 
 	public static String guestPlayerName = customeName.setName("Player ");
 
@@ -61,8 +61,12 @@ public void tick() {
 		} else {
 			isMoving = false;
 		}
-		
-		Swimming();
+
+		setSwim(new Swim(level, getX(), getY()));
+		swimType = getSwim().swimming(isSwimming, isMagma, isMuddy);
+		isSwimming = swimType[0];
+		isMagma = swimType[1];
+		isMuddy = swimType[2];
 
 		if (level.getTile(this.getX() >> 3, this.getY() >> 3).getId() == 11) {
 			changeLevels = true;
@@ -71,15 +75,6 @@ public void tick() {
 		tickCount++;
 	}
 
-	private void Swimming() {
-
-		setSwim(new Swim(level, getX(), getY()));
-
-		isSwimming = getSwim().water(isSwimming);
-		isMagma = getSwim().magma(isMagma);
-		isMuddy = getSwim().mud(isMuddy);
-	}
-
 	public void render(Screen screen) {
 		int xTile = 0;
 		int yTile = 28;
@@ -149,7 +144,7 @@ public void render(Screen screen) {
 			screen.render(xOffset + 8, yOffset + 3, 31 + 31 * 32, waterColour,
 					0x01, 1);
 		}
-		
+
 		if (isMuddy) {
 			int waterColour = 0;
 			yOffset += 4;

src/com/redomar/game/entities/efx/Swim.java

@@ -3,53 +3,58 @@
 import com.redomar.game.level.LevelHandler;
 
 public class Swim {
-	
+
 	private static LevelHandler level;
 	private int x;
 	private int y;
 
-	public Swim(LevelHandler level, int x, int y){
+	public Swim(LevelHandler level, int x, int y) {
 		Swim.level = level;
 		this.x = x;
 		this.y = y;
 	}
-	
-	public boolean water(boolean isSwimming){
+
+	public boolean water(boolean isSwimming) {
 		if (level.getTile(x >> 3, y >> 3).getId() == 4) {
 			isSwimming = true;
 		}
 
-		if (isSwimming
-				&& level.getTile(x >> 3, y >> 3).getId() != 4) {
+		if (isSwimming && level.getTile(x >> 3, y >> 3).getId() != 4) {
 			isSwimming = false;
 		}
 		return isSwimming;
 	}
-	
-	public boolean magma(boolean isMagma){
+
+	public boolean magma(boolean isMagma) {
 		if (level.getTile(x >> 3, y >> 3).getId() == 12) {
 			isMagma = true;
 		}
 
-		if (isMagma
-				&& level.getTile(x >> 3, y >> 3).getId() != 12) {
+		if (isMagma && level.getTile(x >> 3, y >> 3).getId() != 12) {
 			isMagma = false;
 		}
-		
+
 		return isMagma;
 	}
-	
-	public boolean mud(boolean isMuddy){
+
+	public boolean mud(boolean isMuddy) {
 		if (level.getTile(x >> 3, y >> 3).getId() == 14) {
 			isMuddy = true;
 		}
 
-		if (isMuddy
-				&& level.getTile(x >> 3, y >> 3).getId() != 14) {
+		if (isMuddy && level.getTile(x >> 3, y >> 3).getId() != 14) {
 			isMuddy = false;
 		}
-		
+
 		return isMuddy;
 	}
-	
+
+	public boolean[] swimming(boolean isSwimming, boolean isMagma, boolean isMuddy) {
+		boolean[] swimminhType;
+		swimminhType = new boolean[3];
+		swimminhType[0] = water(isSwimming);
+		swimminhType[1] = magma(isMagma);
+		swimminhType[2] = mud(isMuddy);
+		return swimminhType;
+	}
 }