cardodge refactor, cardodge settings integration, game command, help command update

Author: rforzachamp821

.gitignore

@@ -58,6 +58,7 @@ dlldata.c
 # All ZeeTerminal files that are automatically generated
 ZT_Config.ini
 NotesFile.txt
+GameHighScores.dat
 
 # Benchmark Results
 BenchmarkDotNet.Artifacts/

CommandFiles/CommandHelpMessages.cpp

@@ -174,6 +174,10 @@ void SettingsHelp() {
 		<< wordWrap("\n --commandlogging <toggle>\tEnable command input info logging. Set either true/t or false/f in place of <toggle>.")
 		<< wordWrap("\n --usrinputlogging <toggle>\tEnable user input info logging. Set either true/t or false/f in place of <toggle>.")
 		<< wordWrap("\n --newoptionselect <toggle>\tUse the new OptionSelect Engine style. Set either true/t or false/f in place of <toggle>.")
+		<< wordWrap("\n --cdcarturnspeed <speed>\tSet the car turning speed in the CarDodge game. Cannot be >10 and <1. Put the speed in place of <speed>.")
+		<< wordWrap("\n --cdstartupcar <car>\t\tToggle the type of car auto-selected on startup in the CarDodge game. Put the car style in place of <style>.")
+		<< wordWrap("\n --cdforeground <num>\tSet the foreground colour in the CarDodge game. Put the colour number in place of <num>.")
+		<< wordWrap("\n --cdbackground <num>\tSet the background colour in the CarDodge game. Put the colour number in place of <num>.")
 		<< wordWrap("\n\nExample: settings --titlefore 1")
 		<< wordWrap("\n\nNote: You can get colour numbers by executing the \"ColourNumbers\" command.") << "\n\n";
 
@@ -1010,5 +1014,26 @@ void BunnyHelp() {
 		"\n --quote\t\tMake the bunny say a random quote from Nikola Tesla, Albert Einstein or Thomas Edison.\n -c\t\t\tOutput the bunny in a randomised colour.\n\n"
 		"Example: bunny --saytext \"Hello, I am a bunny\"\n\nNOTE: Please make sure that when using spaces in the <text> argument with --saytext, use quotes (\"\").\n\n");
 
+	return;
+}
+
+// GameHelp
+void GameHelp() {
+	CentreColouredText(" ___GAME___ ", 1);
+	std::cout << "\n";
+	CentreColouredText("This command allows you to access the games within ZeeTerminal.", 2);
+	std::cout << "\n\n";
+
+	colourSubheading();
+	std::cout << "What this command does:" << NOULINE_STR;
+	colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
+	std::cout << wordWrap("\n- This command allows you to access the games within ZeeTerminal.\n- These games may have settings that you can adjust. These can be found in the Settings command.\n\n");
+
+	colourSubheading();
+	std::cout << "Possible arguments for this command:" << NOULINE_STR;
+	colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
+	std::cout << wordWrap("\n -h\t\tDisplays this help message.\n --cardodge\tStarts the CarDodge game, a game where you dodge enemy cars to gain points.\n\n"
+		"Example: game --cardodge\n\n");
+
 	return;
 }

CommandFiles/CommandsFile.cpp

