Merge branch 'paul' into AL/races-potions

This commit is contained in:
a25liang
2024-07-13 16:04:17 -04:00
34 changed files with 1221 additions and 359 deletions

View File

@ -2,19 +2,18 @@
#include <algorithm>
#include <math.h>
vampire::vampire(RNG &rng, const position_list &available_positions):
character{rng, race::rvampire} {
pos = available_positions[rng.rand_under(available_positions.size())];
gold = 0;
hostile = true;
vampire::vampire(RNG *rng, const position &pos):
character{rng, race::rshade, pos} {
gold = 0;
hostile = true;
}
result vampire::attack(const direction dir, 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);
for (auto &ch : chlist)
if (tmp == ch->get_position()) {
auto res = ch->get_hit(race, ATK, base_hit_rate);
if (res != result::miss) {
HP += GAIN_HP;
@ -27,9 +26,9 @@ result vampire::attack(const direction dir, character_list &chlist) {
}
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);
const fraction hitrate) {
if (rng->trial(hitrate))
HP = std::max(HP - calc_dmg(atk, DEF), 0);
if (HP == 0)
return result::died;