Skip to content

Refactoring 3 #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
androidmage merged 3 commits into from
Jan 8, 2016
Merged

Refactoring 3 #22

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29cca69
Merge pull request #10 from androidmage/master
jherd23 Jan 8, 2016
c15320f
Merge pull request #11 from androidmage/master
jherd23 Jan 8, 2016
6f70590
Refactoring 3
jherd23 Jan 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 9 additions & 47 deletions RobotPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public class RobotPlayer{
static Collection<Integer> enemyArchonIDs;
// Collection of <Archon ID, Archon Location, Round that measurement was taken>
static Collection<Triple<Integer,MapLocation,Integer>> mostRecentEnemyArchonLocations;
static Direction[] DIRECTIONS = new Direction[]{Direction.NORTH,Direction.NORTH_EAST,Direction.EAST,Direction.SOUTH_EAST,Direction.SOUTH,Direction.SOUTH_WEST,Direction.WEST,Direction.NORTH_WEST};

/**
* run
Expand Down Expand Up @@ -91,7 +92,7 @@ public void run() {
FancyMessage f = FancyMessage.getFromRecievedSignal(s);
MapLocation archonLocation = f.senderLocation;
Direction archonDirection = rc.getLocation().directionTo(archonLocation);
Direction oppositeDirection = RESOURCE_FUNCTIONS.getOpposite(archonDirection);
Direction oppositeDirection = archonDirection.opposite();
if (rc.isCoreReady() && rc.canMove(oppositeDirection)) {
rc.move(oppositeDirection);
}
Expand Down Expand Up @@ -140,7 +141,7 @@ public void run() {
FancyMessage f = FancyMessage.getFromRecievedSignal(s);
MapLocation archonLocation = f.senderLocation;
Direction archonDirection = rc.getLocation().directionTo(archonLocation);
Direction oppositeDirection = RESOURCE_FUNCTIONS.getOpposite(archonDirection);
Direction oppositeDirection = archonDirection.opposite();
if(rc.isCoreReady()){
if(rc.canMove(oppositeDirection)){
rc.move(oppositeDirection);
Expand Down Expand Up @@ -340,11 +341,7 @@ public static class RESOURCE_FUNCTIONS{
*
*/
public static Direction intToDir(int i){
Direction d = Direction.NORTH;
for(int j = 0; j < i; j++){
d = d.rotateRight();
}
return d;
return DIRECTIONS[(i + 8) % 8];
}

/**
Expand Down Expand Up @@ -376,15 +373,12 @@ public static MapLocation scanArchonLocation() {
*
*/
public static int dirToInt(Direction d){
if(d.equals(Direction.NONE)){
return -1;
}
int i = 0;
while(!d.equals(Direction.NORTH)){
d = d.rotateLeft();
i++;
for(int i = 0; i < DIRECTIONS.length; i++){
if(d.equals(DIRECTIONS[i])){
return i;
}
}
return i;
return 0;
}

/**
Expand Down Expand Up @@ -690,38 +684,6 @@ public static boolean BUG(MapLocation target) throws GameActionException{
rc.setIndicatorString(0,"Failed outside of branch");
return false;
}

/**
*
* MapLocation getOpposite
* @param A direction
* @return Returns the opposite direction of the given direction
*
*/
public static Direction getOpposite(Direction archonDirection){
if(archonDirection.equals(Direction.NORTH)){
return Direction.SOUTH;
}
if(archonDirection.equals(Direction.SOUTH)){
return Direction.NORTH;
}
if(archonDirection.equals(Direction.EAST)){
return Direction.WEST;
}
if(archonDirection.equals(Direction.WEST)){
return Direction.EAST;
}
if(archonDirection.equals(Direction.NORTH_EAST)){
return Direction.SOUTH_WEST;
}
if(archonDirection.equals(Direction.NORTH_WEST)){
return Direction.SOUTH_EAST;
}
if(archonDirection.equals(Direction.SOUTH_EAST)){
return Direction.NORTH_WEST;
}
return Direction.NORTH_EAST;
}
}

/**
Expand Down