aortigos/cpp03
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Min fixes

Browse Source
This commit is contained in:
Angel Ortigosa Perez
2025-10-26 20:20:14 +01:00
parent e4c2000a4a
commit 46b7b99abb
11 changed files with 69 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ex02/ClapTrap/ClapTrap.cpp
View File

@@ -65,14 +65,14 @@ void ClapTrap::attack(const std::string &target)
this->energy -= 1;
} else {
std::cout << "ClapTrap " << this->name
<< " cant attack anymore..." << std::endl;
<< " can't attack anymore..." << std::endl;
}
}
void ClapTrap::takeDamage(unsigned int amount)
{
std::cout << "ClapTrap " << this->name
<< " recieves " << amount
<< " receives " << amount
<< " points of damage!" << std::endl;
if (amount >= this->health)
this->health = 0;
@@ -82,16 +82,20 @@ void ClapTrap::takeDamage(unsigned int amount)
void ClapTrap::beRepaired(unsigned int amount)
{
if (this->energy > 0)
if (this->health == 0)
{
std::cout << "ClapTrap " << this->name
<< " repairs itself, recovering " << amount
<< " hit points!" << std::endl;
this->health += amount;
this->energy -= 1;
} else {
std::cout << "ClapTrap " << this->name
<< " cant be repaired..." << std::endl;
std::cout << "ClapTrap " << this->name << " can't repair itself because it's destroyed" << std::endl;
return ;
}
if (this->energy == 0)
{
std::cout << "ClapTrap " << this->name << " has no energy left to repair!" << std::endl;
return ;
}
std::cout << "ClapTrap " << this->name
<< " repairs itself, recovering " << amount
<< " hit points!" << std::endl;
this->health += amount;
this->energy -= 1;
}

2
ex02/FragTrap/FragTrap.hpp
View File

@@ -15,7 +15,7 @@
# define FRAGTRAP_HPP
# include <iostream>
# include "../ClapTrap/ClapTrab.hpp"
# include "../ClapTrap/ClapTrap.hpp"
class FragTrap : public ClapTrap
{

9
ex02/ScavTrap/ScavTrap.cpp
View File

@@ -68,16 +68,15 @@ void ScavTrap::attack(const std::string &target)
void ScavTrap::guardGate()
{
if (this->guardGate)
if (!this->guarding_gate)
{
this->guardGate = false;
std::cout << "ScavTrap " << this->name << " is not in Gate keeper mode"
this->guarding_gate = true;
std::cout << "ScavTrap " << this->name << " is in Gate keeper mode"
<< std::endl;
}
else
{
this->guardGate = true;
std::cout << "ScavTrap " << this->name << " is in Gate keeper mode"
std::cout << "ScavTrap " << this->name << " is already in Gate keeper mode"
<< std::endl;
}

2
ex02/ScavTrap/ScavTrap.hpp
View File

@@ -20,7 +20,7 @@
class ScavTrap : public ClapTrap
{
private:
boold guarding_gate;
bool guarding_gate;
public:
ScavTrap();
ScavTrap(std::string name);