Merge pull request #13 from cpp-gamedev/issue-9

Issue 9

Author: hentai-chan

.gitignore

@@ -368,4 +368,9 @@ venv/
 
 # project-specific files and directories
 assets/
-manifest.json
+manifest.json
+
+# VSCode, clangd etc
+.vscode/
+.cache/
+compile_commands.json

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "libs/djson"]
+	path = libs/djson
+	url = https://github.com/karnkaul/djson
+[submodule "libs/include/str_format"]
+	path = libs/include/str_format
+	url = https://github.com/karnkaul/str-format

CMakeLists.txt

@@ -1,16 +1,46 @@
 cmake_minimum_required(VERSION 3.18 FATAL_ERROR)
 
+function(update_git_submodules MSG_TYPE)
+	message(STATUS "Updating git submodules...")
+	execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
+		WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+		RESULT_VARIABLE UPDATE_SUBMODULES_RESULT
+	)
+	if(NOT UPDATE_SUBMODULES_RESULT EQUAL "0")
+		message(${MSG_TYPE} "git submodule update failed!")
+	endif()
+endfunction()
+
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "")
 set(APP_VERSION "1.0.0" CACHE STRING "Application Version" FORCE)
 project(pkmn VERSION ${APP_VERSION})
 
+find_package(Git QUIET)
+if(GIT_FOUND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
+	option(PKMN_GIT_UPDATE_SUBMODULES "Init/Update submodules during generation" ON)
+	if(PKMN_GIT_UPDATE_SUBMODULES)
+		update_git_submodules(FATAL_ERROR)
+	endif()
+endif()
+
 file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/*.*pp")
+
+# Libraries
+add_subdirectory(libs/djson)
+
 add_executable(${PROJECT_NAME} ${SOURCES})
+target_include_directories(${PROJECT_NAME} PRIVATE libs/include)
+
+if(CMAKE_CXX_COMPILER_ID STREQUAL Clang OR CMAKE_CXX_COMPILER_ID STREQUAL GNU)
+	target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra $<$<NOT:$<CONFIG:Debug>>:-Werror>)
+endif()
 
-if(W_MSBUILD)
+if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+	target_compile_options(${PROJECT_NAME} PRIVATE $<$<NOT:$<CONFIG:Debug>>:/WX>)
 	set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${PROJECT_NAME})
 endif()
 
+target_link_libraries(${PROJECT_NAME} PUBLIC djson::djson)

README.md

@@ -28,32 +28,30 @@
 If this is your first time using a python script, use
 
 ```bash
-$ python -m venv venv/
-$ source venv/Scripts/activate
-$ python -m pip install --upgrade pip
-$ pip install -r requirements.txt --only-binary all
+python -m venv venv/
+source venv/Scripts/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
-assumes that it is being run from the project's root directory. After that
-you should be able to use 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:
 
 ```bash
-$ # creates two new pkmn data sets (sprite + data)
-$ python gen_data.py --verbose make --id 1 4
-$ # create manifest.json
-$ python gen_data.py manifest
+# creates two new pkmns (bulbasaur and charmander)
+python gen_data.py --verbose make --id 1 4
+# creates a manifest.json
+python gen_data.py manifest
 ```
 
-You can also use the `--name` option for identifying a new pokemon. Repeat both
-steps - you need at least two pokemon to play this game. In case of doubt, use
+In case of doubt, use
 
 ```bash
-$ python gen_data.py --help
+python gen_data.py --help
 ```
 
-to get more help. Once you've obtained these files, build the project to play
-this game. Use the `--mirror` flag for your own pokemon (recommended).
+to get more help.
 
 ### On Visual Studio (Windows)
 

gen_data.py

@@ -5,20 +5,22 @@
 
 Description
 -----------
-This script uses the Pokemon API to create a JSON file for the pkmn game.
+This script uses the Pokemon API to create a JSON file and an ASCII sprite for the
+pkmn game. Run it from the root directory of the project and ensure that all dependencies
+are installed.
 
 Usage
 -----
-Run 'python gen_data.py make --name <pokemon>' from the project's root directory
-to create a new JSON file for pkmn. Append the '--help' option for more help.
 
-Additionally, use `python gen_data.py ascii --name <pokemon>` to create a new
-ascii image. In both instances, a ID may be used as primary argument instead.
+1. creates two new pkmns (bulbasaur and charmander)
+>> python gen_data.py --verbose make --id 1 4
+
+2. creates a manifest.json
+>> python gen_data.py manifest
 """
 
 import argparse
 import json
-import os
 from collections import Counter
 from pathlib import Path
 from pprint import pprint
@@ -29,7 +31,6 @@
 import colorama
 import requests
 from colorama import Fore, Style
-from colorama.ansi import clear_screen
 from PIL import Image, ImageOps
 from rich.console import Console
 from rich.progress import track
@@ -98,24 +99,23 @@ def req_pkmn_data(id_: int, verbose: bool) -> None:
             'id': response['id'],
             'name': response['name'],
             'level': level,
-            'hp': int(2 * level * (0.8 + 0.4 * random())), # formula for hp is a rough estimation
-            'atk': 1, 
-            'def': 1, 
+            'hp': int(2 * level * (0.8 + 0.4 * random())),
+            'atk': 100,
+            'def': 100,
         }
 
-    # the base api does not provide detailed information about moves, 
-    # so we need to make more calls to the api (+1 per move)
     moves = {}
     endpoints = [move['move']['url'] for move in response['moves']]
     for index, endpoint in track(enumerate(endpoints), "Sending Requests", total=len(endpoints), transient=True):
         move_response = requests.get(endpoint).json()
+        unescape = lambda text: text.replace('\u00e9','e').replace('\u2019', "'").replace('\n',' ').replace('\u00ad', '-')
         moves[index] = {
             'name': move_response['names'][7]['name'],
             'accuracy': int(move_response['accuracy']) if move_response['accuracy'] is not None else None,
-            'effect_changes': move_response['effect_changes'],
+            'effect_changes': move_response['effect_changes'] if len(move_response['effect_changes']) > 0 else [None],
             'effect_chance': int(move_response['effect_chance']) if move_response['effect_chance'] is not None else None,
             'power': int(move_response['power']) if move_response['power'] is not None else None,
-            'flavor_text_entries': [entry['flavor_text'] for entry in move_response['flavor_text_entries'] if entry['language']['name'] == 'en']
+            'flavor_text_entries': [unescape(entry['flavor_text']) for entry in move_response['flavor_text_entries'] if entry['language']['name'] == 'en']
         }
     result['moves'] = moves
 

libs/djson

@@ -1,41 +1,65 @@
+#include <algorithm>
 #include <filesystem>
 #include <iostream>
 #include <string>
 #include <vector>
-#include "str_format.hpp"
+#include "models.hpp"
 #include "utils.hpp"
+#include <str_format/str_format.hpp>
 
-// TODO: update args to Pokemon object
-std::vector<std::string> gen_healthbar(std::string name, int level, int hp, int max_hp)
+std::vector<std::string> gen_healthbar(Pokemon& pkmn)
 {
-   /*
-	* Bulbasaur :L30	// label
-	* HP [********* ]	// progressbar
-	*         58 / 60	// hitpoints
-	*/
-	std::string label = kt::format_str("{} :L{}\n", name, level);
-	
-	double percentage = ceil(static_cast<double>(hp) / max_hp * 100);
-	int digits = static_cast<int>(log10(percentage));
-	int first_digit = static_cast<int>(percentage / pow(10, digits));
-	
-	std::string stars = std::string(first_digit, '*');
-	stars = stars.append(std::string(10LL - first_digit, ' '));
-	std::string progressbar = kt::format_str("HP [{}]\n", style(stars, Color::GREEN));
-
-	std::string hitpoints = kt::format_str("{} / {}\n", hp, max_hp);
-	hitpoints = std::string(16 - hitpoints.length(), ' ').append(hitpoints);
+	/*
+	 * bulbasaur :L30	// label
+	 * HP [********* ]	// progressbar
+	 *         58 / 60	// hitpoints
+	 */
+	std::string label = kt::format_str("{} :L{}", pkmn.name, pkmn.level);
+	std::size_t max_width = pkmn.name.length() > 10 ? label.length() : 15;
+
+	label = std::string(max_width - label.length(), ' ').append(label);
+
+	double linear_map = (10.0 / pkmn.max_hp) * pkmn.hp;
+	int hp_scaled = (0 < linear_map && linear_map < 1) ? 1 : std::floor(linear_map);
+
+	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;
+	std::string progressbar = kt::format_str("HP [{}]", style(stars, star_color));
+	progressbar = std::string(max_width - 15, ' ').append(progressbar);
+
+	std::string hitpoints = kt::format_str("{} / {}", pkmn.hp, pkmn.max_hp);
+	hitpoints = std::string(max_width - hitpoints.length(), ' ').append(hitpoints);
 
 	return {label, progressbar, hitpoints};
 }
 
