Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🚀 Adjusted units interactions console printing #72

Merged
merged 11 commits into from
May 16, 2024
10 changes: 1 addition & 9 deletions ArmyClasses/Army.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,7 @@
Army::Army(Game* gamePtr): gamePtr(gamePtr)
{}

void Army::printFightingUnits()
{
Unit* unit = nullptr;

while (currentAttackers.dequeue(unit))
unit->printFought();
}

int Army::getFightingUnitsCount() const
{
return currentAttackers.getCount();
}
}
1 change: 0 additions & 1 deletion ArmyClasses/Army.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ class Army
virtual bool isDead() const = 0; // Check if the army is dead

virtual void printArmy() const = 0; // Print the army units
void printFightingUnits(); // Print the fighting units of the army (current attackers)

// Getters
virtual int getUnitsCount(UnitType) const = 0; // Get the count of a specific unit type
Expand Down
20 changes: 16 additions & 4 deletions Game.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,13 @@ LinkedQueue<Unit*> Game::getEnemyList(ArmyType armyType, UnitType unitType, int
return enemyUnits;
}

void Game::registerAttack(Unit* currentAttacker, const std::string& currentAction, const std::string& currentFoughtUnits)
{
attackers.enqueue(currentAttacker); // Store the current attacker
attackActions.enqueue(currentAction); // Store the action it made
foughtUnits.enqueue(currentFoughtUnits); // Store the list of units the action happened on
}

void Game::addToKilledList(Unit* unit)
{
// Add the unit to the killed list
Expand Down Expand Up @@ -309,12 +316,17 @@ void Game::printAll()
std::cout << std::endl << "============== Earth Allied Army Alive Units ===================" << std::endl;
earthAlliedArmy.printArmy();

if (areUnitsFighting())
if (!attackers.isEmpty())
{
std::cout << std::endl << "============== Units fighting at current step =================" << std::endl;
earthArmy.printFightingUnits();
alienArmy.printFightingUnits();
earthAlliedArmy.printFightingUnits();
Unit* currentAttacker = nullptr;
std::string currentFoughtUnits, currentAction;

while (attackers.dequeue(currentAttacker) && attackActions.dequeue(currentAction) && foughtUnits.dequeue(currentFoughtUnits))
{
currentAttacker->printUnit();
std::cout << " " << currentAction << " [" << currentFoughtUnits << "]" << std::endl;
}
}
else
std::cout << std::endl << "============== No units fighting at current step ==============" << std::endl;
Expand Down
5 changes: 5 additions & 0 deletions Game.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ class Game
EarthAlliedArmy earthAlliedArmy;
RandomGenerator randomGenerator;

LinkedQueue<Unit*> attackers; // Attackers of the current time step
LinkedQueue<std::string> foughtUnits; // Units attacked by each attacker in the current timestep
LinkedQueue<std::string> attackActions; // Action done on the unit of the opposite army

LinkedQueue<Unit*> killedList;
PriorityQueue<HealableUnit*> unitMaintenanceList;

Expand Down Expand Up @@ -57,6 +61,7 @@ class Game
void addUnit(Unit*); // Add a unit to the appropriate army and list
Unit* removeUnit(ArmyType, UnitType); // Remove a unit from the appropriate army and list
LinkedQueue<Unit*> getEnemyList(ArmyType, UnitType, int); // Get the enemy list for the given army type, unit type and attack capacity
void registerAttack(Unit*, const std::string&, const std::string&); // Store the current attacker along with its fought units

void addToKilledList(Unit*); // Add a unit to the killed list

Expand Down
20 changes: 10 additions & 10 deletions UnitClasses/AlienDrone.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,9 @@ AlienDrone::AlienDrone(Game* gamePtr, double health, int power, int attackCapaci
: Unit(gamePtr, UnitType::AD, health, power, attackCapacity)
{}

void AlienDrone::printFought()
void AlienDrone::printUnit()
{
if (!foughtUnits.isEmpty())
{
std::cout << "AD " << getId() << " shots [";
foughtUnits.printList();
std::cout << "]" << std::endl;

clearFoughtUnits(); // Clear the list after printing
}
std::cout << "AD " << id;
}

bool AlienDrone::attack()
Expand All @@ -27,6 +20,8 @@ bool AlienDrone::attack()
LinkedQueue<Unit*> ETlist = gamePtr->getEnemyList(ArmyType::EARTH, UnitType::ET, ETnumber);
LinkedQueue<Unit*> EGlist = gamePtr->getEnemyList(ArmyType::EARTH, UnitType::EG, EGnumber);

std::string foughtUnits = "";

// Check for a successful attack
bool attackCheck = false;

Expand All @@ -47,7 +42,9 @@ bool AlienDrone::attack()
gamePtr->addUnit(enemyUnit);

// Store the IDs of the fought units to be printed later
foughtUnits.enqueue(enemyUnit->getId());
if (foughtUnits != "")
foughtUnits += ", ";
foughtUnits += std::to_string(enemyUnit->getId());

// Nullify the pointer
enemyUnit = nullptr;
Expand All @@ -56,5 +53,8 @@ bool AlienDrone::attack()
attackCheck = true;
}

if (foughtUnits != "")
gamePtr->registerAttack(this, "shots", foughtUnits);

return attackCheck;
}
2 changes: 1 addition & 1 deletion UnitClasses/AlienDrone.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class AlienDrone: public Unit
public:
AlienDrone(Game*, double, int, int);

