diff --git a/bin/net/grosinger/nomads/Building$Structure.class b/bin/net/grosinger/nomads/Building$Structure.class deleted file mode 100644 index a41e01f..0000000 Binary files a/bin/net/grosinger/nomads/Building$Structure.class and /dev/null differ diff --git a/bin/net/grosinger/nomads/Building.class b/bin/net/grosinger/nomads/Building.class deleted file mode 100644 index e1aee83..0000000 Binary files a/bin/net/grosinger/nomads/Building.class and /dev/null differ diff --git a/bin/net/grosinger/nomads/Drone.class b/bin/net/grosinger/nomads/Drone.class deleted file mode 100644 index 68c295f..0000000 Binary files a/bin/net/grosinger/nomads/Drone.class and /dev/null differ diff --git a/bin/net/grosinger/nomads/DroneListItem$Direction.class b/bin/net/grosinger/nomads/DroneListItem$Direction.class deleted file mode 100644 index 6bcd1f0..0000000 Binary files a/bin/net/grosinger/nomads/DroneListItem$Direction.class and /dev/null differ diff --git a/bin/net/grosinger/nomads/DroneListItem$EnumMove.class b/bin/net/grosinger/nomads/DroneListItem$EnumMove.class deleted file mode 100644 index 960eca4..0000000 Binary files a/bin/net/grosinger/nomads/DroneListItem$EnumMove.class and /dev/null differ diff --git a/bin/net/grosinger/nomads/DroneListItem.class b/bin/net/grosinger/nomads/DroneListItem.class deleted file mode 100644 index 969a30f..0000000 Binary files a/bin/net/grosinger/nomads/DroneListItem.class and /dev/null differ diff --git a/bin/net/grosinger/nomads/DroneTeam.class b/bin/net/grosinger/nomads/DroneTeam.class deleted file mode 100644 index 5ab7df0..0000000 Binary files a/bin/net/grosinger/nomads/DroneTeam.class and /dev/null differ diff --git a/bin/net/grosinger/nomads/DroneTools.class b/bin/net/grosinger/nomads/DroneTools.class index 3a42fa9..72d7f09 100644 Binary files a/bin/net/grosinger/nomads/DroneTools.class and b/bin/net/grosinger/nomads/DroneTools.class differ diff --git a/bin/net/grosinger/nomads/House.class b/bin/net/grosinger/nomads/House.class deleted file mode 100644 index b564679..0000000 Binary files a/bin/net/grosinger/nomads/House.class and /dev/null differ diff --git a/bin/net/grosinger/nomads/InitializeGame.class b/bin/net/grosinger/nomads/InitializeGame.class index cbd8dd3..e4f3b71 100644 Binary files a/bin/net/grosinger/nomads/InitializeGame.class and b/bin/net/grosinger/nomads/InitializeGame.class differ diff --git a/bin/net/grosinger/nomads/Inventory.class b/bin/net/grosinger/nomads/Inventory.class index a70817e..236ced4 100644 Binary files a/bin/net/grosinger/nomads/Inventory.class and b/bin/net/grosinger/nomads/Inventory.class differ diff --git a/bin/net/grosinger/nomads/NeighborBuilding.class b/bin/net/grosinger/nomads/NeighborBuilding.class deleted file mode 100644 index f4f69c3..0000000 Binary files a/bin/net/grosinger/nomads/NeighborBuilding.class and /dev/null differ diff --git a/bin/net/grosinger/nomads/NeighborDrone.class b/bin/net/grosinger/nomads/NeighborDrone.class deleted file mode 100644 index a84a555..0000000 Binary files a/bin/net/grosinger/nomads/NeighborDrone.class and /dev/null differ diff --git a/bin/net/grosinger/nomads/Nomads.class b/bin/net/grosinger/nomads/Nomads.class index 9bb175f..5e05e91 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 deleted file mode 100644 index 8b03ba9..0000000 Binary files a/bin/net/grosinger/nomads/Police.class and /dev/null differ diff --git a/bin/net/grosinger/nomads/PoliceStation.class b/bin/net/grosinger/nomads/PoliceStation.class deleted file mode 100644 index 947e847..0000000 Binary files a/bin/net/grosinger/nomads/PoliceStation.class and /dev/null differ diff --git a/bin/net/grosinger/nomads/RepairShop.class b/bin/net/grosinger/nomads/RepairShop.class deleted file mode 100644 index 2b9375d..0000000 Binary files a/bin/net/grosinger/nomads/RepairShop.class and /dev/null differ diff --git a/bin/net/grosinger/nomads/TownHall.class b/bin/net/grosinger/nomads/TownHall.class deleted file mode 100644 index 4958976..0000000 Binary files a/bin/net/grosinger/nomads/TownHall.class and /dev/null differ diff --git a/bin/net/grosinger/nomads/Upgrade$UpgradeType.class b/bin/net/grosinger/nomads/Upgrade$UpgradeType.class index 499a6a1..8596f4e 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 d245490..95b15e0 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 d0434b3..3b25546 100644 Binary files a/bin/net/grosinger/nomads/World.class and b/bin/net/grosinger/nomads/World.class differ diff --git a/bin/net/grosinger/nomads/buildings/Building$Structure.class b/bin/net/grosinger/nomads/buildings/Building$Structure.class new file mode 100644 index 0000000..7da348e Binary files /dev/null and b/bin/net/grosinger/nomads/buildings/Building$Structure.class differ diff --git a/bin/net/grosinger/nomads/buildings/Building.class b/bin/net/grosinger/nomads/buildings/Building.class new file mode 100644 index 0000000..6211b43 Binary files /dev/null and b/bin/net/grosinger/nomads/buildings/Building.class differ diff --git a/bin/net/grosinger/nomads/buildings/House.class b/bin/net/grosinger/nomads/buildings/House.class new file mode 100644 index 0000000..616d21a Binary files /dev/null and b/bin/net/grosinger/nomads/buildings/House.class differ diff --git a/bin/net/grosinger/nomads/buildings/NeighborBuilding.class b/bin/net/grosinger/nomads/buildings/NeighborBuilding.class new file mode 100644 index 0000000..053dba0 Binary files /dev/null and b/bin/net/grosinger/nomads/buildings/NeighborBuilding.class differ diff --git a/bin/net/grosinger/nomads/buildings/PoliceStation.class b/bin/net/grosinger/nomads/buildings/PoliceStation.class new file mode 100644 index 0000000..e8a7e0e Binary files /dev/null and b/bin/net/grosinger/nomads/buildings/PoliceStation.class differ diff --git a/bin/net/grosinger/nomads/buildings/RepairShop.class b/bin/net/grosinger/nomads/buildings/RepairShop.class new file mode 100644 index 0000000..4f85893 Binary files /dev/null and b/bin/net/grosinger/nomads/buildings/RepairShop.class differ diff --git a/bin/net/grosinger/nomads/buildings/TownHall.class b/bin/net/grosinger/nomads/buildings/TownHall.class new file mode 100644 index 0000000..bcd1adc Binary files /dev/null and b/bin/net/grosinger/nomads/buildings/TownHall.class differ diff --git a/bin/net/grosinger/nomads/UpgradeShop.class b/bin/net/grosinger/nomads/buildings/UpgradeShop.class similarity index 53% rename from bin/net/grosinger/nomads/UpgradeShop.class rename to bin/net/grosinger/nomads/buildings/UpgradeShop.class index 83e8c71..d1eb7ef 100644 Binary files a/bin/net/grosinger/nomads/UpgradeShop.class and b/bin/net/grosinger/nomads/buildings/UpgradeShop.class differ diff --git a/bin/net/grosinger/nomads/drones/Drone.class b/bin/net/grosinger/nomads/drones/Drone.class new file mode 100644 index 0000000..d02ee6e Binary files /dev/null and b/bin/net/grosinger/nomads/drones/Drone.class differ diff --git a/bin/net/grosinger/nomads/drones/DroneListItem$Direction.class b/bin/net/grosinger/nomads/drones/DroneListItem$Direction.class new file mode 100644 index 0000000..f4cc324 Binary files /dev/null and b/bin/net/grosinger/nomads/drones/DroneListItem$Direction.class differ diff --git a/bin/net/grosinger/nomads/drones/DroneListItem$EnumMove.class b/bin/net/grosinger/nomads/drones/DroneListItem$EnumMove.class new file mode 100644 index 0000000..a8ee0ce Binary files /dev/null and b/bin/net/grosinger/nomads/drones/DroneListItem$EnumMove.class differ diff --git a/bin/net/grosinger/nomads/drones/DroneListItem.class b/bin/net/grosinger/nomads/drones/DroneListItem.class new file mode 100644 index 0000000..0e50be9 Binary files /dev/null and b/bin/net/grosinger/nomads/drones/DroneListItem.class differ diff --git a/bin/net/grosinger/nomads/drones/DroneTeam.class b/bin/net/grosinger/nomads/drones/DroneTeam.class new file mode 100644 index 0000000..9cb2da8 Binary files /dev/null and b/bin/net/grosinger/nomads/drones/DroneTeam.class differ diff --git a/bin/net/grosinger/nomads/drones/NeighborDrone.class b/bin/net/grosinger/nomads/drones/NeighborDrone.class new file mode 100644 index 0000000..3fac130 Binary files /dev/null and b/bin/net/grosinger/nomads/drones/NeighborDrone.class differ diff --git a/bin/net/grosinger/nomads/drones/Police.class b/bin/net/grosinger/nomads/drones/Police.class new file mode 100644 index 0000000..48c6232 Binary files /dev/null and b/bin/net/grosinger/nomads/drones/Police.class differ diff --git a/src/net/grosinger/nomads/DroneTools.java b/src/net/grosinger/nomads/DroneTools.java index f513921..02f6f43 100644 --- a/src/net/grosinger/nomads/DroneTools.java +++ b/src/net/grosinger/nomads/DroneTools.java @@ -2,7 +2,18 @@ package net.grosinger.nomads; import java.util.ArrayList; -import net.grosinger.nomads.Building.Structure; +import net.grosinger.nomads.buildings.Building; +import net.grosinger.nomads.buildings.House; +import net.grosinger.nomads.buildings.NeighborBuilding; +import net.grosinger.nomads.buildings.PoliceStation; +import net.grosinger.nomads.buildings.RepairShop; +import net.grosinger.nomads.buildings.TownHall; +import net.grosinger.nomads.buildings.UpgradeShop; +import net.grosinger.nomads.buildings.Building.Structure; +import net.grosinger.nomads.drones.Drone; +import net.grosinger.nomads.drones.DroneListItem; +import net.grosinger.nomads.drones.DroneTeam; +import net.grosinger.nomads.drones.NeighborDrone; /** * Tools for the Drone to use. Only place methods in here that you want the @@ -147,40 +158,33 @@ public class DroneTools { int maxDistance = listItem.getVisibleDistance(); for (int i = maxDistance * -1; i <= maxDistance; i++) { for (int j = maxDistance * -1; j <= maxDistance; j++) { - if (getX() + i >= worldSize - 1 || getX() + i < 0 - || getY() + j >= worldSize - 1 || getY() + j < 0) { + if (getX() + i >= worldSize - 1 || getX() + i < 0 || getY() + j >= worldSize - 1 + || getY() + j < 0) { } else if (i != 0 && j != 0) { - GameObject objectHere = worldReference.getObjectAt(getX() - + i, getY() + j); + GameObject objectHere = worldReference.getObjectAt(getX() + i, getY() + j); if (objectHere instanceof Building) { Building buildingHere = (Building) objectHere; NeighborBuilding aWildNeighbor; if (buildingHere.getType() == Structure.TOWNHALL) { - aWildNeighbor = new TownHall(buildingHere.getX(), - buildingHere.getY(), - buildingHere.getName(), buildingHere, - listItem); + aWildNeighbor = new TownHall(buildingHere.getX(), buildingHere.getY(), + buildingHere.getName(), buildingHere, listItem); } else if (buildingHere.getType() == Structure.REPAIRSHOP) { aWildNeighbor = new RepairShop(buildingHere.getX(), - buildingHere.getY(), - buildingHere.getName(), buildingHere, + buildingHere.getY(), buildingHere.getName(), buildingHere, listItem); } else if (buildingHere.getType() == Structure.UPGRADESHOP) { - aWildNeighbor = new UpgradeShop( - buildingHere.getX(), buildingHere.getY(), - buildingHere.getName(), buildingHere, + aWildNeighbor = new UpgradeShop(buildingHere.getX(), + buildingHere.getY(), buildingHere.getName(), buildingHere, listItem); } else if (buildingHere.getType() == Structure.POLICESTATION) { - aWildNeighbor = new PoliceStation( - buildingHere.getX(), buildingHere.getY(), - buildingHere.getName(), buildingHere, + aWildNeighbor = new PoliceStation(buildingHere.getX(), + buildingHere.getY(), buildingHere.getName(), buildingHere, listItem); } else { - aWildNeighbor = new NeighborBuilding( - buildingHere.getX(), buildingHere.getY(), - buildingHere.getName(), buildingHere, + aWildNeighbor = new NeighborBuilding(buildingHere.getX(), + buildingHere.getY(), buildingHere.getName(), buildingHere, listItem); } @@ -203,19 +207,16 @@ public class DroneTools { int maxDistance = listItem.getVisibleDistance(); for (int i = maxDistance * -1; i <= maxDistance; i++) { for (int j = maxDistance * -1; j <= maxDistance; j++) { - if (getX() + i >= worldSize - 1 || getX() + i < 0 - || getY() + j >= worldSize - 1 || getY() + j < 0) { + if (getX() + i >= worldSize - 1 || getX() + i < 0 || getY() + j >= worldSize - 1 + || getY() + j < 0) { } else if (i != 0 && j != 0) { - GameObject objectHere = worldReference.getObjectAt(getX() - + i, getY() + j); + GameObject objectHere = worldReference.getObjectAt(getX() + i, getY() + j); if (objectHere instanceof Drone) { Drone droneHere = (Drone) objectHere; - DroneListItem listItemHere = Nomads - .droneToListItem(droneHere); - NeighborDrone aWildNeighbor = new NeighborDrone( - listItemHere.getX(), listItemHere.getY(), - droneHere.getName(), droneHere.getUID()); + DroneListItem listItemHere = Nomads.droneToListItem(droneHere); + NeighborDrone aWildNeighbor = new NeighborDrone(listItemHere.getX(), + listItemHere.getY(), droneHere.getName(), droneHere.getUID()); neighbors.add(aWildNeighbor); } } @@ -224,6 +225,30 @@ public class DroneTools { return neighbors; } + /** + * Retrieve a list of all MoneyPiles that are visible from this drone. + * Does not return the money pile itself, rather just a point where one + * lies. + * + * @return ArrayList of Points + */ + public ArrayList checkLumaLocator() { + // TODO - Implement LumaLocator + return null; + } + + /** + * Retrieve a list of all objectives that are visible from this drone. + * Will tell if the objective belongs to this drone or not. + * + * @return ArrayList of ObjectiveReferences + */ + public ArrayList checkObjectiveLocator() { + // TODO - Implement ObjectiveLocator + // Should not actually return an Objective + return null; + } + /** * If your team has enough money, will create a house 1 space east of * current location. @@ -237,8 +262,8 @@ public class DroneTools { Point intendedPoint = new Point(getX(), getY()); findEmptyPoint(intendedPoint); - House newHouse = new House(Structure.HOUSE, intendedPoint.getX(), - intendedPoint.getY(), currentTeam); + House newHouse = new House(Structure.HOUSE, intendedPoint.getX(), intendedPoint.getY(), + currentTeam); worldReference.placeNewBuilding(newHouse); currentTeam.deductFromBalance(Nomads.HOUSEPRICE); listItem.setWaiting(Nomads.CREATIONTIME); @@ -268,8 +293,7 @@ public class DroneTools { */ private Point findEmptyPoint(Point currentPoint) { // Current point is where the drone is - boolean validSpace = worldReference.getObjectAt(currentPoint.getX(), - currentPoint.getY()) == null; + boolean validSpace = worldReference.getObjectAt(currentPoint.getX(), currentPoint.getY()) == null; Point tryThis = new Point(currentPoint.getX(), currentPoint.getY()); int outX = 1; int outY = 0; diff --git a/src/net/grosinger/nomads/InitializeGame.java b/src/net/grosinger/nomads/InitializeGame.java index b641769..775f5aa 100644 --- a/src/net/grosinger/nomads/InitializeGame.java +++ b/src/net/grosinger/nomads/InitializeGame.java @@ -10,7 +10,10 @@ import java.util.Enumeration; import java.util.jar.JarEntry; import java.util.jar.JarFile; -import net.grosinger.nomads.Building.Structure; +import net.grosinger.nomads.buildings.Building; +import net.grosinger.nomads.buildings.Building.Structure; +import net.grosinger.nomads.drones.Drone; +import net.grosinger.nomads.drones.DroneTeam; /** * Various methods used when first setting up the game and loading everything diff --git a/src/net/grosinger/nomads/Inventory.java b/src/net/grosinger/nomads/Inventory.java index 4608521..4a13d9b 100644 --- a/src/net/grosinger/nomads/Inventory.java +++ b/src/net/grosinger/nomads/Inventory.java @@ -2,6 +2,7 @@ package net.grosinger.nomads; import java.util.ArrayList; +import net.grosinger.nomads.drones.DroneListItem; import net.grosinger.nomads.exceptions.FullInventoryException; public class Inventory { diff --git a/src/net/grosinger/nomads/Nomads.java b/src/net/grosinger/nomads/Nomads.java index 5d21a40..c1d1761 100644 --- a/src/net/grosinger/nomads/Nomads.java +++ b/src/net/grosinger/nomads/Nomads.java @@ -3,6 +3,10 @@ package net.grosinger.nomads; import java.io.IOException; import java.util.ArrayList; +import net.grosinger.nomads.drones.Drone; +import net.grosinger.nomads.drones.DroneListItem; +import net.grosinger.nomads.drones.DroneTeam; + public class Nomads { public static World awesomeWorld; diff --git a/src/net/grosinger/nomads/Upgrade.java b/src/net/grosinger/nomads/Upgrade.java index d02f60c..a7104c2 100644 --- a/src/net/grosinger/nomads/Upgrade.java +++ b/src/net/grosinger/nomads/Upgrade.java @@ -2,6 +2,8 @@ package net.grosinger.nomads; import java.util.Hashtable; +import net.grosinger.nomads.drones.DroneListItem; + public class Upgrade { public enum UpgradeType { diff --git a/src/net/grosinger/nomads/World.java b/src/net/grosinger/nomads/World.java index e8f86a8..c399e1d 100644 --- a/src/net/grosinger/nomads/World.java +++ b/src/net/grosinger/nomads/World.java @@ -9,6 +9,12 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import net.grosinger.nomads.buildings.Building; +import net.grosinger.nomads.buildings.House; +import net.grosinger.nomads.drones.Drone; +import net.grosinger.nomads.drones.DroneListItem; +import net.grosinger.nomads.drones.DroneTeam; + /** * Main class where information about the world is stored * @@ -173,10 +179,9 @@ public class World { * GameObject to be placed */ public void setObjectRandom(GameObject newItem) { - // TODO - Able to go out of bounds // Min + (int)(Math.random() * ((Max - Min) + 1)) - int randX = 0 + (int) (Math.random() * ((getWorldSize() - 0) + 1)); - int randY = 0 + (int) (Math.random() * ((getWorldSize() - 0) + 1)); + int randX = 0 + (int) (Math.random() * ((getWorldSize() - 1 - 0) + 1)); + int randY = 0 + (int) (Math.random() * ((getWorldSize() - 1 - 0) + 1)); setObjectAt(randX, randY, newItem); } diff --git a/src/net/grosinger/nomads/Building.java b/src/net/grosinger/nomads/buildings/Building.java similarity index 94% rename from src/net/grosinger/nomads/Building.java rename to src/net/grosinger/nomads/buildings/Building.java index 6d707b9..584348d 100644 --- a/src/net/grosinger/nomads/Building.java +++ b/src/net/grosinger/nomads/buildings/Building.java @@ -1,4 +1,7 @@ -package net.grosinger.nomads; +package net.grosinger.nomads.buildings; + +import net.grosinger.nomads.GameObject; +import net.grosinger.nomads.drones.DroneTeam; /* diff --git a/src/net/grosinger/nomads/House.java b/src/net/grosinger/nomads/buildings/House.java similarity index 79% rename from src/net/grosinger/nomads/House.java rename to src/net/grosinger/nomads/buildings/House.java index 1600914..b59c744 100644 --- a/src/net/grosinger/nomads/House.java +++ b/src/net/grosinger/nomads/buildings/House.java @@ -1,4 +1,7 @@ -package net.grosinger.nomads; +package net.grosinger.nomads.buildings; + +import net.grosinger.nomads.Nomads; +import net.grosinger.nomads.drones.DroneTeam; /** diff --git a/src/net/grosinger/nomads/NeighborBuilding.java b/src/net/grosinger/nomads/buildings/NeighborBuilding.java similarity index 91% rename from src/net/grosinger/nomads/NeighborBuilding.java rename to src/net/grosinger/nomads/buildings/NeighborBuilding.java index 8b40dbe..5a1fe99 100644 --- a/src/net/grosinger/nomads/NeighborBuilding.java +++ b/src/net/grosinger/nomads/buildings/NeighborBuilding.java @@ -1,4 +1,8 @@ -package net.grosinger.nomads; +package net.grosinger.nomads.buildings; + +import net.grosinger.nomads.GameObject; +import net.grosinger.nomads.Nomads; +import net.grosinger.nomads.drones.DroneListItem; /** * An array of NeigborBuildings will be given to a drone that is searching for diff --git a/src/net/grosinger/nomads/PoliceStation.java b/src/net/grosinger/nomads/buildings/PoliceStation.java similarity index 78% rename from src/net/grosinger/nomads/PoliceStation.java rename to src/net/grosinger/nomads/buildings/PoliceStation.java index 0bee961..a366693 100644 --- a/src/net/grosinger/nomads/PoliceStation.java +++ b/src/net/grosinger/nomads/buildings/PoliceStation.java @@ -1,4 +1,6 @@ -package net.grosinger.nomads; +package net.grosinger.nomads.buildings; + +import net.grosinger.nomads.drones.DroneListItem; /** * A representation of a PoliceStation. Allows Drones to interact with this diff --git a/src/net/grosinger/nomads/RepairShop.java b/src/net/grosinger/nomads/buildings/RepairShop.java similarity index 77% rename from src/net/grosinger/nomads/RepairShop.java rename to src/net/grosinger/nomads/buildings/RepairShop.java index 46fd9cc..8749652 100644 --- a/src/net/grosinger/nomads/RepairShop.java +++ b/src/net/grosinger/nomads/buildings/RepairShop.java @@ -1,4 +1,6 @@ -package net.grosinger.nomads; +package net.grosinger.nomads.buildings; + +import net.grosinger.nomads.drones.DroneListItem; /** * A representation of a RepairShop. Allows Drones to interact with this diff --git a/src/net/grosinger/nomads/TownHall.java b/src/net/grosinger/nomads/buildings/TownHall.java similarity index 84% rename from src/net/grosinger/nomads/TownHall.java rename to src/net/grosinger/nomads/buildings/TownHall.java index 577538b..820df11 100644 --- a/src/net/grosinger/nomads/TownHall.java +++ b/src/net/grosinger/nomads/buildings/TownHall.java @@ -1,5 +1,13 @@ -package net.grosinger.nomads; +package net.grosinger.nomads.buildings; +import net.grosinger.nomads.GameObject; +import net.grosinger.nomads.Inventory; +import net.grosinger.nomads.MoneyPile; +import net.grosinger.nomads.Nomads; +import net.grosinger.nomads.Objective; +import net.grosinger.nomads.Point; +import net.grosinger.nomads.drones.DroneListItem; +import net.grosinger.nomads.drones.DroneTeam; import net.grosinger.nomads.exceptions.BadRequestException; import net.grosinger.nomads.exceptions.ObjectReferenceOutdatedException; diff --git a/src/net/grosinger/nomads/UpgradeShop.java b/src/net/grosinger/nomads/buildings/UpgradeShop.java similarity index 90% rename from src/net/grosinger/nomads/UpgradeShop.java rename to src/net/grosinger/nomads/buildings/UpgradeShop.java index a5e9497..b909212 100644 --- a/src/net/grosinger/nomads/UpgradeShop.java +++ b/src/net/grosinger/nomads/buildings/UpgradeShop.java @@ -1,5 +1,7 @@ -package net.grosinger.nomads; +package net.grosinger.nomads.buildings; +import net.grosinger.nomads.Upgrade; +import net.grosinger.nomads.drones.DroneListItem; import net.grosinger.nomads.exceptions.InsufficientFundsException; import net.grosinger.nomads.exceptions.InvalidUpgradeException; diff --git a/src/net/grosinger/nomads/Drone.java b/src/net/grosinger/nomads/drones/Drone.java similarity index 86% rename from src/net/grosinger/nomads/Drone.java rename to src/net/grosinger/nomads/drones/Drone.java index 92143e7..1bca593 100644 --- a/src/net/grosinger/nomads/Drone.java +++ b/src/net/grosinger/nomads/drones/Drone.java @@ -1,6 +1,8 @@ -package net.grosinger.nomads; +package net.grosinger.nomads.drones; -import net.grosinger.nomads.DroneListItem.EnumMove; +import net.grosinger.nomads.DroneTools; +import net.grosinger.nomads.GameObject; +import net.grosinger.nomads.drones.DroneListItem.EnumMove; /** * All drones will extend this class. Gives them access to basic set of tools diff --git a/src/net/grosinger/nomads/DroneListItem.java b/src/net/grosinger/nomads/drones/DroneListItem.java similarity index 97% rename from src/net/grosinger/nomads/DroneListItem.java rename to src/net/grosinger/nomads/drones/DroneListItem.java index 764e451..f2b04fd 100644 --- a/src/net/grosinger/nomads/DroneListItem.java +++ b/src/net/grosinger/nomads/drones/DroneListItem.java @@ -1,7 +1,14 @@ -package net.grosinger.nomads; +package net.grosinger.nomads.drones; import java.util.ArrayList; +import net.grosinger.nomads.DroneTools; +import net.grosinger.nomads.GameObject; +import net.grosinger.nomads.Inventory; +import net.grosinger.nomads.MoneyPile; +import net.grosinger.nomads.Nomads; +import net.grosinger.nomads.Objective; +import net.grosinger.nomads.Upgrade; import net.grosinger.nomads.Upgrade.UpgradeType; import net.grosinger.nomads.exceptions.FullInventoryException; diff --git a/src/net/grosinger/nomads/DroneTeam.java b/src/net/grosinger/nomads/drones/DroneTeam.java similarity index 96% rename from src/net/grosinger/nomads/DroneTeam.java rename to src/net/grosinger/nomads/drones/DroneTeam.java index c3d5123..7e60f92 100644 --- a/src/net/grosinger/nomads/DroneTeam.java +++ b/src/net/grosinger/nomads/drones/DroneTeam.java @@ -1,7 +1,13 @@ -package net.grosinger.nomads; +package net.grosinger.nomads.drones; import java.util.ArrayList; +import net.grosinger.nomads.GameObject; +import net.grosinger.nomads.InitializeGame; +import net.grosinger.nomads.Nomads; +import net.grosinger.nomads.Point; +import net.grosinger.nomads.buildings.House; + /** * Contains a pointer to the first and the last DroneListItem in a particular diff --git a/src/net/grosinger/nomads/NeighborDrone.java b/src/net/grosinger/nomads/drones/NeighborDrone.java similarity index 93% rename from src/net/grosinger/nomads/NeighborDrone.java rename to src/net/grosinger/nomads/drones/NeighborDrone.java index aaa16b2..8844f40 100644 --- a/src/net/grosinger/nomads/NeighborDrone.java +++ b/src/net/grosinger/nomads/drones/NeighborDrone.java @@ -1,4 +1,6 @@ -package net.grosinger.nomads; +package net.grosinger.nomads.drones; + +import net.grosinger.nomads.GameObject; /** diff --git a/src/net/grosinger/nomads/Police.java b/src/net/grosinger/nomads/drones/Police.java similarity index 92% rename from src/net/grosinger/nomads/Police.java rename to src/net/grosinger/nomads/drones/Police.java index 7985bb5..b4adf12 100644 --- a/src/net/grosinger/nomads/Police.java +++ b/src/net/grosinger/nomads/drones/Police.java @@ -1,6 +1,7 @@ -package net.grosinger.nomads; +package net.grosinger.nomads.drones; -import net.grosinger.nomads.DroneListItem.EnumMove; +import net.grosinger.nomads.DroneTools; +import net.grosinger.nomads.drones.DroneListItem.EnumMove; /** * Enforcer of the law. Has the ability to arrest drones that are wanted. Police