From 2e0cf63a219d24ef07412deca9b0e6cb02882b46 Mon Sep 17 00:00:00 2001 From: Charles Cabergs Date: Wed, 11 Nov 2020 08:27:14 +0100 Subject: Fixing small bugs in cpp03 --- cpp03/ex02/ClapTrap.cpp | 32 +++++++++++++++----------------- cpp03/ex02/ClapTrap.hpp | 4 +--- cpp03/ex02/FragTrap.cpp | 22 ++++++++++------------ cpp03/ex02/ScavTrap.cpp | 22 ++++++++++------------ cpp03/ex02/main.cpp | 10 ++-------- 5 files changed, 38 insertions(+), 52 deletions(-) (limited to 'cpp03/ex02') diff --git a/cpp03/ex02/ClapTrap.cpp b/cpp03/ex02/ClapTrap.cpp index 1211ca1..4c712c3 100644 --- a/cpp03/ex02/ClapTrap.cpp +++ b/cpp03/ex02/ClapTrap.cpp @@ -6,14 +6,13 @@ /* By: charles +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/13 15:28:43 by charles #+# #+# */ -/* Updated: 2020/11/10 14:29:57 by cacharle ### ########.fr */ +/* Updated: 2020/11/11 06:41:35 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ #include "ClapTrap.hpp" ClapTrap::ClapTrap(): - m_prefix("CL4P-TP "), m_hitPoints(100), m_maxHitPoints(100), m_energyPoints(100), @@ -24,11 +23,10 @@ ClapTrap::ClapTrap(): m_rangedAttackDamage(0), m_armorDamageReduction(0) { - std::cout << m_prefix << "New " << m_name << ": your gaming references suck" << std::endl; + std::cout << "CL4P-TP New " << m_name << ": your gaming references suck" << std::endl; } ClapTrap::ClapTrap(std::string const& name): - m_prefix("CL4P-TP "), m_hitPoints(100), m_maxHitPoints(100), m_energyPoints(100), @@ -39,7 +37,7 @@ ClapTrap::ClapTrap(std::string const& name): m_rangedAttackDamage(0), m_armorDamageReduction(0) { - std::cout << m_prefix << "New " << m_name << ": your gaming references suck" << std::endl; + std::cout << "CL4P-TP New " << m_name << ": your gaming references suck" << std::endl; } ClapTrap::ClapTrap(ClapTrap const& other) @@ -62,23 +60,23 @@ ClapTrap& ClapTrap::operator=(ClapTrap const& other) ClapTrap::~ClapTrap() { - std::cout << "CL4P-TP " << "Delete "<< m_name << ": your gaming references still suck" << std::endl; + std::cout << "CL4P-TP Delete "<< m_name << ": your gaming references still suck" << std::endl; } void ClapTrap::rangedAttack(std::string const& target) const { - std::cout << m_prefix << m_name - << " attacks " << target + std::cout << "CL4P-TP " << m_name + << " attacks " << target << " at range, causing " << m_rangedAttackDamage - << " points of damage!" << std::endl; + << " points of damage!" << std::endl; } void ClapTrap::meleeAttack(std::string const& target) const { - std::cout << m_prefix << m_name - << " attacks " << target + std::cout << "CL4P-TP " << m_name + << " attacks " << target << " in melee mode causing " << m_meleeAttackDamage - << " points of damage!" << std::endl; + << " points of damage!" << std::endl; } void ClapTrap::takeDamage(unsigned int amount) @@ -90,9 +88,9 @@ void ClapTrap::takeDamage(unsigned int amount) if (amount > m_hitPoints) amount = m_hitPoints; m_hitPoints -= amount; - std::cout << m_prefix << m_name - << " takes " << amount - << " damage" << std::endl; + std::cout << "CL4P-TP " << m_name + << " takes " << amount + << " damage" << std::endl; } void ClapTrap::beRepaired(unsigned int amount) @@ -100,7 +98,7 @@ void ClapTrap::beRepaired(unsigned int amount) if (amount + m_hitPoints > m_maxHitPoints) amount = m_maxHitPoints - m_hitPoints; m_hitPoints += amount; - std::cout << m_prefix << m_name - << " gained " << amount + std::cout << "CL4P-TP " << m_name + << " gained " << amount << " hit points" << std::endl; } diff --git a/cpp03/ex02/ClapTrap.hpp b/cpp03/ex02/ClapTrap.hpp index 71879b6..00fd168 100644 --- a/cpp03/ex02/ClapTrap.hpp +++ b/cpp03/ex02/ClapTrap.hpp @@ -6,7 +6,7 @@ /* By: charles +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/13 15:20:45 by charles #+# #+# */ -/* Updated: 2020/11/10 14:29:37 by cacharle ### ########.fr */ +/* Updated: 2020/11/11 06:39:00 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -32,8 +32,6 @@ public: void beRepaired(unsigned int amount); protected: - std::string m_prefix; - unsigned int m_hitPoints; unsigned int m_maxHitPoints; unsigned int m_energyPoints; diff --git a/cpp03/ex02/FragTrap.cpp b/cpp03/ex02/FragTrap.cpp index fc65fcd..9ab2ffc 100644 --- a/cpp03/ex02/FragTrap.cpp +++ b/cpp03/ex02/FragTrap.cpp @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/22 05:20:45 by cacharle #+# #+# */ -/* Updated: 2020/11/10 14:39:26 by cacharle ### ########.fr */ +/* Updated: 2020/11/11 06:42:32 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,22 +14,20 @@ FragTrap::FragTrap() : ClapTrap() { - m_prefix = "FR4G-TP "; - m_energyPoints = 100; - m_maxEnergyPoints = 100; - m_meleeAttackDamage = 30; - m_rangedAttackDamage = 20; + m_energyPoints = 100; + m_maxEnergyPoints = 100; + m_meleeAttackDamage = 30; + m_rangedAttackDamage = 20; m_armorDamageReduction = 5; std::cout << "FR4G-TP New " << m_name << ": your gaming references suck" << std::endl; } FragTrap::FragTrap(std::string const& name) : ClapTrap(name) { - m_prefix = "FR4G-TP "; - m_energyPoints = 100; - m_maxEnergyPoints = 100; - m_meleeAttackDamage = 30; - m_rangedAttackDamage = 20; + m_energyPoints = 100; + m_maxEnergyPoints = 100; + m_meleeAttackDamage = 30; + m_rangedAttackDamage = 20; m_armorDamageReduction = 5; std::cout << "FR4G-TP New " << m_name << ": your gaming references suck" << std::endl; } @@ -54,7 +52,7 @@ FragTrap& FragTrap::operator=(FragTrap const& other) FragTrap::~FragTrap() { - std::cout << m_prefix << "Delete "<< m_name << ": your gaming references still suck" << std::endl; + std::cout << "FR4G-TP Delete "<< m_name << ": your gaming references still suck" << std::endl; } void FragTrap::vaulthunter_dot_exe(std::string const& target) diff --git a/cpp03/ex02/ScavTrap.cpp b/cpp03/ex02/ScavTrap.cpp index c2f7e9b..1acf126 100644 --- a/cpp03/ex02/ScavTrap.cpp +++ b/cpp03/ex02/ScavTrap.cpp @@ -6,7 +6,7 @@ /* By: charles +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/13 14:15:03 by charles #+# #+# */ -/* Updated: 2020/11/10 15:06:12 by cacharle ### ########.fr */ +/* Updated: 2020/11/11 06:42:58 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,22 +14,20 @@ ScavTrap::ScavTrap() : ClapTrap() { - m_prefix = "SC4V-TP "; - m_energyPoints = 50; - m_maxEnergyPoints = 50; - m_meleeAttackDamage = 20; - m_rangedAttackDamage = 15; + m_energyPoints = 50; + m_maxEnergyPoints = 50; + m_meleeAttackDamage = 20; + m_rangedAttackDamage = 15; m_armorDamageReduction = 3; - std::cout << "New " << m_name << ": your gaming references suck" << std::endl; + std::cout << "SC4V-TP New " << m_name << ": your gaming references suck" << std::endl; } ScavTrap::ScavTrap(std::string const& name) : ClapTrap(name) { - m_prefix = "SC4V-TP "; - m_energyPoints = 50; - m_maxEnergyPoints = 50; - m_meleeAttackDamage = 20; - m_rangedAttackDamage = 15; + m_energyPoints = 50; + m_maxEnergyPoints = 50; + m_meleeAttackDamage = 20; + m_rangedAttackDamage = 15; m_armorDamageReduction = 3; std::cout << "SC4V-TP New " << m_name << ": your gaming references suck" << std::endl; } diff --git a/cpp03/ex02/main.cpp b/cpp03/ex02/main.cpp index 4e01067..3263cc7 100644 --- a/cpp03/ex02/main.cpp +++ b/cpp03/ex02/main.cpp @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/02/22 05:41:27 by cacharle #+# #+# */ -/* Updated: 2020/11/10 14:21:47 by cacharle ### ########.fr */ +/* Updated: 2020/11/11 06:53:49 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -32,13 +32,11 @@ int main(void) std::cout << "=== ATTACK ===" << std::endl; ft.rangedAttack("a dog"); ft.meleeAttack("a cat"); - std::cout << std::endl << "=== DAMAGE ===" << std::endl; ft.takeDamage(0); ft.beRepaired(0); ft.takeDamage(10); ft.beRepaired(10); - std::cout << std::endl << "=== VAULTHUNTER ===" << std::endl; ft.vaulthunter_dot_exe("your mom"); ft.vaulthunter_dot_exe("your dad"); @@ -46,31 +44,27 @@ int main(void) ft.vaulthunter_dot_exe("your sister"); std::cout << "=== VAULTHUNTER NO ENERGY ===" << std::endl; ft.vaulthunter_dot_exe("your grandma"); - std::cout << std::endl << "=== OVER LIMIT ===" << std::endl; ft.takeDamage(1000); ft.beRepaired(1000); std::cout << std::endl << std::endl << std::endl; + ScavTrap scav("jean"); std::cout << "=== ATTACK ===" << std::endl; scav.rangedAttack("a dog"); scav.meleeAttack("a cat"); - std::cout << std::endl << "=== DAMAGE ===" << std::endl; scav.takeDamage(0); scav.beRepaired(0); scav.takeDamage(10); scav.beRepaired(10); - std::cout << std::endl << "=== CHALLENGE NEW COMER ===" << std::endl; scav.challengeNewcomer("your mom"); scav.challengeNewcomer("your dad"); scav.challengeNewcomer("your brother"); scav.challengeNewcomer("your sister"); - std::cout << "=== VAULTHUNTER NO ENERGY ===" << std::endl; scav.challengeNewcomer("your grandma"); - std::cout << std::endl << "=== OVER LIMIT ===" << std::endl; scav.takeDamage(1000); scav.beRepaired(1000); -- cgit