aortigos/cpp03
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Min fixes

Browse Source
This commit is contained in:
Angel Ortigosa Perez
2025-10-26 20:20:14 +01:00
parent e4c2000a4a
commit 46b7b99abb
11 changed files with 69 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ex00/ClapTrap/ClapTrap.cpp
View File

@@ -65,14 +65,14 @@ void ClapTrap::attack(const std::string &target)
this->energy -= 1; this->energy -= 1;
} else { } else {
std::cout << "ClapTrap " << this->name std::cout << "ClapTrap " << this->name
<< " cant attack anymore..." << std::endl; << " can't attack anymore..." << std::endl;
} }
} }
void ClapTrap::takeDamage(unsigned int amount) void ClapTrap::takeDamage(unsigned int amount)
{ {
std::cout << "ClapTrap " << this->name std::cout << "ClapTrap " << this->name
<< " recieves " << amount << " receives " << amount
<< " points of damage!" << std::endl; << " points of damage!" << std::endl;
if (amount >= this->health) if (amount >= this->health)
this->health = 0; this->health = 0;
@@ -82,16 +82,20 @@ void ClapTrap::takeDamage(unsigned int amount)
void ClapTrap::beRepaired(unsigned int amount) void ClapTrap::beRepaired(unsigned int amount)
{ {
if (this->energy > 0) if (this->health == 0)
{ {
std::cout << "ClapTrap " << this->name std::cout << "ClapTrap " << this->name << " can't repair itself because it's destroyed" << std::endl;
<< " repairs itself, recovering " << amount return ;
<< " hit points!" << std::endl;
this->health += amount;
this->energy -= 1;
} else {
std::cout << "ClapTrap " << this->name
<< " cant be repaired..." << std::endl;
} }
if (this->energy == 0)
{
std::cout << "ClapTrap " << this->name << " has no energy left to repair!" << std::endl;
return ;
}
std::cout << "ClapTrap " << this->name
<< " repairs itself, recovering " << amount
<< " hit points!" << std::endl;
this->health += amount;
this->energy -= 1;
} }

2
ex00/ClapTrap/ClapTrap.hpp
View File

@@ -1,7 +1,7 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* ClapTrap.cpp :+: :+: :+: */ /* ClapTrap.hpp :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: aortigos <aortigos@student.42malaga.com +#+ +:+ +#+ */ /* By: aortigos <aortigos@student.42malaga.com +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */

6
ex00/Makefile
View File

@@ -1,10 +1,10 @@
NAME = claptrap NAME = claptrap
SRCS = main.cpp ClapTrap/ClapTrap.cpp SRCS = main.cpp ClapTrap/ClapTrap.cpp
OBJS=$(SRCS:.cpp=.o) OBJS = $(SRCS:.cpp=.o)
CC=c++ CC = c++
CFLAGS=-Wall -Wextra -Werror -std=c++98 CFLAGS = -Wall -Wextra -Werror -std=c++98
all: $(NAME) all: $(NAME)

28
ex01/ClapTrap/ClapTrap.cpp
View File

@@ -65,14 +65,14 @@ void ClapTrap::attack(const std::string &target)
this->energy -= 1; this->energy -= 1;
} else { } else {
std::cout << "ClapTrap " << this->name std::cout << "ClapTrap " << this->name
<< " cant attack anymore..." << std::endl; << " can't attack anymore..." << std::endl;
} }
} }
void ClapTrap::takeDamage(unsigned int amount) void ClapTrap::takeDamage(unsigned int amount)
{ {
std::cout << "ClapTrap " << this->name std::cout << "ClapTrap " << this->name
<< " recieves " << amount << " receives " << amount
<< " points of damage!" << std::endl; << " points of damage!" << std::endl;
if (amount >= this->health) if (amount >= this->health)
this->health = 0; this->health = 0;
@@ -82,16 +82,20 @@ void ClapTrap::takeDamage(unsigned int amount)
void ClapTrap::beRepaired(unsigned int amount) void ClapTrap::beRepaired(unsigned int amount)
{ {
if (this->energy > 0) if (this->health == 0)
{ {
std::cout << "ClapTrap " << this->name std::cout << "ClapTrap " << this->name << " can't repair itself because it's destroyed" << std::endl;
<< " repairs itself, recovering " << amount return ;
<< " hit points!" << std::endl;
this->health += amount;
this->energy -= 1;
} else {
std::cout << "ClapTrap " << this->name
<< " cant be repaired..." << std::endl;
} }
if (this->energy == 0)
{
std::cout << "ClapTrap " << this->name << " has no energy left to repair!" << std::endl;
return ;
}
std::cout << "ClapTrap " << this->name
<< " repairs itself, recovering " << amount
<< " hit points!" << std::endl;
this->health += amount;
this->energy -= 1;
} }

6
ex01/Makefile
View File

@@ -1,10 +1,10 @@
NAME = scavtrap NAME = scavtrap
SRCS = main.cpp ClapTrap/ClapTrap.cpp ScavTrap/ScavTrap.cpp SRCS = main.cpp ClapTrap/ClapTrap.cpp ScavTrap/ScavTrap.cpp
OBJS=$(SRCS:.cpp=.o) OBJS = $(SRCS:.cpp=.o)
CC=c++ CC = c++
CFLAGS=-Wall -Wextra -Werror -std=c++98 CFLAGS = -Wall -Wextra -Werror -std=c++98
all: $(NAME) all: $(NAME)

15
ex01/ScavTrap/ScavTrap.cpp
View File

@@ -12,7 +12,7 @@
#include "ScavTrap.hpp" #include "ScavTrap.hpp"
ScavTrap::ScavTrap() : ClapTrap("(NULL)") ScavTrap::ScavTrap() : ClapTrap("(NULL)"), guarding_gate(false)
{ {
this->health = 100; this->health = 100;
this->energy = 50; this->energy = 50;
@@ -21,7 +21,7 @@ ScavTrap::ScavTrap() : ClapTrap("(NULL)")
<< std::endl; << std::endl;
} }
ScavTrap::ScavTrap(std::string name) : ClapTrap(name) ScavTrap::ScavTrap(std::string name) : ClapTrap(name), guarding_gate(false)
{ {
this->health = 100; this->health = 100;
this->energy = 50; this->energy = 50;
@@ -62,22 +62,21 @@ void ScavTrap::attack(const std::string &target)
this->energy -= 1; this->energy -= 1;
} else { } else {
std::cout << "ScavTrap " << this->name std::cout << "ScavTrap " << this->name
<< " cant attack anymore..." << std::endl; << " can't attack anymore..." << std::endl;
} }
} }
void ScavTrap::guardGate() void ScavTrap::guardGate()
{ {
if (this->guardGate) if (!this->guarding_gate)
{ {
this->guardGate = false; this->guarding_gate = true;
std::cout << "ScavTrap " << this->name << " is not in Gate keeper mode" std::cout << "ScavTrap " << this->name << " is in Gate keeper mode"
<< std::endl; << std::endl;
} }
else else
{ {
this->guardGate = true; std::cout << "ScavTrap " << this->name << " is already in Gate keeper mode"
std::cout << "ScavTrap " << this->name << " is in Gate keeper mode"
<< std::endl; << std::endl;
} }

2
ex01/ScavTrap/ScavTrap.hpp
View File

@@ -20,7 +20,7 @@
class ScavTrap : public ClapTrap class ScavTrap : public ClapTrap
{ {
private: private:
boold guarding_gate; bool guarding_gate;
public: public:
ScavTrap(); ScavTrap();
ScavTrap(std::string name); ScavTrap(std::string name);

28
ex02/ClapTrap/ClapTrap.cpp
View File

@@ -65,14 +65,14 @@ void ClapTrap::attack(const std::string &target)
this->energy -= 1; this->energy -= 1;
} else { } else {
std::cout << "ClapTrap " << this->name std::cout << "ClapTrap " << this->name
<< " cant attack anymore..." << std::endl; << " can't attack anymore..." << std::endl;
} }
} }
void ClapTrap::takeDamage(unsigned int amount) void ClapTrap::takeDamage(unsigned int amount)
{ {
std::cout << "ClapTrap " << this->name std::cout << "ClapTrap " << this->name
<< " recieves " << amount << " receives " << amount
<< " points of damage!" << std::endl; << " points of damage!" << std::endl;
if (amount >= this->health) if (amount >= this->health)
this->health = 0; this->health = 0;
@@ -82,16 +82,20 @@ void ClapTrap::takeDamage(unsigned int amount)
void ClapTrap::beRepaired(unsigned int amount) void ClapTrap::beRepaired(unsigned int amount)
{ {
if (this->energy > 0) if (this->health == 0)
{ {
std::cout << "ClapTrap " << this->name std::cout << "ClapTrap " << this->name << " can't repair itself because it's destroyed" << std::endl;
<< " repairs itself, recovering " << amount return ;
<< " hit points!" << std::endl;
this->health += amount;
this->energy -= 1;
} else {
std::cout << "ClapTrap " << this->name
<< " cant be repaired..." << std::endl;
} }
if (this->energy == 0)
{
std::cout << "ClapTrap " << this->name << " has no energy left to repair!" << std::endl;
return ;
}
std::cout << "ClapTrap " << this->name
<< " repairs itself, recovering " << amount
<< " hit points!" << std::endl;
this->health += amount;
this->energy -= 1;
} }

2
ex02/FragTrap/FragTrap.hpp
View File

@@ -15,7 +15,7 @@
# define FRAGTRAP_HPP # define FRAGTRAP_HPP
# include <iostream> # include <iostream>
# include "../ClapTrap/ClapTrab.hpp" # include "../ClapTrap/ClapTrap.hpp"
class FragTrap : public ClapTrap class FragTrap : public ClapTrap
{ {

9
ex02/ScavTrap/ScavTrap.cpp
View File

@@ -68,16 +68,15 @@ void ScavTrap::attack(const std::string &target)
void ScavTrap::guardGate() void ScavTrap::guardGate()
{ {
if (this->guardGate) if (!this->guarding_gate)
{ {
this->guardGate = false; this->guarding_gate = true;
std::cout << "ScavTrap " << this->name << " is not in Gate keeper mode" std::cout << "ScavTrap " << this->name << " is in Gate keeper mode"
<< std::endl; << std::endl;
} }
else else
{ {
this->guardGate = true; std::cout << "ScavTrap " << this->name << " is already in Gate keeper mode"
std::cout << "ScavTrap " << this->name << " is in Gate keeper mode"
<< std::endl; << std::endl;
} }

2
ex02/ScavTrap/ScavTrap.hpp
View File

@@ -20,7 +20,7 @@
class ScavTrap : public ClapTrap class ScavTrap : public ClapTrap
{ {
private: private:
boold guarding_gate; bool guarding_gate;
public: public:
ScavTrap(); ScavTrap();
ScavTrap(std::string name); ScavTrap(std::string name);