upd: DiamondTrap

lvl_4_5_cpp_modules/CPP03/ex03/includes/ClapTrap.hpp

@@ -14,6 +14,7 @@ class ClapTrap {
 		void attack(const std::string& target);
 		void takeDamage(unsigned int amount);
 		void beRepaired(unsigned int amount);
+
 	protected:
 		std::string name;
 		unsigned int hit_points;

lvl_4_5_cpp_modules/CPP03/ex03/includes/FragTrap.hpp

@@ -11,6 +11,10 @@ class FragTrap : virtual public ClapTrap
 		~FragTrap(void);
 
 		void highFivesGuys(void);
+
+		static const int defaultHitPoints = 100;
+		static const int defaultEnergyPoints = 100;
+		static const int defaultAttackDamage = 30;
 };
 
 #endif // FRAGTRAP_HPP

lvl_4_5_cpp_modules/CPP03/ex03/includes/ScavTrap.hpp

@@ -12,6 +12,10 @@ class ScavTrap : virtual public ClapTrap
 
 		void attack(const std::string& target);
 		void guardGate(void);
+
+		static const int defaultHitPoints = 100;
+		static const int defaultEnergyPoints = 50;
+		static const int defaultAttackDamage = 20;
 };
 
 #endif // SCAVTRAP_HPP

lvl_4_5_cpp_modules/CPP03/ex03/main.cpp

@@ -8,6 +8,7 @@ using std::endl;
 int main(void)
 {
     DiamondTrap Bozo("Bozo");
+   /*  DiamondTrap Bozo("Bozo");
     DiamondTrap Rato("Rato");
     DiamondTrap	Clone;
 
@@ -50,5 +51,5 @@ int main(void)
 
     cout << endl;
 
-    return EXIT_SUCCESS;
+    return EXIT_SUCCESS; */
 }

lvl_4_5_cpp_modules/CPP03/ex03/srcs/DiamondTrap.cpp

@@ -10,9 +10,9 @@ DiamondTrap::DiamondTrap(std::string name)
 : ClapTrap(name + "_clap_name"), FragTrap(name), ScavTrap(name)
 {
     this->name = name;
-    this->hit_points = FragTrap::hit_points;
-    this->energy_points = ScavTrap::energy_points;
-    this->attack_damage = FragTrap::attack_damage;
+    this->hit_points = FragTrap::defaultHitPoints;
+    this->energy_points = ScavTrap::defaultEnergyPoints;
+    this->attack_damage = FragTrap::defaultAttackDamage;
 
     cout << "Sub Class (DiamondTrap) constructor has been called" << endl;
 }

lvl_4_5_cpp_modules/CPP03/ex03/srcs/FragTrap.cpp

@@ -4,25 +4,28 @@
 using std::cout;
 using std::endl;
 
-FragTrap::FragTrap(void) : ClapTrap() {};
+FragTrap::FragTrap(void) : ClapTrap(){};
 
 FragTrap::FragTrap(std::string name) : ClapTrap(name)
 {
-	this->hit_points = 100;
-	this->energy_points = 100;
-	this->attack_damage = 30;
+	this->hit_points = this->defaultHitPoints;
+	this->energy_points = this->defaultEnergyPoints;
+	this->attack_damage = this->defaultAttackDamage;
 	cout << "Sub Class (FragTrap) constructor has been called" << endl;
 }
 
-FragTrap::~FragTrap(void) {
+FragTrap::~FragTrap(void)
+{
 	cout << "Sub Class (FragTrap) destructor has been called" << endl;
 }
 
-void FragTrap::highFivesGuys(void) {
-	if (this->energy_points == 0) {
-        cout << "FragTrap "<< this->name << " is out of energy points!" << endl;
-        return;
-    }
+void FragTrap::highFivesGuys(void)
+{
+	if (this->energy_points == 0)
+	{
+		cout << "FragTrap " << this->name << " is out of energy points!" << endl;
+		return;
+	}
 	cout << "FragTrap " << this->name << " says: High Fives!" << endl;
-    this->energy_points -= 1;
+	this->energy_points -= 1;
 }

lvl_4_5_cpp_modules/CPP03/ex03/srcs/ScavTrap.cpp

@@ -4,34 +4,36 @@
 using std::cout;
 using std::endl;
 
-ScavTrap::ScavTrap(void) {};
+ScavTrap::ScavTrap(void){};
 
 ScavTrap::ScavTrap(std::string name) : ClapTrap(name)
 {
-	this->hit_points = 100;
-	this->energy_points = 50;
-	this->attack_damage = 20;
+	this->hit_points = this->defaultHitPoints;
+	this->energy_points = this->defaultEnergyPoints;
+	this->attack_damage = this->defaultAttackDamage;
 	cout << "Sub Class (ScavTrap) constructor has been called" << endl;
 }
 
-ScavTrap::~ScavTrap(void) {
+ScavTrap::~ScavTrap(void)
+{
 	cout << "Sub Class (ScavTrap) destructor has been called" << endl;
 }
 
-void ScavTrap::attack(const std::string& target)
+void ScavTrap::attack(const std::string &target)
 {
 	if (this->energy_points == 0)
 	{
 		cout << "ScavTrap is out of energy points!" << endl;
 		return;
 	}
 	cout << "ScavTrap " << this->name
-	     << " attacks " << target 
-		 << " causing <amount> " 
-		 << "points of damage!" << endl;
+			 << " attacks " << target
+			 << " causing <amount> "
+			 << "points of damage!" << endl;
 	this->energy_points -= 1;
 }
 
-void ScavTrap::guardGate(void) {
+void ScavTrap::guardGate(void)
+{
 	cout << "ScavTrap " << this->name << " is now in gate keeper mode" << endl;
 }