Merge branch 'feature' into aside

Author: redomar

src/com/redomar/game/InputHandler.java

@@ -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);
@@ -92,6 +100,14 @@ public void toggleKey(int keyCode, boolean isPressed) {
 			}
 		}
 		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 +143,7 @@ public void toggleKey(int keyCode, boolean isPressed) {
 	}
 
 	public void untoggle(boolean toggle){
-		this.untoggle = toggle;
+		this.ignoreInput = toggle;
 	}
 
 
@@ -179,12 +195,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/entities/Mob.java

@@ -225,6 +225,10 @@ public int getNumSteps() {
 	public void setMoving(boolean isMoving) {
 		this.isMoving = isMoving;
 	}
+	
+	public boolean isMoving(){
+		return this.isMoving;
+	}
 
 	public void setMovingDir(int movingDir) {
 		this.movingDir = movingDir;

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

@@ -43,16 +43,16 @@ public void tick() {
 		double ya = 0;
 
 		if (input != null) {
-			if (input.getUp().isPressed()) {
+			if (input.getUp().isPressed() && input.isIgnoreInput() == false) {
 				ya -= speed;
 			}
-			if (input.getDown().isPressed()) {
+			if (input.getDown().isPressed() && input.isIgnoreInput() == false) {
 				ya += speed;
 			}
-			if (input.getLeft().isPressed()) {
+			if (input.getLeft().isPressed() && input.isIgnoreInput() == false) {
 				xa -= speed;
 			}
-			if (input.getRight().isPressed()) {
+			if (input.getRight().isPressed() && input.isIgnoreInput() == false) {
 				xa += speed;
 			}
 		}

src/com/redomar/game/script/PopUp.java

@@ -0,0 +1,21 @@
+package com.redomar.game.script;
+
+import javax.swing.JFrame;
+import javax.swing.JOptionPane;
+
+import com.redomar.game.Game;
+
+public class PopUp{
+	
+	private JFrame frame;
+	
+	public PopUp(){
+		frame = Game.getFrame();
+	}
+	
+	public int Warn(String msg){
+		Object[] options = {"Continue"};
+		return JOptionPane.showOptionDialog(frame, msg, "Notice", JOptionPane.YES_OPTION, JOptionPane.QUESTION_MESSAGE,
+				null, options, options[0]);
+	}
+}