diff --git a/src/characters.cc b/src/characters.cc index 7a842ea..2939fd1 100644 --- a/src/characters.cc +++ b/src/characters.cc @@ -48,7 +48,7 @@ result character::calc_effects() { for (size_t i = 0; i < effects.size(); ++i) { effects[i]->apply(this->race, HP, ATK, DEF, base_hit_rate); - if (HP <= 0) + if (is_dead()) return result::died; if (effects[i]->get_duration() != 0) diff --git a/src/player.cc b/src/player.cc index e2c4f51..3af4cbf 100644 --- a/src/player.cc +++ b/src/player.cc @@ -308,18 +308,18 @@ void player_base::inventory::print(output *out, unsigned long known_potions) { out->print_char({x, y}, ' '); for (int x = INV_LEFT; x < INV_RIGHT; ++x) { - out->print_char({x, INV_TOP}, '-', COLOR_PAIR(COLOR_YELLOW)); + out->print_char({x, INV_TOP}, '-', COLOR_PAIR(COLOR_MAGENTA)); out->print_char({x, INV_BOTTOM - 1}, '-', - COLOR_PAIR(COLOR_YELLOW)); + COLOR_PAIR(COLOR_MAGENTA)); } for (int y = INV_TOP; y < INV_BOTTOM; ++y) { - out->print_char({INV_LEFT, y}, '|', COLOR_PAIR(COLOR_YELLOW)); - out->print_char({INV_RIGHT - 1, y}, '|', COLOR_PAIR(COLOR_YELLOW)); + out->print_char({INV_LEFT, y}, '|', COLOR_PAIR(COLOR_MAGENTA)); + out->print_char({INV_RIGHT - 1, y}, '|', COLOR_PAIR(COLOR_MAGENTA)); } out->print_str({INV_LEFT + 1, INV_TOP}, - "Potions:", COLOR_PAIR(COLOR_BLUE)); + "Potions:", COLOR_PAIR(COLOR_CYAN)); for (size_t i = 0; i < owns.size(); ++i) { out->print_str({INV_LEFT + INV_POTION_OFFSET,