diff --git a/bin/net/grosinger/nomads/Building$Structure.class b/bin/net/grosinger/nomads/Building$Structure.class
index 867b1c9..a41e01f 100644
Binary files a/bin/net/grosinger/nomads/Building$Structure.class and b/bin/net/grosinger/nomads/Building$Structure.class differ
diff --git a/bin/net/grosinger/nomads/Building.class b/bin/net/grosinger/nomads/Building.class
index 4753945..e1aee83 100644
Binary files a/bin/net/grosinger/nomads/Building.class and b/bin/net/grosinger/nomads/Building.class differ
diff --git a/bin/net/grosinger/nomads/Drone.class b/bin/net/grosinger/nomads/Drone.class
index d679c5f..68c295f 100644
Binary files a/bin/net/grosinger/nomads/Drone.class and b/bin/net/grosinger/nomads/Drone.class differ
diff --git a/bin/net/grosinger/nomads/DroneListItem.class b/bin/net/grosinger/nomads/DroneListItem.class
index 1d34688..4f08f80 100644
Binary files a/bin/net/grosinger/nomads/DroneListItem.class and b/bin/net/grosinger/nomads/DroneListItem.class differ
diff --git a/bin/net/grosinger/nomads/DroneTeam.class b/bin/net/grosinger/nomads/DroneTeam.class
index a44c47e..5ab7df0 100644
Binary files a/bin/net/grosinger/nomads/DroneTeam.class and b/bin/net/grosinger/nomads/DroneTeam.class differ
diff --git a/bin/net/grosinger/nomads/House.class b/bin/net/grosinger/nomads/House.class
index dc4d6b7..b564679 100644
Binary files a/bin/net/grosinger/nomads/House.class and b/bin/net/grosinger/nomads/House.class differ
diff --git a/bin/net/grosinger/nomads/NeighborBuilding.class b/bin/net/grosinger/nomads/NeighborBuilding.class
index ba10c9d..4699e6c 100644
Binary files a/bin/net/grosinger/nomads/NeighborBuilding.class and b/bin/net/grosinger/nomads/NeighborBuilding.class differ
diff --git a/bin/net/grosinger/nomads/NeighborDrone.class b/bin/net/grosinger/nomads/NeighborDrone.class
index a76a08f..a84a555 100644
Binary files a/bin/net/grosinger/nomads/NeighborDrone.class and b/bin/net/grosinger/nomads/NeighborDrone.class differ
diff --git a/bin/net/grosinger/nomads/Nomads.class b/bin/net/grosinger/nomads/Nomads.class
index e034732..c51a5ab 100644
Binary files a/bin/net/grosinger/nomads/Nomads.class and b/bin/net/grosinger/nomads/Nomads.class differ
diff --git a/bin/net/grosinger/nomads/Police.class b/bin/net/grosinger/nomads/Police.class
index 486e194..8b03ba9 100644
Binary files a/bin/net/grosinger/nomads/Police.class and b/bin/net/grosinger/nomads/Police.class differ
diff --git a/bin/net/grosinger/nomads/TownHall.class b/bin/net/grosinger/nomads/TownHall.class
index f276cbc..3b69d5e 100644
Binary files a/bin/net/grosinger/nomads/TownHall.class and b/bin/net/grosinger/nomads/TownHall.class differ
diff --git a/bin/net/grosinger/nomads/Upgrade$UpgradeType.class b/bin/net/grosinger/nomads/Upgrade$UpgradeType.class
index 01c7164..231cb0b 100644
Binary files a/bin/net/grosinger/nomads/Upgrade$UpgradeType.class and b/bin/net/grosinger/nomads/Upgrade$UpgradeType.class differ
diff --git a/bin/net/grosinger/nomads/Upgrade.class b/bin/net/grosinger/nomads/Upgrade.class
index 633199f..dd0f341 100644
Binary files a/bin/net/grosinger/nomads/Upgrade.class and b/bin/net/grosinger/nomads/Upgrade.class differ
diff --git a/bin/net/grosinger/nomads/World.class b/bin/net/grosinger/nomads/World.class
index 79239a4..958c25a 100644
Binary files a/bin/net/grosinger/nomads/World.class and b/bin/net/grosinger/nomads/World.class differ
diff --git a/src/net/grosinger/nomads/Building.java b/src/net/grosinger/nomads/Building.java
index 3413350..6d707b9 100644
--- a/src/net/grosinger/nomads/Building.java
+++ b/src/net/grosinger/nomads/Building.java
@@ -1,5 +1,6 @@
package net.grosinger.nomads;
+
/*
* Anything that is on the theWorld that is not a drone of some sort is a building
*
diff --git a/src/net/grosinger/nomads/Drone.java b/src/net/grosinger/nomads/Drone.java
index 0dcb26b..92143e7 100644
--- a/src/net/grosinger/nomads/Drone.java
+++ b/src/net/grosinger/nomads/Drone.java
@@ -52,13 +52,5 @@ public interface Drone extends GameObject {
* @return Neighbor
*/
public NeighborDrone attack();
-
- /**
- * Asks what the drone would like to upgrade. Will be called whenever the Move
- * method returns Upgrade.
- *
- * @return Upgrade
- */
- public Upgrade upgrade();
}
diff --git a/src/net/grosinger/nomads/DroneListItem.java b/src/net/grosinger/nomads/DroneListItem.java
index 1fe0300..db9ba5b 100644
--- a/src/net/grosinger/nomads/DroneListItem.java
+++ b/src/net/grosinger/nomads/DroneListItem.java
@@ -376,10 +376,6 @@ public class DroneListItem {
} else
return false;
}
- case Upgrade: {
- doUpgrade();
- return true;
- }
case Attack: {
doAttack();
return true;
@@ -497,69 +493,6 @@ public class DroneListItem {
}
}
- /**
- * Finds the upgrade that the drone would like to purchase. Determines if
- * upgrade is possible and performs action accordingly
- */
- private void doUpgrade() {
- Upgrade newUpgrade = current.upgrade();
- Integer price = newUpgrade.getPrice();
- if (price == null) {
- // Invalid upgrade selection, turn lost.
- return;
- }
-
- if (team.getBalance() >= price) {
- switch (newUpgrade.getUpgradeType()) {
- case visibleDistance: {
- visibleDistance++;
- break;
- }
- case lumaLocatorDistance: {
- lumaLocatorDistance++;
- break;
- }
- case objectLocatorDistance: {
- objectLocatorDistance++;
- break;
- }
- case reliability: {
- reliability++;
- break;
- }
- case attack: {
- attack++;
- break;
- }
- case defenses: {
- defenses++;
- break;
- }
- case speed: {
- speed++;
- break;
- }
- case cargoSpace: {
- cargoSpace++;
- break;
- }
- case theft: {
- theft++;
- break;
- }
- default: {
- // Must specify an Upgrade Type
- }
- }
-
- team.deductFromBalance(price);
- return;
- } else {
- // Not enough money, do nothing.
- return;
- }
- }
-
/**
* Move the drone in a specified direction
*
diff --git a/src/net/grosinger/nomads/DroneTeam.java b/src/net/grosinger/nomads/DroneTeam.java
index 730f1a8..c3d5123 100644
--- a/src/net/grosinger/nomads/DroneTeam.java
+++ b/src/net/grosinger/nomads/DroneTeam.java
@@ -2,6 +2,7 @@ package net.grosinger.nomads;
import java.util.ArrayList;
+
/**
* Contains a pointer to the first and the last DroneListItem in a particular
* team. When adding drones to Team A they should be added to the end of the
diff --git a/src/net/grosinger/nomads/House.java b/src/net/grosinger/nomads/House.java
index 9a031b4..1600914 100644
--- a/src/net/grosinger/nomads/House.java
+++ b/src/net/grosinger/nomads/House.java
@@ -1,5 +1,6 @@
package net.grosinger.nomads;
+
/**
* It is a house, just like it says. Basically a building that can be owned by a
* team
diff --git a/src/net/grosinger/nomads/NeighborBuilding.java b/src/net/grosinger/nomads/NeighborBuilding.java
index f5a14cd..03a81e3 100644
--- a/src/net/grosinger/nomads/NeighborBuilding.java
+++ b/src/net/grosinger/nomads/NeighborBuilding.java
@@ -1,5 +1,6 @@
package net.grosinger.nomads;
+
/**
* An array of NeigborBuildings will be given to a drone that is searching for
* the buildings it is near. This is typically done from the town center.
diff --git a/src/net/grosinger/nomads/NeighborDrone.java b/src/net/grosinger/nomads/NeighborDrone.java
index eaa9985..aaa16b2 100644
--- a/src/net/grosinger/nomads/NeighborDrone.java
+++ b/src/net/grosinger/nomads/NeighborDrone.java
@@ -1,5 +1,6 @@
package net.grosinger.nomads;
+
/**
* An array of NeighborDrones will be given to a drone that is using it's radar
*/
diff --git a/src/net/grosinger/nomads/Nomads.java b/src/net/grosinger/nomads/Nomads.java
index aa32786..380cb2d 100644
--- a/src/net/grosinger/nomads/Nomads.java
+++ b/src/net/grosinger/nomads/Nomads.java
@@ -3,6 +3,7 @@ package net.grosinger.nomads;
import java.io.IOException;
import java.util.ArrayList;
+
public class Nomads {
public static World awesomeWorld;
diff --git a/src/net/grosinger/nomads/Police.java b/src/net/grosinger/nomads/Police.java
index 31b4a97..7985bb5 100644
--- a/src/net/grosinger/nomads/Police.java
+++ b/src/net/grosinger/nomads/Police.java
@@ -78,13 +78,4 @@ public class Police implements Drone {
// TODO - Implement Police Attack
return null;
}
-
- @Override
- public Upgrade upgrade() {
- // Police drones do not have upgrades. They will automatically upgrade
- // throughout the game based on time played.
- // TODO - Implement Police Upgrade
- return null;
- }
-
}
diff --git a/src/net/grosinger/nomads/TownHall.java b/src/net/grosinger/nomads/TownHall.java
index fff8340..237b16a 100644
--- a/src/net/grosinger/nomads/TownHall.java
+++ b/src/net/grosinger/nomads/TownHall.java
@@ -2,6 +2,7 @@ package net.grosinger.nomads;
import java.util.ArrayList;
+
/**
* A representation of a TownHall. Allows Drones to interact with this building.
*/
diff --git a/src/net/grosinger/nomads/Upgrade.java b/src/net/grosinger/nomads/Upgrade.java
index c663b89..ded9b2c 100644
--- a/src/net/grosinger/nomads/Upgrade.java
+++ b/src/net/grosinger/nomads/Upgrade.java
@@ -1,5 +1,6 @@
package net.grosinger.nomads;
+
public class Upgrade {
public enum UpgradeType {
diff --git a/src/net/grosinger/nomads/World.java b/src/net/grosinger/nomads/World.java
index 92db099..5981fbf 100644
--- a/src/net/grosinger/nomads/World.java
+++ b/src/net/grosinger/nomads/World.java
@@ -9,6 +9,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
+
/**
* Main class where information about the world is stored
*