void printFought(); // Print the units that the drone has fought
void printUnit(); // Print the unit's type along with its ID
bool attack(); // Attack the enemy units
};

Expand Down
28 changes: 18 additions & 10 deletions UnitClasses/AlienMonster.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,9 @@ void AlienMonster::setInfectingProbability(int probability)
infectingProbability = probability;
}

void AlienMonster::printFought()
void AlienMonster::printUnit()
{
if (!foughtUnits.isEmpty())
{
std::cout << "AM " << getId() << " shots [";
foughtUnits.printList();
std::cout << "]" << std::endl;

clearFoughtUnits(); // Clear the list after printing
}
std::cout << "AM " << id;
}

bool AlienMonster::attack()
Expand All @@ -36,6 +29,8 @@ bool AlienMonster::attack()
LinkedQueue<Unit*> tanksList = gamePtr->getEnemyList(ArmyType::EARTH, UnitType::ET, tanksCapacity);
LinkedQueue<Unit*> saversList = gamePtr->getEnemyList(ArmyType::EARTH_ALLIED, UnitType::SU, saversCapacity);

std::string foughtUnits = "", infectedSoldiers = "";

// Check for a successful attack
bool attackCheck = false;

Expand All @@ -51,6 +46,12 @@ bool AlienMonster::attack()
{
dynamic_cast<EarthSoldier*>(enemyUnit)->getInfection(); // The soldier will get infected if not infected already and not immune
gamePtr->addUnit(enemyUnit); // The soldier will be re-enqueued to the list & infected soldiers counter will be incremented

// Store the IDs of the fought units to be printed later
if (infectedSoldiers != "")
infectedSoldiers += ", ";
infectedSoldiers += std::to_string(enemyUnit->getId());

continue;
}

Expand All @@ -66,7 +67,9 @@ bool AlienMonster::attack()
gamePtr->addUnit(enemyUnit);

// Store the IDs of the fought units to be printed later
foughtUnits.enqueue(enemyUnit->getId());
if (foughtUnits != "")
foughtUnits += ", ";
foughtUnits += std::to_string(enemyUnit->getId());

// Nullify the pointer
enemyUnit = nullptr;
Expand All @@ -75,5 +78,10 @@ bool AlienMonster::attack()
attackCheck = true;
}

if (foughtUnits != "")
gamePtr->registerAttack(this, "shots", foughtUnits);
if (infectedSoldiers != "")
gamePtr->registerAttack(this, "infects", infectedSoldiers);

return attackCheck;
}
2 changes: 1 addition & 1 deletion UnitClasses/AlienMonster.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class AlienMonster: public Unit
// Static functions
static void setInfectingProbability(int); // Set the infecting probability

void printFought(); // Print the units that the monster has fought
void printUnit(); // Print the unit's type along with its ID
bool attack(); // Attack the enemy units
};

Expand Down
20 changes: 10 additions & 10 deletions UnitClasses/AlienSoldier.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,9 @@ AlienSoldier::AlienSoldier(Game* gamePtr, double health, int power, int attackCa
: Unit(gamePtr, UnitType::AS, health, power, attackCapacity)
{}

void AlienSoldier::printFought()
void AlienSoldier::printUnit()
{
if (!foughtUnits.isEmpty())
{
std::cout << "AS " << getId() << " shots [";
foughtUnits.printList();
std::cout << "]" << std::endl;

clearFoughtUnits(); // Clear the list after printing
}
std::cout << "AS " << id;
}

bool AlienSoldier::attack()
Expand All @@ -27,6 +20,8 @@ bool AlienSoldier::attack()
LinkedQueue<Unit*> soldiersList = gamePtr->getEnemyList(ArmyType::EARTH, UnitType::ES, soldiersCapacity);
LinkedQueue<Unit*> saversList = gamePtr->getEnemyList(ArmyType::EARTH_ALLIED, UnitType::SU, saversCapacity);

std::string foughtUnits = "";

// Check for a successful attack
bool attackCheck = false;

Expand All @@ -47,7 +42,9 @@ bool AlienSoldier::attack()
gamePtr->addUnit(enemyUnit);

// Store the IDs of the fought units to be printed later
foughtUnits.enqueue(enemyUnit->getId());
if (foughtUnits != "")
foughtUnits += ", ";
foughtUnits += std::to_string(enemyUnit->getId());

// Nullify the pointer
enemyUnit = nullptr;
Expand All @@ -56,5 +53,8 @@ bool AlienSoldier::attack()
attackCheck = true;
}

