From 7106da8e950f1e0257cfe022c26ed6d91865c88d Mon Sep 17 00:00:00 2001
From: Brett Laptop <tri11paragon@tpgc.me>
Date: Wed, 1 Mar 2023 13:31:16 -0500
Subject: [PATCH] reformat code

---
 .../src/ca/cosc3p91/a2/game/GameEngine.java   | 34 ++++++------
 Assignment 2/src/ca/cosc3p91/a2/game/Map.java | 31 ++++++-----
 .../ca/cosc3p91/a2/gameobjects/Building.java  | 54 +++++++++----------
 .../ca/cosc3p91/a2/gameobjects/Collector.java |  8 +--
 .../a2/gameobjects/DefenseBuilding.java       |  8 +--
 .../cosc3p91/a2/gameobjects/DefenseStage.java | 12 ++---
 .../src/ca/cosc3p91/a2/gameobjects/Farm.java  | 12 ++---
 .../ca/cosc3p91/a2/gameobjects/GoldMine.java  |  8 +--
 .../ca/cosc3p91/a2/gameobjects/Infantry.java  | 22 ++++----
 .../cosc3p91/a2/gameobjects/Inhabitant.java   |  8 +--
 .../ca/cosc3p91/a2/gameobjects/IronMine.java  |  8 +--
 .../cosc3p91/a2/gameobjects/LumberMine.java   |  8 +--
 .../a2/gameobjects/ResourceBuidling.java      |  6 +--
 .../a2/gameobjects/ResourceStage.java         |  8 +--
 .../src/ca/cosc3p91/a2/gameobjects/Stage.java | 36 ++++++-------
 .../src/ca/cosc3p91/a2/gameobjects/Tile.java  |  6 +--
 .../cosc3p91/a2/gameobjects/VillageStage.java | 24 ++++-----
 .../cosc3p91/a2/gameobjects/Village_Hall.java | 24 ++++-----
 .../ca/cosc3p91/a2/gameobjects/Worker.java    |  8 +--
 .../src/ca/cosc3p91/a2/player/Player.java     |  6 +--
 20 files changed, 167 insertions(+), 164 deletions(-)

diff --git a/Assignment 2/src/ca/cosc3p91/a2/game/GameEngine.java b/Assignment 2/src/ca/cosc3p91/a2/game/GameEngine.java
index 167c740..54552b6 100644
--- a/Assignment 2/src/ca/cosc3p91/a2/game/GameEngine.java	
+++ b/Assignment 2/src/ca/cosc3p91/a2/game/GameEngine.java	
@@ -4,26 +4,30 @@ import ca.cosc3p91.a2.player.Player;
 
 public class GameEngine implements Runnable {
 
-  private Player player;
+    private final boolean running = true;
 
-  private int pillageFactor;
+    private Player player;
 
-  private int currentTime;
+    private int pillageFactor;
 
-  public Map map;
+    private int currentTime;
 
-  public void attackVIllage(Map map) {
-  }
+    public Map map;
 
-  public Map generateMap() {
-    return null;
-  }
+    public void attackVIllage(Map map) {
+    }
 
-  public void getScore(Map map) {
-  }
+    public Map generateMap() {
+        return null;
+    }
 
-  @Override
-  public void run() {
-    
-  }
+    public void getScore(Map map) {
+    }
+
+    @Override
+    public void run() {
+        while (running) {
+
+        }
+    }
 }
diff --git a/Assignment 2/src/ca/cosc3p91/a2/game/Map.java b/Assignment 2/src/ca/cosc3p91/a2/game/Map.java
index 4f1deb9..c216d2e 100644
--- a/Assignment 2/src/ca/cosc3p91/a2/game/Map.java	
+++ b/Assignment 2/src/ca/cosc3p91/a2/game/Map.java	
@@ -5,31 +5,30 @@ import ca.cosc3p91.a2.gameobjects.*;
 import java.util.List;
 
 
-
 public class Map {
 
-  private Village_Hall townHall;
+    private Village_Hall townHall;
 
-  private int guardTime;
+    private int guardTime;
 
-  private List<Building> contains;
+    private List<Building> contains;
 
-  public List<Inhabitant> inhabitants;
+    public List<Inhabitant> inhabitants;
 
-  public void move(Infantry i, Tile t) {
-  }
+    public void move(Infantry i, Tile t) {
+    }
 
-  public void inRange(Infantry i, Building b) {
-  }
+    public void inRange(Infantry i, Building b) {
+    }
 
-  public void build(Village_Hall hall, Tile t, Building b) {
-  }
+    public void build(Village_Hall hall, Tile t, Building b) {
+    }
 
-  public int getGuardTime() {
-    return guardTime;
-  }
+    public int getGuardTime() {
+        return guardTime;
+    }
 
-  public void setGuardTime() {
-  }
+    public void setGuardTime() {
+    }
 
 }