@@ -825,7 +825,7 @@ void LogFileSystemSettings(short int nChoice = 0, short int nChoiceLogging = 0,
 
 		// Error
 		else {
-			VerbosityDisplay("In OtherSettings() - ERROR: Unknown return value from OptionSelectEngine::OptionSelect().\n");
+			VerbosityDisplay("In LogFileSystemSettings() - ERROR: Unknown return value from OptionSelectEngine::OptionSelect().\n");
 			UserErrorDisplay("ERROR - Unknown error occured. Please try again later.\n");
 
 			return;
@@ -879,7 +879,7 @@ void LogFileSystemSettings(short int nChoice = 0, short int nChoiceLogging = 0,
 
 		// Error
 		else {
-			VerbosityDisplay("In OtherSettings() - ERROR: Unknown return value from OptionSelectEngine::OptionSelect().\n");
+			VerbosityDisplay("In LogFileSystemSettings() - ERROR: Unknown return value from OptionSelectEngine::OptionSelect().\n");
 			UserErrorDisplay("ERROR - Unknown error occured. Please try again later.\n");
 
 			return;
@@ -933,7 +933,7 @@ void LogFileSystemSettings(short int nChoice = 0, short int nChoiceLogging = 0,
 
 		// Error
 		else {
-			VerbosityDisplay("In OtherSettings() - ERROR: Unknown return value from OptionSelectEngine::OptionSelect().\n");
+			VerbosityDisplay("In LogFileSystemSettings() - ERROR: Unknown return value from OptionSelectEngine::OptionSelect().\n");
 			UserErrorDisplay("ERROR - Unknown error occured. Please try again later.\n");
 
 			return;
@@ -987,7 +987,7 @@ void LogFileSystemSettings(short int nChoice = 0, short int nChoiceLogging = 0,
 
 		// Error
 		else {
-			VerbosityDisplay("In OtherSettings() - ERROR: Unknown return value from OptionSelectEngine::OptionSelect().\n");
+			VerbosityDisplay("In LogFileSystemSettings() - ERROR: Unknown return value from OptionSelectEngine::OptionSelect().\n");
 			UserErrorDisplay("ERROR - Unknown error occured. Please try again later.\n");
 
 			return;
@@ -1041,7 +1041,7 @@ void LogFileSystemSettings(short int nChoice = 0, short int nChoiceLogging = 0,
 
 		// Error
 		else {
-			VerbosityDisplay("In OtherSettings() - ERROR: Unknown return value from OptionSelectEngine::OptionSelect().\n");
+			VerbosityDisplay("In LogFileSystemSettings() - ERROR: Unknown return value from OptionSelectEngine::OptionSelect().\n");
 			UserErrorDisplay("ERROR - Unknown error occured. Please try again later.\n");
 
 			return;
@@ -1054,7 +1054,143 @@ void LogFileSystemSettings(short int nChoice = 0, short int nChoiceLogging = 0,
 	}
 	else
 	{
-		VerbosityDisplay("In OtherSettings() - ERROR: Unknown return value from OptionSelectEngine::OptionSelect().\n");
+		VerbosityDisplay("In LogFileSystemSettings() - ERROR: Unknown return value from OptionSelectEngine::OptionSelect().\n");
+		UserErrorDisplay("ERROR - Unknown error occured. Please try again later.\n");
+
+		return;
+	}
+}
+
+void CarDodgeGameSettings(short int nChoiceMain = 0, int nChoiceCarTurnSpeed = 0, int nChoiceStartupCar = 0, int nChoiceForeground = 0, int nChoiceBackground = 0) {
+	OptionSelectEngine oseCarDodgeSettings;
+
+	if (nChoiceMain == 0) {
+		oseCarDodgeSettings.nSizeOfOptions = 4;
+		std::string sOptions[] = {
+			"Car Turning Speed",
+			"Game Startup Car",
+			"Game Foreground Colour",
+			"Game Background Colour"
+		};
+		oseCarDodgeSettings.sOptions = sOptions;
+		nChoiceMain = oseCarDodgeSettings.OptionSelect("Please select which setting you want to change relating to the Car Dodge game:", " ___CAR DODGE GAME SETTINGS___ ");
+	}
+
+	if (nChoiceMain == 1) {
+		while (true) {
+			if (nChoiceCarTurnSpeed == 0) {
+				CentreColouredText(" ___CAR TURN SPEED SETINGS___ ", 1);
+				std::cout << "\n";
+				colourSubheading(); // extra info colour is the same as subheading colour
+				std::cout << wordWrap("This speed is a measure of characters moved left/right per keypress, so higher numbers are faster.") << NOULINE_STR;
+				colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
+				std::cout << "\nDefault Speed: 2\nCurrent Speed: " << ConfigObjMain.nCarDodgeCarTurningSpeed << wordWrap("\n\nInput 0 to exit. Turning speed cannot be lower than 1 or higher than 10.") << '\n';
+
+				nChoiceCarTurnSpeed = NumInputi("Please input how fast you want the car to turn: > ");
+			}
+
+			if (nChoiceCarTurnSpeed == 0) {
+				colour(YLW, ConfigObjMain.sColourGlobalBack);
+				std::cout << "Modifying setting terminated.\n";
+				colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
+				return;
+			}
+			else if (nChoiceCarTurnSpeed < 1 || nChoiceCarTurnSpeed > 10) {
+				colour(YLW, ConfigObjMain.sColourGlobalBack);
+				std::cout << "Sorry, but you can't have a speed number lower than 1 or higher than 10. Please try again.\n";
+				colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
+				return;
+			}
+			else break;
+		}
+
+		ConfigObjMain.nCarDodgeCarTurningSpeed = nChoiceCarTurnSpeed;
+		ConfigObjMain.WriteConfigFile();
+
+		colour(LGRN, ConfigObjMain.sColourGlobalBack);
+		std::cout << wordWrap("CarDodge Car Turning Speed has successfully been set to " + std::to_string(ConfigObjMain.nCarDodgeCarTurningSpeed) + " in character speed.\n");
+		colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
+
+		return;
+
+	}
+	else if (nChoiceMain == 2) {
+		std::string sOptions[] = {
+			"KartCar (Default)",
+			"TheHoverRocket",
+			"TheSweeper",
+			"TheSlicer",
+			"GTSpeed",
+			"XtraAero",
+		};
+		if (nChoiceStartupCar == 0) {
+			oseCarDodgeSettings.nSizeOfOptions = 6;
+
+			oseCarDodgeSettings.sOptions = sOptions;
+
+			nChoiceStartupCar = oseCarDodgeSettings.OptionSelect("Please select which car you want CarDodge to auto-select when starting up:\n"
+				"(Currently set to: Option " + std::to_string(ConfigObjMain.nCarDodgeGameStartupCar) + ")", " ___GAME STARTUP CAR SETTINGS___ ");
+		}
+
+		colour(LGRN, ConfigObjMain.sColourGlobalBack);
+
+		if (nChoiceStartupCar == 1) {
+			std::cout << "CarDodge Game Startup Car successfully set to \"Default User Car (KartCar)\".\n";
+		}
+		else if (nChoiceStartupCar > 1 && nChoiceStartupCar <= 6) {
+			std::cout << "CarDodge Game Startup Car successfully set to \"" << sOptions[nChoiceStartupCar - 1] << "\".\n";
+		}
+		else if (nChoiceStartupCar == -1) {
+			Exiting();
+			return;
+		}
+		colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
+
+		ConfigObjMain.nCarDodgeGameStartupCar = nChoiceStartupCar;
+		ConfigObjMain.WriteConfigFile();
+
+		return;
+	}
+	else if (nChoiceMain == 3) {
+		if (nChoiceForeground == 0) {
+			oseCarDodgeSettings.nSizeOfOptions = 16;
+			oseCarDodgeSettings.sOptions = sOptionsColour;
+
+			nChoiceForeground = oseCarDodgeSettings.OptionSelect("Please select what foreground colour you want CarDodge to use (note that this only affects the car colours on-screen):"
+				"\n(Currently set to: " + colconv::ColourToLogicalDisplayName(ConfigObjMain.sCarDodgeGameplayColourFore) + ")", " ___GAME FOREGROUND COLOUR SETTINGS___ ");
+		}
+		
+		ColourForegroundSwitch(&nChoiceForeground, &ConfigObjMain.sCarDodgeGameplayColourBack, &ConfigObjMain.sCarDodgeGameplayColourFore);
+		colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
+
+		colour(LGRN, ConfigObjMain.sColourGlobalBack);
+		std::cout << CentreText("CarDodge game foreground colour successfully set!") << std::endl;
+		colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
+		return;
+	}
+	else if (nChoiceMain == 4) {
+		if (nChoiceBackground == 0) {
+			oseCarDodgeSettings.nSizeOfOptions = 16;
+			oseCarDodgeSettings.sOptions = sOptionsColour;
+
+			nChoiceBackground = oseCarDodgeSettings.OptionSelect("Please select what background colour you want CarDodge to use (note that this does NOT affect game borders, only the gameplay background):"
+				"\n(Currently set to: " + colconv::ColourToLogicalDisplayName(ConfigObjMain.sCarDodgeGameplayColourBack) + ")", " ___GAME BACKGROUND COLOUR SETTINGS___ ");
+		}
+
+		ColourBackgroundSwitch(&nChoiceBackground, &ConfigObjMain.sCarDodgeGameplayColourBack, &ConfigObjMain.sCarDodgeGameplayColourFore);
+		colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
+
+		colour(LGRN, ConfigObjMain.sColourGlobalBack);
+		std::cout << CentreText("CarDodge game background colour successfully set!") << std::endl;
+		colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
+		return;
+	}
+	else if (nChoiceMain == -1) {
+		Exiting();
+		return;
+	}
+	else {
+		VerbosityDisplay("In CarDodgeGameSettings() - ERROR: Unknown return value from OptionSelectEngine::OptionSelect().\n");
 		UserErrorDisplay("ERROR - Unknown error occured. Please try again later.\n");
 
 		return;

CommandFiles/Settings.cpp

@@ -336,6 +336,14 @@ namespace zt {
 				ConfigObjMain.sColourSubheadingBack = MAG_WIN32;
 				bSuccess = false;
 			}
+			if (not (isNumberi(ConfigObjMain.sCarDodgeGameplayColourFore) && std::stoi(ConfigObjMain.sCarDodgeGameplayColourFore) < 8192)) {
+				ConfigObjMain.sCarDodgeGameplayColourFore = LWHT_WIN32;
+				bSuccess = false;
+			}
+			if (not (isNumberi(ConfigObjMain.sCarDodgeGameplayColourBack) && std::stoi(ConfigObjMain.sCarDodgeGameplayColourBack) < 8192)) {
+				ConfigObjMain.sCarDodgeGameplayColourBack = BLK_WIN32;
+				bSuccess = false;
+			}
 
 			return bSuccess;
 		}
@@ -423,6 +431,14 @@ namespace zt {
 				ConfigObjMain.sColourSubheadingBack = MAG_ANSI;
 				bSuccess = false;
 			}
+			if (!VerifyANSIColourString(ConfigObjMain.sCarDodgeGameplayColourFore)) {
+				ConfigObjMain.sCarDodgeGameplayColourFore = LWHT_ANSI;
+				bSuccess = false;
+			}
+			if (!VerifyANSIColourString(ConfigObjMain.sCarDodgeGameplayColourBack)) {
+				ConfigObjMain.sCarDodgeGameplayColourBack = BLK_ANSI;
+				bSuccess = false;
+			}
 
 			return bSuccess;
 		}

Core/ColourConv.cpp

@@ -252,6 +252,7 @@ namespace zt {
 	//            sColourOutlineBack - The background colour for the outline.
 	//            sColourTextFore - The foreground colour for the text.
 	//            sColourTextBack - The background colour for the text.
+	//            bCentreBox - If specified, centre the box on the terminal screen. This is based on the terminal's horizontal width. Defaults to FALSE.
 	// Return Values: None
 	//
 	void OutputBoxWithText(std::string sText, std::string sColourOutlineFore, std::string sColourOutlineBack, std::string sColourTextFore, std::string sColourTextBack, bool bCentreBox)
@@ -373,6 +374,15 @@ namespace zt {
 			nBoxWidth = csbiDirections.srWindow.Right - csbiDirections.srWindow.Left + 1;
 		}
 
+		// Calculate left padding width based on box width (for centring text)
+		int nLeftPaddingWidth = 0;
+		if (bCentreBox) {
+			nLeftPaddingWidth = ((csbiDirections.srWindow.Right - csbiDirections.srWindow.Left + 1) - nBoxWidth) / 2;
+		}
+
+		// Output padding
+		colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
+		std::cout << std::string(nLeftPaddingWidth, ' ');
 
 		// Firstly, output box top
 		colour(sColourOutlineFore, sColourOutlineBack);
@@ -387,6 +397,10 @@ namespace zt {
 			}
 
 			// Output padding
+			colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
+			std::cout << std::string(nLeftPaddingWidth, ' ');
+
+			// Output box border character
 			colour(sColourOutlineFore, sColourOutlineBack);
 			std::cout << "* ";
 			colour(sColourTextFore, sColourTextBack);
@@ -399,6 +413,10 @@ namespace zt {
 			std::cout << " *\n";
 		}
 
+		// Output padding
+		colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
+		std::cout << std::string(nLeftPaddingWidth, ' ');
+
 		// Finally, output box bottom
 		colour(sColourOutlineFore, sColourOutlineBack);
 		std::cout << std::string(nBoxWidth, '=');
@@ -639,7 +657,7 @@ namespace zt {
 	}
 
 	// Function to set console cursor position
-	inline void SetCursorPosition(int x, int y) {
+	void SetCursorPosition(int x, int y) {
 		COORD CursorPos{};
 		CursorPos.X = x;
 		CursorPos.Y = y;
@@ -1135,6 +1153,7 @@ namespace zt {
 	}
 
 	// Function that outputs text with random colours 
+	// Specify a background colour with sBackgroundColour to set the text background before writing to display
 	void RandomColourOutput(std::string sText, std::string sBackgroundColour) {
 
 		// Add word wrapping
@@ -1147,10 +1166,10 @@ namespace zt {
 			// Colour indicator going past 16 will give an error
 			if (i > 16) i = 1;
 
-			if (colconv::NumberToColour(i) == ConfigObjMain.sColourGlobalBack && !ConfigObjMain.bAutoReadableContrast) {
-				colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
+			if (colconv::NumberToColour(i) == sBackgroundColour && !ConfigObjMain.bAutoReadableContrast) {
+				colour(ConfigObjMain.sColourGlobal, sBackgroundColour);
 			}
-			else colour(colconv::NumberToColour(i), ConfigObjMain.sColourGlobalBack);
+			else colour(colconv::NumberToColour(i), sBackgroundColour);
 
 			// Output with colour
 			std::cout << sText[j];
@@ -1257,8 +1276,9 @@ namespace zt {
 			return;
 		}
 
-		// Firstly, output string of spaces
-		std::cout << std::string((nWidth - sText.length()) / 2, ' ');
+		// Firstly, set cursor to correct centre position
+		GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbiCentreCT);
+		SetConsoleCursorPosition(GetStdHandle(STD_OUTPUT_HANDLE), { (short)((nWidth - sText.length()) / 2), csbiCentreCT.dwCursorPosition.Y });
 		// Then output the string itself like slowcharfn()
 		for (int i = 0; i <= sText.length(); i++) {
 			sleep(ConfigObjMain.nSlowCharSpeed);