if (foughtUnits != "")
gamePtr->registerAttack(this, "shots", foughtUnits);

return attackCheck;
}
2 changes: 1 addition & 1 deletion UnitClasses/AlienSoldier.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class AlienSoldier: public Unit
public:
AlienSoldier(Game*, double, int, int);

void printFought(); // Print the units that the soldier has fought
void printUnit(); // Print the unit's type along with its ID
bool attack(); // Attack the enemy units
};

Expand Down
21 changes: 11 additions & 10 deletions UnitClasses/EarthGunnery.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,9 @@ EarthGunnery::EarthGunnery(Game* gamePtr, double health, int power, int attackCa
: Unit(gamePtr, UnitType::EG, health, power, attackCapacity)
{}

void EarthGunnery::printFought()
void EarthGunnery::printUnit()
{
if (!foughtUnits.isEmpty())
{
std::cout << "EG " << getId() << " shots [";
foughtUnits.printList();
std::cout << "]" << std::endl;

clearFoughtUnits(); // Clear the list after printing
}
std::cout << "EG " << id;
}

bool EarthGunnery::attack()
Expand All @@ -29,6 +22,8 @@ bool EarthGunnery::attack()
LinkedQueue<Unit*> dronesList = gamePtr->getEnemyList(ArmyType::ALIEN, UnitType::AD, dronesCapacity);
LinkedQueue<Unit*> monstersList = gamePtr->getEnemyList(ArmyType::ALIEN, UnitType::AM, monstersCapacity);

std::string foughtUnits = "";

// Check for a successful attack
bool attackCheck = false;

Expand All @@ -47,14 +42,20 @@ bool EarthGunnery::attack()
gamePtr->addUnit(enemyUnit);

// Store the IDs of the fought units to be printed later
foughtUnits.enqueue(enemyUnit->getId());
if (foughtUnits != "")
foughtUnits += ", ";
foughtUnits += std::to_string(enemyUnit->getId());

// Nullify the pointer
enemyUnit = nullptr;

// If this line is reached, at least one unit was attacked
attackCheck = true;
}

if (foughtUnits != "")
gamePtr->registerAttack(this, "shots", foughtUnits);

return attackCheck;
}

Expand Down
2 changes: 1 addition & 1 deletion UnitClasses/EarthGunnery.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class EarthGunnery: public Unit
public:
EarthGunnery(Game*, double, int, int);

void printFought(); // Print the units that the gunnery has fought
void printUnit(); // Print the unit's type along with its ID
bool attack(); // Attack the enemy units

// Getters
Expand Down
21 changes: 11 additions & 10 deletions UnitClasses/EarthSoldier.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,16 @@ EarthSoldier::EarthSoldier(Game* gamePtr, double health, int power, int attackCa
: HealableUnit(gamePtr, UnitType::ES, health, power, attackCapacity), infected(false), immune(false)
{}

void EarthSoldier::printFought()
void EarthSoldier::printUnit()
{
if (!foughtUnits.isEmpty())
{
std::cout << "ES " << getId() << " shots [";
foughtUnits.printList();
std::cout << "]" << std::endl;

clearFoughtUnits(); // Clear the list after printing
}
std::cout << "ES " << id;
if (infected)
std::cout << "*";
}

bool EarthSoldier::attack()
{
std::string foughtUnits = "";
// Check if the unit is infected and decide what to attack
ArmyType enemyArmyType = isInfected() ? ArmyType::EARTH : ArmyType::ALIEN;
UnitType enemyUnitType = isInfected() ? UnitType::ES : UnitType::AS;
Expand All @@ -45,7 +41,9 @@ bool EarthSoldier::attack()
gamePtr->addUnit(enemyUnit);

// Store the IDs of the fought units to be printed later
foughtUnits.enqueue(enemyUnit->getId());
if (foughtUnits != "")
foughtUnits += ", ";
foughtUnits += std::to_string(enemyUnit->getId());

// Nullify the pointer
enemyUnit = nullptr;
Expand All @@ -54,6 +52,9 @@ bool EarthSoldier::attack()
attackCheck = true;
}

if (foughtUnits != "")
gamePtr->registerAttack(this, "shots", foughtUnits);

return attackCheck;
}

Expand Down
2 changes: 1 addition & 1 deletion UnitClasses/EarthSoldier.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class EarthSoldier: public HealableUnit
public:
EarthSoldier(Game*, double, int, int);

void printFought(); // Print the units that the soldier has fought
void printUnit(); // Print the unit's type along with its ID
bool attack(); // Attack the enemy units

// Infection and immunity functions
Expand Down
Loading
Loading