Add suggested changes to the code base.

Author: hentai-chan

src/anim.cpp

@@ -44,7 +44,7 @@ void print_splash_screen(const std::filesystem::path& assets_dir)
 	for (const char& c : "copyright (c) 2021 cpp-gamedev")
 	{
 		std::cout << c;
-		utils::sleep(100);
+		utils::sleep(std::chrono::milliseconds{50});
 	}
 }
 
@@ -88,7 +88,7 @@ void print_move_table(const models::Pokemon& pkmn)
 std::array<models::Pokemon, 2> load_main_menu(const utils::Manifest& manifest)
 {
 	// 1. set difficulty
-	int selection{utils::validate_user_input({"easy", "moderate", "hard"}, "(1/2) set difficulty")};
+	int selection{utils::validate_user_input({"easy", "moderate", "hard"}, "(1/2) SET DIFFICULTY")};
 	auto difficulty = (selection == 1) ? models::Difficulty::EASY : (selection == 2) ? models::Difficulty::MODERATE : models::Difficulty::HARD;
 
 	// 2. instantiate all available pokemons
@@ -101,7 +101,7 @@ std::array<models::Pokemon, 2> load_main_menu(const utils::Manifest& manifest)
 	std::vector<std::string> names{};
 	names.reserve(pkmns.size());
 	std::for_each(pkmns.begin(), pkmns.end(), [&names](models::Pokemon& pkmn) { names.push_back(pkmn.name); });
-	selection = utils::validate_user_input(names, "(2/2) choose a pokemon");
+	selection = utils::validate_user_input(names, "(2/2) CHOOSE A POKEMON");
 	models::Pokemon player = pkmns[selection - 1];
 
 	// 4. remove selection from pkmns, so that player won't fight against his doppelganger

src/main.cpp

@@ -8,6 +8,7 @@ using namespace utils;
 
 int main()
 {
+	constexpr std::chrono::milliseconds delay{1000};
 	const auto assets_dir = find_upwards("assets");
 	Manifest manifest = check_manifest(assets_dir.parent_path() / "manifest.json");
 
@@ -26,15 +27,15 @@ int main()
 
 			if (ai.hp > 0)
 			{
-				sleep(1000);
+				sleep(delay);
 				ai.make_move(player, random_range<std::size_t>(1, 4));
 				clear_screen();
 			}
 
 		}
 
 		clear_screen();
-		slow_print((ai.hp == 0) ? "You Won :)" : "You Lost :(", 50);
+		slow_print((ai.hp == 0) ? "You Won :)" : "You Lost :(", delay / 20);
 
 		return EXIT_SUCCESS;
 	}

src/models.cpp

@@ -131,6 +131,6 @@ void Pokemon::make_move(Pokemon& pkmn, std::size_t index)
 		break;
 	}
 
-	utils::slow_print(msg, 50);
+	utils::slow_print(msg, std::chrono::milliseconds{50});
 }
 } // namespace models

src/models.hpp

@@ -29,9 +29,10 @@ struct Move
 
 enum class Difficulty
 {
-	EASY = 1,
-	MODERATE = 2,
-	HARD = 3
+	NONE,
+	EASY,
+	MODERATE,
+	HARD
 };
 
 struct Pokemon

src/utils.cpp

@@ -13,14 +13,14 @@ void clear_screen()
 	std::cout << "\033[2J\033[1;1H";
 }
 
-void sleep(int ms)
+void sleep(std::chrono::milliseconds ms)
 {
-	std::this_thread::sleep_for(std::chrono::milliseconds(ms));
+	std::this_thread::sleep_for(ms);
 }
 
-void slow_print(std::string str, int ms)
+void slow_print(const std::string& str, std::chrono::milliseconds ms)
 {
-	for (const char& c : str)
+	for (char c : str)
 	{
 		std::cout << c;
 		sleep(ms);
@@ -86,7 +86,7 @@ std::vector<std::string> read_file(const std::filesystem::path& path)
 	return lines;
 }
 
-void print_enum_table(std::vector<std::string> table, std::string header)
+void print_enum_table(const std::vector<std::string>& table, const std::string& header)
 {
 	// +----------------------------------------------------------+
 	// | HEADER                                                   |
@@ -101,7 +101,6 @@ void print_enum_table(std::vector<std::string> table, std::string header)
 	std::string horizontal_line = utils::style(std::string("+").append(std::string(width - 2, '-')).append("+"), border_color);
 
 	std::cout << horizontal_line << '\n';
-	upper(header);
 	std::cout << border << kt::format_str(" {}{}", header, std::string(width - 3 - header.length(), ' ')) << border << '\n';
 
 	// clang-format off
@@ -112,7 +111,6 @@ void print_enum_table(std::vector<std::string> table, std::string header)
 
 	for (std::size_t i = 0; i < table.size(); ++i)
 	{
-		lower(table[i]);
 		std::cout << padded_string(i + 1, table[i], border) << '\n';
 	}
 
@@ -151,7 +149,7 @@ Manifest check_manifest(const std::filesystem::path& path)
 			manifest.game_ready = json["game_ready"].as<bool>();
 			manifest.duplicates = json["duplicates"].as<std::vector<int>>();
 			manifest.files = json["files"].as<std::vector<std::string>>();
-			manifest.asset_dir = path.parent_path() / std::filesystem::path("assets");
+			manifest.asset_dir = path.parent_path() / "assets";
 		}
 	}
 	else

src/utils.hpp

@@ -74,9 +74,9 @@ T get_user_input(std::string prompt)
 
 void clear_screen();
 
-void sleep(int ms);
+void sleep(std::chrono::milliseconds ms);
 
-void slow_print(std::string str, int ms);
+void slow_print(const std::string& str, std::chrono::milliseconds ms);
 
 enum class Color
 {
@@ -100,7 +100,7 @@ std::filesystem::path find_upwards(std::string dir_name, int max_depth = 10);
 
 std::vector<std::string> read_file(const std::filesystem::path& path);
 
-void print_enum_table(std::vector<std::string> table, std::string header);
+void print_enum_table(const std::vector<std::string>& table, const std::string& header);
 
 int validate_user_input(std::vector<std::string> table, std::string header);