From 234f06191afa6db32529692d07aafb1d11101847 Mon Sep 17 00:00:00 2001 From: a25liang Date: Tue, 2 Jul 2024 20:39:48 -0400 Subject: [PATCH 1/3] - Moved calc_dmg to characters.h - put vampire into new source files --- src/characters.cc | 6 ++++++ src/characters.h | 6 ++++++ src/constants.h | 20 +++++++++++--------- src/races.cc | 5 +---- src/races.h | 4 ++-- src/vampire.cc | 31 +++++++++++++++++++++++++++++++ src/vampire.h | 17 +++++++++++++++++ 7 files changed, 74 insertions(+), 15 deletions(-) create mode 100644 src/vampire.cc create mode 100644 src/vampire.h diff --git a/src/characters.cc b/src/characters.cc index 358531f..34b1592 100644 --- a/src/characters.cc +++ b/src/characters.cc @@ -174,3 +174,9 @@ result character::move_or_attack(const direction dir, return this->attack(dir,chlist); } + + +int calc_dmg(const int ATK, const int DEF) { + return ceil((100 / (100 + DEF)) * ATK); +} + diff --git a/src/characters.h b/src/characters.h index 9962f7e..88884e5 100644 --- a/src/characters.h +++ b/src/characters.h @@ -9,11 +9,14 @@ #include #include #include +#include + #include "constants.h" #include "position.h" #include "layer.h" #include "objects.h" #include "rng.h" + // #include "inventory.h" // Reserved for later class character; // forward declaration @@ -96,4 +99,7 @@ protected: position_list remove_from_list(const position_list &sorted_positions, position_list excluded); + +int calc_dmg(const int ATK, const int DEF); + #endif diff --git a/src/constants.h b/src/constants.h index 5ec97ec..1279f36 100644 --- a/src/constants.h +++ b/src/constants.h @@ -6,30 +6,32 @@ #include #include "position.h" -// IMPORTANT: added END to the end of all valued enums so that you can -// iterate over them +const int INF = 0x3F3F3F3F; enum error {none}; // TODO: update result to include subject -enum result {fine, died, go_down, hit, moved}; +enum result {fine, died, go_down, hit, moved, miss}; enum stat_name {HP, ATK, DEF, hostile}; const int LAYER_CNT = 4; // TODO: update as you go enum layer_num {map = 0, objects, characters, shop}; -const int RACE_CNT = 2; // TODO: update as you go +const int RACE_CNT = 3; // TODO: update as you go -enum race {unknown = 0, rshade /* TODO: fill out the other races (including enemies) */}; +enum race {unknown = 0, rshade , rvampire /* TODO: fill out the other races (including enemies) */}; // TODO: fill out the other races (including enemies) -const int MAX_HP[RACE_CNT] = {0, 125}; -const int STARTING_HP[RACE_CNT] = {0, 125}; -const int STARTING_ATK[RACE_CNT] = {0, 25}; -const int STARTING_DEF[RACE_CNT] = {0, 25}; +const int MAX_HP[RACE_CNT] = {0, 125, INF}; +const int STARTING_HP[RACE_CNT] = {0, 125, 50}; +const int STARTING_ATK[RACE_CNT] = {0, 25, 25}; +const int STARTING_DEF[RACE_CNT] = {0, 25, 25}; const char CHARACTER_REP[RACE_CNT] = {'@', 'S'}; + + + const int DIRECTION_CNT = 8; // IMPORTANT: east is positive for x and SOUTH is positive for y // initializes all directions to an int diff --git a/src/races.cc b/src/races.cc index 9594b3d..1724a08 100644 --- a/src/races.cc +++ b/src/races.cc @@ -21,10 +21,6 @@ result shade::attack(const direction dir, const character_list &chlist) { return result::fine; } -int calc_dmg(const int ATK, const int DEF) { - return ceil((100 / (100 + DEF)) * ATK); -} - result shade::get_hit(const enum race &race, const int atk, const float hitrate) { if (rng.rand_num() <= hitrate * (float)RAND_MAX) // This is a hit! @@ -35,3 +31,4 @@ result shade::get_hit(const enum race &race, const int atk, return result::hit; } + diff --git a/src/races.h b/src/races.h index 0351a9e..f493169 100644 --- a/src/races.h +++ b/src/races.h @@ -16,10 +16,10 @@ public: virtual result attack(const direction dir, const character_list &chlist) override; virtual result get_hit(const enum race &race, const int atk, - const float hitrate) override; + const float hit_rate) override; }; -// TODO: fill out the other races + // TODO: implement enemie movement #endif diff --git a/src/vampire.cc b/src/vampire.cc new file mode 100644 index 0000000..12cdb1d --- /dev/null +++ b/src/vampire.cc @@ -0,0 +1,31 @@ +#include "vampire.h" + +#include +#include + + +result vampire::attack(const direction dir, const character_list &chlist) { + position tmp{pos + MOVE[dir]}; + + for (auto &ch : chlist) + if (tmp == ch->get_position()) { + auto res = ch->get_hit(race, ATK, base_hitrate); + if (res != result::miss) { + HP += GAIN_HP; + } + return res; + } + + return result::fine; +} + +result vampire::get_hit(const enum race &race, const int atk, + const float hitrate) { + if (rng.rand_num() <= hitrate * (float)RAND_MAX) + HP = std::max(HP - calc_dmg(atk, DEF), 0); + + if (HP == 0) + return result::died; + + return result::hit; +} diff --git a/src/vampire.h b/src/vampire.h new file mode 100644 index 0000000..3954f95 --- /dev/null +++ b/src/vampire.h @@ -0,0 +1,17 @@ +#ifndef __VAMPIRE_H__ +#define __VAMPIRE_H__ +#include "characters.h" + + +class vampire final: public character { +public: + vampire(const position_list &available_positions); // spawn at a random place + virtual result attack(const direction dir, + const character_list &chlist) override; + virtual result get_hit(const enum race &race, const int atk, + const float hit_rate) override; +private: + const int GAIN_HP = 5; +}; + +#endif From bd372f7a47ee9fab2f299f0c6bd9bcf177eb3c59 Mon Sep 17 00:00:00 2001 From: a25liang Date: Tue, 2 Jul 2024 21:05:52 -0400 Subject: [PATCH 2/3] moved GAIN_UP for vampire to global scope (avoid memory dups) --- src/vampire.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/vampire.h b/src/vampire.h index 3954f95..6c6d560 100644 --- a/src/vampire.h +++ b/src/vampire.h @@ -2,6 +2,7 @@ #define __VAMPIRE_H__ #include "characters.h" +const int GAIN_HP = 5; class vampire final: public character { public: @@ -9,9 +10,7 @@ public: virtual result attack(const direction dir, const character_list &chlist) override; virtual result get_hit(const enum race &race, const int atk, - const float hit_rate) override; -private: - const int GAIN_HP = 5; + const float hit_rate) override; }; #endif From 9086f0773a39c52ab3d1217d9b00fe7c3920ba7b Mon Sep 17 00:00:00 2001 From: a25liang Date: Tue, 2 Jul 2024 21:58:56 -0400 Subject: [PATCH 3/3] - impl goblin character class --- src/characters.cc | 4 ++-- src/characters.h | 2 +- src/constants.h | 16 ++++++++-------- src/goblin.cc | 30 ++++++++++++++++++++++++++++++ src/goblin.h | 16 ++++++++++++++++ src/races.cc | 2 +- src/vampire.cc | 3 +-- 7 files changed, 59 insertions(+), 14 deletions(-) create mode 100644 src/goblin.cc create mode 100644 src/goblin.h diff --git a/src/characters.cc b/src/characters.cc index 34b1592..50b10aa 100644 --- a/src/characters.cc +++ b/src/characters.cc @@ -33,7 +33,7 @@ int character::get_gold() const { } float character::get_hitrate() const { - return base_hitrate; + return base_hit_rate; } bool character::is_hostile() const { @@ -61,7 +61,7 @@ void character::set_gold(const int ngold) { } void character::set_hitrate(const float nhitrate) { - base_hitrate = nhitrate; + base_hit_rate = nhitrate; } void character::set_hostile(const bool is_hostile) { diff --git a/src/characters.h b/src/characters.h index 88884e5..b14ff7e 100644 --- a/src/characters.h +++ b/src/characters.h @@ -90,7 +90,7 @@ protected: int gold; // characters spawn with gold // inventory inventory; // Reserved - float base_hitrate; // requires: between [0,1] + float base_hit_rate; // requires: between [0,1] bool hostile; }; diff --git a/src/constants.h b/src/constants.h index 1279f36..13be32c 100644 --- a/src/constants.h +++ b/src/constants.h @@ -8,7 +8,7 @@ const int INF = 0x3F3F3F3F; -enum error {none}; +enum error {none}; // TODO: update result to include subject enum result {fine, died, go_down, hit, moved, miss}; @@ -18,16 +18,16 @@ enum stat_name {HP, ATK, DEF, hostile}; const int LAYER_CNT = 4; // TODO: update as you go enum layer_num {map = 0, objects, characters, shop}; -const int RACE_CNT = 3; // TODO: update as you go +const int RACE_CNT = 4; // TODO: update as you go -enum race {unknown = 0, rshade , rvampire /* TODO: fill out the other races (including enemies) */}; +enum race {unknown = 0, rshade , rvampire, goblin /* TODO: fill out the other races (including enemies) */}; // TODO: fill out the other races (including enemies) -const int MAX_HP[RACE_CNT] = {0, 125, INF}; -const int STARTING_HP[RACE_CNT] = {0, 125, 50}; -const int STARTING_ATK[RACE_CNT] = {0, 25, 25}; -const int STARTING_DEF[RACE_CNT] = {0, 25, 25}; -const char CHARACTER_REP[RACE_CNT] = {'@', 'S'}; +const int MAX_HP[RACE_CNT] = {0, 125, INF, 110}; +const int STARTING_HP[RACE_CNT] = {0, 125, 50, 110}; +const int STARTING_ATK[RACE_CNT] = {0, 25, 25, 15}; +const int STARTING_DEF[RACE_CNT] = {0, 25, 25, 20}; +const char CHARACTER_REP[RACE_CNT] = {'@', 'S', 'V', 'G'}; diff --git a/src/goblin.cc b/src/goblin.cc new file mode 100644 index 0000000..48907b6 --- /dev/null +++ b/src/goblin.cc @@ -0,0 +1,30 @@ +#include "goblin.h" +#include +#include + + +result goblin::attack(const direction dir, const character_list &chlist) { + position tmp{pos + MOVE[dir]}; + + for (auto &ch : chlist) + if (tmp == ch->get_position()) { + auto res = ch->get_hit(race, ATK, base_hit_rate); + if (res == result::died) { + gold += GAIN_GOLD; + } + return res; + } + + return result::fine; +} + +result goblin::get_hit(const enum race &race, const int atk, + const float hitrate) { + if (rng.rand_num() <= hitrate * (float)RAND_MAX) + HP = std::max(HP - calc_dmg(atk, DEF), 0); + + if (HP == 0) + return result::died; + + return result::hit; +} diff --git a/src/goblin.h b/src/goblin.h new file mode 100644 index 0000000..d2f89db --- /dev/null +++ b/src/goblin.h @@ -0,0 +1,16 @@ +#ifndef __GOBLIN_H__ +#define __GOBLIN_H__ +#include "characters.h" + +const int GAIN_GOLD = 5; + +class goblin final: public character { +public: + goblin(const position_list &available_positions); // spawn at a random place + virtual result attack(const direction dir, + const character_list &chlist) override; + virtual result get_hit(const enum race &race, const int atk, + const float hit_rate) override; +}; + +#endif \ No newline at end of file diff --git a/src/races.cc b/src/races.cc index 1724a08..b3f8b1a 100644 --- a/src/races.cc +++ b/src/races.cc @@ -15,7 +15,7 @@ result shade::attack(const direction dir, const character_list &chlist) { for (auto &ch : chlist) if (tmp == ch->get_position()) { - return ch->get_hit(race, ATK, base_hitrate); + return ch->get_hit(race, ATK, base_hit_rate); } return result::fine; diff --git a/src/vampire.cc b/src/vampire.cc index 12cdb1d..99fffd7 100644 --- a/src/vampire.cc +++ b/src/vampire.cc @@ -1,5 +1,4 @@ #include "vampire.h" - #include #include @@ -9,7 +8,7 @@ result vampire::attack(const direction dir, const character_list &chlist) { for (auto &ch : chlist) if (tmp == ch->get_position()) { - auto res = ch->get_hit(race, ATK, base_hitrate); + auto res = ch->get_hit(race, ATK, base_hit_rate); if (res != result::miss) { HP += GAIN_HP; }