diff --git a/cpp03/ex01/ClapTrap.cpp b/cpp03/ex01/ClapTrap.cpp index dea7cfe..de4937e 100644 --- a/cpp03/ex01/ClapTrap.cpp +++ b/cpp03/ex01/ClapTrap.cpp @@ -6,7 +6,7 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/01/10 13:59:49 by rparodi #+# #+# */ -/* Updated: 2025/01/14 21:59:42 by rparodi ### ########.fr */ +/* Updated: 2025/01/24 18:32:35 by rparodi ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,6 +14,10 @@ #include #include +ClapTrap::ClapTrap() { + +} + ClapTrap::ClapTrap(std::string name) { _name = name; _hit_point = 10; diff --git a/cpp03/ex01/ClapTrap.hpp b/cpp03/ex01/ClapTrap.hpp index 5cfa268..a6c5d7b 100644 --- a/cpp03/ex01/ClapTrap.hpp +++ b/cpp03/ex01/ClapTrap.hpp @@ -6,7 +6,7 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/01/10 14:54:21 by rparodi #+# #+# */ -/* Updated: 2025/01/10 15:52:10 by rparodi ### ########.fr */ +/* Updated: 2025/01/24 18:32:41 by rparodi ### ########.fr */ /* */ /* ************************************************************************** */ @@ -17,17 +17,18 @@ class ClapTrap { public: + ClapTrap(); ClapTrap(std::string name); ~ClapTrap(); void attack(const std::string& target); void takeDamage(unsigned int amount); void beRepaired(unsigned int amount); - private: - ClapTrap(); + protected: std::string _name; int _hit_point; int _energy_point; int _attack_damage; + private: }; diff --git a/cpp03/ex01/ScavTrap.cpp b/cpp03/ex01/ScavTrap.cpp index e69de29..cffeba4 100644 --- a/cpp03/ex01/ScavTrap.cpp +++ b/cpp03/ex01/ScavTrap.cpp @@ -0,0 +1,21 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ScavTrap.cpp :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: rparodi +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2025/01/24 17:41:01 by rparodi #+# #+# */ +/* Updated: 2025/01/24 18:31:52 by rparodi ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "ScavTrap.hpp" + +ScavTrap::ScavTrap (std::string name) { + _name = name; + _hit_point = 100; + _energy_point = 50; + _attack_damage = 20; + std::cout << "\n[Init] ScavTrap:\n\t" << "Name: " << _name << std::endl; +} diff --git a/cpp03/ex01/ScavTrap.hpp b/cpp03/ex01/ScavTrap.hpp index 35835bd..ee90651 100644 --- a/cpp03/ex01/ScavTrap.hpp +++ b/cpp03/ex01/ScavTrap.hpp @@ -6,7 +6,7 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/01/20 23:13:16 by rparodi #+# #+# */ -/* Updated: 2025/01/20 23:17:49 by rparodi ### ########.fr */ +/* Updated: 2025/01/24 18:23:14 by rparodi ### ########.fr */ /* */ /* ************************************************************************** */ @@ -18,8 +18,12 @@ class ScavTrap : public ClapTrap { public: + ScavTrap(std::string name); + + protected: private: + }; #endif diff --git a/cpp03/ex01/main.cpp b/cpp03/ex01/main.cpp index c61ddf4..115256d 100644 --- a/cpp03/ex01/main.cpp +++ b/cpp03/ex01/main.cpp @@ -6,16 +6,17 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/01/10 15:50:07 by rparodi #+# #+# */ -/* Updated: 2025/01/14 22:04:48 by rparodi ### ########.fr */ +/* Updated: 2025/01/24 17:37:56 by rparodi ### ########.fr */ /* */ /* ************************************************************************** */ #include "ClapTrap.hpp" +#include "ScavTrap.hpp" #include int main(void) { std::cout << "[Broadcast]\n\tIn the Red corner the first cat of the 42 school !" << std::endl; - ClapTrap test("Norminet"); + ScavTrap test("Norminet"); test.attack("Moulinette"); test.takeDamage(42); test.beRepaired(42);