Changing operator= and const reference in Traps

7 files changed, 58 insertions, 30 deletions

diff --git a/cpp03/ex02/ClapTrap.cpp b/cpp03/ex02/ClapTrap.cpp
index 6711799..1211ca1 100644
--- a/cpp03/ex02/ClapTrap.cpp
+++ b/cpp03/ex02/ClapTrap.cpp
@@ -6,7 +6,7 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/04/13 15:28:43 by charles           #+#    #+#             */
-/*   Updated: 2020/04/13 15:50:48 by charles          ###   ########.fr       */
+/*   Updated: 2020/11/10 14:29:57 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -27,7 +27,7 @@ ClapTrap::ClapTrap():
 	std::cout << m_prefix << "New " << m_name << ": your gaming references suck" << std::endl;
 }
 
-ClapTrap::ClapTrap(std::string name):
+ClapTrap::ClapTrap(std::string const& name):
     m_prefix("CL4P-TP "),
     m_hitPoints(100),
     m_maxHitPoints(100),
@@ -47,7 +47,7 @@ ClapTrap::ClapTrap(ClapTrap const& other)
     *this = other;
 }
 
-void ClapTrap::operator=(ClapTrap const& other)
+ClapTrap& ClapTrap::operator=(ClapTrap const& other)
 {
     m_hitPoints            = other.m_hitPoints;
     m_maxHitPoints         = other.m_maxHitPoints;
@@ -57,6 +57,7 @@ void ClapTrap::operator=(ClapTrap const& other)
     m_meleeAttackDamage    = other.m_meleeAttackDamage;
     m_rangedAttackDamage   = other.m_rangedAttackDamage;
     m_armorDamageReduction = other.m_armorDamageReduction;
+    return *this;
 }
 
 ClapTrap::~ClapTrap()
diff --git a/cpp03/ex02/ClapTrap.hpp b/cpp03/ex02/ClapTrap.hpp
index 5f4e26a..71879b6 100644
--- a/cpp03/ex02/ClapTrap.hpp
+++ b/cpp03/ex02/ClapTrap.hpp
@@ -6,7 +6,7 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/04/13 15:20:45 by charles           #+#    #+#             */
-/*   Updated: 2020/04/13 15:47:14 by charles          ###   ########.fr       */
+/*   Updated: 2020/11/10 14:29:37 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -21,9 +21,9 @@ class ClapTrap
 {
 public:
 	ClapTrap();
-	ClapTrap(std::string name);
+	ClapTrap(std::string const& name);
 	ClapTrap(ClapTrap const& other);
-	void operator=(ClapTrap const& other);
+	ClapTrap& operator=(ClapTrap const& other);
 	~ClapTrap();
 
 	void rangedAttack(std::string const& target) const;
@@ -32,14 +32,14 @@ public:
 	void beRepaired(unsigned int amount);
 
 protected:
-    std::string m_prefix;
+    std::string  m_prefix;
 
     unsigned int m_hitPoints;
     unsigned int m_maxHitPoints;
     unsigned int m_energyPoints;
     unsigned int m_maxEnergyPoints;
     unsigned int m_level;
-    std::string m_name;
+    std::string  m_name;
     unsigned int m_meleeAttackDamage;
     unsigned int m_rangedAttackDamage;
     unsigned int m_armorDamageReduction;
diff --git a/cpp03/ex02/FragTrap.cpp b/cpp03/ex02/FragTrap.cpp
index 4db102e..fc65fcd 100644
--- a/cpp03/ex02/FragTrap.cpp
+++ b/cpp03/ex02/FragTrap.cpp
@@ -6,14 +6,13 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/02/22 05:20:45 by cacharle          #+#    #+#             */
-/*   Updated: 2020/04/13 15:46:59 by charles          ###   ########.fr       */
+/*   Updated: 2020/11/10 14:39:26 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "FragTrap.hpp"
 
-FragTrap::FragTrap():
-    ClapTrap()
+FragTrap::FragTrap() : ClapTrap()
 {
     m_prefix = "FR4G-TP ";
     m_energyPoints = 100;
@@ -24,8 +23,7 @@ FragTrap::FragTrap():
 	std::cout << "FR4G-TP New " << m_name << ": your gaming references suck" << std::endl;
 }
 
-FragTrap::FragTrap(std::string name):
-    ClapTrap(name)
+FragTrap::FragTrap(std::string const& name) : ClapTrap(name)
 {
     m_prefix = "FR4G-TP ";
     m_energyPoints = 100;
@@ -41,7 +39,7 @@ FragTrap::FragTrap(FragTrap const& other)
     *this = other;
 }
 
-void FragTrap::operator=(FragTrap const& other)
+FragTrap& FragTrap::operator=(FragTrap const& other)
 {
     m_hitPoints            = other.m_hitPoints;
     m_maxHitPoints         = other.m_maxHitPoints;
@@ -51,6 +49,7 @@ void FragTrap::operator=(FragTrap const& other)
     m_meleeAttackDamage    = other.m_meleeAttackDamage;
     m_rangedAttackDamage   = other.m_rangedAttackDamage;
     m_armorDamageReduction = other.m_armorDamageReduction;
+    return *this;
 }
 
 FragTrap::~FragTrap()
diff --git a/cpp03/ex02/FragTrap.hpp b/cpp03/ex02/FragTrap.hpp
index 2afa95c..fc99532 100644
--- a/cpp03/ex02/FragTrap.hpp
+++ b/cpp03/ex02/FragTrap.hpp
@@ -6,7 +6,7 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/02/22 05:17:16 by cacharle          #+#    #+#             */
-/*   Updated: 2020/04/13 15:33:50 by charles          ###   ########.fr       */
+/*   Updated: 2020/11/10 14:40:04 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -20,9 +20,9 @@ class FragTrap : public ClapTrap
 {
 public:
 	FragTrap();
-	FragTrap(std::string name);
+	FragTrap(std::string const& name);
 	FragTrap(FragTrap const& other);
-	void operator=(FragTrap const& other);
+	FragTrap& operator=(FragTrap const& other);
 	~FragTrap();
 
 	void vaulthunter_dot_exe(std::string const& target);
diff --git a/cpp03/ex02/ScavTrap.cpp b/cpp03/ex02/ScavTrap.cpp
index d310ab1..c2f7e9b 100644
--- a/cpp03/ex02/ScavTrap.cpp
+++ b/cpp03/ex02/ScavTrap.cpp
@@ -6,14 +6,13 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/04/13 14:15:03 by charles           #+#    #+#             */
-/*   Updated: 2020/04/13 15:46:56 by charles          ###   ########.fr       */
+/*   Updated: 2020/11/10 15:06:12 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "ScavTrap.hpp"
 
-ScavTrap::ScavTrap():
-    ClapTrap()
+ScavTrap::ScavTrap() : ClapTrap()
 {
     m_prefix = "SC4V-TP ";
     m_energyPoints = 50;
@@ -24,8 +23,7 @@ ScavTrap::ScavTrap():
 	std::cout << "New " << m_name << ": your gaming references suck" << std::endl;
 }
 
-ScavTrap::ScavTrap(std::string name):
-    ClapTrap(name)
+ScavTrap::ScavTrap(std::string const& name) : ClapTrap(name)
 {
     m_prefix = "SC4V-TP ";
     m_energyPoints = 50;
@@ -41,7 +39,7 @@ ScavTrap::ScavTrap(ScavTrap const& other)
     *this = other;
 }
 
-void ScavTrap::operator=(ScavTrap const& other)
+ScavTrap& ScavTrap::operator=(ScavTrap const& other)
 {
     m_hitPoints            = other.m_hitPoints;
     m_maxHitPoints         = other.m_maxHitPoints;
@@ -51,6 +49,7 @@ void ScavTrap::operator=(ScavTrap const& other)
     m_meleeAttackDamage    = other.m_meleeAttackDamage;
     m_rangedAttackDamage   = other.m_rangedAttackDamage;
     m_armorDamageReduction = other.m_armorDamageReduction;
+    return *this;
 }
 
 ScavTrap::~ScavTrap()
@@ -70,5 +69,4 @@ void ScavTrap::challengeNewcomer(std::string const& target)
 	std::cout << "SC4V-TP " << m_name
               << " challenge " << target
               << " to " << challenges[rand() % 5] << std::endl;
-    m_energyPoints -= 25;
 }
diff --git a/cpp03/ex02/ScavTrap.hpp b/cpp03/ex02/ScavTrap.hpp
index 1ec4008..b1c162d 100644
--- a/cpp03/ex02/ScavTrap.hpp
+++ b/cpp03/ex02/ScavTrap.hpp
@@ -6,7 +6,7 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/04/13 14:11:51 by charles           #+#    #+#             */
-/*   Updated: 2020/04/13 15:34:53 by charles          ###   ########.fr       */
+/*   Updated: 2020/11/10 14:38:59 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -20,9 +20,9 @@ class ScavTrap : public ClapTrap
 {
 public:
     ScavTrap();
-    ScavTrap(std::string name);
+    ScavTrap(std::string const& name);
     ScavTrap(ScavTrap const& other);
-    void operator=(ScavTrap const& other);
+    ScavTrap& operator=(ScavTrap const& other);
     ~ScavTrap();
 
     void challengeNewcomer(std::string const& target);
diff --git a/cpp03/ex02/main.cpp b/cpp03/ex02/main.cpp
index 8e1e8f0..4e01067 100644
--- a/cpp03/ex02/main.cpp
+++ b/cpp03/ex02/main.cpp
@@ -6,42 +6,72 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/02/22 05:41:27 by cacharle          #+#    #+#             */
-/*   Updated: 2020/04/13 14:30:37 by charles          ###   ########.fr       */
+/*   Updated: 2020/11/10 14:21:47 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include <cstdlib>
+#include <fstream>
 #include "FragTrap.hpp"
 #include "ScavTrap.hpp"
 
 int main(void)
 {
-    srand(time(NULL));
+    int seed;
+    std::ifstream devRandom("/dev/random");
+    if (devRandom.is_open())
+    {
+        devRandom.read((char*)&seed, sizeof(int));
+        devRandom.close();
+    }
+    else
+        seed = time(NULL);
+	srand(seed);
 
     FragTrap ft("bob");
+    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");
     ft.vaulthunter_dot_exe("your brother");
     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::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);
 	return 0;