🎉 completed random generator class and Adding units

Alien-Invasion.vcxproj

@@ -24,9 +24,16 @@
     <ClCompile Include="Game.cpp" />
     <ClCompile Include="main.cpp" />
     <ClCompile Include="RandomGenerator\RandomGenerator.cpp" />
+    <ClCompile Include="UnitClasses\AlienDrone.cpp" />
+    <ClCompile Include="UnitClasses\AlienMonster.cpp" />
+    <ClCompile Include="UnitClasses\AlienSoldier.cpp" />
+    <ClCompile Include="UnitClasses\EarthGunnery.cpp" />
+    <ClCompile Include="UnitClasses\EarthSoldier.cpp" />
+    <ClCompile Include="UnitClasses\EarthTank.cpp" />
     <ClCompile Include="UnitClasses\Unit.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="Containers\Array.h" />
     <ClInclude Include="Containers\ArrayStack.h" />
     <ClInclude Include="Containers\Deque.h" />
     <ClInclude Include="Containers\LinkedQueue.h" />

Alien-Invasion.vcxproj.filters

@@ -42,6 +42,9 @@
     <ClInclude Include="Containers\ArrayStack.h">
       <Filter>Containers Classes</Filter>
     </ClInclude>
+    <ClInclude Include="Containers\Array.h">
+      <Filter>Containers Classes</Filter>
+    </ClInclude>
     <ClInclude Include="UnitClasses\AlienDrone.h">
       <Filter>Unit Classes</Filter>
     </ClInclude>
@@ -99,5 +102,23 @@
     <ClCompile Include="Game.cpp">
       <Filter>Game Class</Filter>
     </ClCompile>
+    <ClCompile Include="UnitClasses\EarthSoldier.cpp">
+      <Filter>Unit Classes</Filter>
+    </ClCompile>
+    <ClCompile Include="UnitClasses\AlienMonster.cpp">
+      <Filter>Unit Classes</Filter>
+    </ClCompile>
+    <ClCompile Include="UnitClasses\AlienDrone.cpp">
+      <Filter>Unit Classes</Filter>
+    </ClCompile>
+    <ClCompile Include="UnitClasses\AlienSoldier.cpp">
+      <Filter>Unit Classes</Filter>
+    </ClCompile>
+    <ClCompile Include="UnitClasses\EarthGunnery.cpp">
+      <Filter>Unit Classes</Filter>
+    </ClCompile>
+    <ClCompile Include="UnitClasses\EarthTank.cpp">
+      <Filter>Unit Classes</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

ArmyClasses/AlienArmy.cpp

@@ -1,17 +1,23 @@
+#include <iostream>
+
 #include "AlienArmy.h"
+#include "../UnitClasses/Unit.h"
 
-void AlienArmy::addUnit()
+void AlienArmy::addUnit(Unit* unit)
 {
+    if (unit->getUnitType() == UnitType::AS)
+        soldiers.enqueue(dynamic_cast<AlienSoldier*>(unit)); 
+    //else if (unit->getUnitType() == UnitType::AM)
+        // add it to array
+    else 
+        drones.enqueue(dynamic_cast<AlienDrone*>(unit));
 }
 
 void AlienArmy::removeUnit()
-{
-}
+{}
 
 void AlienArmy::print() const
-{
-}
+{}
 
 void AlienArmy::attack()
-{
-}
+{}

ArmyClasses/AlienArmy.h