diff --git a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Building.java b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Building.java
index 13d2f1b..cddb71e 100644
--- a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Building.java	
+++ b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Building.java	
@@ -4,47 +4,47 @@ import java.util.List;
 
 public abstract class Building {
 
-  private static int level;
+    private static int level;
 
-  private int health;
+    private int health;
 
-  private static Stage stages;
+    private static Stage stages;
 
-  private int goldCost;
+    private int goldCost;
 
-  private int ironCost;
+    private int ironCost;
 
-  private int woodCost;
+    private int woodCost;
 
-  private int buildTime;
+    private int buildTime;
 
-  public List<Stage> stage;
-  public Tile tile;
+    public List<Stage> stage;
+    public Tile tile;
 
-  public List<Inhabitant> inhabitant;
+    public List<Inhabitant> inhabitant;
 
-  public int getLevel() {
-    return level;
-  }
+    public int getLevel() {
+        return level;
+    }
 
-  public int getHealth() {
-    return health;
-  }
+    public int getHealth() {
+        return health;
+    }
 
-  public int getCost(String type) {
-    return 0;
-  }
+    public int getCost(String type) {
+        return 0;
+    }
 
-  public int getUpgradeCost() {
-    return 0;
-  }
+    public int getUpgradeCost() {
+        return 0;
+    }
 
-  public void upgrade() {
+    public void upgrade() {
 
-  }
+    }
 
-  public int getBuildTime() {
-    return 0;
-  }
+    public int getBuildTime() {
+        return 0;
+    }
 
 }
diff --git a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Collector.java b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Collector.java
index 7d63c27..dcf9a4f 100644
--- a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Collector.java	
+++ b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Collector.java	
@@ -2,10 +2,10 @@ package ca.cosc3p91.a2.gameobjects;
 
 public class Collector {
 
-  private int averageCollectionRate;
+    private int averageCollectionRate;
 
-  public int getCollectionRate() {
-    return averageCollectionRate;
-  }
+    public int getCollectionRate() {
+        return averageCollectionRate;
+    }
 
 }
diff --git a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/DefenseBuilding.java b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/DefenseBuilding.java
index 669945f..92dc8fe 100644
--- a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/DefenseBuilding.java	
+++ b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/DefenseBuilding.java	
@@ -2,12 +2,12 @@ package ca.cosc3p91.a2.gameobjects;
 
 public class DefenseBuilding extends Building {
 
-  public int damage;
+    public int damage;
 
-  public int range;
+    public int range;
 
-  public void attack(Infantry attacker) {
+    public void attack(Infantry attacker) {
 
-  }
+    }
 
 }
diff --git a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/DefenseStage.java b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/DefenseStage.java
index ea2c8fa..09083cd 100644
--- a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/DefenseStage.java	
+++ b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/DefenseStage.java	
@@ -2,14 +2,14 @@ package ca.cosc3p91.a2.gameobjects;
 
 class DefenseStage extends Stage {
 
-  protected int dDamge;
+    protected int dDamge;
 
-  protected int dRange;
+    protected int dRange;
 
-  public void getDamageChange() {
-  }
+    public void getDamageChange() {
+    }
 
-  public void getRangeChange() {
-  }
+    public void getRangeChange() {
+    }
 
 }
\ No newline at end of file
diff --git a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Farm.java b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Farm.java
index 3f39711..b8e78ea 100644
--- a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Farm.java	
+++ b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Farm.java	
@@ -2,12 +2,12 @@ package ca.cosc3p91.a2.gameobjects;
 
 public class Farm extends ResourceBuidling {
 
-  public int getPopulationContribution() {
-    return 0;
-  }
+    public int getPopulationContribution() {
+        return 0;
+    }
 
-  @Override
-  public void harvest(Village_Hall hall) {
+    @Override
+    public void harvest(Village_Hall hall) {
 
-  }
+    }
 }
