Merge pull request #3 from rforzachamp821/Ryan_WorkingBranch

Ryan working branch v0.8.0 update PR

Author: rforzachamp821

CommandFiles/CommandFileAssets.cpp

@@ -215,12 +215,19 @@ void RGBColourPresets() {
 // Also has tutorial directions text support.
 //
 void help(bool bFromTutorial) {
-	ScreenNavigateEngine sneHelp;
+	// Output title
+	CentreColouredText(" ___HELP___ ", 1);
+	std::cout << "\n\n";
 
-	sneHelp.nSizeOfScreens = 4;
-	std::string sScreens[] =
-	{
-		"___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"
+	// Output subheading and information about commands to display help commands under
+	colourSubheading();
+	std::cout << wordWrap("___LIST OF COMMANDS___") << NOULINE_STR;
+	colour(LCYN, ConfigObjMain.sColourGlobalBack);
+	std::cout << wordWrap("\n\nTo see more info about a command, type in \"<command> -h\". This will work for all commands, except: echo and title.\n\n");
+	colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
+
+	// Output help commands
+	std::cout <<
 		"[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"
@@ -232,19 +239,26 @@ void help(bool bFromTutorial) {
 		"[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"
+		"[12] ColourNumbers\t[27] ShellExecute\t[42] FileParse\t\t[57] PiOutput\n"
+		"[13] MediaPlayer\t[28] Hacker\t\t[43] Disp\t\t[58] Spam\n"
+		"[14] AudioPlayer\t[29] Calculator\t\t[44] SysInfo\t\t[59] FAQ\n"
+		"[15] TTS\t\t[30] Logoff\t\t[45] Einstein\t\t[60] About\n"
+
+		"\nMore will be added soon!\n";
 
-		"\nMore will be added soon!\n",
+	// Exit
+	return;
+}
 
-		"___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 - A function that displays all about and copyright information for ZeeTerminal,
+//         using the ScreenNavigate engine.
+//
+void About(bool bFromTutorial) {
+	ScreenNavigateEngine sneAbout;
 
+	sneAbout.nSizeOfScreens = 2;
+	std::string sScreens[] =
+	{
 		"___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" +
@@ -270,15 +284,15 @@ void help(bool bFromTutorial) {
 		"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\n"
 	};
 
-	sneHelp.sScreens = sScreens;
-
+	sneAbout.sScreens = sScreens;
+	
+	// Set custom direction text when coming from tutorial
 	if (bFromTutorial) {
-		// Set custom direction text when coming from tutorial
-		sneHelp.SetDirectionsText("Press the 'A' key or left arrow key to move left.\nPress the 'D' key or right arrow key to move right.\nPress ESC to exit the Help command and continue with the tutorial.");
+		sneAbout.SetDirectionsText("Press the 'A' key or left arrow key to move left.\nPress the 'D' key or right arrow key to move right.\nPress ESC to exit the About command and continue with the tutorial.");
 	}
 
-	// Call sneHelp.ScreenNavigate for screen strings set.
-	sneHelp.ScreenNavigate(" ___HELP___ ");
+	// Call sneAbout.ScreenNavigate for screen strings set.
+	sneAbout.ScreenNavigate(" ___ABOUT___ ");
 
 	return;
 }
@@ -332,9 +346,10 @@ void Tutorial() {
 			std::cout << "Please try again.\n";
 		}
 	}
-	slowcharfn(false, "\nThat previous command also taught you how to use the ScreenNavigate engine.\nYou can move left and right between 'screens' using the the ");
-	slowcolourfn(LCYN, ConfigObjMain.sColourGlobalBack, "A, D and left/right arrow keys");
-	slowcharfn(true, ", to look through any information provided.\n");
+
+	sleep(1000);
+	slowcharfn(true, "\nDid you notice how when you typed in 'help', the Help command executed?\nWhen executing commands, type the name of the command and press ENTER to execute it, just like you did to execute the Help command.\n"
+		"Use the Help command to get a reference of all the commands in the terminal.");
 
 	// OptionSelect Engine Tutorial
 	sleep(1000);

CommandFiles/CommandHelpMessages.cpp

@@ -12,9 +12,7 @@ namespace helpmsgs
 		colourSubheading();
 		std::cout << "What this command does:" << NOULINE_STR;
 		colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
-		std::cout << wordWrap("\n- Lists all possible commands in ZeeTerminal.")
-			<< wordWrap("\n- Displays some frequently asked questions with answers.")
-			<< wordWrap("\n- Displays information about the program, such as copyright information, credits and basic program information.") << "\n\n";
+		std::cout << wordWrap("\n- Lists all possible commands in ZeeTerminal, with small amounts of extra information.\n\n");
 
 		colourSubheading();
 		std::cout << "Possible arguments for this command:" << NOULINE_STR;
@@ -182,6 +180,8 @@ namespace helpmsgs
 			<< 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 --gtneforeground <num>\t\tSet the foreground colour in the Guess The Number Extreme game. Put the colour number in place of <num>.")
+			<< wordWrap("\n --gtnebackground <num>\t\tSet the background colour in the Guess The Number Extreme 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";
 
@@ -1039,7 +1039,8 @@ 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 --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"
+			" --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"
+			" --gtne\t\tStarts the Guess The Number Extreme game, a game where you guess a number between 2 random numbers in under 5 tries, fighting for the highest score.\n\n"
 			"Example: game --cardodge\n\n");
 
 		return;
@@ -1151,4 +1152,88 @@ namespace helpmsgs
 
 		return;
 	}
+
+	// PiOutputHelp
+	void PiOutputHelp() {
+		CentreColouredText(" ___PIOUTPUT___ ", 1);
+		std::cout << "\n";
+		CentreColouredText("This command outputs an argument-specified number of digits of Pi, up to 1 million d.p.", 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 outputs an argument-specified number of digits of Pi, up to 1 million decimal places.\n- For speed and efficiency purposes, the number is truncated, not rounded up or down.\n- For speed and simplistic purposes, the value of Pi is not calculated at run-time, however it was hard-coded at the compile-time of this program."
+			"\n- You can learn more about Pi here: ");
+		colour(LBLU, ConfigObjMain.sColourGlobalBack);
+		std::cout << wordWrap("https://en.wikipedia.org/wiki/Pi\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 <dp>\tNumber of decimal places to output Pi to. Put the integer desired in place of <dp>.\n\nExample: pioutput 16\n\nNOTE: <dp> argument cannot be less than 1 or more than 1 million.\n\n");
+
+		return;
+	}
+
+	// SpamHelp
+	void SpamHelp() {
+		CentreColouredText(" ___SPAM___ ", 1);
+		std::cout << "\n";
+		CentreColouredText("This command outputs an argument-specified string non-stop until the ESC key is pressed.", 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 outputs a string a specific number of times until infinity or until the ESC key is pressed on the keyboard.\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 <str>\tThe string to spam output of. Put the desired string in place of <str>.\n\nExample: spam \"ZOO WEE MAMA\"\n\n"
+			"NOTE: For any strings containing spaces, please enclose them in quotes like the example.\n\n");
+
+		return;
+	}
+
+	// FAQHelp
+	void FAQHelp() {
+		CentreColouredText(" ___FAQ___ ", 1);
+		std::cout << "\n";
+		CentreColouredText("This command outputs frequently-asked questions and answers about 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 displays frequently-asked questions with answers, about ZeeTerminal.\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: faq -h\n\n");
+
+		return;
+	}
+
+	// AboutHelp
+	void AboutHelp() {
+		CentreColouredText(" ___ABOUT___ ", 1);
+		std::cout << "\n";
+		CentreColouredText("This command outputs information about ZeeTerminal, including copyright.", 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 outputs information about ZeeTerminal, including copyright information about different modules/APIs, thank-you messages, and license information.\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: about -h\n\n");
+
+		return;
+	}
 }

CommandFiles/CommandsFile.cpp

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

CommandFiles/CommandsFiles/CommandsFile_1to10.cpp

@@ -827,12 +827,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] == "gtneforeground") {
+				if (isNumberi(sStringDataCommandArgs[0])) {
+					GuessTheNumberExtremeGameSettings(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] == "gtnebackground") {
+				if (isNumberi(sStringDataCommandArgs[0])) {
+					GuessTheNumberExtremeGameSettings(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 = 12;
+		oseSettings.nSizeOfOptions = 13;
 		std::string sOptions[] = {
 			"Highlight Colour Settings",
 			"Title Colour Settings",
@@ -845,6 +867,7 @@ bool commands::Commands1To10(const std::string sCommand, char* cCommandArgs, con
 			"LogFile System Settings",
 			"CarDodge Game Settings",
 			"Guess The Number Game Settings",
+			"Guess The Number Extreme Game Settings",
 			"Other Settings"
 		};
 		oseSettings.sOptions = sOptions;
@@ -892,6 +915,9 @@ bool commands::Commands1To10(const std::string sCommand, char* cCommandArgs, con
 				GuessTheNumberGameSettings();
 				break;
 			case 12:
+				GuessTheNumberExtremeGameSettings();
+				break;
+			case 13:
 				OtherSettings();
 				break;