42_adjoly/CPP_Module_03
Archived
1
0
Fork 0
Code

「🔨」 fix(Ex01): Turned claptrap private attribute to protected

Browse Source
This commit is contained in:
Adam JOLY
2024-11-29 15:39:44 +01:00
parent c8a9dbade3
commit 09f2fbf12d
5 changed files with 53 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ex01/ClapTrap.cpp
View File

@ -6,12 +6,21 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/11/20 14:29:16 by adjoly #+# #+# */ /* Created: 2024/11/20 14:29:16 by adjoly #+# #+# */
/* Updated: 2024/11/27 13:02:14 by adjoly ### ########.fr */ /* Updated: 2024/11/29 15:21:39 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "ClapTrap.hpp" #include "ClapTrap.hpp"
#include <string> #include <string>
#include <iostream>
void logClap(std::string emoji, std::string who, std::string str) {
std::cout << "「" << emoji << "」ClapTrap(" << who << "): " << str << std::endl;
}
void logClap(std::string emoji, std::string str) {
std::cout << "「" << emoji << "」ClapTrap: " << str << std::endl;
}
ClapTrap::ClapTrap(void) : ClapTrap::ClapTrap(void) :
_name("Kanel"), _health(10), _energyPoints(10), _attackDamage(0) { _name("Kanel"), _health(10), _energyPoints(10), _attackDamage(0) {
@ -58,7 +67,7 @@ void ClapTrap::attack(const std::string& target) {
void ClapTrap::takeDamage(unsigned int amount) { void ClapTrap::takeDamage(unsigned int amount) {
logClap("🥊", _name, "take " + iToS(amount) + " damage"); logClap("🥊", _name, "take " + iToS(amount) + " damage");
if (_health >= amount) { if (_health <= amount) {
logClap("💀", _name, "is dead HAHA"); logClap("💀", _name, "is dead HAHA");
_health = 0; _health = 0;
} else { } else {

8
ex01/ClapTrap.hpp
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/11/20 14:08:19 by adjoly #+# #+# */ /* Created: 2024/11/20 14:08:19 by adjoly #+# #+# */
/* Updated: 2024/11/27 13:02:23 by adjoly ### ########.fr */ /* Updated: 2024/11/29 15:24:06 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -17,7 +17,7 @@
typedef unsigned int uint; typedef unsigned int uint;
class ClapTrap { class ClapTrap {
private: protected:
std::string _name; std::string _name;
uint _health; uint _health;
uint _energyPoints; uint _energyPoints;
@ -46,6 +46,6 @@ class ClapTrap {
void setName(std::string); void setName(std::string);
}; };
void logClap(std::string, std::string, std::string);
void logClap(std::string, std::string);
std::string iToS(unsigned int i); std::string iToS(unsigned int i);
void logClap(std::string, std::string);
void logClap(std::string, std::string, std::string);

46
ex01/ScavTrap.cpp
View File

@ -6,49 +6,63 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/11/27 12:53:46 by adjoly #+# #+# */ /* Created: 2024/11/27 12:53:46 by adjoly #+# #+# */
/* Updated: 2024/11/27 12:59:02 by adjoly ### ########.fr */ /* Updated: 2024/11/29 15:39:05 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "ScavTrap.hpp" #include "ScavTrap.hpp"
#include "ClapTrap.hpp" #include <iostream>
void logScav(std::string emoji, std::string who, std::string str) {
std::cout << "「" << emoji << "」ScavTrap(" << who << "): " << str << std::endl;
}
void logScav(std::string emoji, std::string str) {
std::cout << "「" << emoji << "」ScavTrap: " << str << std::endl;
}
ScavTrap::ScavTrap(void) : ClapTrap() { ScavTrap::ScavTrap(void) : ClapTrap() {
log("➕", "default constructor called"); logScav("➕", "default constructor called");
_health = 100;
_energyPoints = 50;
_attackDamage = 20;
} }
ScavTrap::~ScavTrap(void) { ScavTrap::~ScavTrap(void) {
log("➖", "destructor called"); logScav("➖", "destructor called");
} }
ScavTrap::ScavTrap(std::string name) : ClapTrap(name) { ScavTrap::ScavTrap(std::string name) : ClapTrap(name) {
log("➕", getName(), "constructor called"); logScav("➕", name, "constructor called");
_health = 100;
_energyPoints = 50;
_attackDamage = 20;
} }
ScavTrap::ScavTrap(const ScavTrap &other) { ScavTrap::ScavTrap(const ScavTrap &other) {
*this = other; *this = other;
log("➕", getName(), "copy constructor called"); logScav("➕", _name, "copy constructor called");
} }
ScavTrap &ScavTrap::operator=(const ScavTrap &cpy) { ScavTrap &ScavTrap::operator=(const ScavTrap &cpy) {
log("🟰", getName(), "copy assignement constructor called"); logScav("🟰", _name, "copy assignement constructor called");
if (this != &cpy) { if (this != &cpy) {
setName(cpy.getName()); _name = cpy.getName();
setHealth(cpy.getHealth()); _health = cpy.getHealth();
setEnergyPoints(cpy.getEnergyPoints()); _energyPoints = cpy.getEnergyPoints();
setAttackDamage(cpy.getAttackDamage()); _attackDamage = cpy.getAttackDamage();
} }
return (*this); return (*this);
} }
void ScavTrap::attack(const std::string& target) { void ScavTrap::attack(const std::string& target) {
if (getHealth() == 0) { if (_health == 0) {
log("💀", getName(), "can't attack already dead"); logScav("💀", _name, "can't attack already dead");
return ; return ;
} else if (getEnergyPoints() == 0) { } else if (_energyPoints == 0) {
log("💤", getName(), "can't attack no energy left GO TO SLEEP!"); logScav("💤", _name, "can't attack no energy left GO TO SLEEP!");
return ; return ;
} }
log("💥", getName(), "attacks " + target + " causing " + iToS(getAttackDamage()) + " points of damage!"); logScav("💥", _name, "attacks " + target + " causing " + iToS(_attackDamage) + " points of damage!");
setEnergyPoints(getEnergyPoints() - 1); setEnergyPoints(getEnergyPoints() - 1);
} }

9
ex01/ScavTrap.hpp
View File

@ -6,10 +6,12 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/11/27 12:29:17 by adjoly #+# #+# */ /* Created: 2024/11/27 12:29:17 by adjoly #+# #+# */
/* Updated: 2024/11/27 13:00:47 by adjoly ### ########.fr */ /* Updated: 2024/11/29 15:25:47 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#pragma once
#include "ClapTrap.hpp" #include "ClapTrap.hpp"
class ScavTrap : public ClapTrap { class ScavTrap : public ClapTrap {
@ -24,6 +26,5 @@ class ScavTrap : public ClapTrap {
void attack(const std::string &); void attack(const std::string &);
}; };
void log(std::string, std::string, std::string); void logScav(std::string, std::string);
void log(std::string, std::string); void logScav(std::string, std::string, std::string);
std::string iToS(unsigned int i);

23
ex01/main.cpp
View File

@ -6,30 +6,13 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/11/20 14:25:07 by adjoly #+# #+# */ /* Created: 2024/11/20 14:25:07 by adjoly #+# #+# */
/* Updated: 2024/11/27 13:01:55 by adjoly ### ########.fr */ /* Updated: 2024/11/29 15:21:45 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "ScavTrap.hpp" #include "ScavTrap.hpp"
#include <iostream>
#include <sstream> #include <sstream>
void log(std::string emoji, std::string who, std::string str) {
std::cout << "「" << emoji << "」ScavTrap(" << who << "): " << str << std::endl;
}
void log(std::string emoji, std::string str) {
std::cout << "「" << emoji << "」ScavTrap: " << str << std::endl;
}
void logClap(std::string emoji, std::string who, std::string str) {
std::cout << "「" << emoji << "」ClapTrap(" << who << "): " << str << std::endl;
}
void logClap(std::string emoji, std::string str) {
std::cout << "「" << emoji << "」ClapTrap: " << str << std::endl;
}
std::string iToS(unsigned int i) { std::string iToS(unsigned int i) {
std::stringstream ss; std::stringstream ss;
@ -41,8 +24,8 @@ int main(void) {
ScavTrap kanel("Kanel"); ScavTrap kanel("Kanel");
ScavTrap suki("Suki"); ScavTrap suki("Suki");
kanel.setAttackDamage(5); kanel.setAttackDamage(51);
log("🙀", kanel.getName(), "Oh my god Kanel uses his last teeth to attack " + suki.getName()); logScav("🙀", kanel.getName(), "Oh my god Kanel uses his last teeth to attack " + suki.getName());
kanel.attack(suki.getName()); kanel.attack(suki.getName());
suki.takeDamage(kanel.getAttackDamage()); suki.takeDamage(kanel.getAttackDamage());