diff --git a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/GoldMine.java b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/GoldMine.java
index 43e25de..648bc90 100644
--- a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/GoldMine.java	
+++ b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/GoldMine.java	
@@ -2,10 +2,10 @@ package ca.cosc3p91.a2.gameobjects;
 
 public class GoldMine extends ResourceBuidling {
 
-  public static String resource = "good";
+    public static String resource = "good";
 
-  @Override
-  public void harvest(Village_Hall hall) {
+    @Override
+    public void harvest(Village_Hall hall) {
 
-  }
+    }
 }
diff --git a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Infantry.java b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Infantry.java
index 9a3c078..a9c4f7c 100644
--- a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Infantry.java	
+++ b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Infantry.java	
@@ -2,22 +2,22 @@ package ca.cosc3p91.a2.gameobjects;
 
 public abstract class Infantry {
 
-  private int health;
+    private int health;
 
-  private int damage;
+    private int damage;
 
-  private int range;
+    private int range;
 
-  public void attack(Building b) {
-  }
+    public void attack(Building b) {
+    }
 
-  public void getHealth() {
-  }
+    public void getHealth() {
+    }
 
-  public void getDamage() {
-  }
+    public void getDamage() {
+    }
 
-  public void getRange() {
-  }
+    public void getRange() {
+    }
 
 }
diff --git a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Inhabitant.java b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Inhabitant.java
index 96c6da8..3a10a28 100644
--- a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Inhabitant.java	
+++ b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Inhabitant.java	
@@ -4,11 +4,11 @@ import ca.cosc3p91.a2.game.Map;
 
 public interface Inhabitant {
 
-  public Map map = null;
-  public Building building = null;
+    Map map = null;
+    Building building = null;
 
-  public void move(Tile t);
+    void move(Tile t);
 
-  public void getPosition();
+    void getPosition();
 
 }
diff --git a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/IronMine.java b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/IronMine.java
index 296fc76..69e1faf 100644
--- a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/IronMine.java	
+++ b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/IronMine.java	
@@ -2,10 +2,10 @@ package ca.cosc3p91.a2.gameobjects;
 
 public class IronMine extends ResourceBuidling {
 
-  public static String resource = "iron";
+    public static String resource = "iron";
 
-  @Override
-  public void harvest(Village_Hall hall) {
+    @Override
+    public void harvest(Village_Hall hall) {
 
-  }
+    }
 }
diff --git a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/LumberMine.java b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/LumberMine.java
index 658839f..68c7492 100644
--- a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/LumberMine.java	
+++ b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/LumberMine.java	
@@ -2,10 +2,10 @@ package ca.cosc3p91.a2.gameobjects;
 
 public class LumberMine extends ResourceBuidling {
 
-  public static String resource = "wood";
+    public static String resource = "wood";
 
-  public void harvest(Village_Hall hall) {
+    public void harvest(Village_Hall hall) {
+
+    }
 
-  }
-    
 }
diff --git a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/ResourceBuidling.java b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/ResourceBuidling.java
index 3560777..c0c9fbc 100644
--- a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/ResourceBuidling.java	
+++ b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/ResourceBuidling.java	
@@ -2,10 +2,10 @@ package ca.cosc3p91.a2.gameobjects;
 
 public abstract class ResourceBuidling extends Building {
 
-  public static String resource;
+    public static String resource;
 
-  private int harvest_rate;
+    private int harvest_rate;
 
-  public abstract void harvest(Village_Hall hall);
+    public abstract void harvest(Village_Hall hall);
 
 }
diff --git a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/ResourceStage.java b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/ResourceStage.java
index 90401bf..07f14bb 100644
--- a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/ResourceStage.java	
+++ b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/ResourceStage.java	
@@ -2,10 +2,10 @@ package ca.cosc3p91.a2.gameobjects;
 
 public class ResourceStage extends Stage {
 
-  protected int harvestRateIncrease;
+    protected int harvestRateIncrease;
 
-  public int getHarvestRateIncrease() {
-    return harvestRateIncrease;
-  }
+    public int getHarvestRateIncrease() {
+        return harvestRateIncrease;
+    }
 
 }
