Merge pull request #2 from rforzachamp821/Ryan_WorkingBranch

Ryan working branch v0.7.0 PR (v0.7.0 files!)

Author: rforzachamp821

CommandFiles/CalculationAlgorithm/CalculationAlgorithm.cpp

@@ -1020,9 +1020,6 @@ bool CalculationAlgorithm::UseEuropeanNotation(bool bToggleValue) {
 		cDecimalPoint = cDefaultDecimalPoint;
 		cThousandsSeparator = cDefaultThousandsSeparator;
 		break;
-	default:
-		VerbosityDisplay("In CalculationAlgorithm::UseEuropeanNotation(): ERROR - Unknown value recieved from bToggleValue, therefore setting notation failed. Not true/false (1/0).\n", nObjectID);
-		return false;
 	}
 
 	return true;

CommandFiles/CommandFileAssets.cpp

@@ -220,19 +220,36 @@ void help(bool bFromTutorial) {
 	sneHelp.nSizeOfScreens = 4;
 	std::string sScreens[] =
 	{
-		"___LIST OF COMMANDS___\n\nTo see more about a command, type in \"<command> -h\". This will work for all commands, except: echo and title.\n\n[1] Help\n[2] Exit\n[3] Tutorial\n[4] Echo\n[5] CLS\n[6] DevTools\n[7] CPUStress\n[8] Colour\n[9] Settings\n[10] Title\n[11] Date\n[12] ColourNumbers\n[13] MediaPlayer\n[14] AudioPlayer\n[15] TTS\n[16] Stopwatch\n[17] Read\n[18] Timer\n[19] Beep\n[20] MessageBox\n[21] Copy\n[22] CopyFile\n[23] TextInfo\n[24] ConfigAction\n[25] BeepSounds\n[26] RickRoll\n[27] ShellExecute\n[28] Hacker\n[29] Calculator\n[30] Logoff\n[31] Shutdown\n[32] Reboot (or Restart)\n[33] Hibernate\n[34] ResetExpl\n[35] MemTest\n[36] RandCol\n[37] Pause\n[38] CommandNum\n[39] SlowChar\n[40] ReverseText\n[41] Notes\n[42] FileParse\n[43] Disp\n[44] SysInfo\n[45] Einstein\n[46] Edison\n[47] Tesla\n[48] Cow\n[49] Cat\n[50] Bunny\n[51] Game\n[52] FileCryptor\n[53] Delete\n\nMore will be added soon!\n",
+		"___LIST OF COMMANDS___\n\nTo see more info about a command, type in \"<command> -h\". This will work for all commands, except: echo and title.\n\n"
+		"[1] Help\t\t[16] Stopwatch\t\t[31] Shutdown\t\t[46] Edison\n"
+		"[2] Exit\t\t[17] Read\t\t[32] Reboot\t\t[47] Tesla\n"
+		"[3] Tutorial\t\t[18] Timer\t\t[33] Hibernate\t\t[48] Cow\n"
+		"[4] Echo\t\t[19] Beep\t\t[34] ResetExpl\t\t[49] Cat\n"
+		"[5] CLS\t\t\t[20] MessageBox\t\t[35] MemTest\t\t[50] Bunny\n"
+		"[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\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"
+		"[15] TTS\t\t[30] Logoff\t\t[45] Einstein\n"
+
+		"\nMore will be added soon!\n",
 
 		"___FREQUENTLY ASKED QUESTIONS___\n\n"
 		"1) I can't see the terminal text. How can I zoom in?\n  1a) You can zoom in, of course. Press and hold the Ctrl button and scroll with the mouse to your desired text size.\n"
 		"\n\n2) The error messages shown aren't detailed enough. How do I get better-quality error messages?\n  2a) To get better quality error messages, just enable the Verbosity Messages setting in the Settings command.\n"
 		"\n\n3) I'm using the Windows 7 terminal. How do I scroll up and down in the terminal without using the mouse?\n  3a) To scroll up and down without the mouse, press Alt + Space and then the keys 'E' and 'L', and then scroll with the up/down arrow keys. Use the PageUp/PageDown keys to scroll full pages in the terminal.\n"
 		"\n\n4) What is the difference between the 'old' and 'new' OptionSelect Session styles?\n  4a) The 'old' style is an inspiration from the TerminalAppGen2, the previous iteration of this program. It is very robust, simple and works by associating a number with each option, which you type in and press ENTER to select.\nThe 'new' style isn't exactly new, and has been in ZeeTerminal since v0.1.0. However, it is newer than the 'old' style, hence it's referred to as 'new'. It relies on using the arrow/WS keys to move a highlight up and down, to select an option.\n",
 
-		"___ABOUT THIS PROGRAM___\n\nThis is the ZeeTerminal Commandline Program, Build " + std::string(ZT_VERSION) + ".\n" +
-		"This is an early alpha build of ZeeTerminal, with an entirely new engine and components.\nThis program is made in C++, with a few very small parts of C." +
-		"\n\nThis program uses the DirectShow API in the MediaPlayer command, which is licensed by Microsoft Corporation. (c) Microsoft Corporation.\n\n" +
-		"This program uses the BASS API in the AudioPlayer command, which is licensed by Un4Seen Developments. (c) Un4Seen Developments.\n\n" +
-		"This program uses a slightly modified version of the CarDodge game v0.5.1, accessible in the Game command. CarDodge is licensed under Ryan Zorkot with the MIT License. For more information, visit the repository: https://github.com/rforzachamp821/CarDodge\n\n"
+		"___ABOUT THIS PROGRAM___\n\nThis is the ZeeTerminal Commandline Program, Build v" + std::string(ZT_VERSION) + ".\n" +
+		"This is a beta build of ZeeTerminal, with an entirely new engine and components.\nThis program is made in C++, with a few very small parts of C." +
+		"\n\nThis program uses the DirectShow API in the MediaPlayer command, licensed by Microsoft Corp. (c) Microsoft Corp.\n\n" +
+		"This program uses the BASS API in the AudioPlayer command, licensed by Un4Seen Developments. (c) Un4Seen Developments.\n\n" +
+		"This program uses the CarDodge game v0.6.0, accessible in the Game command. CarDodge is licensed under Ryan Zorkot with the MIT License. For more information, visit the archived repo: https://github.com/rforzachamp821/CarDodge\n\n"
 		"\nZeeTerminal is licensed under the MIT License. The license and credits can be viewed on Page 4.\n\n"
 		"  _____        _____                   _             _ \n"
 		" |__  /___  __|_   _|__ _ __ _ __ ___ (_)_ __   __ _| |\n"
@@ -2682,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";
 
@@ -394,6 +396,7 @@ namespace helpmsgs
 		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 <source>\tThe original file to be copied to another file. Put the file directory in place of <source>.\n <dest>\t\tThe file directory of the new/existing file. Put the file directory in place of <dest>.")
+			<< wordWrap("\n\nSyntax: copyfile <source> <dest> (in this exact order).")
 			<< wordWrap("\n\nExample: copyfile \"C:\\test\\a file.txt\" C:\\Users\\newfile.txt")
 			<< wordWrap("\n\nNOTE: For any directory with spaces, use quotes like in the example.\nNOTE: You must have both the source and the destination directories when using them as arguments.\nNOTE: Read this article for information on the different forms of filepaths: ");
 
@@ -422,6 +425,7 @@ namespace helpmsgs
 		std::cout << wordWrap("\n -h\t\tDisplays this help message.\n -o\t\tEnable overwrite mode. Any existing file with the same filename as the file to copy will be overwritten when specified."
 			"\n -d\t\tEnable folder copy mode. When a folder is specified as a source, the contents of that folder will be recursively copied to the destination."
 			"\n <source>\tThe file to copy. Put the file directory in place of <source>.\n <dest>\t\tThe destination location/directory. Put the directory path in place of <dest>.\n\n"
+			"Syntax: copy <source <dest> (in this exact order).\n\n"
 			"Example: copy \"C:\\test\\a file.txt\" C:\\Users\n\n"
 			"NOTE: For any directory with spaces, use quotes like in the example.\nNOTE: You must have both the source and the destination directories when using them as arguments.\nNOTE: Read this article for information on the different forms of filepaths: ");
 
@@ -549,7 +553,7 @@ namespace helpmsgs
 		colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
 		std::cout << wordWrap("\n -h\t\tDisplays this help message.\n -i\t\tStart immediately, with default settings when no argument is given.\n --display\tStarts the hacking text part of this command.\n --type\t\tStarts the hacker typing part of this command.\n --typecustom\tStarts the hacker typing part of this command, with custom file output abilities.\n <speed>\tSpeed of output characters for 'type' and 'typecustom' arguments. Must be a number.\n <filepath>\tCustom filepath argument for 'typecustom' argument. Must be a valid filepath.")
 			<< wordWrap("\n\nSyntax for '--type' argument:\t\t --type <speed>\nSyntax for '--typecustom' argument:\t --typecustom <filepath> <speed> (In order)")
-			<< wordWrap("\n\nExample: hacker --type\n\n");
+			<< wordWrap("\n\nExample: hacker --type\n\nNOTE: When using the --typecustom argument, in the <filepath> argument, you can use \"*open\" without quotes to use the Windows File Dialogue to open files.\n\n");
 
 		return;
 	}
@@ -1034,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;
@@ -1082,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;
 

CommandFiles/CommandsFiles/CommandsFile_21to30.cpp

@@ -816,12 +816,25 @@ bool commands::Commands21To30(const std::string sCommand, char* cCommandArgs, co
 			}
 
 			if (sFileName == "") {
-				sFileName = StrInput("Please input the filepath for the custom file (0 to exit): > ");
+				sFileName = StrInput("Please input the filepath for the custom file (0 to exit, *open for Windows File Dialogue): > ");
 				if (sFileName == "0") {
 					Exiting();
 					return true;
 				}
 			}
+
+			// Open file with Windows File Dialogue
+			if (sFileName == "*open") {
+				// Use the Windows File Dialogue
+				std::cout << wordWrap("Opening with the Windows File Dialogue...\n");
+				FileOpenGUIEngine HackerFileOpen;
+				HackerFileOpen.FileOpenDialogue("Open a File to Use for Hacker Type");
+				sFileName = HackerFileOpen.GetRetrievedPathName();
+				if (sFileName == "") {
+					Exiting();
+					return true;
+				}
+			}
 
 			if (bStartImmediately == false) {
 				std::cout << '\n';