Manual merge of pull request #6 for Naval Robocode as this pull request could not be automatically merged with GitHub as it contained merge conflicts.

Author: flemming-n-larsen

naval-robocode-versions.md

@@ -1,10 +1,11 @@
-## Naval Robocode Version 0.9.2 (28-Feb-2015)
+## Naval Robocode Version 0.9.2 (02-Mar-2015)
 
 ### Changes
 * Merged all changes with Naval Robocode with Robocode 1.9.2.4 (newest version).
 * Flemming clean-up and Naval Robocode specification
 * Now able to use naval-robocode.bat to start Naval Robocode
 * Fixed a few UnitTests that fell short due to a few missing classes
+* The in-game editor can now create a sample ship for you.
 
 ### Bug fixes
 * Mines now have a blast Radius. (See NavalRules)

robocode.content/src/main/resources/templates/newship.tpt

@@ -0,0 +1,78 @@
+package $PACKAGE;
+
+import java.awt.Color;
+
+import robocode.HitRobotEvent;
+import robocode.HitWallEvent;
+import robocode.ScannedShipEvent;
+import robocode.Ship;
+
+/**
+ * $CLASSNAME - a ship by (your name here)
+ */
+public class $CLASSNAME extends Ship{
+	int direction = 1;
+	
+	/**
+	 * run: $CLASSNAME's default behavior
+	 */
+	public void run(){
+		// The following components can all be colored seperately
+		// Setup
+		setBodyColor(Color.red);
+		setFrontCannonColor(Color.orange);
+		setBackCannonColor(Color.yellow);
+		setRadarColor(Color.green);
+		setMineComponentColor(Color.cyan);
+		setBulletColor(Color.blue);
+		setScanColor(Color.magenta);
+		
+		//Easy way to make your radar go in circles forever
+		setTurnRadarRightRadians(Double.POSITIVE_INFINITY);
+		
+		// Loop
+		while(true){
+			//Makes sure we go 4000 units toward a certain direction
+			setAhead(4000 * direction);
+			//Execute makes sure your commands actually get executed. You could see it
+			//as if you're ending your turn.
+			//Try removing the execute command. You'll see that that your Ship
+			//won't even move! This is because you'll end up saying "Go ahead!" an infinite 
+			//amount of times, without ever ending your turn.
+			execute();
+		}
+	}
+	// When a wall is hit, reverse direction and make a slight turn.
+	public void onHitWall(HitWallEvent event){
+		direction *= -1;
+		setTurnRightDegrees(45);
+	}
+
+	public void onHitRobot(HitRobotEvent event){
+		//Fill in something you'd like your Ship to do when it hits another Ship
+	}
+	
+	public void onScannedShip(ScannedShipEvent event){
+		// The easiest way to target the scanned ship is to use these functions
+		// Turn your front cannon towards the ship
+		setTurnFrontCannonRightRadians(event.getBearingFrontRadians());
+		//At this point you've already told your ship to move 4000 ahead,
+		//AND you've told it to turn its front cannon
+		//All you gotta do now is wait for your cannon to reach its destination
+		while(getFrontCannonTurnRemainingRadians() != 0){
+			execute();
+			if(getFrontCannonAtBlindSpot())
+				break;
+		}
+		//If your front cannon is not at its blindspot
+		if(!getFrontCannonAtBlindSpot()){
+			//Then shoot!
+			fireFrontCannon(3);
+		}
+		//We waited all this time for our cannon to turn and it didn't even reach its target?!
+		else{
+			//Bomb the place.
+			placeMine(5);
+		}
+	}
+}

robocode.core/src/main/java/net/sf/robocode/core/RobocodeMain.java

@@ -18,6 +18,7 @@
 import net.sf.robocode.recording.BattleRecordFormat;
 import net.sf.robocode.recording.IRecordManager;
 import net.sf.robocode.repository.IRepositoryManager;
+import net.sf.robocode.security.HiddenAccess;
 import net.sf.robocode.serialization.SerializableOptions;
 import net.sf.robocode.settings.ISettingsManager;
 import net.sf.robocode.sound.ISoundManager;
