Add suggested changes to PR

Author: hentai-chan

src/anim.cpp

@@ -12,7 +12,7 @@
 
 namespace anim
 {
-std::vector<std::string> gen_healthbar(models::Pokemon& pkmn)
+std::vector<std::string> gen_healthbar(const models::Pokemon& pkmn)
 {
 	/*
 	 * bulbasaur :L30	// label
@@ -41,10 +41,10 @@ std::vector<std::string> gen_healthbar(models::Pokemon& pkmn)
 
 void print_splash_screen(const std::filesystem::path& assets_dir)
 {
-	auto logo = utils::read_file(assets_dir / std::filesystem::path("splashscreen.txt"));
+	auto logo = utils::read_file(assets_dir / "splashscreen.txt");
 	std::cout << utils::style(std::accumulate(logo.begin(), logo.end(), std::string("")), utils::Color::YELLOW) << '\n';
 
-	std::cout << '\n' << std::string(19, ' ');
+	std::cout << '\n' << std::setfill(' ') << std::setw(19);
 
 	for (const char& c : "copyright (c) 2021 cpp-gamedev")
 	{
@@ -81,7 +81,7 @@ std::vector<models::Pokemon> load_main_menu(utils::Manifest manifest)
 	return {player, pkmns.size() > 1 ? utils::random_choice(pkmns) : pkmns[0]};
 }
 
-void print_frame(models::Pokemon& pkmn1, models::Pokemon& pkmn2)
+void print_frame(const models::Pokemon& pkmn1, const models::Pokemon& pkmn2)
 {
 	std::string healthbars{};
 	std::string sprites{};

src/anim.hpp

@@ -7,11 +7,11 @@
 
 namespace anim
 {
-std::vector<std::string> gen_healthbar(models::Pokemon& pkmn);
+std::vector<std::string> gen_healthbar(const models::Pokemon& pkmn);
 
 void print_splash_screen(const std::filesystem::path& assets_dir);
 
 std::vector<models::Pokemon> load_main_menu(utils::Manifest manifest);
 
-void print_frame(models::Pokemon& pkmn1, models::Pokemon& pkmn2);
+void print_frame(const models::Pokemon& pkmn1, const models::Pokemon& pkmn2);
 } // namespace anim

src/main.cpp

@@ -15,7 +15,7 @@ using namespace utils;
 int main()
 {
 	const auto assets_dir = find_upwards("assets");
-	Manifest manifest = check_manifest(assets_dir.parent_path() / std::filesystem::path("manifest.json"));
+	Manifest manifest = check_manifest(assets_dir.parent_path() / "manifest.json");
 
 	if (std::filesystem::exists(assets_dir) && manifest.game_ready)
 	{
@@ -36,7 +36,7 @@ int main()
 	}
 	else
 	{
-		std::cerr << "Error!" << '\n';
+		std::cerr << "Error: The assets directory is in an invalid state. Consult the README for further instructions." << '\n';
 		return EXIT_FAILURE;
 	}
 }

src/models.cpp

@@ -13,8 +13,7 @@ namespace models
 {
 std::vector<std::string> Pokemon::read_asset(std::string ext)
 {
-	std::filesystem::path ext_dir = (ext == "txt") ? std::filesystem::path("textures") : std::filesystem::path("data");
-	return utils::read_file(assets_dir / ext_dir / std::filesystem::path(kt::format_str("{}.{}", std::to_string(this->id), ext)));
+	return utils::read_file(assets_dir / ((ext == "txt") ? "textures" : "data") / kt::format_str("{}.{}", std::to_string(this->id), ext));
 }
 
 void Pokemon::configure_move_set()

src/utils.cpp

@@ -38,21 +38,19 @@ std::string style(std::string text, Color fore, Color back)
 	return ansi_text.append(kt::format_str("{}\033[0m", text));
 }
 
-std::string upper(std::string& str)
+void upper(std::string& str)
 {
 	std::transform(str.begin(), str.end(), str.begin(), [](unsigned char c) { return toupper(c); });
-	return str;
 }
 
-std::string lower(std::string& str)
+void lower(std::string& str)
 {
 	std::transform(str.begin(), str.end(), str.begin(), [](unsigned char c) { return tolower(c); });
-	return str;
 }
 
 std::filesystem::path find_upwards(std::string dir_name, int max_depth)
 {
-	auto path = std::filesystem::current_path() / std::filesystem::path(dir_name);
+	auto path = std::filesystem::current_path() / dir_name;
 
 	while (!std::filesystem::exists(path) && max_depth > 0)
 	{
@@ -99,16 +97,18 @@ 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';
-	std::cout << border << kt::format_str(" {}{}", upper(header), std::string(width - 3 - header.length(), ' ')) << border << '\n';
+	upper(header);
+	std::cout << border << kt::format_str(" {}{}", header, std::string(width - 3 - header.length(), ' ')) << border << '\n';
 
 	// clang-format off
 	auto padded_string = [](int i, std::string str, std::string limits) {
-		return kt::format_str("{} {}. {}{}{}", limits, i, lower(str), std::string(54 - str.length(), ' '), limits);
+		return kt::format_str("{} {}. {}{}{}", limits, i, str, std::string(54 - str.length(), ' '), limits);
 	};
 	// clang-format on
 
 	for (std::size_t i = 0; i < table.size(); ++i)
 	{
+		lower(table[i]);
 		std::cout << padded_string(i + 1, table[i], border) << '\n';
 	}
 

src/utils.hpp

@@ -32,8 +32,8 @@ T random_range(T min, T max)
 ///
 /// \brief Return k random values in range of [min, max] (with repitition)
 ///
-template <typename T>
-std::vector<T> random_ranges(T min, T max, std::size_t k)
+template <typename T, typename U>
+std::vector<T> random_ranges(T min, T max, U k)
 {
 	std::vector<T> vector(k);
 	std::generate(vector.begin(), vector.end(), [min, max]() { return random_range(min, max); });
@@ -52,8 +52,8 @@ T random_choice(const std::vector<T>& vector)
 ///
 /// \brief Return k random elements from vector (with repitition)
 ///
-template <typename T>
-std::vector<T> random_choices(const std::vector<T>& vector, std::size_t k)
+template <typename T, typename U>
+std::vector<T> random_choices(const std::vector<T>& vector, U k)
 {
 	std::vector<T> choices(k);
 	std::generate(choices.begin(), choices.end(), [&]() { return random_choice(vector); });
@@ -87,9 +87,9 @@ enum class Color
 
 std::string style(std::string text, Color fore, Color back = Color::BLACK);
 
-std::string upper(std::string& str);
+void upper(std::string& str);
 
-std::string lower(std::string& str);
+void lower(std::string& str);
 
 std::filesystem::path find_upwards(std::string dir_name, int max_depth = 10);