@@ -13,12 +13,12 @@
 class AlienArmy: public Army
 {
 private:
-    LinkedQueue<AlienSoldier*> soldiers;
-    // Array <AlienMonster> monsters;
+    LinkedQueue<AlienSoldier*> soldiers; 
+    // Array <AlienMonster*> monsters;
     Deque<AlienDrone*> drones;
 
 public:
-    void addUnit();
+    void addUnit(Unit*);
     void removeUnit();
     void print() const;
     void attack();

ArmyClasses/Army.h

@@ -1,10 +1,12 @@
 #ifndef ARMY_H
 #define ARMY_H
 
+#include "../UnitClasses/Unit.h"
+
 class Army
 {
 public:
-    virtual void addUnit() = 0; // Will take a pointer to Unit as a parameter
+    virtual void addUnit(Unit*) = 0; // Will take a pointer to Unit as a parameter
     virtual void removeUnit() = 0;
     virtual void print() const = 0;
     virtual void attack() = 0;

ArmyClasses/EarthArmy.cpp

@@ -1,17 +1,23 @@
+#include <iostream>
+
 #include "EarthArmy.h"
+#include "../UnitClasses/Unit.h"
 
-void EarthArmy::addUnit()
+void EarthArmy::addUnit(Unit* unit)
 {
+    if (unit->getUnitType() == UnitType::ES)
+        soldiers.enqueue(dynamic_cast<EarthSoldier*>(unit)); 
+    else if (unit->getUnitType() == UnitType::ET)
+        tanks.push(dynamic_cast<EarthTank*>(unit));
+    else if (unit->getUnitType() == UnitType::EG)
+        gunneries.enqueue(dynamic_cast<EarthGunnery*>(unit), unit->getHealth() + unit->getPower());
 }
 
 void EarthArmy::removeUnit()
-{
-}
+{}
 
 void EarthArmy::print() const
-{
-}
+{}
 
 void EarthArmy::attack()
-{
-}
+{}

ArmyClasses/EarthArmy.h

@@ -19,7 +19,7 @@ class EarthArmy: public Army
     PriorityQueue<EarthGunnery*> gunneries;
 
 public:
-    void addUnit();
+    void addUnit(Unit*);
     void removeUnit();
     void print() const;
     void attack();

CMakeLists.txt

@@ -14,4 +14,15 @@ add_executable(Alien_Invasion
         Containers/PriorityNode.h
         Containers/PriorityQueue.h
         Containers/QueueADT.h
-        Containers/StackADT.h)
+        Containers/StackADT.h
+        RandomGenerator/RandomGenerator.cpp
+        UnitClasses/AlienDrone.cpp
+        UnitClasses/AlienMonster.cpp
+        UnitClasses/AlienSoldier.cpp
+        UnitClasses/EarthGunnery.cpp
+        UnitClasses/EarthSoldier.cpp
+        UnitClasses/EarthTank.cpp
+        UnitClasses/Unit.cpp
+        Game.cpp
+        ArmyClasses/AlienArmy.cpp
+        ArmyClasses/EarthArmy.cpp)

Containers/Array.h

@@ -0,0 +1,83 @@
+#ifndef ARRAY_H
+#define ARRAY_H
+
+#include <iostream>
+
+template<typename T>
+class Array
+{
+    enum { MAX_SIZE = 1000 };
+private:
+    T items[MAX_SIZE];
+    int count;
+
+public:
+    Array();
+    bool isEmpty() const;
+    bool insert(const T newEntry);
+    bool remove(int index);
+    bool entryAt(T entry, int index) const;
+    void printList() const;
+    int getCount() const;
+};
+
+
+template <typename T>
+inline Array<T>::Array() : count(0)
+{}
+
+template <typename T>
+inline bool Array<T>::isEmpty() const
+{
+    return (count == 0);
+}
+
+template <typename T>
+inline bool Array<T>::insert(const T newEntry)
+{
+    if (count == MAX_SIZE - 1) return false;
+
+    items[count++] = newEntry;
+    return true;
+}
+
+template <typename T>
+inline bool Array<T>::remove(int index)
+{
+    if (index >= count) return false;
+
+    items[index] = items[count - 1];
+    items[count - 1] = nullptr;
+    count--;
+
+    return true;
+}
+
+template <typename T>
+inline bool Array<T>::entryAt(T entry, int index) const
+{
+    if (isEmpty()) return false;
+
+    entry = items[index];
+    return true;
+}
+
+template <typename T>
+inline void Array<T>::printList() const
+{
+    for (int i = 0; i < count; i++)
+    {
+        std::cout << items[i];
+        if (i != count - 1)
+            std::cout << ", ";
+    }
+    std::cout << std::endl;
+}
+
+template <typename T>
+inline int Array<T>::getCount() const
+{
+    return count;
+}
+
+#endif

Containers/ArrayStack.h

@@ -25,7 +25,7 @@ class ArrayStack: public StackADT<T>
 
 template<typename T>
 inline ArrayStack<T>::ArrayStack(): top(-1)
-{ }
+{}
 
 template<typename T>
 inline bool ArrayStack<T>::isEmpty() const

Containers/LinkedQueue.h

@@ -25,7 +25,7 @@ class LinkedQueue: public QueueADT<T>
 
 template <typename T>
 inline LinkedQueue<T>::LinkedQueue():itemCount(0), backPtr(nullptr), frontPtr(nullptr)
-{ }
+{}
 
 template <typename T>
 inline bool LinkedQueue<T>::isEmpty() const

Containers/Node.h

@@ -24,12 +24,12 @@ class Node
 template < typename T>
 inline Node<T>::Node()
     : prev(nullptr), next(nullptr)
-{ }
+{}
 
 template < typename T>
 inline Node<T>::Node(const T& item)
     : item(item), prev(nullptr), next(nullptr)
-{ }
+{}
 
 template < typename T>
 inline Node<T>::Node(const T& item, Node<T>* prevNodePtr, Node<T>* nextNodePtr)

Containers/PriorityQueue.h

@@ -28,7 +28,7 @@ class PriorityQueue
 
 template <typename T>
 inline PriorityQueue<T>::PriorityQueue(): head(nullptr), itemCount(0)
-{ }
+{}
 
 // Insert the new node in its correct position according to its priority
 template <typename T>

Containers/QueueADT.h

@@ -14,6 +14,6 @@ class QueueADT
 
     virtual bool peek(T& FrontEntry) const = 0;
 
-    virtual ~QueueADT() { }
+    virtual ~QueueADT() {}
 };
 #endif

