Tournament

.gitignore

@@ -74,3 +74,23 @@ Temporary Items
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
+# RoboCode
+
+*META-INF*
+ReadMe.txt
+ReadMe.html
+compilers*
+config*
+desktop*
+javadoc*
+libs*
+meleerumble*
+net*
+robocode/*
+robots/sample*
+roborumble*
+teamrumble*
+templates*
+theme*
+twinduel*
+versions.md

README.md

@@ -1,9 +1,22 @@
 # Robocode - Darby Computer Club Battles
 
+[![Summary graphic for the latest battle](https://darbycomputerclub.github.io/darbyrobocode/results/melee/darbygraphic.png)](https://darbycomputerclub.github.io/darbyrobocode/results/melee/darby-col.txt)<br>
+[view leaderboard](https://darbycomputerclub.github.io/darbyrobocode/results/melee/darby-col.txt) | [download battle record](https://darbycomputerclub.github.io/darbyrobocode/results/melee/darby.br)
+
 [![Circle CI](https://circleci.com/gh/DarbyComputerClub/darbyrobocode/tree/master.svg?style=svg)](https://circleci.com/gh/DarbyComputerClub/darbyrobocode/tree/master)
 
 This version of robocode is for the Darby Computer Club. 
 
 To add your self to the battle, make a fork and add your robot to the `robots` folder in the form `robots/lastname/firstname/RobotName.java`. Then, submit a pull request.
 
-If you are signed in to github, you can access the artifacts from the build which will contain the battle replay.  If you do not have access to these artifacts, submit a comment here: https://github.com/DarbyComputerClub/darbyrobocode/issues/1
+Current battles run:
+  - darby.battle
+    - sample.Corners
+    - sample.Fire
+    - sample.MyFirstRobot
+    - sample.SittingDuck
+    - sample.Walls
+    - io.github.enzanki_ars.AlexSimpleBot*
+    - io.github.jacobsims.AimingBot*
+
+If you would like to see the most recent battle, download [this battle record](https://darbycomputerclub.github.io/darbyrobocode/results/melee/darby.br) or take a look at [the leaderboard](https://darbycomputerclub.github.io/darbyrobocode/results/melee/darby-col.txt)

battles/1v1/enz_v_jac.battle

@@ -0,0 +1,10 @@
+#Battle Properties
+robocode.battleField.width=800
+robocode.battleField.height=600
+robocode.battle.numRounds=10
+robocode.battle.gunCoolingRate=0.1
+robocode.battle.rules.inactivityTime=450
+robocode.battle.hideEnemyNames=true
+# ADD YOUR ROBOT HERE IN THE FORM lastname.firstname.RobotName*
+#                                           star is important ^
+robocode.battle.selectedRobots=io.github.enzanki_ars.AlexSimpleBot*,io.github.jacobsims.AimingBot*

battles/1v1/enz_v_wall.battle

@@ -0,0 +1,10 @@
+#Battle Properties
+robocode.battleField.width=800
+robocode.battleField.height=600
+robocode.battle.numRounds=10
+robocode.battle.gunCoolingRate=0.1
+robocode.battle.rules.inactivityTime=450
+robocode.battle.hideEnemyNames=true
+# ADD YOUR ROBOT HERE IN THE FORM lastname.firstname.RobotName*
+#                                           star is important ^
+robocode.battle.selectedRobots=io.github.enzanki_ars.AlexSimpleBot*,sample.Walls

battles/1v1/jac_v_wall.battle

@@ -0,0 +1,10 @@
+#Battle Properties
+robocode.battleField.width=800
+robocode.battleField.height=600
+robocode.battle.numRounds=10
+robocode.battle.gunCoolingRate=0.1
+robocode.battle.rules.inactivityTime=450
+robocode.battle.hideEnemyNames=true
+# ADD YOUR ROBOT HERE IN THE FORM lastname.firstname.RobotName*
+#                                           star is important ^
+robocode.battle.selectedRobots=sample.Walls,io.github.jacobsims.AimingBot*

battles/melee/darby.battle

@@ -0,0 +1,10 @@
+#Battle Properties
+robocode.battleField.width=800
+robocode.battleField.height=600
+robocode.battle.numRounds=20
+robocode.battle.gunCoolingRate=0.1
+robocode.battle.rules.inactivityTime=450
+robocode.battle.hideEnemyNames=true
+# ADD YOUR ROBOT HERE IN THE FORM lastname.firstname.RobotName*
+#                                           star is important ^
+robocode.battle.selectedRobots=io.github.enzanki_ars.AlexSimpleBot*,io.github.jacobsims.AimingBot*

battles/darby.battle → battles/melee/withsample.battle

@@ -1,10 +1,10 @@
 #Battle Properties
 robocode.battleField.width=800
 robocode.battleField.height=600
-robocode.battle.numRounds=10
+robocode.battle.numRounds=20
 robocode.battle.gunCoolingRate=0.1
 robocode.battle.rules.inactivityTime=450
 robocode.battle.hideEnemyNames=true
 # ADD YOUR ROBOT HERE IN THE FORM lastname.firstname.RobotName*
 #                                           star is important ^
-robocode.battle.selectedRobots=sample.Corners,sample.Fire,sample.MyFirstRobot,sample.SittingDuck,sample.Walls,io.github.enzanki_ars.DemoBot*,io.github.jacobsims.AimingBot*
+robocode.battle.selectedRobots=sample.Corners,sample.Fire,sample.MyFirstRobot,sample.RamFire,sample.Target,sample.TrackFire,sample.Walls,sample.Crazy,io.github.enzanki_ars.AlexSimpleBot*,io.github.jacobsims.AimingBot*

battles/tournament/withsample.tournament

@@ -0,0 +1,10 @@
+#Battle Properties
+robocode.battleField.width=800
+robocode.battleField.height=600
+robocode.battle.numRounds=5
+robocode.battle.gunCoolingRate=0.1
+robocode.battle.rules.inactivityTime=450
+robocode.battle.hideEnemyNames=true
+# ADD YOUR ROBOT HERE IN THE FORM lastname.firstname.RobotName*
+#                                           star is important ^
+darby.tournament.selectedRobots=sample.Corners,sample.Fire,sample.MyFirstRobot,sample.RamFire,sample.Target,sample.TrackFire,sample.Walls,sample.Crazy,io.github.enzanki_ars.AlexSimpleBot*,io.github.jacobsims.AimingBot*

circle.yml

@@ -1,27 +1,22 @@
 general:
   artifacts: 
-    - "darbyrecord.br"
-    - "results-columns.txt"
+    - "~/battles/"
   branches:
     ignore:
       - gh-pages
 
 dependencies:
+  pre:
+    - pip install --user cairosvg pyjavaproperties
   override:
-    - unzip robocode-1.9.2.5-setup.jar
+    - cp -R run ~/run
+    - unzip ~/run/robocode-1.9.2.5-setup.jar -d .
+    - mkdir ~/battles
 
 test:
   override:
-    - find robots/ -name '*.java' -print0 | xargs -0 javac -classpath "$CLASSPATH":./libs/robocode.jar:./robots -deprecation -g -source 1.6 -encoding UTF-8
-    - java -Xmx512M -Dsun.io.useCanonCaches=false -cp libs/robocode.jar robocode.Robocode -battle battles/darby.battle -nodisplay -results results.txt -nosound -record darbyrecord.br
-    - column -ts $'\t' results.txt | tee results-columns.txt
-  post:
-    - mkdir ~/results/
-    - cp darbyrecord.br results-columns.txt ../results/
-    - git checkout gh-pages
-    - cp ../results/results-columns.txt ../results/darbyrecord.br .
-    - git config user.email '@'
-    - git config user.name 'CircleCI'
-    - git add results-columns.txt darbyrecord.br
-    - git commit -m 'Update published battle'
-    - git push
+    - find robots/ -name '*.java' -print0 | xargs -0 javac -classpath "$CLASSPATH":./libs/robocode.jar:./robots -encoding UTF-8:
+        parallel: true
+    - ~/run/runner.py:
+        parallel: true
+    - ~/run/upload.py

robots/io/github/enzanki_ars/AlexSimpleBot.java

@@ -0,0 +1,53 @@
+package io.github.enzanki_ars;
+import robocode.*;
+import java.awt.Color;
+
+// API help : http://robocode.sourceforge.net/docs/robocode/robocode/Robot.html
+
+/**
+ * DemoBot - a robot by Alex Shafer
+ */
+public class AlexSimpleBot extends AdvancedRobot
+{
+	private boolean cantSeeBot = true;
+
+	public void run() {
+		setColors(Color.green,Color.blue,Color.red);
+		setAdjustGunForRobotTurn(true);
+		while(true) {
+			if (cantSeeBot) {
+				setTurnGunLeft(10);
+				setAhead(20);
+			}
+			else {
+				cantSeeBot = true;
+			}
+			execute();
+		}
+	}
+
+	public void onScannedRobot(ScannedRobotEvent e) {
+		cantSeeBot = false;
+		setTurnGunRight(0);
+		setFire(2);
+	}
+
+	public void onHitByBullet(HitByBulletEvent e) {
+		setBack(10);
+		execute();
+	}
+
+	public void onHitRobot(HitRobotEvent e) {
+		setBack(10);
+		execute();
+	}
+
+	/**
+	 * onHitWall: What to do when you hit a wall
+	 */
+	public void onHitWall(HitWallEvent e) {
+		setBack(20);
+		setTurnLeft(180);
+		execute();
+	}	
+}

