Fixing cpp03, moved more common logic in ClapTrap, Added better main

1 files changed, 17 insertions, 39 deletions

diff --git a/cpp03/ex04/SuperTrap.cpp b/cpp03/ex04/SuperTrap.cpp
index 1555956..bc5947d 100644
--- a/cpp03/ex04/SuperTrap.cpp
+++ b/cpp03/ex04/SuperTrap.cpp
@@ -6,69 +6,47 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/04/13 17:52:56 by charles           #+#    #+#             */
-/*   Updated: 2020/11/11 08:15:03 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/11/12 10:33:35 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "SuperTrap.hpp"
 
-SuperTrap::SuperTrap() : ClapTrap(), FragTrap(), NinjaTrap()
-{
-    // m_hitPoints            = 100;
-    // m_maxHitPoints         = 100;
-    // m_energyPoints         = 100;
-    // m_maxEnergyPoints      = 100;
-    // m_level                = 1;
-    // m_name                 = "";
-    // m_meleeAttackDamage    = 0;
-    // m_rangedAttackDamage   = 0;
-    // m_armorDamageReduction = 0;
-	// std::cout << "SUP3R-TP New " << m_name << ": your gaming references suck" << std::endl;
-}
-
 SuperTrap::SuperTrap(std::string const& name) : ClapTrap(name), FragTrap(name), NinjaTrap(name)
 {
     m_hitPoints            = 100;
-    // m_maxHitPoints         = 100;
-    // m_energyPoints         = 100;
-    // m_maxEnergyPoints      = 100;
-    // m_level                = 1;
-    // m_name                 = name;
-    // m_meleeAttackDamage    = 0;
-    // m_rangedAttackDamage   = 0;
-    // m_armorDamageReduction = 0;
-	// std::cout << "SUP3R-TP New " << m_name << ": your gaming references suck" << std::endl;
+    m_maxHitPoints         = 100;
+    m_energyPoints         = 120;
+    m_maxEnergyPoints      = 120;
+    m_level                = 1;
+    m_name                 = name;
+    m_meleeAttackDamage    = 60;
+    m_rangedAttackDamage   = 20;
+    m_armorDamageReduction = 5;
+	std::cout << "SUP3R-TP New " << m_name << ": your gaming references suck" << std::endl;
 }
 
-SuperTrap::SuperTrap(SuperTrap const& other)
-{
-    *this = other;
-}
+SuperTrap::SuperTrap(SuperTrap const& other) : ClapTrap(other), FragTrap(other), NinjaTrap(other) {}
 
 SuperTrap& SuperTrap::operator=(SuperTrap const& other)
 {
-    // m_hitPoints            = other.m_hitPoints;
-    // m_maxHitPoints         = other.m_maxHitPoints;
-    // m_energyPoints         = other.m_energyPoints;
-    // m_maxEnergyPoints      = other.m_maxEnergyPoints;
-    // m_level                = other.m_level;
-    // m_meleeAttackDamage    = other.m_meleeAttackDamage;
-    // m_rangedAttackDamage   = other.m_rangedAttackDamage;
-    // m_armorDamageReduction = other.m_armorDamageReduction;
+    ClapTrap::operator=(other);
     return *this;
 }
 
 SuperTrap::~SuperTrap()
 {
-	// std::cout << "SUP3R-TP Delete "<< m_name << ": your gaming references still suck" << std::endl;
+	std::cout << "SUP3R-TP Delete "<< m_name << ": your gaming references still suck" << std::endl;
 }
 
 void SuperTrap::rangedAttack(std::string const& target) const
 {
-    // FragTrap::rangedArray(target);
+    FragTrap::rangedAttack(target);
 }
 
 void SuperTrap::meleeAttack(std::string const& target) const
 {
-    // NinjaTrap::rangedArray(target);
+    NinjaTrap::meleeAttack(target);
 }
+
+SuperTrap::SuperTrap() {}