peisongxiao/cc3k
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of peisongxiao.com:~/cs246/a5

Browse Source
This commit is contained in:
Peisong Xiao
2024-07-18 20:11:14 -04:00
parent 032ba8a39a 1976b7dc47
commit 688ca30ed3
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/characters.cc
View File

@ -48,7 +48,7 @@ result character::calc_effects() {
for (size_t i = 0; i < effects.size(); ++i) { for (size_t i = 0; i < effects.size(); ++i) {
effects[i]->apply(this->race, HP, ATK, DEF, base_hit_rate); effects[i]->apply(this->race, HP, ATK, DEF, base_hit_rate);
if (HP <= 0) if (is_dead())
return result::died; return result::died;
if (effects[i]->get_duration() != 0) if (effects[i]->get_duration() != 0)

10
src/player.cc
View File

@ -318,18 +318,18 @@ void player_base::inventory::print(output *out, unsigned long known_potions) {
out->print_char({x, y}, ' '); out->print_char({x, y}, ' ');
for (int x = INV_LEFT; x < INV_RIGHT; ++x) { 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}, '-', out->print_char({x, INV_BOTTOM - 1}, '-',
COLOR_PAIR(COLOR_YELLOW)); COLOR_PAIR(COLOR_MAGENTA));
} }
for (int y = INV_TOP; y < INV_BOTTOM; ++y) { for (int y = INV_TOP; y < INV_BOTTOM; ++y) {
out->print_char({INV_LEFT, 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_YELLOW)); out->print_char({INV_RIGHT - 1, y}, '|', COLOR_PAIR(COLOR_MAGENTA));
} }
out->print_str({INV_LEFT + 1, INV_TOP}, 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) { for (size_t i = 0; i < owns.size(); ++i) {
out->print_str({INV_LEFT + INV_POTION_OFFSET, out->print_str({INV_LEFT + INV_POTION_OFFSET,