diff --git a/src/poison_health.cc b/src/poison_health.cc index b8401e9..b6f4fbb 100644 --- a/src/poison_health.cc +++ b/src/poison_health.cc @@ -2,21 +2,21 @@ #include -poison_health::poison_health(): - potion{potion_type::poison_health, 1} {} +poison_health::poison_health(const position &pos): + potion{potion_type::poison_health, 1, pos} {} -void poison_health::apply(enum race &race, int &HP, int &ATK, int &DEF, - float &base_hit_rate) { - if (remaining_duration > 0) { - if (race == rdrow) - HP = std::max(HP - 7, 0); - else - HP = std::max(HP - 5, 0); +void poison_health::apply(const enum race &race, int &HP, int &ATK, int &DEF, + fraction &base_hit_rate) { + if (remaining_duration > 0) { + if (race == rdrow) + HP = std::max(HP - 7, 0); + else + HP = std::max(HP - 5, 0); - --remaining_duration; - } + --remaining_duration; + } } int poison_health::get_priority() const { - return CALC_ADD_BASE; + return CALC_ADD_BASE; } diff --git a/src/poison_health.h b/src/poison_health.h index 5242bf2..f970f7c 100644 --- a/src/poison_health.h +++ b/src/poison_health.h @@ -5,10 +5,10 @@ class poison_health final: public potion { public: - poison_health(); - void apply(enum race &race, int &HP, int &ATK, int &DEF, - float &base_hit_rate) override; - int get_priority() const override; + poison_health(const position &pos); + void apply(const enum race &race, int &HP, int &ATK, int &DEF, + fraction &base_hit_rate) override; + int get_priority() const override; }; #endif diff --git a/src/wound_atk.cc b/src/wound_atk.cc index 60d9d34..e30ffd2 100644 --- a/src/wound_atk.cc +++ b/src/wound_atk.cc @@ -5,21 +5,21 @@ const int WOUND_ATK = 5; const int WOUND_ATK_DROW = 7; -wound_atk::wound_atk(): - potion{potion_type::wound_atk, -1} {} +wound_atk::wound_atk(const position &pos): + potion{potion_type::wound_atk, -1, pos} {} -void wound_atk::apply(enum race &race, int &HP, int &ATK, int &DEF, - float &base_hit_rate) { - if (remaining_duration > 0) { - if (race == rdrow) - ATK = std::max(ATK - WOUND_ATK_DROW, 0); - else - ATK = std::max(ATK - WOUND_ATK, 0); +void wound_atk::apply(const enum race &race, int &HP, int &ATK, int &DEF, + fraction &base_hit_rate) { + if (remaining_duration > 0) { + if (race == rdrow) + ATK = std::max(ATK - WOUND_ATK_DROW, 0); + else + ATK = std::max(ATK - WOUND_ATK, 0); - --remaining_duration; - } + --remaining_duration; + } } int wound_atk::get_priority() const { - return CALC_ADD_BASE; + return CALC_ADD_BASE; } diff --git a/src/wound_atk.h b/src/wound_atk.h index 81890be..1d95411 100644 --- a/src/wound_atk.h +++ b/src/wound_atk.h @@ -5,10 +5,10 @@ class wound_atk final: public potion { public: - wound_atk(); - void apply(enum race &race, int &HP, int &ATK, int &DEF, - float &base_hit_rate) override; - int get_priority() const override; + wound_atk(const position &pos); + void apply(const enum race &race, int &HP, int &ATK, int &DEF, + fraction &base_hit_rate) override; + int get_priority() const override; }; #endif diff --git a/src/wound_def.cc b/src/wound_def.cc index 1916e11..1c3561f 100644 --- a/src/wound_def.cc +++ b/src/wound_def.cc @@ -5,21 +5,21 @@ const int WOUND_DEF = 5; const int WOUND_DEF_DROW = 7; -wound_def::wound_def(): - potion{potion_type::wound_def, -1} {} +wound_def::wound_def(const position &pos): + potion{potion_type::wound_def, -1, pos} {} -void wound_def::apply(enum race &race, int &HP, int &ATK, int &DEF, - float &base_hit_rate) { - if (remaining_duration > 0) { - if (race == rdrow) - DEF = std::max(DEF - WOUND_DEF_DROW, 0); - else - DEF = std::max(DEF - WOUND_DEF, 0); +void wound_def::apply(const enum race &race, int &HP, int &ATK, int &DEF, + fraction &base_hit_rate) { + if (remaining_duration > 0) { + if (race == rdrow) + DEF = std::max(DEF - WOUND_DEF_DROW, 0); + else + DEF = std::max(DEF - WOUND_DEF, 0); - --remaining_duration; - } + --remaining_duration; + } } int wound_def::get_priority() const { - return CALC_ADD_BASE; + return CALC_ADD_BASE; } diff --git a/src/wound_def.h b/src/wound_def.h index 7d22f68..62cd528 100644 --- a/src/wound_def.h +++ b/src/wound_def.h @@ -5,10 +5,10 @@ class wound_def final: public potion { public: - wound_def(); - void apply(enum race &race, int &HP, int &ATK, int &DEF, - float &base_hit_rate) override; - int get_priority() const override; + wound_def(const position &pos); + void apply(const enum race &race, int &HP, int &ATK, int &DEF, + fraction &base_hit_rate) override; + int get_priority() const override; }; #endif