robots/io/github/jacobsims/AimingBot.java

@@ -44,7 +44,7 @@ public void onScannedRobot(ScannedRobotEvent e) {
 		double eBearingRelGun = Utils.normalRelativeAngleDegrees(e.getBearing() - (getGunHeading() - getHeading()));
 		double currentPerpAxis = Math.sin(Math.toRadians(eBearingRelGun)) * e.getDistance();
 		double currentHeadAxis = Math.cos(Math.toRadians(eBearingRelGun)) * e.getDistance();
-		double eHeadingRelGun = Utils.normalRelativeAngleDegrees(e.getHeading() - (getGunHeading() - getHeading()));
+		double eHeadingRelGun = Utils.normalRelativeAngleDegrees(e.getHeading() - (getGunHeading()));
 		double projectedPerpAxis = 0;
 		double projectedHeadAxis = 0;
 		double projectionTime = (e.getDistance() / Rules.getBulletSpeed(bulletPower));

run/geninfo.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+git checkout gh-pages
+git pull
+mkdir results
+cp -r ~/battles/* .
+git config user.email '@' && git config user.name 'CircleCI'
+git add .
+git commit -m "Update published battles $CIRCLE_BUILD_NUM"
+git pull
+git push
+git checkout master

run/robocoderun.py

@@ -0,0 +1,11 @@
+import subprocess
+
+def robocoderun(battlefile, resultsfile, recordfile):
+    code = subprocess.call(['java', '-Xmx512M', '-Dsun.io.useCanonCaches=false', '-cp', 'libs/robocode.jar',
+                            'robocode.Robocode',
+                            '-battle', battlefile,
+                            '-nodisplay',
+                            '-results', resultsfile,
+                            '-nosound',
+                            '-record', recordfile])
+    return code