-std::vector<std::string> load_sprite(int id, const std::filesystem::path& assets)
+void print_frame(Pokemon& pkmn1, Pokemon& pkmn2)
 {
-	for (const auto& file : std::filesystem::directory_iterator(assets))
+	std::string healthbars{};
+	std::string sprites{};
+
+	std::vector<std::string> healthbar1 = gen_healthbar(pkmn1);
+	std::vector<std::string> healthbar2 = gen_healthbar(pkmn2);
+
+	std::size_t padding = healthbar1[0].length() + healthbar2[0].length();
+
+	if (padding > 30)
+		padding -= 2 * (padding - 30);
+
+	for (std::size_t i = 0; i < 3; i++)
+		healthbars.append(healthbar1[i]).append(std::string(padding, ' ')).append(healthbar2[i]).append("\n");
+
+	std::cout << healthbars;
+
+	for (std::size_t i = 0; i < 20; i++)
 	{
-		if (file.path().extension() == ".txt" && std::stoi(file.path().stem().string()) == id)
-		{
-			return read_file(file);
-		}			
+		std::string tmp = pkmn1.sprite[i]; // strip new line
+		tmp.erase(std::remove(tmp.begin(), tmp.end(), '\n'), tmp.end());
+		sprites.append(tmp).append(std::string(20, ' ')).append(pkmn2.sprite[i]);
 	}
+
+	std::cout << sprites;
+
+	return;
 }

libs/include/str_format

@@ -2,7 +2,8 @@
 
 #include<string>
 #include<vector>
+#include "models.hpp"
 
-std::vector<std::string> gen_healthbar(std::string name, int level, int hp, int max_hp);
+std::vector<std::string> gen_healthbar(Pokemon& pkmn);
 
-std::vector<std::string> load_sprite(int id, const std::filesystem::path& assets);
+void print_frame(Pokemon& pkmn1, Pokemon& pkmn2);