v1.7 Alpha

Author: redomar

README.md

@@ -1,4 +1,4 @@
-JavaGame Alpha v1.6.4
+JavaGame Alpha v1.7
 =====================
 
 [![Ohloh Stats](https://www.ohloh.net/p/JavaGame/widgets/project_thin_badge.gif)](https://www.ohloh.net/p/JavaGame)

jar/javagame.jar

@@ -34,7 +34,7 @@ public class Game extends Canvas implements Runnable {
 
 	// Setting the size and name of the frame/canvas
 	private static final long serialVersionUID = 1L;
-	private static final String game_Version = "v1.6.4 Alpha";
+	private static final String game_Version = "v1.7 Alpha";
 	private static final int WIDTH = 160;
 	private static final int HEIGHT = (WIDTH / 3 * 2);
 	private static final int SCALE = 3;
@@ -50,6 +50,10 @@ public class Game extends Canvas implements Runnable {
 	private static int shirtCol;
 	private static int faceCol;
 	private static boolean[] alternateCols = new boolean[2];
+	private static int fps;
+	private static int tps;
+	private static int steps;
+	private static boolean[] devMode = new boolean[2];
 
 	private static JFrame frame;
 
@@ -65,7 +69,7 @@ public class Game extends Canvas implements Runnable {
 	private BufferedImage image2 = new BufferedImage(WIDTH, HEIGHT - 30,
 			BufferedImage.TYPE_INT_RGB);
 	private Screen screen;
-	private InputHandler input;
+	private static InputHandler input;
 	private WindowHandler window;
 	private LevelHandler level;
 	private Player player;
@@ -95,6 +99,8 @@ public Game() {
 		getFrame().setLocationRelativeTo(null);
 		getFrame().setVisible(true);
 
+		setDevMode(false);
+		setDevTime(false);
 	}
 
 	public void init() {
@@ -117,7 +123,7 @@ public void init() {
 		setMap("/levels/custom_level.png");
 		setMap(1);
 		Packet00Login loginPacket = new Packet00Login(player.getUsername(),
-				player.getX(), player.getY());
+				(int) player.getX(), (int) player.getY());
 
 		if (socketServer != null) {
 			socketServer.addConnection((PlayerMP) getPlayer(), loginPacket);
@@ -215,6 +221,8 @@ public void run() {
 			if (System.currentTimeMillis() - lastTimer >= 1000) {
 				lastTimer += 1000;
 				getFrame().setTitle("JavaGame - Version "+WordUtils.capitalize(game_Version).substring(1, game_Version.length()));
+				fps = frames;
+				tps = ticks;
 				frames = 0;
 				ticks = 0;
 			}
@@ -234,8 +242,8 @@ public void render() {
 			return;
 		}
 
-		int xOffset = getPlayer().getX() - (screen.getWidth() / 2);
-		int yOffset = getPlayer().getY() - (screen.getHeight() / 2);
+		int xOffset = (int) getPlayer().getX() - (screen.getWidth() / 2);
+		int yOffset = (int) getPlayer().getY() - (screen.getHeight() / 2);
 
 		getLevel().renderTiles(screen, xOffset, yOffset);
 
@@ -304,6 +312,7 @@ public void render() {
 		g.drawString("Press Q to quit", (getWidth()/2)-("Press Q to quit".length()*3), getHeight() -17);
 		g.setColor(Color.YELLOW);
 		g.drawString(time.getTime(), (getWidth() - 58), (getHeight() - 3));
+		status(g, isDevMode());
 		g.setColor(Color.WHITE);
 		if (noAudioDevice == true) {
 			g.setColor(Color.RED);
@@ -338,6 +347,19 @@ public void render() {
 		bs.show();
 	}
 
+	private void status(Graphics g, boolean TerminalMode) {
+		if (TerminalMode == true){
+			g.setColor(Color.GREEN);
+			g.drawString("JavaGame Stats", 0, 10);
+			g.drawString("FPS/TPS: " + fps + "/" + tps, 0, 25);
+			if ((player.getNumSteps() & 15) == 15) {
+				steps += 1;
+			}
+			g.drawString("Foot Steps: " + steps, 0, 40);
+			g.drawString("NPC: " + WordUtils.capitalize(String.valueOf(isNpc())) , 0, 55);
+		}
+	}
+
 	public static void main(String[] args) {
 		new Menu().start();
 	}
@@ -514,4 +536,28 @@ public static void setAternateColsS(boolean alternateCols){
 		Game.alternateCols[0] = alternateCols;
 	}
 
+	public static InputHandler getInput() {
+		return input;
+	}
+
+	public void setInput(InputHandler input) {
+		Game.input = input;
+	}
+
+	public static boolean isDevMode() {
+		return devMode[0];
+	}
+
+	public static void setDevMode(boolean devMode) {
+		Game.devMode[0] = devMode;
+	}
+
+	public static boolean isDevTime() {
+		return devMode[1];
+	}
+
+	public static void setDevTime(boolean devTime) {
+		Game.devMode[1] = devTime;
+	}
+
 }

src/com/redomar/game/Game.java

@@ -3,6 +3,7 @@
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 
+import com.redomar.game.lib.SleepThread;
 import com.redomar.game.script.PrintTypes;
 import com.redomar.game.script.Printing;
 
@@ -39,7 +40,8 @@ public void toggle(boolean isPressed) {
 	private Printing print = new Printing();
 	private boolean PlayMusic = false;
 	private int map;
-
+	private boolean untoggle = false;
+	
 	public void keyPressed(KeyEvent e) {
 		toggleKey(e.getKeyCode(), true);
 	}
@@ -53,17 +55,24 @@ public void keyTyped(KeyEvent e) {
 	}
 
 	public void toggleKey(int keyCode, boolean isPressed) {
-		if (keyCode == KeyEvent.VK_W || keyCode == KeyEvent.VK_UP) {
-			getUp().toggle(isPressed);
-		}
-		if (keyCode == KeyEvent.VK_S || keyCode == KeyEvent.VK_DOWN) {
-			getDown().toggle(isPressed);
-		}
-		if (keyCode == KeyEvent.VK_A || keyCode == KeyEvent.VK_LEFT) {
-			getLeft().toggle(isPressed);
-		}
-		if (keyCode == KeyEvent.VK_D || keyCode == KeyEvent.VK_RIGHT) {
-			getRight().toggle(isPressed);
+		if(untoggle == false){
+			if (keyCode == KeyEvent.VK_W || keyCode == KeyEvent.VK_UP) {
+				getUp().toggle(isPressed);
+			}
+			if (keyCode == KeyEvent.VK_S || keyCode == KeyEvent.VK_DOWN) {
+				getDown().toggle(isPressed);
+			}
+			if (keyCode == KeyEvent.VK_A || keyCode == KeyEvent.VK_LEFT) {
+				getLeft().toggle(isPressed);
+			}
+			if (keyCode == KeyEvent.VK_D || keyCode == KeyEvent.VK_RIGHT) {
+				getRight().toggle(isPressed);
+			}
+		}else{
+			getUp().toggle(false);
+			getDown().toggle(false);
+			getLeft().toggle(false);
+			getRight().toggle(false);
 		}
 		if (keyCode == KeyEvent.VK_M) {
 			this.setPlayMusic(true);
@@ -102,7 +111,20 @@ public void toggleKey(int keyCode, boolean isPressed) {
 			Game.getFrame().dispose();
 			System.exit(1);
 		}
+
+		if (keyCode == KeyEvent.VK_BACK_QUOTE){
+			if (Game.isDevTime() == false && Game.isDevMode() == false){
+				Game.setDevMode(true);
+				Game.setDevTime(true);
+				new Thread(new SleepThread());
+			}
+		}
+	}
+	
+	public void untoggle(boolean toggle){
+		this.untoggle = toggle;
 	}
+	
 
 	public int getMap() {
 		return map;
@@ -152,4 +174,12 @@ public void setRight(Key right) {
 		this.right = right;
 	}
 
+	public boolean isUntoggle() {
+		return untoggle;
+	}
+
+	public void setUntoggle(boolean untoggle) {
+		this.untoggle = untoggle;
+	}
+
 }

src/com/redomar/game/InputHandler.java

@@ -1,5 +1,7 @@
 package com.redomar.game.entities;
 
+import java.util.List;
+
 import com.redomar.game.Game;
 import com.redomar.game.entities.efx.Swim;
 import com.redomar.game.gfx.Colours;
@@ -10,27 +12,33 @@ 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() {
 
-		followMovementAI(getX(), getY(), Game.getPlayer().getX(), Game
-				.getPlayer().getY(), xa, ya, this);
+		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, speed, this);
+		}else{
+			isMoving = false;
+		}
 
-		setSwim(new Swim(level, getX(), getY()));
+		setSwim(new Swim(level, (int) getX(), (int) getY()));
 		swimType = getSwim().swimming(isSwimming, isMagma, isMuddy);
 		isSwimming = swimType[0];
 		isMagma = swimType[1];
@@ -57,11 +65,14 @@ public void render(Screen screen) {
 		} else if (movingDir > 1) {
 			xTile += 4 + ((numSteps >> walkingSpeed) & 1) * 2;
 			flipTop = (movingDir - 1) % 2;
+			if(!isMoving){
+				xTile = 4;
+			}
 		}
 
 		int modifier = 8 * scale;
-		int xOffset = getX() - modifier / 2;
-		int yOffset = getY() - modifier / 2 - 4;
+		int xOffset = (int) getX() - modifier / 2;
+		int yOffset = (int) getY() - modifier / 2 - 4;
 
 		if (isSwimming || isMagma || isMuddy) {
 			swimColour = getSwim().waveCols(isSwimming, isMagma, isMuddy);
@@ -104,39 +115,6 @@ public void render(Screen screen) {
 		}
 	}
 
-	public boolean hasCollided(int xa, int 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)) {
-				return true;
-			}
-		}
-
-		for (int x = xMin; x < xMax; x++) {
-			if (isSolid(xa, ya, x, yMax)) {
-				return true;
-			}
-		}
-
-		for (int y = yMin; y < yMax; y++) {
-			if (isSolid(xa, ya, xMin, y)) {
-				return true;
-			}
-		}
-
-		for (int y = yMin; y < yMax; y++) {
-			if (isSolid(xa, ya, xMax, y)) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
 	public Swim getSwim() {
 		return swim;
 	}

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

@@ -5,7 +5,7 @@
 
 public abstract class Entity {
 
-	protected int x, y;
+	protected double x, y;
 	protected LevelHandler level;
 
 	public Entity(LevelHandler level) {
@@ -20,15 +20,15 @@ public final void init(LevelHandler level) {
 
 	public abstract void render(Screen screen);
 
-	public int getX() {
+	public double getX() {
 		return x;
 	}
 
 	public void setX(int x) {
 		this.x = x;
 	}
 
-	public int getY() {
+	public double getY() {
 		return y;
 	}