Containers/StackADT.h

@@ -14,7 +14,7 @@ class StackADT
 
     virtual bool peek(T& TopEntry) const = 0;
 
-    virtual ~StackADT() { }
+    virtual ~StackADT() {}
 };
 #endif 
 

DEFS.h

@@ -6,4 +6,14 @@ struct Range {
 	int max;
 };
 
+enum ArmyType {
+	EARTH, ALIEN
+};
+
+enum UnitType
+{
+	ES, EG, ET,
+	AS, AD, AM
+};
+
 #endif

Game.cpp

@@ -1,9 +1,55 @@
+#include <iostream>
+#include <fstream>
+#include <string>
+#include <sstream>
+
 #include "Game.h"
+#include "DEFS.h"
+#include "UnitClasses/Unit.h"
 
-Game::Game(): gameMode(GameMode::INTERACTIVE), currentTimestep(0)
+std::string Game::loadFile(std::string fileName)
 {
+	std::fstream fin(fileName);
+	std::string wholeFile;
+
+	if (fin.is_open())
+	{
+		std::string newLine;
+		while (std::getline(fin, newLine))
+			wholeFile += newLine + " ";
+	}
+	return wholeFile;
 }
 
-Game::~Game()
+Game::Game(): gameMode(GameMode::INTERACTIVE), currentTimestep(0), randomGenerator(nullptr)
+{}
+
+void Game::run(GameMode gameMode, std::string inputFileName)
 {
+	this->gameMode = gameMode;
+
+	std::string inputParameters = loadFile(inputFileName);
+	randomGenerator = new RandomGenerator(this, inputParameters);
 }
+
+void Game::incrementTimestep()
+{}
+
+void Game::changeGameMode(GameMode)
+{}
+
+void Game::addUnit(Unit* unit)
+{
+	if (unit->getArmyType() == ArmyType::EARTH)
+		earthArmy.addUnit(unit);
+	else if (unit->getArmyType() == ArmyType::ALIEN)
+		alienArmy.addUnit(unit);
+}
+
+int Game::getCurrentTimestep() const
+{
+	return currentTimestep;
+}
+
+Game::~Game()
+{}