diff --git a/src/constants.h b/src/constants.h index 8d8201c..25fe01a 100644 --- a/src/constants.h +++ b/src/constants.h @@ -162,8 +162,8 @@ static const int RETURN_PANICKED = 1; static const int COLOR_BLACK_ON_WHITE = 8; -static const int GOLD_NORMAL = 1; -static const int GOLD_SMALL = 2; +static const int GOLD_NORMAL = 2; +static const int GOLD_SMALL = 1; static const int GOLD_MERCHANT = 4; static const int GOLD_DRAGON = 6; diff --git a/src/halfling.cc b/src/halfling.cc index 40b843c..ebc63bd 100644 --- a/src/halfling.cc +++ b/src/halfling.cc @@ -35,5 +35,5 @@ long_result halfling::get_hit(character *ch, const int tATK, } return {MISS, "PC tried to hit " + abbrev + - " but missed. The halfling laughed. "}; + " but missed. The halfling laughs. "}; } diff --git a/src/player.cc b/src/player.cc index e29ca98..eef5dbf 100644 --- a/src/player.cc +++ b/src/player.cc @@ -52,7 +52,7 @@ long_result player_base::apply(std::unique_ptr p) { "PC gets rusty joints (-50 HP). "}; return {result::APPLIED, - "PC applied potion of " + name + ". "}; + "PC uses potion of " + name + ". "}; } long_result player_base::attack(character *ch) { @@ -90,9 +90,9 @@ long_result player_base::move(level *lvl, } } else if (lvl->get_up_stairs() == p && enabled_features & FEATURE_REVISIT) { - return {result::GO_UP, "PC went up the stairs. "}; + return {result::GO_UP, "PC goes up the stairs. "}; } else if (lvl->get_down_stairs() == p) { - return {result::GO_DOWN, "PC went down the stairs. "}; + return {result::GO_DOWN, "PC goes down the stairs. "}; } else if (lvl->is_available(p, true)) { pos = p; return {result::MOVED, ""}; @@ -109,7 +109,7 @@ void player_base::pickup_gold(level *lvl, std::string &msg) { gold_tmp += g.get_amount(); if (gold_tmp) - msg += "PC picked up " + std::to_string(gold_tmp) + + msg += "PC picks up " + std::to_string(gold_tmp) + " pieces of gold. "; bool locked = false; @@ -163,7 +163,7 @@ long_result player_base::throw_potion(level *lvl, std::unique_ptr p, size_t flag = lvl->what_is_at(tmp); if (flag & WHAT_WALL) - return {THROWN, "The potion shattered against a wall. "}; + return {THROWN, "The potion shatters against a wall. "}; else if (flag & WHAT_ENEMY) { std::string name{p->get_name()}; character *ch = lvl->get_elist()[flag ^ WHAT_ENEMY]; @@ -172,15 +172,15 @@ long_result player_base::throw_potion(level *lvl, std::unique_ptr p, if (ch->get_race() != BABY_DRAGON) return {THROWN, "The potion of " + name + - "'s contents spilled on " + + "'s contents spills on " + ch->get_abbrev() + ". "}; return {THROWN, "The potion of " + name + - " didn't seem to affect B. "}; + " doesn't seem to affect B. "}; } } - return {THROWN, "The potion shattered against the floor. "}; + return {THROWN, "The potion shatters against the floor. "}; } long_result player_base::interpret_command(level *lvl, game_command cmd) { @@ -222,7 +222,7 @@ long_result player_base::interpret_command(level *lvl, game_command cmd) { if (idx != lvl->get_plist().size() && inv.owns.size() < INV_MAX_CNT) { inv.insert(lvl->detach_potion(idx)); - res.msg += "PC picked up a potion. "; + res.msg += "PC picks up a potion. "; } else if (idx != lvl->get_plist().size()) { res.msg += "PC already has a full knapsack. "; } @@ -262,21 +262,21 @@ long_result player_base::interpret_command(level *lvl, game_command cmd) { } else if (cmd == UP_STAIRS) { if (lvl->get_up_stairs() == pos && enabled_features & FEATURE_REVISIT) - return {GO_UP, "PC went up the stairs. "}; + return {GO_UP, "PC goes up the stairs. "}; return {result::NOTHING, "PC tried to fly through the ceiling. "}; } else if (cmd == DOWN_STAIRS) { if (lvl->get_down_stairs() == pos) - return {GO_DOWN, "PC went down the stairs. "}; + return {GO_DOWN, "PC goes down the stairs. "}; return {result::NOTHING, "PC tried to dig through the floor. "}; } else if (cmd == THE_WORLD) { - return {TOGGLE_THE_WORLD, "PC toggled Stand: The World! "}; + return {TOGGLE_THE_WORLD, "PC toggles Stand: The World! "}; } else if (cmd == STAR_PLATINUM) { return {TOGGLE_STAR_PLATINUM, - "PC toggled Stand: Star Platinum: The World! "}; + "PC toggles Stand: Star Platinum: The World! "}; } else if (cmd == GAME_RESTART) { return {RESTART_GAME, ""}; } else if (cmd == GAME_COMMAND_PASS) { diff --git a/src/witch.cc b/src/witch.cc index f249034..72c3486 100644 --- a/src/witch.cc +++ b/src/witch.cc @@ -22,7 +22,7 @@ long_result witch::attack(character *ch) { DEFAULT_POTION_TYPE_CNT)); auto npotion = new_potion(type, {0, 0}); res.msg += std::string("Z's potion of ") + - npotion->get_name() + " spilled onto PC. "; + npotion->get_name() + " spills onto PC. "; static_cast(ch)->set_potion_known( npotion->get_type()); ch->apply_effect(std::move(npotion));