Merge pull request #18 from cpp-gamedev/issue-15

Issue 15

Author: hentai-chan

.clang-format

@@ -9,7 +9,9 @@ Standard: c++17
 TabWidth: 4
 IndentWidth: 4
 UseTab: Always
+AllowAllArgumentsOnNextLine: false
 AllowShortFunctionsOnASingleLine: false
+SortIncludes: true
 IncludeCategories:
   # Headers in <> without extension.
   - Regex:           '<([A-Za-z0-9\/-_])+>'

.gitignore

@@ -367,7 +367,8 @@ FodyWeavers.xsd
 venv/
 
 # project-specific files and directories
-assets/
+assets/textures/*.txt
+assets/data/*.json
 manifest.json
 
 # VSCode, clangd etc

README.md

@@ -23,18 +23,34 @@
 
 ## Build & Debug
 
+Initialize and update all submodules after you have cloned this repository:
+
+```bash
+git submodule update --init --recursive
+```
+
+For python specifically, you may need to install `python3-venv` to create virtual
+environments on Linux.
+
 ### Generating new Pokemon
 
+---
+
+*Note: You can also use the `./easy_install.sh` script to skip this section.*
+
+---
+
 If this is your first time using a python script, use
 
 ```bash
 python -m venv venv/
-source venv/Scripts/activate
+source venv/bin/activate
 python -m pip install --upgrade pip
 pip install -r requirements.txt --only-binary all
 ```
 
-to install the dependencies in a virtual environment. Note that this script
+to install the dependencies in a virtual environment. On Windows, you need to use
+`.\venv\Scripts\Activate.ps1` to activate a virtual environment. Note that this script
 assumes that it is being run from the project's root directory. You need to create
 at least two new pkmn file sets before you can start playing this game:
 
@@ -60,4 +76,7 @@ to start debugging this project (`F5`).
 
 ### On Visual Studio Code (Linux)
 
-TODO
+Useful links for first timers:
+
+- <https://cpp-gamedev.netlify.app/series/101/1_getting_started/>
+- <https://cpp-gamedev.netlify.app/series/101/2_development_environment/>

assets/splashscreen.txt

@@ -0,0 +1,12 @@
+                                  ,'\                              
+    _.----.        ____         ,'  _\   ___    ___     ____       
+_,-'       `.     |    |  /`.   \,-'    |   \  /   |   |    \  |`. 
+\      __    \    '-.  | /   `.  ___    |    \/    |   '-.   \ |  |
+ \.    \ \   |  __  |  |/    ,','_  `.  |          | __  |    \|  |
+   \    \/   /,' _`.|      ,' / / / /   |          ,' _`.|     |  |
+    \     ,-'/  /   \    ,'   | \/ / ,`.|         /  /   \  |     |
+     \    \ |   \_/  |   `-.  \    `'  /|  |    ||   \_/  | |\    |
+      \    \ \      /       `-.`.___,-' |  |\  /| \      /  | |   |
+       \    \ `.__,'|  |`-._    `|      |__| \/ |  `.__,'|  | |   |
+        \_.-'       |__|    `-._ |              '-.|     '-.| |   |
+                                `'                            '-._|

easy_install.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+echo "+++ PKMN Asset Builder +++"
+
+echo -e "\nAccording to the National Pok\u00e9mon Index, the first 151 entries served in Generation I."
+echo -e "You may use any of these numbers to create new asset files to play this game.\n"
+
+echo -n "Pokemon ID #1: "
+read id1
+
+echo -n "Pokemon ID #2: "
+read id2
+
+if [[ ! -d "venv/" ]]; then
+    echo "Creating a new virtual environment . . ."
+    python3 -m venv venv/
+    source venv/bin/activate
+    echo "Installing dependencies . . ."
+    python3 -m pip install --upgrade pip
+    python3 -m pip install -r requirements.txt --only-binary all
+else
+    source venv/bin/activate
+fi
+
+python3 gen_data.py --verbose make --id $id1 $id2
+python3 gen_data.py manifest
+
+echo "Updating submodules . . ."
+git submodule update --init --recursive
+
+echo "Done!"

gen_data.py

@@ -27,6 +27,7 @@
 from random import randint, random
 from typing import List
 from urllib.parse import urljoin
+from itertools import chain
 
 import colorama
 import requests
@@ -35,14 +36,23 @@
 from rich.console import Console
 from rich.progress import track
 
+#region global variables
+
 __version__ = "0.0.1"
-assets = Path('assets/')
-assets.mkdir(parents=True, exist_ok=True)
-ASSETS = assets
+
+def setup() -> List[Path]:
+    assets = [Path('assets/'), Path('assets/textures'), Path('assets/data')]
+    for dir in assets:
+        dir.mkdir(parents=True, exist_ok=True)
+    return assets
+
+ASSETS, TEXTURES, DATA = setup()
 BASE_API = "https://pokeapi.co/api/v2/pokemon/"
 SPRITE_API = "https://pokeres.bastionbot.org/images/pokemon/"
 CONSOLE = Console()
 
+#endregion
+
 #region image processing
 
 CHARS = [' ', '.', 'o', 'v', '@', '#', 'W']
@@ -119,13 +129,15 @@ def req_pkmn_data(id_: int, verbose: bool) -> None:
         }
     result['moves'] = moves
 
-    with open(ASSETS.joinpath(f"{result['id']}.json"), mode='w', encoding='utf-8') as file_handler:
+    data = DATA.joinpath(f"{result['id']}.json")
+
+    with open(data, mode='w', encoding='utf-8') as file_handler:
         json.dump(result, file_handler)
 
     if verbose:
         pprint(result)
 
-    print(f"{Fore.YELLOW}Done! A new JSON file was created in {str(ASSETS)!r}.{Style.RESET_ALL}")
+    print(f"{Fore.YELLOW}Created {str(data)!r}{Style.RESET_ALL}")
 
 def gen_sprite(id_: int,  mirror: bool, verbose: bool) -> None:    
     colorama.init(autoreset=False)
@@ -139,22 +151,25 @@ def gen_sprite(id_: int,  mirror: bool, verbose: bool) -> None:
                 file_handler.write(chunk)
 
         ascii_art = img2ascii(Image.open(image_path), width=20, mirror_image=mirror)
-        with open(ASSETS.joinpath(f"{id_}.txt"), mode='w', encoding='utf-8') as file_handler:
+
+        sprite = TEXTURES.joinpath(f"{id_}.txt")
+
+        with open(sprite, mode='w', encoding='utf-8') as file_handler:
             file_handler.writelines(ascii_art)
 
         image_path.unlink(missing_ok=True)
 
     if verbose:
         print(f"\n{''.join(ascii_art)}")
 
-    print(f"{Fore.YELLOW}Done! A new ASCII image was created in {str(ASSETS)!r}.{Style.RESET_ALL}")
+    print(f"{Fore.YELLOW}Created {str(sprite)!r}{Style.RESET_ALL}")
 
 def check_manifest(verbose: bool) -> None:
     extensions = ['.txt', '.json']
 
     files = list(filter(
         lambda file: file.suffix in extensions and file.stem.isnumeric(), 
-        [file for file in ASSETS.glob(r'**/*')]
+        [file for file in chain(DATA.glob(r'**/*'), TEXTURES.glob(r'**/*'))]
     ))
 
     ids = list(map(lambda file: int(file.stem), files))
