From 4c669f75195d0fba2c6b7a87dffda530d1ecd6a0 Mon Sep 17 00:00:00 2001 From: Lukas Jiriste Date: Thu, 24 Oct 2024 10:20:25 +0200 Subject: [PATCH] Make remove "ClapTrap" from inherited functions So that the child classes don't have to overwrite the repair and takeDamage methods while not confusing user by calling Scav- and FragTraps ClapTraps, the "ClapTrap" is removed from the functions. --- ex00/ClapTrap.cpp | 12 ++++++------ ex01/ClapTrap.cpp | 12 ++++++------ ex02/ClapTrap.cpp | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ex00/ClapTrap.cpp b/ex00/ClapTrap.cpp index 9fb2e9d..208bb08 100644 --- a/ex00/ClapTrap.cpp +++ b/ex00/ClapTrap.cpp @@ -32,17 +32,17 @@ void ClapTrap::attack(const std::string &target) void ClapTrap::takeDamage(unsigned int amount) { if (m_hp == 0) - std::cout << "ClapTrap " << m_name << + std::cout << m_name << " is already dead and cannot be damaged further.\n"; else if (amount >= m_hp) { - std::cout << "ClapTrap " << m_name + std::cout << m_name << " takes " << amount << " damage and dies\n"; m_hp = 0; } else { - std::cout << "ClapTrap " << m_name + std::cout << m_name << " takes " << amount << " damage.\n"; m_hp -= amount; } @@ -51,14 +51,14 @@ void ClapTrap::takeDamage(unsigned int amount) void ClapTrap::beRepaired(unsigned int amount) { if (m_hp == 0) - std::cout << "ClapTrap " << m_name + std::cout << m_name << " is dead, hence cannot repair itself.\n"; else if (m_energy == 0) - std::cout << "ClapTrap " << m_name + std::cout << m_name << " does not have enough energy to repair itself.\n"; else { - std::cout << "ClapTrap " << m_name + std::cout << m_name << " repairs iself for " << amount << " hit points.\n"; m_hp += amount; } diff --git a/ex01/ClapTrap.cpp b/ex01/ClapTrap.cpp index 9fb2e9d..208bb08 100644 --- a/ex01/ClapTrap.cpp +++ b/ex01/ClapTrap.cpp @@ -32,17 +32,17 @@ void ClapTrap::attack(const std::string &target) void ClapTrap::takeDamage(unsigned int amount) { if (m_hp == 0) - std::cout << "ClapTrap " << m_name << + std::cout << m_name << " is already dead and cannot be damaged further.\n"; else if (amount >= m_hp) { - std::cout << "ClapTrap " << m_name + std::cout << m_name << " takes " << amount << " damage and dies\n"; m_hp = 0; } else { - std::cout << "ClapTrap " << m_name + std::cout << m_name << " takes " << amount << " damage.\n"; m_hp -= amount; } @@ -51,14 +51,14 @@ void ClapTrap::takeDamage(unsigned int amount) void ClapTrap::beRepaired(unsigned int amount) { if (m_hp == 0) - std::cout << "ClapTrap " << m_name + std::cout << m_name << " is dead, hence cannot repair itself.\n"; else if (m_energy == 0) - std::cout << "ClapTrap " << m_name + std::cout << m_name << " does not have enough energy to repair itself.\n"; else { - std::cout << "ClapTrap " << m_name + std::cout << m_name << " repairs iself for " << amount << " hit points.\n"; m_hp += amount; } diff --git a/ex02/ClapTrap.cpp b/ex02/ClapTrap.cpp index 9fb2e9d..208bb08 100644 --- a/ex02/ClapTrap.cpp +++ b/ex02/ClapTrap.cpp @@ -32,17 +32,17 @@ void ClapTrap::attack(const std::string &target) void ClapTrap::takeDamage(unsigned int amount) { if (m_hp == 0) - std::cout << "ClapTrap " << m_name << + std::cout << m_name << " is already dead and cannot be damaged further.\n"; else if (amount >= m_hp) { - std::cout << "ClapTrap " << m_name + std::cout << m_name << " takes " << amount << " damage and dies\n"; m_hp = 0; } else { - std::cout << "ClapTrap " << m_name + std::cout << m_name << " takes " << amount << " damage.\n"; m_hp -= amount; } @@ -51,14 +51,14 @@ void ClapTrap::takeDamage(unsigned int amount) void ClapTrap::beRepaired(unsigned int amount) { if (m_hp == 0) - std::cout << "ClapTrap " << m_name + std::cout << m_name << " is dead, hence cannot repair itself.\n"; else if (m_energy == 0) - std::cout << "ClapTrap " << m_name + std::cout << m_name << " does not have enough energy to repair itself.\n"; else { - std::cout << "ClapTrap " << m_name + std::cout << m_name << " repairs iself for " << amount << " hit points.\n"; m_hp += amount; } -- 2.30.2