diff --git a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Stage.java b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Stage.java
index 2779c75..8a78efa 100644
--- a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Stage.java	
+++ b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Stage.java	
@@ -2,33 +2,33 @@ package ca.cosc3p91.a2.gameobjects;
 
 abstract class Stage {
 
-  protected int dHealth;
+    protected int dHealth;
 
-  protected int goldCost;
+    protected int goldCost;
 
-  protected int requiredVillageLevel;
+    protected int requiredVillageLevel;
 
-  protected int upgradeTime;
+    protected int upgradeTime;
 
-  protected int ironCost;
+    protected int ironCost;
 
-  protected int woodCost;
+    protected int woodCost;
 
-  public Building building;
+    public Building building;
 
-  public void getHealthChange() {
-  }
+    public void getHealthChange() {
+    }
 
-  public int getCost(String type) {
-    return 0;
-  }
+    public int getCost(String type) {
+        return 0;
+    }
 
-  public int getRequiredVillageLevel() {
-    return requiredVillageLevel;
-  }
+    public int getRequiredVillageLevel() {
+        return requiredVillageLevel;
+    }
 
-  public int getUpgradeTime() {
-    return upgradeTime;
-  }
+    public int getUpgradeTime() {
+        return upgradeTime;
+    }
 
 }
diff --git a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Tile.java b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Tile.java
index 708c2e4..e29ec41 100644
--- a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Tile.java	
+++ b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Tile.java	
@@ -4,10 +4,10 @@ import java.util.List;
 
 public class Tile {
 
-  public int x;
+    public int x;
 
-  public int y;
+    public int y;
 
-  public List<Building> building;
+    public List<Building> building;
 
 }
diff --git a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/VillageStage.java b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/VillageStage.java
index 225a504..e4e4f95 100644
--- a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/VillageStage.java	
+++ b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/VillageStage.java	
@@ -2,22 +2,22 @@ package ca.cosc3p91.a2.gameobjects;
 
 class VillageStage extends Stage {
 
-  protected int goldCapacityIncrease;
+    protected int goldCapacityIncrease;
 
-  protected int ironCapacityIncrease;
+    protected int ironCapacityIncrease;
 
-  protected int woodCapacityIncrease;
+    protected int woodCapacityIncrease;
 
-  public int getGoldCapacityIncrease() {
-    return goldCapacityIncrease;
-  }
+    public int getGoldCapacityIncrease() {
+        return goldCapacityIncrease;
+    }
 
-  public int getIronCapacityIncrease() {
-    return ironCapacityIncrease;
-  }
+    public int getIronCapacityIncrease() {
+        return ironCapacityIncrease;
+    }
 
-  public int getWoodCapacityIncrease() {
-    return woodCapacityIncrease;
-  }
+    public int getWoodCapacityIncrease() {
+        return woodCapacityIncrease;
+    }
 
 }
diff --git a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Village_Hall.java b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Village_Hall.java
index ca5a801..f651385 100644
--- a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Village_Hall.java	
+++ b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Village_Hall.java	
@@ -2,22 +2,22 @@ package ca.cosc3p91.a2.gameobjects;
 
 public class Village_Hall extends Building {
 
-  private int goldCapacity;
+    private int goldCapacity;
 
-  private int ironCapacity;
+    private int ironCapacity;
 
-  private int woodCapacity;
+    private int woodCapacity;
 
-  public int getGoldCapacity() {
-  return goldCapacity;
-  }
+    public int getGoldCapacity() {
+        return goldCapacity;
+    }
 
-  public int getIronCapacity() {
-  return ironCapacity;
-  }
+    public int getIronCapacity() {
+        return ironCapacity;
+    }
 
-  public int getWoodCapacity() {
-  return woodCapacity;
-  }
+    public int getWoodCapacity() {
+        return woodCapacity;
+    }
 
 }
diff --git a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Worker.java b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Worker.java
index ae319b1..90255c0 100644
--- a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Worker.java	
+++ b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Worker.java	
@@ -2,10 +2,10 @@ package ca.cosc3p91.a2.gameobjects;
 
 public class Worker {
 
-  private boolean currentlyBuilding;
+    private boolean currentlyBuilding;
 
-  public boolean isCurrentlyBuilding() {
-    return currentlyBuilding;
-  }
+    public boolean isCurrentlyBuilding() {
+        return currentlyBuilding;
+    }
 
 }
diff --git a/Assignment 2/src/ca/cosc3p91/a2/player/Player.java b/Assignment 2/src/ca/cosc3p91/a2/player/Player.java
index 6508591..f6121ab 100644
--- a/Assignment 2/src/ca/cosc3p91/a2/player/Player.java	
+++ b/Assignment 2/src/ca/cosc3p91/a2/player/Player.java	
@@ -2,10 +2,10 @@ package ca.cosc3p91.a2.player;
 
 public class Player {
 
-  public int currentGold;
+    public int currentGold;
 
-  public int currentIron;
+    public int currentIron;
 
-  public int currentWood;
+    public int currentWood;
 
 }
\ No newline at end of file