Merge remote-tracking branch 'origin/aside'

Author: redomar

res/levels/custom_level.png

@@ -44,6 +44,7 @@ public class Game extends Canvas implements Runnable {
 	private static String Jdata_UserName = "";
 	private static String Jdata_IP = "127.0.0.1";
 	private static boolean changeLevel = false;
+	private static boolean npc = false;
 	private static int map = 0;
 
 	private JFrame frame;
@@ -62,7 +63,7 @@ public class Game extends Canvas implements Runnable {
 	private InputHandler input;
 	private WindowHandler window;
 	private LevelHandler level;
-	private static Player player;
+	private Player player;
 	private Dummy dummy;
 	private Music music = new Music();
 	private Time time = new Time();
@@ -125,10 +126,21 @@ public void setMap(String Map_str) {
 		setLevel(new LevelHandler(Map_str));
 		setPlayer(new PlayerMP(getLevel(), 100, 100, input,
 				Jdata_UserName, null, -1));
-		dummy = new Dummy(getLevel(), "h", 215, 215, 500, 543);
-		level.addEntity(dummy);
 		level.addEntity(player);
 	}
+	
+	public static void npcSpawn(){
+		if(isNpc() == true){
+			game.setDummy(new Dummy(Game.getLevel(), "h", 215, 215, 500, 543));
+			game.level.addEntity(Game.getDummy());
+		}
+	}
+	
+	public static void npcKill(){
+		if(isNpc() == false){
+			game.level.removeEntity(Game.getDummy());
+		}
+	}
 
 	public synchronized void start() {
 		running = true;
@@ -235,15 +247,15 @@ public void render() {
 					musicThread.start();
 					notActive = false;
 				} else {
-					System.out.println("Canceled");
+					System.out.println("[GAME] Canceled music option");
 					input.setPlayMusic(false);
 				}
 			}			
 		}
 
-		if (input.isChangeLevel() == true && getTickCount() % 60 == 0){
+		if (isChangeLevel() == true && getTickCount() % 60 == 0){
 			Game.setChangeLevel(true);
-			input.setChangeLevel(false);
+			setChangeLevel(false);
 		}
 
 		if (changeLevel == true){
@@ -354,15 +366,15 @@ public void setSocketClient(GameClient socketClient) {
 	}
 
 	public static Player getPlayer() {
-		return player;
+		return game.player;
 	}
 
 	public void setPlayer(Player player) {
-		Game.player = player;
+		game.player = player;
 	}
 
-	public LevelHandler getLevel() {
-		return level;
+	public static LevelHandler getLevel() {
+		return game.level;
 	}
 
 	public void setLevel(LevelHandler level) {
@@ -417,4 +429,20 @@ public static void setMap(int map) {
 		Game.map = map;
 	}
 
+	public static boolean isNpc() {
+		return npc;
+	}
+
+	public static void setNpc(boolean npc) {
+		Game.npc = npc;
+	}
+
+	public static Dummy getDummy() {
+		return game.dummy;
+	}
+
+	public void setDummy(Dummy dummy) {
+		this.dummy = dummy;
+	}
+
 }

src/com/redomar/game/Game.java

@@ -34,7 +34,6 @@ public void toggle(boolean isPressed) {
 	private Key left = new Key();
 	private Key right = new Key();
 	private boolean PlayMusic = false;
-	private boolean ChangeLevel = false;
 	private int map;
 
 	public void keyPressed(KeyEvent e) {
@@ -74,7 +73,23 @@ public void toggleKey(int keyCode, boolean isPressed) {
 //				map--;
 //			}
 			if(Game.getMap() == 2){
-				this.setChangeLevel(true);
+				Game.setChangeLevel(true);
+				Game.getLevel().removeEntity(Game.getDummy());
+				Game.setNpc(false);
+			}
+		}
+		if (keyCode == KeyEvent.VK_N){
+			if(Game.isNpc() == false){
+				Game.setNpc(true);
+				Game.npcSpawn();
+				System.out.println("[GAME] Dummy has been spawned");
+			}
+		}
+		if (keyCode == KeyEvent.VK_K){
+			if(Game.isNpc() == true){
+				Game.setNpc(false);
+				Game.npcKill();
+				System.out.println("[GAME] Dummy has been despawned");
 			}
 		}
 	}
@@ -95,14 +110,6 @@ public void setPlayMusic(boolean playMusic) {
 		PlayMusic = playMusic;
 	}
 
-	public boolean isChangeLevel() {
-		return ChangeLevel;
-	}
-
-	public void setChangeLevel(boolean changeLevel) {
-		ChangeLevel = changeLevel;
-	}
-
 	public Key getUp() {
 		return up;
 	}

src/com/redomar/game/InputHandler.java

@@ -15,6 +15,7 @@ public abstract class Mob extends Entity {
 	protected int movingDir = 1;
 	protected int scale = 1;
 	protected boolean isSwimming = false;
+	protected boolean isMagma = false;
 	protected boolean changeLevels = false;
 	protected int ticker;
 

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

@@ -60,7 +60,7 @@ public void tick() {
 		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;
 		}
@@ -69,6 +69,14 @@ public void tick() {
 			changeLevels = true;
 		}
 
+		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;
+		}
+		
 		tickCount++;
 	}
 
@@ -117,12 +125,36 @@ public void render(Screen screen) {
 			screen.render(xOffset + 8, yOffset + 3, 31 + 31 * 32, waterColour,
 					0x01, 1);
 		}
+		
+		if (isMagma) {
+			int waterColour = 0;
+			yOffset += 4;
+
+			colour = Colours.get(-1, 111, -1, 310);
+
+			if (tickCount % 60 < 15) {
+				waterColour = Colours.get(-1, -1, 541, -1);
+			} else if (15 <= tickCount % 60 && tickCount % 60 < 30) {
+				yOffset--;
+				waterColour = Colours.get(-1, 521, 510, -1);
+			} else if (30 <= tickCount % 60 && tickCount % 60 < 45) {
+				waterColour = Colours.get(-1, 510, -1, 521);
+			} else {
+				yOffset--;
+				waterColour = Colours.get(-1, -1, 521, 510);
+			}
+
+			screen.render(xOffset, yOffset + 3, 31 + 31 * 32, waterColour,
+					0x00, 1);
+			screen.render(xOffset + 8, yOffset + 3, 31 + 31 * 32, waterColour,
+					0x01, 1);
+		}
 
 		screen.render((xOffset + (modifier * flipTop)), yOffset,
 				(xTile + yTile * 32), colour, flipTop, scale);
 		screen.render((xOffset + modifier - (modifier * flipTop)), yOffset,
 				((xTile + 1) + yTile * 32), colour, flipTop, scale);
-		if (!isSwimming) {
+		if (!isSwimming && !isMagma) {
 			screen.render((xOffset + (modifier * flipBottom)),
 					(yOffset + modifier), (xTile + (yTile + 1) * 32), colour,
 					flipBottom, scale);

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

@@ -150,6 +150,10 @@ public void addEntity(Entity entity) {
 		this.getEntities().add(entity);
 	}
 
+	public void removeEntity(Entity entity) {
+		this.getEntities().remove(entity);
+	}
+	
 	public void removeEntity(String username) {
 		int index = 0;
 		for(Entity e : getEntities()){

src/com/redomar/game/level/LevelHandler.java

@@ -19,6 +19,7 @@ public abstract class Tile {
 	private static final Tile CHEST_b = new BasicSolidTile(9, 1, 1, Colours.get(333, 111, 420, 000), 0xFFFF0002);
 	private static final Tile CARPET_red = new BasicTile(10, 5, 0, Colours.get(-1, 311, 411, 311), 0xFFAA3636);
 	private static final Tile PORTAL = new AnimatedTile(11, new int[][] { { 3,  5 },  { 4, 5 }, { 5, 5 }, { 6, 5 }, { 7, 5 }, { 8, 5 }, { 9, 5 }, { 10, 5 } },  Colours.get(-1, 005, 305, -1), 0xFF00EAFF, 100);
+	private static final Tile MAGMA = new AnimatedTile(12, new int [][] { { 0, 5 }, { 1, 5 }, { 2, 5 }, { 1, 5 } }, Colours.get(-1, 400, 511, -1), 0xFFF00F0F, 1000);
 
 	protected byte id;
 	protected boolean solid;
@@ -111,4 +112,8 @@ public static Tile getPortal() {
 		return PORTAL;
 	}
 
+	public static Tile getMagma() {
+		return MAGMA;
+	}
+
 }