moved move and move_or_attack implementation into characters.cc
This commit is contained in:
32
src/races.cc
32
src/races.cc
@ -10,19 +10,6 @@ shade::shade(const position_list &available_positions):
|
||||
hostile = true;
|
||||
}
|
||||
|
||||
// TODO: this shouldn't be a pure virtual functions
|
||||
// IMPORTANT: remember to check if player is on the stairs
|
||||
result shade::move(const direction dir,
|
||||
const position_list &available_positions) {
|
||||
if (find(available_positions, pos + MOVE[dir])
|
||||
!= available_positions.size()) {
|
||||
pos += MOVE[dir];
|
||||
return result::moved;
|
||||
}
|
||||
|
||||
return result::fine;
|
||||
}
|
||||
|
||||
result shade::attack(const direction dir, const character_list &chlist) {
|
||||
position tmp{pos + MOVE[dir]};
|
||||
|
||||
@ -34,25 +21,6 @@ result shade::attack(const direction dir, const character_list &chlist) {
|
||||
return result::fine;
|
||||
}
|
||||
|
||||
result shade::move_or_attack(const direction dir,
|
||||
const position_list &available_positions,
|
||||
const character_list &chlist) {
|
||||
position tmp{pos + MOVE[dir]};
|
||||
|
||||
if (find(available_positions, tmp)
|
||||
!= available_positions.size()) {
|
||||
pos = tmp;
|
||||
return result::moved;
|
||||
}
|
||||
|
||||
for (auto &ch : chlist)
|
||||
if (tmp == ch->get_position()) {
|
||||
return ch->get_hit(race, ATK, base_hitrate);
|
||||
}
|
||||
|
||||
return result::fine;
|
||||
}
|
||||
|
||||
int calc_dmg(const int ATK, const int DEF) {
|
||||
return ceil((100 / (100 + DEF)) * ATK);
|
||||
}
|
||||
|
Reference in New Issue
Block a user