tri11paragon
/
COSC-3P91-Assignments
mirror of https://github.com/Tri11Paragon/COSC-3P91-Assignments.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refine package name

main
Brett 2023-03-24 15:15:07 -04:00
parent 610c9b5801
commit e20d1a73f1
74 changed files with 186 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.idea/inspectionProfiles/Project_Default.xml Normal file
View File

@ -0,0 +1,10 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="DuplicatedCode" enabled="true" level="WEAK WARNING" enabled_by_default="true">
<Languages>
<language minSize="378" name="Java" />
</Languages>
</inspection_tool>
</profile>
</component>

6
Assignment 2/src/ca/cosc3p91/a2/Main.java
View File

@ -1,7 +1,7 @@
package ca.cosc3p91.a2;
package ca.cosc3p91.a3;
import ca.cosc3p91.a2.game.GameEngine;
import ca.cosc3p91.a2.gameobjects.Stage;
import ca.cosc3p91.a3.game.GameEngine;
import ca.cosc3p91.a3.gameobjects.Stage;
public class Main {

12
Assignment 2/src/ca/cosc3p91/a2/game/GameEngine.java
View File

@ -1,10 +1,10 @@
package ca.cosc3p91.a2.game;
package ca.cosc3p91.a3.game;
import ca.cosc3p91.a2.gameobjects.*;
import ca.cosc3p91.a2.player.*;
import ca.cosc3p91.a2.util.Print;
import ca.cosc3p91.a2.util.Time;
import ca.cosc3p91.a2.util.Util;
import ca.cosc3p91.a3.gameobjects.*;
import ca.cosc3p91.a3.player.*;
import ca.cosc3p91.a3.util.Print;
import ca.cosc3p91.a3.util.Time;
import ca.cosc3p91.a3.util.Util;
import java.io.BufferedReader;
import java.io.IOException;

4
Assignment 2/src/ca/cosc3p91/a2/game/Map.java
View File

@ -1,6 +1,6 @@
package ca.cosc3p91.a2.game;
package ca.cosc3p91.a3.game;
import ca.cosc3p91.a2.gameobjects.*;
import ca.cosc3p91.a3.gameobjects.*;
import java.util.ArrayList;
import java.util.List;

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

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
public class Archer extends Infantry {

2
Assignment 2/src/ca/cosc3p91/a2/gameobjects/ArcherTower.java
View File

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
public class ArcherTower extends DefenseBuilding {

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

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
import java.util.ArrayList;

2
Assignment 2/src/ca/cosc3p91/a2/gameobjects/Cannon.java
View File

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
public class Cannon extends DefenseBuilding {

2
Assignment 2/src/ca/cosc3p91/a2/gameobjects/CasaDeNarino.java
View File

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
public class CasaDeNarino extends Building {

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

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
public class Catapult extends Infantry {

2
Assignment 2/src/ca/cosc3p91/a2/gameobjects/Collector.java
View File

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
public class Collector implements Inhabitant {

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

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
public abstract class DefenseBuilding extends Building {

4
Assignment 2/src/ca/cosc3p91/a2/gameobjects/DefenseStage.java
View File

@ -1,6 +1,6 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
import ca.cosc3p91.a2.util.Time;
import ca.cosc3p91.a3.util.Time;
class DefenseStage extends Stage {

4
Assignment 2/src/ca/cosc3p91/a2/gameobjects/DefenseStages.java
View File

@ -1,6 +1,6 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
import ca.cosc3p91.a2.util.Time;
import ca.cosc3p91.a3.util.Time;
public class DefenseStages {

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

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
public class Farm extends ResourceBuilding {

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

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
public abstract class Infantry implements Inhabitant {

4
Assignment 2/src/ca/cosc3p91/a2/gameobjects/Inhabitant.java
View File

@ -1,6 +1,6 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
import ca.cosc3p91.a2.game.Map;
import ca.cosc3p91.a3.game.Map;
public interface Inhabitant {

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

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
public class IronMine extends ResourceBuilding {

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

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
public class Knight extends Infantry {

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

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
public class LumberMine extends ResourceBuilding {

4
Assignment 2/src/ca/cosc3p91/a2/gameobjects/ResourceBuilding.java
View File

@ -1,6 +1,6 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
import ca.cosc3p91.a2.util.Time;
import ca.cosc3p91.a3.util.Time;
public abstract class ResourceBuilding extends Building {

4
Assignment 2/src/ca/cosc3p91/a2/gameobjects/ResourceStage.java
View File

@ -1,6 +1,6 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
import ca.cosc3p91.a2.util.Time;
import ca.cosc3p91.a3.util.Time;
public class ResourceStage extends Stage {

4
Assignment 2/src/ca/cosc3p91/a2/gameobjects/ResourceStages.java
View File

@ -1,6 +1,6 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
import ca.cosc3p91.a2.util.Time;
import ca.cosc3p91.a3.util.Time;
public class ResourceStages {

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

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
public class SaulGoodMine extends ResourceBuilding {

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

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
public class Soldier extends Infantry {

4
Assignment 2/src/ca/cosc3p91/a2/gameobjects/Stage.java
View File

@ -1,6 +1,6 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
import ca.cosc3p91.a2.util.Time;
import ca.cosc3p91.a3.util.Time;
import java.util.HashMap;

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

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
import java.util.List;

4
Assignment 2/src/ca/cosc3p91/a2/gameobjects/VillageHallStages.java
View File

@ -1,6 +1,6 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
import ca.cosc3p91.a2.util.Time;
import ca.cosc3p91.a3.util.Time;
public class VillageHallStages {

4
Assignment 2/src/ca/cosc3p91/a2/gameobjects/VillageStage.java
View File

@ -1,6 +1,6 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
import ca.cosc3p91.a2.util.Time;
import ca.cosc3p91.a3.util.Time;
public class VillageStage extends Stage {

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

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
public class Worker implements Inhabitant {

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

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.player;
package ca.cosc3p91.a3.player;
public class Player {

2
Assignment 2/src/ca/cosc3p91/a2/userinterface/GuiManager.java
View File

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.userinterface;
package ca.cosc3p91.a3.userinterface;
public class GuiManager {
}

2
Assignment 2/src/ca/cosc3p91/a2/util/Print.java
View File

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.util;
package ca.cosc3p91.a3.util;
import java.util.ArrayList;
import java.util.Arrays;

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

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.util;
package ca.cosc3p91.a3.util;
public class Time {

2
Assignment 2/src/ca/cosc3p91/a2/util/Util.java
View File

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.util;
package ca.cosc3p91.a3.util;
import java.util.Random;

19
Assignment 3/src/ca/cosc3p91/a2/gameobjects/Inhabitant.java
View File

@ -1,19 +0,0 @@
package ca.cosc3p91.a2.gameobjects;
import ca.cosc3p91.a2.game.Map;
public interface Inhabitant {
Map map = null;
Building building = null;
int lvl = 0;
void move(Tile t);
void getPosition();
int getLevel();
void setLevel(int level);
int getCost();
}

6
Assignment 3/src/ca/cosc3p91/a2/player/Player.java
View File

@ -1,6 +0,0 @@
package ca.cosc3p91.a2.player;
public class Player {
}

5
Assignment 3/src/ca/cosc3p91/a2/Main.java → Assignment 3/src/ca/cosc3p91/a3/Main.java
View File

@ -1,7 +1,6 @@
package ca.cosc3p91.a2;
package ca.cosc3p91.a3;
import ca.cosc3p91.a2.game.GameEngine;
import ca.cosc3p91.a2.gameobjects.Stage;
import ca.cosc3p91.a3.game.GameEngine;
public class Main {

64
Assignment 3/src/ca/cosc3p91/a2/game/GameEngine.java → Assignment 3/src/ca/cosc3p91/a3/game/GameEngine.java
View File

@ -1,14 +1,19 @@
package ca.cosc3p91.a2.game;
package ca.cosc3p91.a3.game;
import ca.cosc3p91.a2.gameobjects.*;
import ca.cosc3p91.a2.gameobjects.factory.BuildingFactory;
import ca.cosc3p91.a2.gameobjects.factory.InhabitantFactory;
import ca.cosc3p91.a2.player.*;
import ca.cosc3p91.a2.userinterface.GameDisplay;
import ca.cosc3p91.a3.gameobjects.*;
import ca.cosc3p91.a3.gameobjects.factory.BuildingFactory;
import ca.cosc3p91.a3.gameobjects.factory.InhabitantFactory;
import ca.cosc3p91.a3.player.*;
import ca.cosc3p91.a3.userinterface.GameDisplay;
import ca.cosc3p91.a3.util.ChallengeAdapter;
import java.beans.XMLEncoder;
import java.io.BufferedOutputStream;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Random;
public class GameEngine<T> implements Runnable {
public class GameEngine implements Runnable {
public static final double GOLD_FACTOR = 5;
public static final double IRON_FACTOR = 1;
@ -32,22 +37,24 @@ public class GameEngine<T> implements Runnable {
}
public void attackVillage(Map map) {
int defenseiveCounter = 1;
int inhabCounter = 0;
for (Building b : map.contains)
if (b instanceof DefenseBuilding)
defenseiveCounter++;
for (Inhabitant i : map.inhabitants)
if (i instanceof Infantry)
inhabCounter++;
pillageFactor = (float) inhabCounter / (float) defenseiveCounter;
if (pillageFactor < 0)
pillageFactor = 0;
if (pillageFactor > 1)
pillageFactor = 1;
this.map.getTownHall().addWood((int) (map.getTownHall().getCurrentWood() * pillageFactor));
this.map.getTownHall().addIron((int) (map.getTownHall().getCurrentIron() * pillageFactor));
this.map.getTownHall().addGold((int) (map.getTownHall().getCurrentGold() * pillageFactor));
// int defenseiveCounter = 1;
// int inhabCounter = 0;
// for (Building b : map.contains)
// if (b instanceof DefenseBuilding)
// defenseiveCounter++;
// for (Inhabitant i : map.inhabitants)
// if (i instanceof Infantry)
// inhabCounter++;
// pillageFactor = (float) inhabCounter / (float) defenseiveCounter;
// if (pillageFactor < 0)
// pillageFactor = 0;
// if (pillageFactor > 1)
// pillageFactor = 1;
// this.map.getTownHall().addWood((int) (map.getTownHall().getCurrentWood() * pillageFactor));
// this.map.getTownHall().addIron((int) (map.getTownHall().getCurrentIron() * pillageFactor));
// this.map.getTownHall().addGold((int) (map.getTownHall().getCurrentGold() * pillageFactor));
ChallengeAdapter adapter = new ChallengeAdapter(this.map);
adapter.attack(map);
}
private Map generateInitialMap(){
@ -242,6 +249,17 @@ public class GameEngine<T> implements Runnable {
if (deleteMyHeart)
exploringMap = null;
}
save("test.xml", this.map);
}
public void save(String file, Map map){
try (XMLEncoder encoder = new XMLEncoder(new BufferedOutputStream(Files.newOutputStream(Paths.get(file))))) {
map.contains.forEach(encoder::writeObject);
map.inhabitants.forEach(encoder::writeObject);
System.out.println("Wrote map");
} catch (Exception e) {
e.printStackTrace();
}
}
}

4
Assignment 3/src/ca/cosc3p91/a2/game/Map.java → Assignment 3/src/ca/cosc3p91/a3/game/Map.java
View File

@ -1,6 +1,6 @@
package ca.cosc3p91.a2.game;
package ca.cosc3p91.a3.game;
import ca.cosc3p91.a2.gameobjects.*;
import ca.cosc3p91.a3.gameobjects.*;
import java.util.ArrayList;
import java.util.List;

2
Assignment 3/src/ca/cosc3p91/a2/gameobjects/Archer.java → Assignment 3/src/ca/cosc3p91/a3/gameobjects/Archer.java
View File

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
public class Archer extends Infantry {

2
Assignment 3/src/ca/cosc3p91/a2/gameobjects/ArcherTower.java → Assignment 3/src/ca/cosc3p91/a3/gameobjects/ArcherTower.java
View File

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
public class ArcherTower extends DefenseBuilding {

5
Assignment 3/src/ca/cosc3p91/a2/gameobjects/Building.java → Assignment 3/src/ca/cosc3p91/a3/gameobjects/Building.java
View File

@ -1,8 +1,9 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
import java.io.Serializable;
import java.util.ArrayList;
public abstract class Building {
public abstract class Building implements Serializable {
// members
private int level;

2
Assignment 3/src/ca/cosc3p91/a2/gameobjects/Cannon.java → Assignment 3/src/ca/cosc3p91/a3/gameobjects/Cannon.java
View File

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
public class Cannon extends DefenseBuilding {

2
Assignment 3/src/ca/cosc3p91/a2/gameobjects/CasaDeNarino.java → Assignment 3/src/ca/cosc3p91/a3/gameobjects/CasaDeNarino.java
View File

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
public class CasaDeNarino extends Building {

2
Assignment 3/src/ca/cosc3p91/a2/gameobjects/Catapult.java → Assignment 3/src/ca/cosc3p91/a3/gameobjects/Catapult.java
View File

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
public class Catapult extends Infantry {

2
Assignment 3/src/ca/cosc3p91/a2/gameobjects/Collector.java → Assignment 3/src/ca/cosc3p91/a3/gameobjects/Collector.java
View File

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
public class Collector implements Inhabitant {

2
Assignment 3/src/ca/cosc3p91/a2/gameobjects/DefenseBuilding.java → Assignment 3/src/ca/cosc3p91/a3/gameobjects/DefenseBuilding.java
View File

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
public abstract class DefenseBuilding extends Building {

4
Assignment 3/src/ca/cosc3p91/a2/gameobjects/DefenseStage.java → Assignment 3/src/ca/cosc3p91/a3/gameobjects/DefenseStage.java
View File

@ -1,6 +1,6 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
import ca.cosc3p91.a2.util.Time;
import ca.cosc3p91.a3.util.Time;
class DefenseStage extends Stage {

4
Assignment 3/src/ca/cosc3p91/a2/gameobjects/DefenseStages.java → Assignment 3/src/ca/cosc3p91/a3/gameobjects/DefenseStages.java
View File

@ -1,6 +1,6 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
import ca.cosc3p91.a2.util.Time;
import ca.cosc3p91.a3.util.Time;
public class DefenseStages {

2
Assignment 3/src/ca/cosc3p91/a2/gameobjects/Farm.java → Assignment 3/src/ca/cosc3p91/a3/gameobjects/Farm.java
View File

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
public class Farm extends ResourceBuilding {

2
Assignment 3/src/ca/cosc3p91/a2/gameobjects/Infantry.java → Assignment 3/src/ca/cosc3p91/a3/gameobjects/Infantry.java
View File

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
public abstract class Infantry implements Inhabitant {

17
Assignment 3/src/ca/cosc3p91/a3/gameobjects/Inhabitant.java Normal file
View File

@ -0,0 +1,17 @@
package ca.cosc3p91.a3.gameobjects;
import java.io.Serializable;
public interface Inhabitant extends Serializable {
int lvl = 0;
void move(Tile t);
void getPosition();
int getLevel();
void setLevel(int level);
int getCost();
}

2
Assignment 3/src/ca/cosc3p91/a2/gameobjects/IronMine.java → Assignment 3/src/ca/cosc3p91/a3/gameobjects/IronMine.java
View File

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
public class IronMine extends ResourceBuilding {

2
Assignment 3/src/ca/cosc3p91/a2/gameobjects/Knight.java → Assignment 3/src/ca/cosc3p91/a3/gameobjects/Knight.java
View File

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
public class Knight extends Infantry {

2
Assignment 3/src/ca/cosc3p91/a2/gameobjects/LumberMine.java → Assignment 3/src/ca/cosc3p91/a3/gameobjects/LumberMine.java
View File

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
public class LumberMine extends ResourceBuilding {

4
Assignment 3/src/ca/cosc3p91/a2/gameobjects/ResourceBuilding.java → Assignment 3/src/ca/cosc3p91/a3/gameobjects/ResourceBuilding.java
View File

@ -1,6 +1,6 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
import ca.cosc3p91.a2.util.Time;
import ca.cosc3p91.a3.util.Time;
public abstract class ResourceBuilding extends Building {

4
Assignment 3/src/ca/cosc3p91/a2/gameobjects/ResourceStage.java → Assignment 3/src/ca/cosc3p91/a3/gameobjects/ResourceStage.java
View File

@ -1,6 +1,6 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
import ca.cosc3p91.a2.util.Time;
import ca.cosc3p91.a3.util.Time;
public class ResourceStage extends Stage {

4
Assignment 3/src/ca/cosc3p91/a2/gameobjects/ResourceStages.java → Assignment 3/src/ca/cosc3p91/a3/gameobjects/ResourceStages.java
View File

@ -1,6 +1,6 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
import ca.cosc3p91.a2.util.Time;
import ca.cosc3p91.a3.util.Time;
public class ResourceStages {

2
Assignment 3/src/ca/cosc3p91/a2/gameobjects/SaulGoodMine.java → Assignment 3/src/ca/cosc3p91/a3/gameobjects/SaulGoodMine.java
View File

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
public class SaulGoodMine extends ResourceBuilding {

2
Assignment 3/src/ca/cosc3p91/a2/gameobjects/Soldier.java → Assignment 3/src/ca/cosc3p91/a3/gameobjects/Soldier.java
View File

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
public class Soldier extends Infantry {

8
Assignment 3/src/ca/cosc3p91/a2/gameobjects/Stage.java → Assignment 3/src/ca/cosc3p91/a3/gameobjects/Stage.java
View File

@ -1,10 +1,10 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
import ca.cosc3p91.a2.util.Time;
import ca.cosc3p91.a3.util.Time;
import java.util.HashMap;
import java.io.Serializable;
public abstract class Stage {
public abstract class Stage implements Serializable {
protected int dHealth;

4
Assignment 3/src/ca/cosc3p91/a2/gameobjects/Tile.java → Assignment 3/src/ca/cosc3p91/a3/gameobjects/Tile.java
View File

@ -1,6 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
import java.util.List;
package ca.cosc3p91.a3.gameobjects;
public class Tile {

4
Assignment 3/src/ca/cosc3p91/a2/gameobjects/VillageHallStages.java → Assignment 3/src/ca/cosc3p91/a3/gameobjects/VillageHallStages.java
View File

@ -1,6 +1,6 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
import ca.cosc3p91.a2.util.Time;
import ca.cosc3p91.a3.util.Time;
public class VillageHallStages {

4
Assignment 3/src/ca/cosc3p91/a2/gameobjects/VillageStage.java → Assignment 3/src/ca/cosc3p91/a3/gameobjects/VillageStage.java
View File

@ -1,6 +1,6 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
import ca.cosc3p91.a2.util.Time;
import ca.cosc3p91.a3.util.Time;
public class VillageStage extends Stage {

2
Assignment 3/src/ca/cosc3p91/a2/gameobjects/Worker.java → Assignment 3/src/ca/cosc3p91/a3/gameobjects/Worker.java
View File

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.gameobjects;
package ca.cosc3p91.a3.gameobjects;
public class Worker implements Inhabitant {

6
Assignment 3/src/ca/cosc3p91/a2/gameobjects/factory/BuildingFactory.java → Assignment 3/src/ca/cosc3p91/a3/gameobjects/factory/BuildingFactory.java
View File

@ -1,7 +1,7 @@
package ca.cosc3p91.a2.gameobjects.factory;
package ca.cosc3p91.a3.gameobjects.factory;
import ca.cosc3p91.a2.gameobjects.*;
import ca.cosc3p91.a2.util.Util;
import ca.cosc3p91.a3.gameobjects.*;
import ca.cosc3p91.a3.util.Util;
public class BuildingFactory {
public Building getBuilding(String buildingName) {

6
Assignment 3/src/ca/cosc3p91/a2/gameobjects/factory/InhabitantFactory.java → Assignment 3/src/ca/cosc3p91/a3/gameobjects/factory/InhabitantFactory.java
View File

@ -1,7 +1,7 @@
package ca.cosc3p91.a2.gameobjects.factory;
package ca.cosc3p91.a3.gameobjects.factory;
import ca.cosc3p91.a2.gameobjects.*;
import ca.cosc3p91.a2.util.Util;
import ca.cosc3p91.a3.gameobjects.*;
import ca.cosc3p91.a3.util.Util;
public class InhabitantFactory {
public Inhabitant getInhabitant(String inhabitantName) {

6
Assignment 3/src/ca/cosc3p91/a3/player/Player.java Normal file
View File

@ -0,0 +1,6 @@
package ca.cosc3p91.a3.player;
public class Player {
}

10
Assignment 3/src/ca/cosc3p91/a2/userinterface/GameDisplay.java → Assignment 3/src/ca/cosc3p91/a3/userinterface/GameDisplay.java
View File

@ -1,9 +1,9 @@
package ca.cosc3p91.a2.userinterface;
package ca.cosc3p91.a3.userinterface;
import ca.cosc3p91.a2.game.Map;
import ca.cosc3p91.a2.gameobjects.Building;
import ca.cosc3p91.a2.gameobjects.Inhabitant;
import ca.cosc3p91.a2.util.Print;
import ca.cosc3p91.a3.game.Map;
import ca.cosc3p91.a3.gameobjects.Building;
import ca.cosc3p91.a3.gameobjects.Inhabitant;
import ca.cosc3p91.a3.util.Print;
import java.io.BufferedReader;
import java.io.IOException;

6
Assignment 3/src/ca/cosc3p91/a2/util/ChallengeAdapter.java → Assignment 3/src/ca/cosc3p91/a3/util/ChallengeAdapter.java
View File

@ -1,8 +1,8 @@
package ca.cosc3p91.a2.util;
package ca.cosc3p91.a3.util;
import ChallengeDecision.*;
import ca.cosc3p91.a2.game.Map;
import ca.cosc3p91.a2.gameobjects.*;
import ca.cosc3p91.a3.game.Map;
import ca.cosc3p91.a3.gameobjects.*;
import java.util.ArrayList;
import java.util.List;

2
Assignment 3/src/ca/cosc3p91/a2/util/Print.java → Assignment 3/src/ca/cosc3p91/a3/util/Print.java
View File

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.util;
package ca.cosc3p91.a3.util;
import java.util.ArrayList;
import java.util.Arrays;

6
Assignment 3/src/ca/cosc3p91/a2/util/Time.java → Assignment 3/src/ca/cosc3p91/a3/util/Time.java
View File

@ -1,6 +1,8 @@
package ca.cosc3p91.a2.util;
package ca.cosc3p91.a3.util;
public class Time {
import java.io.Serializable;
public class Time implements Serializable {
private long timeSeconds;

2
Assignment 3/src/ca/cosc3p91/a2/util/Util.java → Assignment 3/src/ca/cosc3p91/a3/util/Util.java
View File

@ -1,4 +1,4 @@
package ca.cosc3p91.a2.util;
package ca.cosc3p91.a3.util;
import java.util.Random;