Modifications after last commit with QC bugfixes applied as well:

- Add commands Y2038, CalcQuadratic, Factorial
- Add game Guess The Number
- Add settings for the Guess The Number game
- Fix settings indentation in help page
- Fix issues with incomplete error checking in settings involving colours in the Settings command

Author: rforzachamp821

CommandFiles/CommandFileAssets.cpp

@@ -229,9 +229,9 @@ void help(bool bFromTutorial) {
 		"[6] DevTools\t\t[21] Copy\t\t[36] RandCol\t\t[51] Game\n"
 		"[7] CPUStress\t\t[22] CopyFile\t\t[37] Pause\t\t[52] FileCryptor\n"
 		"[8] Colour\t\t[23] TextInfo\t\t[38] CommandNum\t\t[53] Delete\n"
-		"[9] Settings\t\t[24] ConfigAction\t[39] SlowChar\n"
-		"[10] Title\t\t[25] BeepSounds\t\t[40] ReverseText\n"
-		"[11] Date\t\t[26] RickRoll\t\t[41] Notes\n"
+		"[9] Settings\t\t[24] ConfigAction\t[39] SlowChar\t\t[54] Factorial\n"
+		"[10] Title\t\t[25] BeepSounds\t\t[40] ReverseText\t[55] CalcQuadratic\n"
+		"[11] Date\t\t[26] RickRoll\t\t[41] Notes\t\t[56] Y2038\n"
 		"[12] ColourNumbers\t[27] ShellExecute\t[42] FileParse\n"
 		"[13] MediaPlayer\t[28] Hacker\t\t[43] Disp\n"
 		"[14] AudioPlayer\t[29] Calculator\t\t[44] SysInfo\n"
@@ -2699,6 +2699,59 @@ std::string FormatValueForEuropeanNotation(long double dValue) {
 	return sFormatBuffer;
 }
 
+// GetNumPrimeFactorsAsString - Get the prime factors of a specified integer argument and return them as a string in this format: "<n>, <n>, <n>"...
+// Parameters: nNumToUse - The number to calculate the prime factors of.
+// Return Values: std::string containing the prime factors of nNumToUse, as a string.
+//
+std::string GetNumPrimeFactorsAsString(uint64_t nNumToUse) {
+	std::string sPrimeFactorStr = "";
+
+	// Repeat until square root of nNumToUse
+	for (uint64_t i = 2; i * i <= nNumToUse; ++i) {
+
+		// Check if divisible by i
+		while (nNumToUse % i == 0) {
+			// Add prime factor to string with space
+			sPrimeFactorStr += std::to_string(i) + ", ";
+			// Divide by i to move on to next prime factor
+			nNumToUse /= i;
+		}
+	}
+
+	// nNumToUse has been divided all the way, do not forget about it
+	if (nNumToUse > 1) {
+		// Add prime factor to string with space
+		sPrimeFactorStr += std::to_string(nNumToUse) + ", ";
+	}
+
+	// There should be an unnecessary extra ", " at the end of the string - remove it
+	sPrimeFactorStr.erase(sPrimeFactorStr.length() - 2, 2);
+
+	// Return string
+	return sPrimeFactorStr;
+}
+
+// GetNumFactorsAsString - Get the factors of a specified integer argument and return it as a string in this format: "<n>, <n>, <n>"...
+// Parameters: nNumToUse - The number to calculate the factors of.
+// Return Values: std::string containing the factors of nNumToUse, as a string.
+//
+std::string GetNumFactorsAsString(uint64_t nNumToUse) {
+	std::string sFactorsStr = "";
+
+	// Iterate until number with increment of 1 (brute-force technique)
+	for (uint64_t i = 1; i <= nNumToUse; i++) {
+		if (nNumToUse % i == 0) {
+			// Add number to string
+			sFactorsStr += std::to_string(i) + ", ";
+		}
+	}
+
+	// There should be an unnecessary extra ", " at the end of the string - remove it
+	sFactorsStr.erase(sFactorsStr.length() - 2, 2);
+
+	return sFactorsStr;
+}
+
 /* MessageBox Codes */
 //////////////////////
 /* Message box codes are the following for icons:

CommandFiles/CommandHelpMessages.cpp

@@ -178,8 +178,10 @@ namespace helpmsgs
 			<< 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 --cdforeground <num>\t\tSet the foreground colour in the CarDodge game. Put the colour number in place of <num>.")
+			<< wordWrap("\n --cdbackground <num>\t\tSet the background colour in the CarDodge game. Put the colour number in place of <num>.")
+			<< wordWrap("\n --gtnforeground <num>\t\tSet the foreground colour in the Guess The Number game. Put the colour number in place of <num>.")
+			<< wordWrap("\n --gtnbackground <num>\t\tSet the background colour in the Guess The Number 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";
 
@@ -1036,7 +1038,8 @@ namespace helpmsgs
 		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"
+		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"
+			" --gtn\t\tStarts the Guess The Number game, a game where you guess a number between 1 and 100 in as little tries as you can.\n\n"
 			"Example: game --cardodge\n\n");
 
 		return;
@@ -1084,4 +1087,68 @@ namespace helpmsgs
 
 		return;
 	}
+
+	// FactorialHelp
+	void FactorialHelp() {
+		CentreColouredText(" ___FACTORIAL___ ", 1);
+		std::cout << "\n";
+		CentreColouredText("This command calculates the factors and prime factors of a positive integer.", 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 simply calculates the prime factors and factors of a positive integer.\n- The results are displayed on the terminal screen.\n\n");
+
+		colourSubheading();
+		std::cout << "Possible arguments for this command:" << NOULINE_STR;
+		colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
+		std::cout << wordWrap("\n -h\tDisplays this help message.\n <num>\tFactorise a number from an argument parameter. Put the number in place of <num>.\n\nExample: factorial 45\n\n");
+
+		return;
+	}
+
+	// CalcQuadraticHelp
+	void CalcQuadraticHelp() {
+		CentreColouredText(" ___CALCQUADRATIC___ ", 1);
+		std::cout << "\n";
+		CentreColouredText("CalcQuadratic allows you to compute all values of a quadratic equation quickly and easily.", 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 calculates all the values of a quadratic mathematical equation quickly and easily.\n- All the command needs is the A, B and C values, from this quadratic equation form: [ax^2 + bx + c = 0].\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 <a> <b> <c>\tCompute values of quadratic equation from arguments. Put A, B and C values in place of <a>, <b> and <c> respectively.\n\n"
+			"Example: calcquadratic 1 9 18\n\nNOTE: The A, B and C arguments must be numerical for the calculator to work.\n\n");
+
+		return;
+	}
+
+	// Y2038Help
+	void Y2038Help() {
+		CentreColouredText(" ___Y2038___ ", 1);
+		std::cout << "\n";
+		CentreColouredText("This command displays how long is left until the Y2038 time overflow occurs.", 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 displays how long is left until the Y2038 time overflow occurs (aka the Y2038 problem, Y2K38).\n- This bug occurs because there are simply too many seconds to fit into a 32-bit integer. Therefore, it affects all 32-bit systems."
+			"\n- You can find out more about this phenomenon on the Wikipedia page: ");
+		colour(LBLU, ConfigObjMain.sColourGlobalBack);
+		std::cout << wordWrap("https://en.wikipedia.org/wiki/Year_2038_problem\n\n");
+
+		colourSubheading();
+		std::cout << "Possible arguments for this command:" << NOULINE_STR;
+		colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
+		std::cout << wordWrap("\n -h\tDisplays this help message.\n\nExample: y2038 -h\n\n");
+
+		return;
+	}
 }

CommandFiles/CommandsFile.cpp

@@ -28,6 +28,7 @@
 #include "CommandHelpMessages.cpp"
 #include "CalculationAlgorithm/CalculationAlgorithm.h"
 #include "../GameFiles/CarDodge/CarDodge.cpp"
+#include "../GameFiles/GuessTheNumber/GuessTheNumber.h"
 
 #include <vector>
 #include <string>

CommandFiles/CommandsFiles/CommandsFile_1to10.cpp

@@ -805,12 +805,34 @@ bool commands::Commands1To10(const std::string sCommand, char* cCommandArgs, con
 					UserErrorDisplay("An error occured. Your setting option seems to be incorrect. Make sure it's a number and try again.\nType \"settings -h\" for more info.\n");
 				}
 
+				return true;
+			}
+			else if (sStringOptionCommandArgs[0] == "gtnforeground") {
+				if (isNumberi(sStringDataCommandArgs[0])) {
+					GuessTheNumberGameSettings(1, std::stoi(sStringDataCommandArgs[0]), 0);
+				}
+				else {
+					VerbosityDisplay("In Commands() - ERROR: Could not detect numerical value in string-based number argument.\n");
+					UserErrorDisplay("An error occured. Your setting option seems to be incorrect. Make sure it's a number and try again.\nType \"settings -h\" for more info.\n");
+				}
+
+				return true;
+			}
+			else if (sStringOptionCommandArgs[0] == "gtnbackground") {
+				if (isNumberi(sStringDataCommandArgs[0])) {
+					GuessTheNumberGameSettings(2, 0, std::stoi(sStringDataCommandArgs[0]));
+				}
+				else {
+					VerbosityDisplay("In Commands() - ERROR: Could not detect numerical value in string-based number argument.\n");
+					UserErrorDisplay("An error occured. Your setting option seems to be incorrect. Make sure it's a number and try again.\nType \"settings -h\" for more info.\n");
+				}
+
 				return true;
 			}
 		}
 
 		OptionSelectEngine oseSettings;
-		oseSettings.nSizeOfOptions = 11;
+		oseSettings.nSizeOfOptions = 12;
 		std::string sOptions[] = {
 			"Highlight Colour Settings",
 			"Title Colour Settings",
@@ -822,6 +844,7 @@ bool commands::Commands1To10(const std::string sCommand, char* cCommandArgs, con
 			"Cursor Settings",
 			"LogFile System Settings",
 			"CarDodge Game Settings",
+			"Guess The Number Game Settings",
 			"Other Settings"
 		};
 		oseSettings.sOptions = sOptions;
@@ -866,6 +889,9 @@ bool commands::Commands1To10(const std::string sCommand, char* cCommandArgs, con
 				CarDodgeGameSettings();
 				break;
 			case 11:
+				GuessTheNumberGameSettings();
+				break;
+			case 12:
 				OtherSettings();
 				break;