@@ -134,7 +135,8 @@ public void uncaughtException(Thread thread, Throwable t) {
 
 				if (setup.battleFilename == null && versionManager.isLastRunVersionChanged()) {
 					properties.saveProperties();
-					windowManager.runIntroBattle();
+					if(!HiddenAccess.getNaval())
+						windowManager.runIntroBattle();
 				}
 			}
 

robocode.tests/src/test/java/net/sf/robocode/test/robots/TestConstructorHttpAttack.java

@@ -36,7 +36,7 @@ public void onTurnEnded(TurnEndedEvent event) {
 			messagedInitialization = true;	
 		}	
 
-		if (out.contains("access denied (java.net.SocketPermission")) {
+		if (out.contains("access denied (\"java.net.SocketPermission")) {
 			messagedAccessDenied = true;	
 		}	
 	}

robocode.tests/src/test/java/net/sf/robocode/test/robots/TestConstructorReflectionAttack.java

@@ -31,7 +31,7 @@ public void onTurnEnded(TurnEndedEvent event) {
 
 		final String out = event.getTurnSnapshot().getRobots()[0].getOutputStreamSnapshot();
 
-		if (out.contains("access denied (java.lang.reflect.ReflectPermission")) {
+		if (out.contains("access denied (\"java.lang.reflect.ReflectPermission")) {
 			messagedAccessDenied = true;
 		}
 	}

robocode.tests/src/test/java/net/sf/robocode/test/robots/TestConstructorSocketAttack.java

@@ -36,7 +36,7 @@ public void onTurnEnded(TurnEndedEvent event) {
 			messagedInitialization = true;	
 		}	
 
-		if (out.contains("access denied (java.net.SocketPermission")) {
+		if (out.contains("access denied (\"java.net.SocketPermission")) {
 			messagedAccessDenied = true;	
 		}	
 	}

robocode.tests/src/test/java/net/sf/robocode/test/robots/TestFileAttack.java

@@ -33,11 +33,11 @@ public void onTurnEnded(TurnEndedEvent event) {
 		super.onTurnEnded(event);
 		final String out = event.getTurnSnapshot().getRobots()[1].getOutputStreamSnapshot();
 
-		if (out.contains("Preventing tested.robots.FileAttack from access: (java.io.FilePermission C:\\MSDOS.SYS read)")) {
+		if (out.contains("Preventing tested.robots.FileAttack from access: (\"java.io.FilePermission\" \"C:\\MSDOS.SYS\" \"read\")")) {
 			messagedRead = true;
 		}
 		if (out.contains(
-				"Preventing tested.robots.FileAttack from access: (java.io.FilePermission C:\\Robocode.attack write)")) {
+				"Preventing tested.robots.FileAttack from access: (\"java.io.FilePermission\" \"C:\\Robocode.attack\" \"write\")")) {
 			messagedWrite = true;
 		}
 	}

robocode.tests/src/test/java/net/sf/robocode/test/robots/TestFileOutputStreamAttack.java

@@ -31,7 +31,7 @@ public void onTurnEnded(TurnEndedEvent event) {
 
 		final String out = event.getTurnSnapshot().getRobots()[0].getOutputStreamSnapshot();
 
-		if (out.contains("access denied (java.io.FilePermission")) {
+		if (out.contains("access denied (\"java.io.FilePermission")) {
 			messagedAccessDenied = true;	
 		}	
 	}

robocode.tests/src/test/java/net/sf/robocode/test/robots/TestHttpAttack.java

@@ -31,7 +31,7 @@ public void onTurnEnded(TurnEndedEvent event) {
 
 		final String out = event.getTurnSnapshot().getRobots()[0].getOutputStreamSnapshot();
 
-		if (out.contains("access denied (java.net.SocketPermission")) {
+		if (out.contains("access denied (\"java.net.SocketPermission")) {
 			messagedAccessDenied = true;	
 		}	
 	}

robocode.tests/src/test/java/net/sf/robocode/test/robots/TestReflectionAttack.java

@@ -31,7 +31,7 @@ public void onTurnEnded(TurnEndedEvent event) {
 
 		final String out = event.getTurnSnapshot().getRobots()[0].getOutputStreamSnapshot();
 
-		if (out.contains("access denied (java.lang.reflect.ReflectPermission")) {
+		if (out.contains("access denied (\"java.lang.reflect.ReflectPermission")) {
 			messagedAccessDenied = true;	
 		}	
 	}

robocode.tests/src/test/java/net/sf/robocode/test/robots/TestSocketAttack.java

@@ -31,9 +31,9 @@ public void onTurnEnded(TurnEndedEvent event) {
 
 		final String out = event.getTurnSnapshot().getRobots()[0].getOutputStreamSnapshot();
 
-		if (out.contains("access denied (java.net.SocketPermission")) {
+		if (out.contains("access denied (\"java.net.SocketPermission")) {	// In Thomas's version, the extra " is required
 			messagedAccessDenied = true;	
-		}	
+		}
 	}
 
 	@Override

robocode.ui.editor/src/main/java/net/sf/robocode/ui/editor/RobocodeEditor.java

@@ -212,6 +212,10 @@ public void createNewJavaFile() {
 	public void createNewRobot() {
 		createNewRobot("Robot");
 	}
+	
+	public void createNewShip(){
+		createNewRobot("Ship");
+	}
 
 	public void createNewJuniorRobot() {
 		createNewRobot("JuniorRobot");

robocode.ui.editor/src/main/java/net/sf/robocode/ui/editor/RobocodeEditorMenuBar.java

@@ -38,6 +38,8 @@ public void actionPerformed(ActionEvent e) {
 
 			if (source == RobocodeEditorMenuBar.this.getFileNewRobotMenuItem()) {
 				fileNewRobotActionPerformed();
+			} else if(source == RobocodeEditorMenuBar.this.getFileNewShipMenuItem()){	//For adding ships
+				fileNewShipActionPerformed();
 			} else if (source == RobocodeEditorMenuBar.this.getFileNewJuniorRobotMenuItem()) {
 				fileNewJuniorRobotActionPerformed();
 			} else if (source == RobocodeEditorMenuBar.this.getFileNewJavaFileMenuItem()) {
@@ -102,6 +104,7 @@ public void actionPerformed(ActionEvent e) {
 	private JMenuItem fileNewJavaFileMenuItem;
 	private JMenu fileNewMenu;
 	private JMenuItem fileNewRobotMenuItem;
+	private JMenuItem fileNewShipMenuItem;
 	private JMenuItem fileNewJuniorRobotMenuItem;
 
 	// Compiler menu
@@ -198,6 +201,13 @@ private void fileNewRobotActionPerformed() {
 		getFileSaveMenuItem().setEnabled(true);
 		getFileSaveAsMenuItem().setEnabled(true);
 	}
+	
+	private void fileNewShipActionPerformed(){
+		editor.createNewShip();
+		
+		getFileSaveMenuItem().setEnabled(true);
+		getFileSaveAsMenuItem().setEnabled(true);
+	}
 
 	private void fileNewJuniorRobotActionPerformed() {
 		editor.createNewJuniorRobot();
@@ -408,6 +418,7 @@ private JMenu getFileNewMenu() {
 			fileNewMenu.setText("New");
 			fileNewMenu.setMnemonic('N');
 			fileNewMenu.add(getFileNewRobotMenuItem());
+			fileNewMenu.add(getFileNewShipMenuItem());
 			fileNewMenu.add(getFileNewJuniorRobotMenuItem());
 			fileNewMenu.add(getFileNewJavaFileMenuItem());
 		}
@@ -424,6 +435,18 @@ private JMenuItem getFileNewRobotMenuItem() {
 		}
 		return fileNewRobotMenuItem;
 	}
+	
+	//New JMenuItem to add Ships
+	private JMenuItem getFileNewShipMenuItem(){
+		if(fileNewShipMenuItem == null){
+			fileNewShipMenuItem = new JMenuItem();
+			fileNewShipMenuItem.setText("Ship");
+			
+			fileNewShipMenuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Q, MENU_SHORTCUT_KEY_MASK));
+			fileNewShipMenuItem.addActionListener(eventHandler);
+		}
+		return fileNewShipMenuItem;
+	}
 
 	private JMenuItem getFileNewJuniorRobotMenuItem() {
 		if (fileNewJuniorRobotMenuItem == null) {