diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Assignment 2/src/ca/cosc3p91/a2/Main.java b/Assignment 2/src/ca/cosc3p91/a2/Main.java index 18130b1..e65efa7 100644 --- a/Assignment 2/src/ca/cosc3p91/a2/Main.java +++ b/Assignment 2/src/ca/cosc3p91/a2/Main.java @@ -7,6 +7,7 @@ public class Main { public static void main(String[] args) { GameEngine engine = new GameEngine(); + engine.printMap(); engine.run(); } diff --git a/Assignment 2/src/ca/cosc3p91/a2/game/GameEngine.java b/Assignment 2/src/ca/cosc3p91/a2/game/GameEngine.java index 167c740..7ff19d4 100644 --- a/Assignment 2/src/ca/cosc3p91/a2/game/GameEngine.java +++ b/Assignment 2/src/ca/cosc3p91/a2/game/GameEngine.java @@ -1,5 +1,8 @@ package ca.cosc3p91.a2.game; +import ca.cosc3p91.a2.gameobjects.Building; +import ca.cosc3p91.a2.gameobjects.VillageStage; +import ca.cosc3p91.a2.gameobjects.Village_Hall; import ca.cosc3p91.a2.player.Player; public class GameEngine implements Runnable { @@ -12,7 +15,22 @@ public class GameEngine implements Runnable { public Map map; - public void attackVIllage(Map map) { + public GameEngine () { + player = new Player(); + VillageStage vInitialStage = new VillageStage(100,0,2,30,0, + 0, 12,12,12); + map = new Map(new Village_Hall(1,vInitialStage),30); + } + + public void printMap() { + System.out.println("~ Current Map State ~\n\n"); + System.out.println("In Map:\n"); + for (Building b : map.contains) { + System.out.println("|> "+b.getClass().toString()+" lvl: "+b.getLevel()+" health: "+b.getHealth()); + } + } + + public void attackVillage(Map map) { } public Map generateMap() { diff --git a/Assignment 2/src/ca/cosc3p91/a2/game/Map.java b/Assignment 2/src/ca/cosc3p91/a2/game/Map.java index 4f1deb9..8564a36 100644 --- a/Assignment 2/src/ca/cosc3p91/a2/game/Map.java +++ b/Assignment 2/src/ca/cosc3p91/a2/game/Map.java @@ -2,34 +2,47 @@ package ca.cosc3p91.a2.game; import ca.cosc3p91.a2.gameobjects.*; +import java.util.ArrayList; import java.util.List; - - public class Map { + static int MAXSIZE = 400; + private Village_Hall townHall; private int guardTime; - private List contains; + public List contains; public List inhabitants; + public Map (Village_Hall villageHall, int gTime) { + contains = new ArrayList<>(); + inhabitants = new ArrayList<>(); + this.townHall = villageHall; + this.contains.add(villageHall); + this.guardTime = gTime; + } + public void move(Infantry i, Tile t) { + } public void inRange(Infantry i, Building b) { + } public void build(Village_Hall hall, Tile t, Building b) { + contains.add(b); } public int getGuardTime() { return guardTime; } - public void setGuardTime() { + public void setGuardTime(int gTime) { + this.guardTime = gTime; } } diff --git a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Building.java b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Building.java index 13d2f1b..91f5a03 100644 --- a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Building.java +++ b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Building.java @@ -1,27 +1,25 @@ package ca.cosc3p91.a2.gameobjects; -import java.util.List; +import java.util.ArrayList; public abstract class Building { - private static int level; - + // members + private int level; private int health; - private static Stage stages; + private Stage stage; private int goldCost; - private int ironCost; - private int woodCost; private int buildTime; - public List stage; - public Tile tile; + public ArrayList tiles = new ArrayList<>(); + public ArrayList inhabitants = new ArrayList<>(); - public List inhabitant; + // functions public int getLevel() { return level; @@ -32,19 +30,40 @@ public abstract class Building { } public int getCost(String type) { - return 0; + return (type.equals("gold"))?(goldCost): + (type.equals("iron"))?(ironCost):woodCost; + } + + public Stage getStage() { + return stage; } public int getUpgradeCost() { return 0; } - public void upgrade() { + public void setLevel(int level) { + this.level = level; + } + public void setHealth(int health) { + this.health = health; + } + + public void setStage(Stage stage) {this.stage = stage; } + + public void addInhabitant(Inhabitant newMember) { + inhabitants.add(newMember); + // newMember.setBuilding(this); + } + + public void upgrade(Stage stage) { + this.stage = stage; + this.health += stage.dHealth; + // interact with the timer regarding Upgrade time } public int getBuildTime() { - return 0; + return buildTime; } - } diff --git a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/DefenseBuilding.java b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/DefenseBuilding.java index 669945f..30b3692 100644 --- a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/DefenseBuilding.java +++ b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/DefenseBuilding.java @@ -2,9 +2,14 @@ package ca.cosc3p91.a2.gameobjects; public class DefenseBuilding extends Building { - public int damage; + private int damage; + private int range; - public int range; + public void upgrade(DefenseStage stage) { + super.upgrade(stage); + this.damage += stage.getDamageChange(); + this.range += stage.getRangeChange(); + } 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..bc0320c 100644 --- a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/DefenseStage.java +++ b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/DefenseStage.java @@ -2,14 +2,23 @@ package ca.cosc3p91.a2.gameobjects; class DefenseStage extends Stage { - protected int dDamge; + protected int dDamage; protected int dRange; - public void getDamageChange() { + 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); + this.dDamage = damageIncrease; + this.dRange = rangeIncrease; } - public void getRangeChange() { + public int getDamageChange() { + return dDamage; + } + + public int getRangeChange() { + return dRange; } } \ 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..28b92f5 100644 --- a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Farm.java +++ b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Farm.java @@ -1,6 +1,11 @@ package ca.cosc3p91.a2.gameobjects; -public class Farm extends ResourceBuidling { +public class Farm extends ResourceBuilding { + + public Farm (int lvl, ResourceStage baseStage) { + setLevel(lvl); + upgrade(baseStage); + } public int getPopulationContribution() { return 0; diff --git a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/GoldMine.java b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/GoldMine.java index 43e25de..7aa95f9 100644 --- a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/GoldMine.java +++ b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/GoldMine.java @@ -1,8 +1,13 @@ package ca.cosc3p91.a2.gameobjects; -public class GoldMine extends ResourceBuidling { +public class GoldMine extends ResourceBuilding { - public static String resource = "good"; + public static String resource = "gold"; + + public GoldMine (int lvl, ResourceStage baseStage) { + setLevel(lvl); + upgrade(baseStage); + } @Override public void harvest(Village_Hall hall) { diff --git a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/IronMine.java b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/IronMine.java index 296fc76..ec38c21 100644 --- a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/IronMine.java +++ b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/IronMine.java @@ -1,9 +1,14 @@ package ca.cosc3p91.a2.gameobjects; -public class IronMine extends ResourceBuidling { +public class IronMine extends ResourceBuilding { public static String resource = "iron"; + public IronMine (int lvl, ResourceStage baseStage) { + setLevel(lvl); + upgrade(baseStage); + } + @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..b5323b5 100644 --- a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/LumberMine.java +++ b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/LumberMine.java @@ -1,9 +1,14 @@ package ca.cosc3p91.a2.gameobjects; -public class LumberMine extends ResourceBuidling { +public class LumberMine extends ResourceBuilding { public static String resource = "wood"; + public LumberMine (int lvl, ResourceStage baseStage) { + setLevel(lvl); + upgrade(baseStage); + } + 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 deleted file mode 100644 index 3560777..0000000 --- a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/ResourceBuidling.java +++ /dev/null @@ -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); - -} diff --git a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/ResourceBuilding.java b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/ResourceBuilding.java new file mode 100644 index 0000000..546e841 --- /dev/null +++ b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/ResourceBuilding.java @@ -0,0 +1,15 @@ +package ca.cosc3p91.a2.gameobjects; + +public abstract class ResourceBuilding extends Building { + + public static String resource; + private int harvest_rate; + + public void upgrade(ResourceStage stage) { + super.upgrade(stage); + this.harvest_rate += stage.getHarvestRateIncrease(); + } + + 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..a2092b0 100644 --- a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/ResourceStage.java +++ b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/ResourceStage.java @@ -4,6 +4,12 @@ public class ResourceStage extends Stage { protected int harvestRateIncrease; + public ResourceStage(int dHealth, int goldCost, int requiredVillageLevel, int upgradeTime, int ironCost, int woodCost, + int harvestRateIncr) { + super(dHealth,goldCost,requiredVillageLevel,upgradeTime,ironCost,woodCost); + this.harvestRateIncrease = harvestRateIncr; + } + 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..71e10a1 100644 --- a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Stage.java +++ b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Stage.java @@ -14,13 +14,22 @@ abstract class Stage { protected int woodCost; - public Building building; + public Stage(int dHealth, int goldCost, int requiredVillageLevel, int upgradeTime, int ironCost, int woodCost) { + this.dHealth = dHealth; + this.goldCost = goldCost; + this.requiredVillageLevel = requiredVillageLevel; + this.upgradeTime = upgradeTime; + this.ironCost = ironCost; + this.woodCost = woodCost; + } - public void getHealthChange() { + public int getHealthChange() { + return dHealth; } public int getCost(String type) { - return 0; + return (type.equals("gold"))?(goldCost): + (type.equals("iron"))?(ironCost):woodCost; } public int getRequiredVillageLevel() { diff --git a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Tile.java b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Tile.java index 708c2e4..bbc6f6f 100644 --- a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Tile.java +++ b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Tile.java @@ -8,6 +8,4 @@ public class Tile { public int y; - public List 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..71c7019 100644 --- a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/VillageStage.java +++ b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/VillageStage.java @@ -1,6 +1,6 @@ package ca.cosc3p91.a2.gameobjects; -class VillageStage extends Stage { +public class VillageStage extends Stage { protected int goldCapacityIncrease; @@ -8,6 +8,14 @@ class VillageStage extends Stage { protected int woodCapacityIncrease; + 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); + this.goldCapacityIncrease = goldCapIncrease; + this.ironCapacityIncrease = ironCapIncrease; + this.woodCapacityIncrease = woodCapIncrease; + } + public int getGoldCapacityIncrease() { return goldCapacityIncrease; } 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..039216a 100644 --- a/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Village_Hall.java +++ b/Assignment 2/src/ca/cosc3p91/a2/gameobjects/Village_Hall.java @@ -1,23 +1,38 @@ package ca.cosc3p91.a2.gameobjects; +import java.util.ArrayList; + public class Village_Hall extends Building { - private int goldCapacity; + private int goldCapacity = 0; - private int ironCapacity; + private int ironCapacity = 0; + + private int woodCapacity = 0; + + public Village_Hall (int lvl, VillageStage baseStage) { + setLevel(lvl); + upgrade(baseStage); + } + + public void upgrade(VillageStage stage) { + super.upgrade(stage); + this.goldCapacity += stage.getGoldCapacityIncrease(); + this.ironCapacity += stage.getIronCapacityIncrease(); + this.woodCapacity += stage.getWoodCapacityIncrease(); + } - private int woodCapacity; public int getGoldCapacity() { - return goldCapacity; + return goldCapacity; } public int getIronCapacity() { - return ironCapacity; + return ironCapacity; } public int getWoodCapacity() { - return woodCapacity; + return woodCapacity; } } diff --git a/Assignment 2/src/ca/cosc3p91/a2/player/Player.java b/Assignment 2/src/ca/cosc3p91/a2/player/Player.java index 6508591..0dcbff3 100644 --- a/Assignment 2/src/ca/cosc3p91/a2/player/Player.java +++ b/Assignment 2/src/ca/cosc3p91/a2/player/Player.java @@ -3,9 +3,7 @@ package ca.cosc3p91.a2.player; public class Player { public int currentGold; - public int currentIron; - public int currentWood; } \ No newline at end of file diff --git a/out/production/untitled104/ca/cosc3p91/a2/Main.class b/out/production/untitled104/ca/cosc3p91/a2/Main.class new file mode 100644 index 0000000..ac4e0ac Binary files /dev/null and b/out/production/untitled104/ca/cosc3p91/a2/Main.class differ diff --git a/out/production/untitled104/ca/cosc3p91/a2/game/GameEngine.class b/out/production/untitled104/ca/cosc3p91/a2/game/GameEngine.class new file mode 100644 index 0000000..8d8c078 Binary files /dev/null and b/out/production/untitled104/ca/cosc3p91/a2/game/GameEngine.class differ diff --git a/out/production/untitled104/ca/cosc3p91/a2/game/Map.class b/out/production/untitled104/ca/cosc3p91/a2/game/Map.class new file mode 100644 index 0000000..ff3148f Binary files /dev/null and b/out/production/untitled104/ca/cosc3p91/a2/game/Map.class differ diff --git a/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Archer.class b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Archer.class new file mode 100644 index 0000000..0f7650d Binary files /dev/null and b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Archer.class differ diff --git a/out/production/untitled104/ca/cosc3p91/a2/gameobjects/ArcherTower.class b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/ArcherTower.class new file mode 100644 index 0000000..ae0ceb7 Binary files /dev/null and b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/ArcherTower.class differ diff --git a/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Building.class b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Building.class new file mode 100644 index 0000000..fb7a845 Binary files /dev/null and b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Building.class differ diff --git a/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Cannon.class b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Cannon.class new file mode 100644 index 0000000..5a152fd Binary files /dev/null and b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Cannon.class differ diff --git a/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Catapult.class b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Catapult.class new file mode 100644 index 0000000..6c26ebd Binary files /dev/null and b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Catapult.class differ diff --git a/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Collector.class b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Collector.class new file mode 100644 index 0000000..302c2be Binary files /dev/null and b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Collector.class differ diff --git a/out/production/untitled104/ca/cosc3p91/a2/gameobjects/DefenseBuilding.class b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/DefenseBuilding.class new file mode 100644 index 0000000..410f3ef Binary files /dev/null and b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/DefenseBuilding.class differ diff --git a/out/production/untitled104/ca/cosc3p91/a2/gameobjects/DefenseStage.class b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/DefenseStage.class new file mode 100644 index 0000000..4247a45 Binary files /dev/null and b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/DefenseStage.class differ diff --git a/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Farm.class b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Farm.class new file mode 100644 index 0000000..eaf6df5 Binary files /dev/null and b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Farm.class differ diff --git a/out/production/untitled104/ca/cosc3p91/a2/gameobjects/GoldMine.class b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/GoldMine.class new file mode 100644 index 0000000..1c11629 Binary files /dev/null and b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/GoldMine.class differ diff --git a/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Infantry.class b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Infantry.class new file mode 100644 index 0000000..28e3045 Binary files /dev/null and b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Infantry.class differ diff --git a/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Inhabitant.class b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Inhabitant.class new file mode 100644 index 0000000..3e1eb3d Binary files /dev/null and b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Inhabitant.class differ diff --git a/out/production/untitled104/ca/cosc3p91/a2/gameobjects/IronMine.class b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/IronMine.class new file mode 100644 index 0000000..6a9909d Binary files /dev/null and b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/IronMine.class differ diff --git a/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Knight.class b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Knight.class new file mode 100644 index 0000000..5c91e3b Binary files /dev/null and b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Knight.class differ diff --git a/out/production/untitled104/ca/cosc3p91/a2/gameobjects/LumberMine.class b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/LumberMine.class new file mode 100644 index 0000000..e8ceace Binary files /dev/null and b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/LumberMine.class differ diff --git a/out/production/untitled104/ca/cosc3p91/a2/gameobjects/ResourceBuilding.class b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/ResourceBuilding.class new file mode 100644 index 0000000..93d31ae Binary files /dev/null and b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/ResourceBuilding.class differ diff --git a/out/production/untitled104/ca/cosc3p91/a2/gameobjects/ResourceStage.class b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/ResourceStage.class new file mode 100644 index 0000000..f1636b9 Binary files /dev/null and b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/ResourceStage.class differ diff --git a/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Soldier.class b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Soldier.class new file mode 100644 index 0000000..84b927a Binary files /dev/null and b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Soldier.class differ diff --git a/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Stage.class b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Stage.class new file mode 100644 index 0000000..fec0d70 Binary files /dev/null and b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Stage.class differ diff --git a/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Tile.class b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Tile.class new file mode 100644 index 0000000..01ff575 Binary files /dev/null and b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Tile.class differ diff --git a/out/production/untitled104/ca/cosc3p91/a2/gameobjects/VillageStage.class b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/VillageStage.class new file mode 100644 index 0000000..fa2ebef Binary files /dev/null and b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/VillageStage.class differ diff --git a/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Village_Hall.class b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Village_Hall.class new file mode 100644 index 0000000..9d62b57 Binary files /dev/null and b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Village_Hall.class differ diff --git a/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Worker.class b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Worker.class new file mode 100644 index 0000000..ea5e470 Binary files /dev/null and b/out/production/untitled104/ca/cosc3p91/a2/gameobjects/Worker.class differ diff --git a/out/production/untitled104/ca/cosc3p91/a2/player/Player.class b/out/production/untitled104/ca/cosc3p91/a2/player/Player.class new file mode 100644 index 0000000..2b21f79 Binary files /dev/null and b/out/production/untitled104/ca/cosc3p91/a2/player/Player.class differ diff --git a/out/production/untitled104/ca/cosc3p91/a2/userinterface/GuiManager.class b/out/production/untitled104/ca/cosc3p91/a2/userinterface/GuiManager.class new file mode 100644 index 0000000..f91e52d Binary files /dev/null and b/out/production/untitled104/ca/cosc3p91/a2/userinterface/GuiManager.class differ