@@ -190,7 +205,7 @@ def main():
     if args.command == 'make':
         for id_ in args.id:
             req_pkmn_data(id_, verbose=False)
-            gen_sprite(id_, args.mirror, args.verbose)
+            gen_sprite(id_, args.mirror, verbose=False)
     elif args.command == 'manifest':
         check_manifest(args.verbose)
     else:

src/anim.cpp

@@ -1,13 +1,18 @@
 #include <algorithm>
 #include <filesystem>
 #include <iostream>
+#include <numeric>
 #include <string>
 #include <vector>
+
+#include <str_format/str_format.hpp>
+
 #include "models.hpp"
 #include "utils.hpp"
-#include <str_format/str_format.hpp>
 
-std::vector<std::string> gen_healthbar(Pokemon& pkmn)
+namespace anim
+{
+std::vector<std::string> gen_healthbar(const models::Pokemon& pkmn)
 {
 	/*
 	 * bulbasaur :L30	// label
@@ -24,7 +29,7 @@ std::vector<std::string> gen_healthbar(Pokemon& pkmn)
 
 	std::string stars = std::string(hp_scaled, '*');
 	stars = stars.append(std::string(10 - hp_scaled, ' '));
-	Color star_color = (hp_scaled >= 5) ? Color::GREEN : (3 < hp_scaled && hp_scaled < 5) ? Color::YELLOW : Color::RED;
+	utils::Color star_color = (hp_scaled >= 5) ? utils::Color::GREEN : (3 < hp_scaled && hp_scaled < 5) ? utils::Color::YELLOW : utils::Color::RED;
 	std::string progressbar = kt::format_str("HP [{}]", style(stars, star_color));
 	progressbar = std::string(max_width - 15, ' ').append(progressbar);
 
@@ -34,7 +39,49 @@ std::vector<std::string> gen_healthbar(Pokemon& pkmn)
 	return {label, progressbar, hitpoints};
 }
 
-void print_frame(Pokemon& pkmn1, Pokemon& pkmn2)
+void print_splash_screen(const std::filesystem::path& assets_dir)
+{
+	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::setfill(' ') << std::setw(19);
+
+	for (const char& c : "copyright (c) 2021 cpp-gamedev")
+	{
+		std::cout << c;
+		utils::sleep(100);
+	}
+}
+
+std::vector<models::Pokemon> load_main_menu(utils::Manifest manifest)
+{
+	// 1. set difficulty
+	int selection{};
+	utils::print_enum_table({"easy", "moderate", "hard"}, "difficulty");
+	selection = utils::get_user_input<int>(">>> ");
+	auto difficulty = (selection == 1) ? models::Difficulty::EASY : (selection == 2) ? models::Difficulty::MODERATE : models::Difficulty::HARD;
+
+	// 2. instantiate all available pokemons
+	std::vector<models::Pokemon> pkmns{};
+	pkmns.reserve(manifest.duplicates.size());
+	std::for_each(manifest.duplicates.begin(), manifest.duplicates.end(),
+				  [&manifest, &pkmns, &difficulty](int id) { pkmns.push_back(models::Pokemon(id, manifest.asset_dir, difficulty)); });
+
+	// 3. select pokemon
+	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); });
+	utils::print_enum_table(names, "pokemons");
+	selection = utils::get_user_input<int>(">>> ");
+	models::Pokemon player = pkmns[selection - 1];
+
+	// 4. remove selection from pkmns, so that player won't fight against his doppelganger
+	pkmns.erase(std::remove_if(pkmns.begin(), pkmns.end(), [player](models::Pokemon pkmn) { return player.id == pkmn.id; }), pkmns.end());
+
+	return {player, pkmns.size() > 1 ? utils::random_choice(pkmns) : pkmns[0]};
+}
+
+void print_frame(const models::Pokemon& pkmn1, const models::Pokemon& pkmn2)
 {
 	std::string healthbars{};
 	std::string sprites{};
@@ -63,3 +110,4 @@ void print_frame(Pokemon& pkmn1, Pokemon& pkmn2)
 
 	return;
 }
+} // namespace anim

src/anim.hpp

@@ -2,8 +2,16 @@
 
 #include<string>
 #include<vector>
+
 #include "models.hpp"
 
-std::vector<std::string> gen_healthbar(Pokemon& pkmn);
+namespace anim
+{
+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(Pokemon& pkmn1, Pokemon& pkmn2);
+void print_frame(const models::Pokemon& pkmn1, const models::Pokemon& pkmn2);
+} // namespace anim

src/main.cpp

@@ -1,12 +1,42 @@
+#include <algorithm>
+#include <filesystem>
 #include <iostream>
+#include <numeric>
 #include <string>
+
+#include "anim.hpp"
 #include "models.hpp"
 #include "utils.hpp"
+
+using namespace anim;
+using namespace models;
+using namespace utils;
+
 int main()
 {
-	/* 	auto name = get_user_input<std::string>("What's your name? ");
-		std::cout << "Hello, " << name << '!' << '\n';
-		std::cin.get(); */
+	const auto assets_dir = find_upwards("assets");
+	Manifest manifest = check_manifest(assets_dir.parent_path() / "manifest.json");
+
+	if (std::filesystem::exists(assets_dir) && manifest.game_ready)
+	{
+		print_splash_screen(assets_dir);
+		clear_screen();
+
+		auto pkmns = load_main_menu(manifest);
+		sleep(1000);
+		clear_screen();
+
+		std::cout << "TODO: init game loop" << '\n';
+		sleep(1000);
+		clear_screen();
+
+		print_frame(pkmns[0], pkmns[1]);
 
-	return 0;
+		return EXIT_SUCCESS;
+	}
+	else
+	{
+		std::cerr << "Error: The assets directory is in an invalid state. Consult the README for further instructions." << '\n';
+		return EXIT_FAILURE;
+	}
 }