v1.8 Alpha - Projectiles

Author: redomar

README.md

@@ -1,7 +1,5 @@
-JavaGame Alpha v1.7.1 - 1 Year Anniversary
-=====================
-
-[![Ohloh Stats](https://www.ohloh.net/p/JavaGame/widgets/project_thin_badge.gif)](https://www.ohloh.net/p/JavaGame)
+JavaGame Alpha v1.8
+===================
 
 #####What is JavaGame?
 JavaGame is a game project that have been working on since May 2013. I have added many features to the game over the last year and I plan on adding even more features. This game is purely for my own sake to practice my skills in Java.
@@ -15,6 +13,12 @@ Well i'm still not sure what exactly i'm going to do with it, and I haven't thou
 * For multiplayer enabled get 
    * [v1.5.4](https://github.com/redomar/JavaGame/releases/tag/v1.5.4)
 
+#####Your version naming is all wrong
+Yes, I recently noticed that there is a standard called Semantic Versioning that I should follow. Currently my project isn't organised as well as I hoped so starting from the Beta I will follow Semantic Versioning schema.
+
+#####Your project is lacking comments
+I don't know why I have not commented my code but now I'm at a stage where I cannot go back to comment the entire project, I should of commented my code from the outset. This is going to be a reminder for me in the future.
+
 #####How to download this repository for eclipse tutorial
 Watch this video [here](http://youtu.be/_3nCgac3KKM) or checkout the [GitHub Pages](http://redomar.github.io/JavaGame/)
 ####How to use this repository
@@ -32,4 +36,5 @@ Watch this video [here](http://youtu.be/_3nCgac3KKM) or checkout the [GitHub Pag
 * Push to the branch (```git push origin my_branch```)
 * Open a [Pull Request](https://github.com/redomar/JavaGame/pull/new/master)
 
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/redomar/javagame/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/redomar/javagame/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+[![Ohloh Stats](https://www.ohloh.net/p/JavaGame/widgets/project_thin_badge.gif)](https://www.ohloh.net/p/JavaGame)

jar/javagame.jar

@@ -17,6 +17,7 @@
 import com.redomar.game.entities.Dummy;
 import com.redomar.game.entities.Player;
 import com.redomar.game.entities.PlayerMP;
+import com.redomar.game.entities.Vendor;
 import com.redomar.game.gfx.Screen;
 import com.redomar.game.gfx.SpriteSheet;
 import com.redomar.game.level.LevelHandler;
@@ -34,7 +35,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.7.1 Alpha";
+	private static final String game_Version = "v1.8 Alpha";
 	private static final int WIDTH = 160;
 	private static final int HEIGHT = (WIDTH / 3 * 2);
 	private static final int SCALE = 3;
@@ -71,10 +72,12 @@ public class Game extends Canvas implements Runnable {
 			BufferedImage.TYPE_INT_RGB);
 	private Screen screen;
 	private static InputHandler input;
+	private static MouseHandler mouse;
 	private WindowHandler window;
 	private LevelHandler level;
 	private Player player;
 	private Dummy dummy;
+	private Vendor vendor;
 	private Music music = new Music();
 	private Font font = new Font();
 	private Thread musicThread = new Thread(music, "MUSIC");
@@ -88,7 +91,7 @@ public class Game extends Canvas implements Runnable {
 
 	/**
 	 * @author Redomar
-	 * @version Alpha 1.7.1
+	 * @version Alpha 1.8
 	 */
 	public Game() {
 		setMinimumSize(new Dimension(WIDTH * SCALE, HEIGHT * SCALE));
@@ -124,6 +127,7 @@ public void init() {
 
 		screen = new Screen(WIDTH, HEIGHT, new SpriteSheet("/sprite_sheet.png"));
 		input = new InputHandler(this);
+		setMouse(new MouseHandler(this));
 		setWindow(new WindowHandler(this));
 		setMap("/levels/custom_level.png");
 		setMap(1);
@@ -136,6 +140,9 @@ public void init() {
 
 		// socketClient.sendData("ping".getBytes());
 		loginPacket.writeData(getSocketClient());
+		
+		game.setVendor(new Vendor(getLevel(), "Vendor", 215, 215, 304, 543));
+		getLevel().addEntity(getVendor());
 	}
 
 	public void setMap(String Map_str) {
@@ -159,7 +166,7 @@ public void setMap(String Map_str) {
 
 	public static void npcSpawn() {
 		if (isNpc() == true) {
-			game.setDummy(new Dummy(Game.getLevel(), "h", 215, 215, 500, 543));
+			game.setDummy(new Dummy(Game.getLevel(), "Dummy", 100, 150, 500, 543));
 			game.level.addEntity(Game.getDummy());
 		}
 	}
@@ -260,6 +267,7 @@ public void render() {
 		 */
 
 		getLevel().renderEntities(screen);
+		getLevel().renderProjectileEntities(screen);
 
 		for (int y = 0; y < screen.getHeight(); y++) {
 			for (int x = 0; x < screen.getWidth(); x++) {
@@ -292,11 +300,16 @@ public void render() {
 		}
 
 		if (changeLevel == true) {
+			print.print("Teleported into new world", PrintTypes.GAME);
 			if (getMap() == 1) {
 				setMap("/levels/water_level.png");
+				getLevel().removeEntity(getDummy()); setNpc(false);
+				getLevel().removeEntity(getVendor());
 				setMap(2);
 			} else if (getMap() == 2) {
 				setMap("/levels/custom_level.png");
+				getLevel().removeEntity(getDummy()); setNpc(false);
+				getLevel().addEntity(getVendor());
 				setMap(1);
 			}
 			changeLevel = false;
@@ -305,6 +318,7 @@ public void render() {
 		Graphics g = bs.getDrawGraphics();
 		g.drawRect(0, 0, getWidth(), getHeight());
 		g.drawImage(image, 0, 0, getWidth(), getHeight() - 30, null);
+		status(g, isDevMode(), isClosing());
 		// Font.render("Hi", screen, 0, 0, Colours.get(-1, -1, -1, 555), 1);
 		g.drawImage(image2, 0, getHeight() - 30, getWidth(), getHeight(), null);
 		g.setColor(Color.WHITE);
@@ -317,7 +331,6 @@ 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(), isClosing());
 		g.setColor(Color.WHITE);
 		if (noAudioDevice == true) {
 			g.setColor(Color.RED);
@@ -354,14 +367,18 @@ public void render() {
 
 	private void status(Graphics g, boolean TerminalMode, boolean TerminalQuit) {
 		if (TerminalMode == true){
-			g.setColor(Color.GREEN);
+			g.setColor(Color.CYAN);
 			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);
+			g.drawString("Mouse: " + getMouse().getX() + "x |" + getMouse().getY() + "y", 0, 70);
+			if(getMouse().getButton() != -1) g.drawString("Button: " + getMouse().getButton(), 0, 85);
+			g.setColor(Color.CYAN);
+			g.fillRect(getMouse().getX()-12, getMouse().getY()-12, 24, 24);
 		}
 		if (TerminalQuit == true){
 			g.setColor(Color.BLACK);
@@ -488,6 +505,14 @@ public void setDummy(Dummy dummy) {
 		this.dummy = dummy;
 	}
 
+	public Vendor getVendor() {
+		return vendor;
+	}
+
+	public void setVendor(Vendor vendor) {
+		this.vendor = vendor;
+	}
+
 	public static String getJdata_IP() {
 		return Jdata_IP;
 	}
@@ -556,6 +581,14 @@ public void setInput(InputHandler input) {
 		Game.input = input;
 	}
 
+	public static MouseHandler getMouse() {
+		return mouse;
+	}
+
+	public static void setMouse(MouseHandler mouse) {
+		Game.mouse = mouse;
+	}
+
 	public static boolean isDevMode() {
 		return devMode;
 	}

res/sprite_sheet.png

@@ -4,6 +4,7 @@
 import java.awt.event.KeyListener;
 
 import com.redomar.game.lib.SleepThread;
+import com.redomar.game.script.PopUp;
 import com.redomar.game.script.PrintTypes;
 import com.redomar.game.script.Printing;
 
@@ -31,6 +32,11 @@ public void toggle(boolean isPressed) {
 				numTimesPressed++;
 			}
 		}
+		
+		public void off(){
+			pressed = false;
+			numTimesPressed = 0;
+		}
 	}
 
 	private Key up = new Key();
@@ -40,7 +46,8 @@ public void toggle(boolean isPressed) {
 	private Printing print = new Printing();
 	private boolean PlayMusic = false;
 	private int map;
-	private boolean untoggle = false;
+	private boolean ignoreInput = false;
+	private PopUp popup = new PopUp();
 
 	public void keyPressed(KeyEvent e) {
 		toggleKey(e.getKeyCode(), true);
@@ -55,7 +62,7 @@ public void keyTyped(KeyEvent e) {
 	}
 
 	public void toggleKey(int keyCode, boolean isPressed) {
-		if(untoggle == false){
+		if(isIgnoreInput() == false){
 			if (keyCode == KeyEvent.VK_W || keyCode == KeyEvent.VK_UP) {
 				getUp().toggle(isPressed);
 			}
@@ -68,7 +75,8 @@ public void toggleKey(int keyCode, boolean isPressed) {
 			if (keyCode == KeyEvent.VK_D || keyCode == KeyEvent.VK_RIGHT) {
 				getRight().toggle(isPressed);
 			}
-		}else{
+		}
+		if(isIgnoreInput() == true){
 			getUp().toggle(false);
 			getDown().toggle(false);
 			getLeft().toggle(false);
@@ -87,11 +95,18 @@ public void toggleKey(int keyCode, boolean isPressed) {
 			// }
 			if (Game.getMap() == 2) {
 				Game.setChangeLevel(true);
-				Game.getLevel().removeEntity(Game.getDummy());
 				Game.setNpc(false);
 			}
 		}
 		if (keyCode == KeyEvent.VK_N) {
+			if (Game.getPlayer().isMoving()){
+				setIgnoreInput(true);
+				int n = popup.Warn("Stop moving before spawing dummy AI");
+				if(n == 0){
+					setIgnoreInput(false);
+				}
+				return;
+			}
 			if (Game.isNpc() == false) {
 				Game.setNpc(true);
 				Game.npcSpawn();
@@ -127,7 +142,7 @@ public void toggleKey(int keyCode, boolean isPressed) {
 	}
 
 	public void untoggle(boolean toggle){
-		this.untoggle = toggle;
+		this.ignoreInput = toggle;
 	}
 
 
@@ -179,12 +194,12 @@ public void setRight(Key right) {
 		this.right = right;
 	}
 
-	public boolean isUntoggle() {
-		return untoggle;
+	public boolean isIgnoreInput() {
+		return ignoreInput;
 	}
 
-	public void setUntoggle(boolean untoggle) {
-		this.untoggle = untoggle;
+	public void setIgnoreInput(boolean ignoreInput) {
+		this.ignoreInput = ignoreInput;
 	}
 
 }

src/com/redomar/game/Game.java

@@ -0,0 +1,60 @@
+package com.redomar.game;
+
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+
+public class MouseHandler implements MouseListener, MouseMotionListener{
+	
+	private static int mouseX = -1;
+	private static int mouseY = -1;
+	private static int mouseB = -1;
+	
+	public MouseHandler(Game game){
+		game.addMouseListener(this);
+		game.addMouseMotionListener(this);
+	}
+
+	public int getX() {
+		return mouseX;
+	}
+
+	public int getY() {
+		return mouseY;
+	}
+
+	public int getButton() {
+		return mouseB;
+	}
+
+	public void mouseDragged(MouseEvent e) {
+		mouseX = e.getX();
+		mouseY = e.getY();
+	}
+
+	public void mouseMoved(MouseEvent e) {
+		mouseX = e.getX();
+		mouseY = e.getY();
+	}
+
+	public void mouseClicked(MouseEvent e) {
+		
+	}
+	
+	public void mousePressed(MouseEvent e) {
+		mouseB = e.getButton();
+	}
+
+	public void mouseReleased(MouseEvent e) {
+		mouseB = -1;
+	}
+
+	public void mouseEntered(MouseEvent e) {
+		
+	}
+
+	public void mouseExited(MouseEvent e) {
+		
+	}
+	
+}

src/com/redomar/game/InputHandler.java

@@ -26,7 +26,7 @@ public class Dummy extends Mob {
 
 	public Dummy(LevelHandler level, String name, int x, int y, int shirtCol,
 			int faceCol) {
-		super(level, "h", x, y, speed, collisionBoders);
+		super(level, name, x, y, speed, collisionBoders);
 		this.faceCol = faceCol;
 		this.shirtCol = shirtCol;
 		this.colour = Colours.get(-1, 111, shirtCol, faceCol);

src/com/redomar/game/MouseHandler.java

@@ -6,6 +6,7 @@
 public abstract class Entity {
 
 	protected double x, y;
+	protected String name;
 	protected LevelHandler level;
 
 	public Entity(LevelHandler level) {
@@ -35,4 +36,12 @@ public double getY() {
 	public void setY(int y) {
 		this.y = y;
 	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
 }