reformat

Assignment 2/src/ca/cosc3p91/a2/Main.java

@@ -1,34 +1,13 @@
 package ca.cosc3p91.a2;
 
 import ca.cosc3p91.a2.game.GameEngine;
-import ca.cosc3p91.a2.util.Print;
 
 public class Main {
 
     public static void main(String[] args) {
         GameEngine engine = new GameEngine();
 
-<<<<<<< HEAD
+        engine.printState();
-        engine.printMap();
-=======
-        Print test = new Print("Hello There", 2);
-
-        test.addColumn(new Print.Column("I am value 1"));
-        test.addColumn(new Print.Column("Super Value"));
-        test.addColumn(new Print.Column("SOLD!"));
-
-        Print.Row row = new Print.Row();
-        row.add("HelloThere");
-        row.add("Goodbye");
-        row.add("3");
-
-        test.addRow(row);
-        test.addRow(row);
-        test.addRow(row);
-
-        Print.print(test.createTable());
-
->>>>>>> abf784868daa920a9ca8b3b9d291a7cf521aa9c7
         engine.run();
     }
 

Assignment 2/src/ca/cosc3p91/a2/game/GameEngine.java

@@ -1,21 +1,18 @@
 package ca.cosc3p91.a2.game;
 
-import ca.cosc3p91.a2.gameobjects.Building;
+import ca.cosc3p91.a2.gameobjects.*;
-import ca.cosc3p91.a2.gameobjects.VillageStage;
+import ca.cosc3p91.a2.player.*;
-import ca.cosc3p91.a2.gameobjects.Village_Hall;
-import ca.cosc3p91.a2.player.Player;
 
 public class GameEngine implements Runnable {
 
-    private final boolean running = true;
-
     private Player player;
 
     private int pillageFactor;
 
     private int currentTime;
 
-<<<<<<< HEAD
+    public Map map;
+
     public GameEngine() {
         player = new Player();
         VillageStage vInitialStage = new VillageStage(100, 0, 2, 30, 0,
@@ -23,22 +20,22 @@ public class GameEngine implements Runnable {
         map = new Map(new Village_Hall(1, vInitialStage), 30);
     }
 
-  public void printMap() {
+    public void printState() {
-    System.out.println("~ Current Map State ~\n\n");
+        // Print toPrint = new Print("~ Current Village Buildings ~",2);
+
         System.out.println("In Map:\n");
+        System.out.println("\t~ Current Village Buildings ~\n");
         for (Building b : map.contains) {
-      System.out.println("|> "+b.getClass().toString()+" lvl: "+b.getLevel()+" health: "+b.getHealth());
+            System.out.println("\t|> " + b.getClass().getSimpleName() + " lvl: " + b.getLevel() + " health: " + b.getHealth());
+        }
+        System.out.println("\n\t~ Current Village Inhabitants ~\n\n");
+        for (Inhabitant i : map.inhabitants) {
+            System.out.println("\t|> " + i.getClass().getSimpleName() + " lvl: " + i.getLevel());
         }
     }
 
     public void attackVillage(Map map) {
     }
-=======
-    public Map map;
->>>>>>> abf784868daa920a9ca8b3b9d291a7cf521aa9c7
-
-    public void attackVIllage(Map map) {
-    }
 
     public Map generateMap() {
         return null;
@@ -49,8 +46,6 @@ public class GameEngine implements Runnable {
 
     @Override
     public void run() {
-        while (running) {
 
     }
 }
-}

Assignment 2/src/ca/cosc3p91/a2/game/Map.java

@@ -5,30 +5,18 @@ import ca.cosc3p91.a2.gameobjects.*;
 import java.util.ArrayList;
 import java.util.List;
 
-<<<<<<< HEAD
 public class Map {
 
     static int MAXSIZE = 400;
 
     private Village_Hall townHall;
-=======
-
-public class Map {
-
-    private Village_Hall townHall;
->>>>>>> abf784868daa920a9ca8b3b9d291a7cf521aa9c7
 
     private int guardTime;
 
-<<<<<<< HEAD
     public List<Building> contains;
-=======
-    private List<Building> contains;
->>>>>>> abf784868daa920a9ca8b3b9d291a7cf521aa9c7
 
     public List<Inhabitant> inhabitants;
 
-<<<<<<< HEAD
     public Map(Village_Hall villageHall, int gTime) {
         contains = new ArrayList<>();
         inhabitants = new ArrayList<>();
@@ -45,31 +33,16 @@ public class Map {
 
     }
 
-  public void build(Village_Hall hall, Tile t, Building b) {
+    public void build(Tile t, Building b) {
         contains.add(b);
     }
-=======
-    public void move(Infantry i, Tile t) {
-    }
-
-    public void inRange(Infantry i, Building b) {
-    }
-
-    public void build(Village_Hall hall, Tile t, Building b) {
-    }
->>>>>>> abf784868daa920a9ca8b3b9d291a7cf521aa9c7
 
     public int getGuardTime() {
         return guardTime;
     }
 
-<<<<<<< HEAD
     public void setGuardTime(int gTime) {
         this.guardTime = gTime;
     }
-=======
-    public void setGuardTime() {
-    }
->>>>>>> abf784868daa920a9ca8b3b9d291a7cf521aa9c7
 
 }

Assignment 2/src/ca/cosc3p91/a2/gameobjects/Archer.java

@@ -1,4 +1,28 @@
 package ca.cosc3p91.a2.gameobjects;
 
 public class Archer extends Infantry {
+
+    public Archer() {
+        super(90, 2, 10);
+    }
+
+    @Override
+    public void move(Tile t) {
+
+    }
+
+    @Override
+    public void getPosition() {
+
+    }
+
+    @Override
+    public int getLevel() {
+        return super.getLevel();
+    }
+
+    @Override
+    public int setLevel(int level) {
+        return super.setLevel(level);
+    }
 }

Assignment 2/src/ca/cosc3p91/a2/gameobjects/Building.java

@@ -4,7 +4,6 @@ import java.util.ArrayList;
 
 public abstract class Building {
 
-<<<<<<< HEAD
     // members
     private int level;
     private int health;
@@ -14,33 +13,13 @@ public abstract class Building {
     private int goldCost;
     private int ironCost;
     private int woodCost;
-=======
-    private static int level;
-
-    private int health;
-
-    private static Stage stages;
-
-    private int goldCost;
-
-    private int ironCost;
-
-    private int woodCost;
->>>>>>> abf784868daa920a9ca8b3b9d291a7cf521aa9c7
 
     private int buildTime;
 
-<<<<<<< HEAD
     public ArrayList<Tile> tiles = new ArrayList<>();
     public ArrayList<Inhabitant> inhabitants = new ArrayList<>();
 
     // functions
-=======
-    public List<Stage> stage;
-    public Tile tile;
-
-    public List<Inhabitant> inhabitant;
->>>>>>> abf784868daa920a9ca8b3b9d291a7cf521aa9c7
 
     public int getLevel() {
         return level;
@@ -50,7 +29,6 @@ public abstract class Building {
         return health;
     }
 
-<<<<<<< HEAD
     public int getCost(String type) {
         return (type.equals("gold")) ? (goldCost) :
                 (type.equals("iron")) ? (ironCost) : woodCost;
@@ -59,17 +37,11 @@ public abstract class Building {
     public Stage getStage() {
         return stage;
     }
-=======
-    public int getCost(String type) {
-        return 0;
-    }
->>>>>>> abf784868daa920a9ca8b3b9d291a7cf521aa9c7
 
     public int getUpgradeCost() {
         return 0;
     }
 
-<<<<<<< HEAD
     public void setLevel(int level) {
         this.level = level;
     }
@@ -78,7 +50,9 @@ public abstract class Building {
         this.health = health;
     }
 
-  public void setStage(Stage stage) {this.stage = stage; }
+    public void setStage(Stage stage) {
+        this.stage = stage;
+    }
 
     public void addInhabitant(Inhabitant newMember) {
         inhabitants.add(newMember);
@@ -94,14 +68,4 @@ public abstract class Building {
     public int getBuildTime() {
         return buildTime;
     }
-=======
-    public void upgrade() {
-
-    }
-
-    public int getBuildTime() {
-        return 0;
-    }
-
->>>>>>> abf784868daa920a9ca8b3b9d291a7cf521aa9c7
 }

Assignment 2/src/ca/cosc3p91/a2/gameobjects/Catapult.java

@@ -1,4 +1,28 @@
 package ca.cosc3p91.a2.gameobjects;
 
 public class Catapult extends Infantry {
+
+    public Catapult() {
+        super(80, 12, 12);
+    }
+
+    @Override
+    public void move(Tile t) {
+
+    }
+
+    @Override
+    public void getPosition() {
+
+    }
+
+    @Override
+    public int getLevel() {
+        return super.getLevel();
+    }
+
+    @Override
+    public int setLevel(int level) {
+        return super.setLevel(level);
+    }
 }

Assignment 2/src/ca/cosc3p91/a2/gameobjects/DefenseBuilding.java

@@ -2,7 +2,6 @@ package ca.cosc3p91.a2.gameobjects;
 
 public class DefenseBuilding extends Building {
 
-<<<<<<< HEAD
     private int damage;
     private int range;
 
@@ -11,11 +10,6 @@ public class DefenseBuilding extends Building {
         this.damage += stage.getDamageChange();
         this.range += stage.getRangeChange();
     }
-=======
-    public int damage;
-
-    public int range;
->>>>>>> abf784868daa920a9ca8b3b9d291a7cf521aa9c7
 
     public void attack(Infantry attacker) {
 

Assignment 2/src/ca/cosc3p91/a2/gameobjects/DefenseStage.java

@@ -2,15 +2,10 @@ package ca.cosc3p91.a2.gameobjects;
 
 class DefenseStage extends Stage {
 
-<<<<<<< HEAD
     protected int dDamage;
-=======
-    protected int dDamge;
->>>>>>> abf784868daa920a9ca8b3b9d291a7cf521aa9c7
 
     protected int dRange;
 
-<<<<<<< HEAD
     public DefenseStage(int dHealth, int goldCost, int requiredVillageLevel, int upgradeTime, int ironCost, int woodCost,
                         int damageIncrease, int rangeIncrease) {
         super(dHealth, goldCost, requiredVillageLevel, upgradeTime, ironCost, woodCost);
@@ -25,12 +20,5 @@ class DefenseStage extends Stage {
     public int getRangeChange() {
         return dRange;
     }
-=======
-    public void getDamageChange() {
-    }
-
-    public void getRangeChange() {
-    }
->>>>>>> abf784868daa920a9ca8b3b9d291a7cf521aa9c7
 
 }

Assignment 2/src/ca/cosc3p91/a2/gameobjects/Farm.java

@@ -8,11 +8,9 @@ public class Farm extends ResourceBuilding {
     }
 
     public int getPopulationContribution() {
-        return 0;
+        return getHarvestRate();
     }
 
     @Override
-    public void harvest(Village_Hall hall) {
+    public void harvest(Village_Hall hall) {}
-
-    }
 }

Assignment 2/src/ca/cosc3p91/a2/gameobjects/GoldMine.java

@@ -1,20 +0,0 @@
-package ca.cosc3p91.a2.gameobjects;
-
-public class GoldMine extends ResourceBuilding {
-
-<<<<<<< HEAD
-  public static String resource = "gold";
-
-  public GoldMine (int lvl, ResourceStage baseStage) {
-    setLevel(lvl);
-    upgrade(baseStage);
-  }
-=======
-    public static String resource = "good";
->>>>>>> abf784868daa920a9ca8b3b9d291a7cf521aa9c7
-
-    @Override
-    public void harvest(Village_Hall hall) {
-
-    }
-}

Assignment 2/src/ca/cosc3p91/a2/gameobjects/Infantry.java

@@ -1,6 +1,6 @@
 package ca.cosc3p91.a2.gameobjects;
 
-public abstract class Infantry {
+public abstract class Infantry implements Inhabitant {
 
     private int health;
 
@@ -8,16 +8,36 @@ public abstract class Infantry {
 
     private int range;
 
+    public Infantry(int hitPoints, int damage, int range) {
+        this.health = hitPoints;
+        this.damage = damage;
+        this.range = range;
+    }
+
     public void attack(Building b) {
     }
 
-    public void getHealth() {
+    public int getHealth() {
+        return health;
     }
 
-    public void getDamage() {
+    public int getDamage() {
+        return damage;
     }
 
-    public void getRange() {
+    public int getRange() {
+        return range;
     }
 
+    public void setHealth(int health) {
+        this.health = health;
+    }
+
+    public void setDamage(int damage) {
+        this.damage = damage;
+    }
+
+    public void setRange(int range) {
+        this.range = range;
+    }
 }

Assignment 2/src/ca/cosc3p91/a2/gameobjects/Inhabitant.java

@@ -6,9 +6,18 @@ public interface Inhabitant {
 
     Map map = null;
     Building building = null;
+    int lvl = 1;
 
     void move(Tile t);
 
     void getPosition();
 
+    default int getLevel() {
+        return lvl;
+    }
+
+    default int setLevel(int level) {
+        return lvl;
+    }
+
 }

Assignment 2/src/ca/cosc3p91/a2/gameobjects/IronMine.java

@@ -4,7 +4,6 @@ public class IronMine extends ResourceBuilding {
 
     public static String resource = "iron";
 
-<<<<<<< HEAD
     public IronMine(int lvl, ResourceStage baseStage) {
         setLevel(lvl);
         upgrade(baseStage);
@@ -12,10 +11,6 @@ public class IronMine extends ResourceBuilding {
 
     @Override
     public void harvest(Village_Hall hall) {
-=======
+        hall.addCurrentIron(getHarvestRate());
-    @Override
-    public void harvest(Village_Hall hall) {
->>>>>>> abf784868daa920a9ca8b3b9d291a7cf521aa9c7
-
     }
 }

Assignment 2/src/ca/cosc3p91/a2/gameobjects/Knight.java

@@ -1,4 +1,28 @@
 package ca.cosc3p91.a2.gameobjects;
 
 public class Knight extends Infantry {
+
+    public Knight() {
+        super(150, 6, 6);
+    }
+
+    @Override
+    public void move(Tile t) {
+
+    }
+
+    @Override
+    public void getPosition() {
+
+    }
+
+    @Override
+    public int getLevel() {
+        return super.getLevel();
+    }
+
+    @Override
+    public int setLevel(int level) {
+        return super.setLevel(level);
+    }
 }

Assignment 2/src/ca/cosc3p91/a2/gameobjects/LumberMine.java

@@ -4,17 +4,13 @@ public class LumberMine extends ResourceBuilding {
 
     public static String resource = "wood";
 
-<<<<<<< HEAD
     public LumberMine(int lvl, ResourceStage baseStage) {
         setLevel(lvl);
         upgrade(baseStage);
     }
 
     public void harvest(Village_Hall hall) {
-=======
+        hall.addCurrentWood(getHarvestRate());
-    public void harvest(Village_Hall hall) {
+    }
-
-    }
->>>>>>> abf784868daa920a9ca8b3b9d291a7cf521aa9c7
 
 }

Assignment 2/src/ca/cosc3p91/a2/gameobjects/ResourceBuidling.java

@@ -1,11 +0,0 @@
-package ca.cosc3p91.a2.gameobjects;
-
-public abstract class ResourceBuidling extends Building {
-
-    public static String resource;
-
-    private int harvest_rate;
-
-    public abstract void harvest(Village_Hall hall);
-
-}

Assignment 2/src/ca/cosc3p91/a2/gameobjects/ResourceBuilding.java

@@ -1,15 +1,36 @@
 package ca.cosc3p91.a2.gameobjects;
 
+import ca.cosc3p91.a2.util.Time;
+
 public abstract class ResourceBuilding extends Building {
 
     public static String resource;
+
+    private final Time harvestMinTime = new Time().offsetSeconds(10);
+
     private int harvest_rate;
+    private Time nextHarvestTime;
+
+    public ResourceBuilding() {
+        nextHarvestTime = Time.getTime().offsetTime(harvestMinTime);
+    }
 
     public void upgrade(ResourceStage stage) {
         super.upgrade(stage);
         this.harvest_rate += stage.getHarvestRateIncrease();
     }
 
-  public abstract void harvest(Village_Hall hall);
+    public void update(Village_Hall hall){
+        if (nextHarvestTime.occurred()){
+            harvest(hall);
+            nextHarvestTime = Time.getTime().offsetTime(harvestMinTime);
+        }
+    }
+
+    protected abstract void harvest(Village_Hall hall);
+
+    public int getHarvestRate(){
+        return harvest_rate;
+    }
 
 }

Assignment 2/src/ca/cosc3p91/a2/gameobjects/ResourceStage.java

@@ -4,7 +4,6 @@ public class ResourceStage extends Stage {
 
     protected int harvestRateIncrease;
 
-<<<<<<< HEAD
     public ResourceStage(int dHealth, int goldCost, int requiredVillageLevel, int upgradeTime, int ironCost, int woodCost,
                          int harvestRateIncr) {
         super(dHealth, goldCost, requiredVillageLevel, upgradeTime, ironCost, woodCost);
@@ -14,10 +13,5 @@ public class ResourceStage extends Stage {
     public int getHarvestRateIncrease() {
         return harvestRateIncrease;
     }
-=======
-    public int getHarvestRateIncrease() {
-        return harvestRateIncrease;
-    }
->>>>>>> abf784868daa920a9ca8b3b9d291a7cf521aa9c7
 
 }

Assignment 2/src/ca/cosc3p91/a2/gameobjects/SaulGoodMine.java

@@ -0,0 +1,18 @@
+package ca.cosc3p91.a2.gameobjects;
+
+import ca.cosc3p91.a2.util.Time;
+
+public class SaulGoodMine extends ResourceBuilding {
+
+    public static String resource = "gold";
+
+    public SaulGoodMine(int lvl, ResourceStage baseStage) {
+        setLevel(lvl);
+        upgrade(baseStage);
+    }
+
+    @Override
+    public void harvest(Village_Hall hall) {
+        hall.addCurrentGold(getHarvestRate());
+    }
+}

Assignment 2/src/ca/cosc3p91/a2/gameobjects/Soldier.java

@@ -1,4 +1,28 @@
 package ca.cosc3p91.a2.gameobjects;
 
 public class Soldier extends Infantry {
+
+    public Soldier() {
+        super(100, 4, 4);
+    }
+
+    @Override
+    public void move(Tile t) {
+
+    }
+
+    @Override
+    public void getPosition() {
+
+    }
+
+    @Override
+    public int getLevel() {
+        return super.getLevel();
+    }
+
+    @Override
+    public int setLevel(int level) {
+        return super.setLevel(level);
+    }
 }

Assignment 2/src/ca/cosc3p91/a2/gameobjects/Stage.java

@@ -14,7 +14,6 @@ abstract class Stage {
 
     protected int woodCost;
 
-<<<<<<< HEAD
     public Stage(int dHealth, int goldCost, int requiredVillageLevel, int upgradeTime, int ironCost, int woodCost) {
         this.dHealth = dHealth;
         this.goldCost = goldCost;
@@ -32,16 +31,6 @@ abstract class Stage {
         return (type.equals("gold")) ? (goldCost) :
                 (type.equals("iron")) ? (ironCost) : woodCost;
     }
-=======
-    public Building building;
-
-    public void getHealthChange() {
-    }
-
-    public int getCost(String type) {
-        return 0;
-    }
->>>>>>> abf784868daa920a9ca8b3b9d291a7cf521aa9c7
 
     public int getRequiredVillageLevel() {
         return requiredVillageLevel;

Assignment 2/src/ca/cosc3p91/a2/gameobjects/Tile.java

@@ -8,9 +8,4 @@ public class Tile {
 
     public int y;
 
-<<<<<<< HEAD
-=======
-    public List<Building> building;
-
->>>>>>> abf784868daa920a9ca8b3b9d291a7cf521aa9c7
 }

Assignment 2/src/ca/cosc3p91/a2/gameobjects/VillageStage.java

@@ -8,7 +8,6 @@ public class VillageStage extends Stage {
 
     protected int woodCapacityIncrease;
 
-<<<<<<< HEAD
     public VillageStage(int dHealth, int goldCost, int requiredVillageLevel, int upgradeTime, int ironCost, int woodCost,
                         int goldCapIncrease, int ironCapIncrease, int woodCapIncrease) {
         super(dHealth, goldCost, requiredVillageLevel, upgradeTime, ironCost, woodCost);
@@ -20,11 +19,6 @@ public class VillageStage extends Stage {
     public int getGoldCapacityIncrease() {
         return goldCapacityIncrease;
     }
-=======
-    public int getGoldCapacityIncrease() {
-        return goldCapacityIncrease;
-    }
->>>>>>> abf784868daa920a9ca8b3b9d291a7cf521aa9c7
 
     public int getIronCapacityIncrease() {
         return ironCapacityIncrease;

Assignment 2/src/ca/cosc3p91/a2/gameobjects/Village_Hall.java

@@ -4,13 +4,14 @@ import java.util.ArrayList;
 
 public class Village_Hall extends Building {
 
-<<<<<<< HEAD
     private int goldCapacity = 0;
-
     private int ironCapacity = 0;
-
     private int woodCapacity = 0;
 
+    private int currentGold;
+    private int currentIron;
+    private int currentWood;
+
     public Village_Hall(int lvl, VillageStage baseStage) {
         setLevel(lvl);
         upgrade(baseStage);
@@ -35,24 +36,28 @@ public class Village_Hall extends Building {
     public int getWoodCapacity() {
         return woodCapacity;
     }
-=======
-    private int goldCapacity;
 
-    private int ironCapacity;
+    public int getCurrentGold() {
-
+        return currentGold;
-    private int woodCapacity;
-
-    public int getGoldCapacity() {
-        return goldCapacity;
     }
 
-    public int getIronCapacity() {
+    public void addCurrentGold(int currentGold) {
-        return ironCapacity;
+        this.currentGold += currentGold;
     }
 
-    public int getWoodCapacity() {
+    public int getCurrentIron() {
-        return woodCapacity;
+        return currentIron;
     }
->>>>>>> abf784868daa920a9ca8b3b9d291a7cf521aa9c7
 
+    public void addCurrentIron(int currentIron) {
+        this.currentIron += currentIron;
+    }
+
+    public int getCurrentWood() {
+        return currentWood;
+    }
+
+    public void addCurrentWood(int currentWood) {
+        this.currentWood += currentWood;
+    }
 }

Assignment 2/src/ca/cosc3p91/a2/gameobjects/Worker.java

@@ -1,11 +1,34 @@
 package ca.cosc3p91.a2.gameobjects;
 
-public class Worker {
+public class Worker implements Inhabitant {
 
     private boolean currentlyBuilding;
 
+    public void set_IsBuilding(boolean state) {
+        currentlyBuilding = state;
+    }
+
     public boolean isCurrentlyBuilding() {
         return currentlyBuilding;
     }
 
+    @Override
+    public void move(Tile t) {
+
+    }
+
+    @Override
+    public void getPosition() {
+
+    }
+
+    @Override
+    public int getLevel() {
+        return Inhabitant.super.getLevel();
+    }
+
+    @Override
+    public int setLevel(int level) {
+        return Inhabitant.super.setLevel(level);
+    }
 }

Assignment 2/src/ca/cosc3p91/a2/player/Player.java

@@ -2,16 +2,5 @@ package ca.cosc3p91.a2.player;
 
 public class Player {
 
-<<<<<<< HEAD
-  public int currentGold;
-  public int currentIron;
-  public int currentWood;
-=======
-    public int currentGold;
-
-    public int currentIron;
-
-    public int currentWood;
->>>>>>> abf784868daa920a9ca8b3b9d291a7cf521aa9c7
 
 }

Assignment 2/src/ca/cosc3p91/a2/util/Time.java

@@ -37,16 +37,8 @@ public class Time {
         return timeSeconds;
     }
 
-    public static class FutureTime {
-        private final Time futureTime;
-
-        public FutureTime(Time futureTime) {
-            this.futureTime = futureTime;
-        }
-
     public boolean occurred() {
-            return getTime().timeSeconds >= futureTime.timeSeconds;
+        return getTime().timeSeconds >= timeSeconds;
-        }
     }
 
     public static Time getTime() {