Clarify install requirements for linux

Update version
Merge pull request #44 from sam-astro/dev
2025-12-11 16:22:12 +00:00 · 2023-03-05 13:15:51 -05:00 · 2022-08-28 12:52:33 -04:00 · 2022-08-28 12:44:38 -04:00 · 2022-08-28 12:43:50 -04:00 · 2022-08-28 12:43:01 -04:00
16 changed files with 1166 additions and 343 deletions
--- a/README.md
+++ b/README.md
@ -1,56 +1,45 @@
 <img src="https://raw.githubusercontent.com/sam-astro/Z-Sharp/master/ExtraResources/ZS-Gem-Icon-Small.png"/><img src="https://raw.githubusercontent.com/sam-astro/Z-Sharp/master/ExtraResources/ZS-Logo-Light-Small.png"/>

+> Z-Sharp is no longer in development! This project was never meant to go beyond the scope of a simple thing I could make pong in, yet people continue to ask for features and fixes, and I continue to oblige. So sadly, even though this was a cool project in which I learned a lot, it will be ending now. I will eventually make some docs and standards for the syntax, and will still leave this repository open. This way anybody can make their own interpreter or compiler for it. I will also still accept pull requests for any changes to this repository.
+
 ## Introduction
-Z-Sharp is a custom programming language I made because I don't like c++ very much (Z-Sharp's interpreter is written in c++ though). Z-Sharp scripts have the file extension .ZS. The base syntax and formatting I would say is quite similar to C# or Python, but differs as task complexity increases. It has support for graphics using SDL2, and by default is not enabled.
+Z-Sharp is a custom programming language I made because I don't like c++ very much (Z-Sharp's interpreter is written in c++ though). Z-Sharp scripts have the file extension .ZS. The base syntax and formatting I would say is quite similar to C# or Python, but differs as task complexity increases. It also has support for graphics using SDL2.

 Before using Z#:
 There is ***no documentation***, ***strings*** barely work, ***performance*** isn't great, the syntax is ***very specific***, and most errors just cause it to ***crash without warning***. I am just a *single developer* working on this during my free time; between school, other projects, and YouTube. Z-Sharp will most likely never be finished, since it was really supposed to end when the video was published about it.
 If you are trying to use a common programming language feature, ask yourself this: ***Is this feature required to play pong?*** If not, then most likely that feature ***has not been implemented yet***. I initially only made the language so I could create pong and make a video about it, so it really is the ***bare minimum***.

+## Documentation and getting started:
+[The docs and tutorial](https://spazelectro.github.io/ZSharpDocs/#/README)
+
 ## Installation
 Downloading or installing is very simple, here is how depending on your version and operating system:
 ### Windows
 1. Navigate to [the most recent release](https://github.com/sam-astro/Z-Sharp/releases) and download `ZSharp-Win-Installer.zip`.
 2. Unzip `ZSharp-Win-Installer.zip` and open the unzipped folder.
 3. Inside is a single file titled `ZSharp-Setup.exe`. Run it, and follow the setup instructions.
-4. Now that it is installed, there are a few ways to use it:
+4. If it fails to run, make sure the `MS Visual Runtime and MSVC C++ Redistribute` are installed. You can download them [here from Microsoft](https://docs.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist)
+5. Now that it is installed, there are a few ways to use it:
    * (recommended) Any ZSharp file that ends with .ZS will automatically be associated with the interpreter. Just double-click it, and the interpreter will run.
    * Drag and drop any .ZS script directly onto the executable.
    * Use command line, providing path to interpreter and then to script like so:
    `> ./ZSharp.exe ./Pong-Example-Project/script.zs`
-5. Feel free to use and edit the `Pong-Example-Project`. It is a single script called `script.zs`, and you can open it with any of the methods above. It is also located on the releases page.
+6. Feel free to use and edit the `Pong-Example-Project`. It is a single script called `script.zs`, and you can open it with any of the methods above. It is also located on the releases page.
 > If you don't want to install ZSharp on your device, or you want easier acces to the executable and .DLLs, another version is provided called `ZS_Win_Base_Raw.zip`. This just contains all of the files the installer puts on your computer.
 ### Linux
-1. Install requirements:
-   * You need the package ***libsdl2-dev***. 
+1. Install requirements: `SDL2, SDL2 Image, SDL2 TTF` Commands for `apt` and `pacman` below:

-   For Debian based operating systems you can install it with
-   
-      ```$ sudo apt install libsdl2-dev```
+#### Debian

-   For Arch based operating systems you can install it with
+```
+$ sudo apt install libsdl2-dev libsdl2-image-dev libsdl2-ttf-dev
+```

-   	  ```$ sudo pacman -S sdl2```
-      
-   * You also need the package ***libsdl2-image-dev***. 
+#### Arch

-   For Debian based operating systems you can install it with
-   
-      ```$ sudo apt install libsdl2-image-dev```
-
-   For Arch based operating systems you can install it with
-
-   	  ```$ sudo pacman -S sdl2_image```
-      
-   * You also need the package ***libsdl2-ttf-dev***. 
-
-   For Debian based operating systems you can install it with
-   
-      ```$ sudo apt install libsdl2-ttf-dev```
-
-   For Arch based operating systems you can install it with
-
-   	  ```$ sudo pacman -S sdl2_ttf```
+```
+$ sudo pacman -S sdl2 sdl2_image sdl2_ttf
+```

 2. Navigate to [the most recent release](https://github.com/sam-astro/Z-Sharp/releases) and download `ZSharp-Linux.zip`.
 3. Unzip `ZSharp-Linux.zip` and open the unzipped folder.
@ -84,7 +73,7 @@ func Main()
    
    if s == "r"
    {
-        print s + " is r"
+        Printl(s + " is r")
    }
    
    int functionNumber = ExampleFunction("A", s)
@ -98,8 +87,8 @@ func Main()
 /// be assigned at all on execute and can be left blank
 func ExampleFunction(inputA, inputB)
 {
-    print "In A is: " + inputA
-    print "In B is: " + inputB
+    Printl("In A is: " + inputA)
+    Printl("In B is: " + inputB)
    
    // Return a value to the valling location
    return 4
--- a/ZSharp/Main.cpp
+++ b/ZSharp/Main.cpp
@ -2,9 +2,10 @@
 #include <iostream>
 #include <fstream>
 #include <string>
+//bool DEVELOPER_MESSAGES = true;
 #define DEVELOPER_MESSAGES false
 #define EXAMPLE_PROJECT false
-#define NAMEVERSION "ZSharp v2.1.0-alpha"
+#define NAMEVERSION "ZSharp v2.1.3-alpha"

 #if defined(__unix__)
 #define UNIX true
@ -77,10 +78,13 @@ boost::any GetVariableValue(const string& varName, const unordered_map<string, b
 // Check if there is a variable with the specified name
 bool IsVar(const string& varName, const unordered_map<string, boost::any>& variableValues)
 {
-	if (variableValues.find(split(varName, '.')[0]) != variableValues.end() && split(varName, '.')[0] != "ZS")
-		return true;
-	else
+	if (split(varName, '.')[0] == "ZS")
 		return false;
+
+	if (variableValues.find(split(varName, '.')[0]) != variableValues.end())
+		return true;
+
+	return false;
 }

 // Return a vector of values that correspond to a vector of input variable names
@ -111,6 +115,20 @@ vector<boost::any> VarValues(const vector<string>& varNames, unordered_map<strin
 	return realValues;
 }

+void printVarValues(const vector<string>& vec, unordered_map<string, boost::any>& variableValues)
+{
+	cout << "<";
+	for (int i = 0; i < vec.size(); i++)
+	{
+		cout << AnyAsString(GetVariableValue(vec.at(i), globalVariableValues));
+		cout << AnyAsString(GetVariableValue(vec.at(i), variableValues));
+		cout << " | ";
+	}
+	cout << ">";
+	cout << endl;
+}
+
+
 bool IsFunction(const string& funcName)
 {
 	if (functionValues.find(funcName) != functionValues.end())
@ -120,10 +138,7 @@ bool IsFunction(const string& funcName)
 }
 bool IsZSFunction(const string& funcName)
 {
-	if (funcName[0] == 'Z' && funcName[1] == 'S' && funcName[2] == '.')
-		return true;
-	else
-		return false;
+	return startsWith(funcName, "ZS.");
 }

 boost::any EvalExpression(const string& ex, unordered_map<string, boost::any>& variableValues)
@ -146,30 +161,26 @@ boost::any EvalExpression(const string& ex, unordered_map<string, boost::any>& v
 			// start -> FuncCall(0, x, OtherFunc(a))
 			// changeto -> 0, x, OtherFunc(a)
 			string insideFunArgs = betweenChars(expression, '(', ')');
-#if DEVELOPER_MESSAGES == true
-			cout << insideFunArgs << endl;
-#endif
 			vector<string> argList = splitNoOverlap(insideFunArgs, ',', '(', ')');
 #if DEVELOPER_MESSAGES == true
-			cout << "[" << unWrapVec(argList) << "]" << endl;
+			cout << split(expression, '(')[0] << "  [" << unWrapVec(argList) << "]" << endl;
+			printVarValues(argList, variableValues);
 #endif
 			vector<boost::any> funcArgs = VarValues(argList, variableValues);
-			return ExecuteFunction(trim(split(expression, '(')[0]), funcArgs);
+			return ExecuteFunction(split(expression, '(')[0], funcArgs);
 		}
 		else if (isZS && !inQuotes)
 		{
 			// start -> FuncCall(0, x, OtherFunc(a))
 			// changeto -> 0, x, OtherFunc(a)
 			string insideFunArgs = betweenChars(expression, '(', ')');
-#if DEVELOPER_MESSAGES == true
-			cout << insideFunArgs << endl;
-#endif
 			vector<string> argList = splitNoOverlap(insideFunArgs, ',', '(', ')');
 #if DEVELOPER_MESSAGES == true
-			cout << "[" << unWrapVec(argList) << "]" << endl;
+			cout << split(expression, '(')[0] << "  [" << unWrapVec(argList) << "]" << endl;
+			printVarValues(argList, variableValues);
 #endif
 			vector<boost::any> funcArgs = VarValues(argList, variableValues);
-			return ZSFunction(trim(split(expression, '(')[0]), funcArgs);
+			return ZSFunction(split(expression, '(')[0], funcArgs);
 		}
 		else
 			return GetVariableValue(expression, variableValues);
@ -200,15 +211,13 @@ boost::any EvalExpression(const string& ex, unordered_map<string, boost::any>& v
 				// start -> FuncCall(0, x, OtherFunc(a))
 				// changeto -> 0, x, OtherFunc(a)
 				string insideFunArgs = betweenChars(expression, '(', ')');
-#if DEVELOPER_MESSAGES == true
-				cout << insideFunArgs << endl;
-#endif
 				vector<string> argList = splitNoOverlap(insideFunArgs, ',', '(', ')');
 #if DEVELOPER_MESSAGES == true
-				cout << unWrapVec(argList) << endl;
+				cout << "[" << unWrapVec(argList) << "]" << endl;
+				printVarValues(argList, variableValues);
 #endif
 				vector<boost::any> funcArgs = VarValues(argList, variableValues);
-				string returnVal = AnyAsString(ExecuteFunction(trim(split(expression, '(')[0]), funcArgs));
+				string returnVal = AnyAsString(ExecuteFunction(split(expression, '(')[0], funcArgs));
 				newExpression += returnVal;
 			}
 			else if (split(name, '.')[0] == "ZS" && !inQuotes)
@ -216,15 +225,13 @@ boost::any EvalExpression(const string& ex, unordered_map<string, boost::any>& v
 				// start -> FuncCall(0, x, OtherFunc(a))
 				// changeto -> 0, x, OtherFunc(a)
 				string insideFunArgs = betweenChars(expression, '(', ')');
-#if DEVELOPER_MESSAGES == true
-				cout << insideFunArgs << endl;
-#endif
 				vector<string> argList = splitNoOverlap(insideFunArgs, ',', '(', ')');
 #if DEVELOPER_MESSAGES == true
-				cout << unWrapVec(argList) << endl;
+				cout << "[" << unWrapVec(argList) << "]" << endl;
+				printVarValues(argList, variableValues);
 #endif
 				vector<boost::any> funcArgs = VarValues(argList, variableValues);
-				string returnVal = AnyAsString(ExecuteFunction(trim(split(expression, '(')[0]), funcArgs));
+				string returnVal = AnyAsString(ZSFunction(split(expression, '(')[0], funcArgs));
 				newExpression += returnVal;
 			}
 			else
@ -277,27 +284,33 @@ boost::any EvalExpression(const string& ex, unordered_map<string, boost::any>& v
 		return evaluate(newExpression);
 }

-bool BooleanLogic(const string& valA, const string& determinant, const string& valB, unordered_map<string, boost::any>& variableValues)
+bool BooleanLogic(const string& valA, const string& comparer, const string& valB, unordered_map<string, boost::any>& variableValues)
 {
-	boost::any valARealValue = EvalExpression(valA, variableValues);
-	boost::any valBRealValue = EvalExpression(valB, variableValues);
+	boost::any valARealValue;
+	boost::any valBRealValue;
+	if (valA != "")
+		valARealValue = EvalExpression(valA, variableValues);
+	if (valB != "")
+		valBRealValue = EvalExpression(valB, variableValues);
 #if DEVELOPER_MESSAGES == true
-	InterpreterLog(AnyAsString(valARealValue) + " " + determinant + " " + AnyAsString(valBRealValue) + " : " + AnyAsString(valA) + " " + determinant + " " + AnyAsString(valB) + " : " + to_string(AnyAsString(valARealValue) == AnyAsString(valBRealValue)));
+	InterpreterLog(AnyAsString(valARealValue) + " " + comparer + " " + AnyAsString(valBRealValue) + " : " + AnyAsString(valA) + " " + comparer + " " + AnyAsString(valB) + " : " + to_string(AnyAsString(valARealValue) == AnyAsString(valBRealValue)));
 #endif
-	if (determinant == "==")
+	if (comparer == "==")
 		return any_compare(valARealValue, valBRealValue);
-	else if (determinant == "!=")
+	else if (comparer == "!=")
 		return !any_compare(valARealValue, valBRealValue);
-	else if (determinant == ">=")
+	else if (comparer == ">=")
 		return AnyAsFloat(valARealValue) >= AnyAsFloat(valBRealValue);
-	else if (determinant == "<=")
+	else if (comparer == "<=")
 		return AnyAsFloat(valARealValue) <= AnyAsFloat(valBRealValue);
-	else if (determinant == ">")
+	else if (comparer == ">")
 		return AnyAsFloat(valARealValue) > AnyAsFloat(valBRealValue);
-	else if (determinant == "<")
+	else if (comparer == "<")
 		return AnyAsFloat(valARealValue) < AnyAsFloat(valBRealValue);
+	else if (comparer == "")
+		return AnyAsBool(valARealValue) == true;
 	else
-		LogWarning("unrecognized determinant \'" + determinant + "\'");
+		LogWarning("unrecognized comparer \'" + comparer + "\'");

 	return false;
 }
@ -384,12 +397,12 @@ int varOperation(const vector<string>& str, unordered_map<string, boost::any>& v

 boost::any ProcessLine(const vector<vector<string>>& words, int& lineNum, unordered_map<string, boost::any>& variableValues)
 {
-	// Check if the first two chars are '//', which would make it a comment
-	if (words.at(lineNum).at(0)[0] == '/' && words.at(lineNum).at(0)[1] == '/')
-		return nullType;
+	//// Check if the first two chars are '//', which would make it a comment
+	//if (startsWith(words.at(lineNum).at(0), "//"))
+	//	return nullType;

 	// If print statement (deprecated, now use ZS.System.Print() function)
-	else if (words.at(lineNum).at(0) == "print")
+	if (words.at(lineNum).at(0) == "print")
 	{
 		cout << StringRaw(AnyAsString(EvalExpression(unWrapVec(vector<string>(words.at(lineNum).begin() + 1, words.at(lineNum).end())), variableValues))) << endl;
 		return nullType;
@ -399,32 +412,30 @@ boost::any ProcessLine(const vector<vector<string>>& words, int& lineNum, unorde
 	else if (words.at(lineNum).at(0) == "return")
 		return EvalExpression(unWrapVec(vector<string>(words.at(lineNum).begin() + 1, words.at(lineNum).end())), variableValues);

-	// Check if it is ZS Builtin function
-	else if (words.at(lineNum).at(0)[0] == 'Z' && words.at(lineNum).at(0)[1] == 'S' && words.at(lineNum).at(0)[2] == '.')
+	// Check if it is ZS Builtin function call
+	else if (startsWith(words.at(lineNum).at(0), "ZS."))
 		return EvalExpression(unWrapVec(words.at(lineNum)), variableValues);

-	// Check if it is function
-	else if (IsFunction(trim(split(words.at(lineNum).at(0), '(')[0])))
+	// Check if it is function call
+	else if (IsFunction(split(words.at(lineNum).at(0), '(')[0]))
 	{
-		// No args provided
-		if (count(words.at(lineNum).at(0), '(') > 0 && count(words.at(lineNum).at(0), ')') > 0)
-			ExecuteFunction(trim(split(words.at(lineNum).at(0), '(')[0]), vector<boost::any>());
-		else
-		{ // Args provided, parse them first
-			// start -> FuncCall(0, x, OtherFunc(a))
-			// changeto -> 0, x, OtherFunc(a)
-			string insideFunArgs = betweenChars(unWrapVec(words.at(lineNum)), '(', ')');
-			vector<string> argList = splitNoOverlap(insideFunArgs, ',', '(', ')');
-			vector<boost::any> funcArgs = VarValues(argList, variableValues);
-			ExecuteFunction(trim(split(words.at(lineNum).at(0), '(')[0]), funcArgs);
-		}
+		// start -> FuncCall(0, x, OtherFunc(a))
+		// changeto -> 0, x, OtherFunc(a)
+		string insideFunArgs = betweenChars(unWrapVec(words.at(lineNum)), '(', ')');
+		vector<string> argList = splitNoOverlap(insideFunArgs, ',', '(', ')');
+#if DEVELOPER_MESSAGES == true
+		cout << unWrapVec(argList) << endl;
+		printVarValues(argList, variableValues);
+#endif
+		vector<boost::any> funcArgs = VarValues(argList, variableValues);
+		ExecuteFunction(split(words.at(lineNum).at(0), '(')[0], funcArgs);
 		return nullType;
 	}

 	// Check if it is a SplitThread call
 	else if (startsWith(words.at(lineNum).at(0), "SplitThread"))
 	{
-		vector<string> lineContents = removeTabs(words.at(lineNum), 10);
+		vector<string> lineContents = words.at(lineNum);
 		cout << "New Thread: " << words.at(lineNum).at(0) << endl;
 		//lineContents.at(0) = betweenChars(lineContents.at(0), '(', ')');

@ -438,18 +449,31 @@ boost::any ProcessLine(const vector<vector<string>>& words, int& lineNum, unorde
 	}

 	// Check if global variable declaration
-	else if (trim(words.at(lineNum).at(0)) == "global")
+	else if (words.at(lineNum).at(0) == "global")
 	{
-		globalVariableValues[words.at(lineNum).at(2)] = EvalExpression(unWrapVec(slice(words.at(lineNum), 4, -1)), variableValues);
+		try
+		{
+			globalVariableValues[words.at(lineNum).at(2)] = EvalExpression(unWrapVec(slice(words.at(lineNum), 4, -1)), variableValues);
+		}
+		catch (const std::exception&)
+		{
+			LogCriticalError("Error at line: " + to_string(lineNum) + ", " + unWrapVec(words.at(lineNum)) + ", couldn't initialize variable.");
+		}
 		return nullType;
 	}

 	// Iterate through all types to see if line inits or
 	// re-inits a variable then store it with it's value
-	else if (countInVector(types, trim(words.at(lineNum).at(0))) > 0)
+	else if (countInVector(types, words.at(lineNum).at(0)) > 0)
 	{
-		//cout << words.at(lineNum).at(1) << "=" << unWrapVec(slice(words.at(lineNum), 3, -1)) << "=" << AnyAsString(EvalExpression(unWrapVec(slice(words.at(lineNum), 3, -1)), variableValues)) << endl;
-		variableValues[words.at(lineNum).at(1)] = EvalExpression(unWrapVec(slice(words.at(lineNum), 3, -1)), variableValues);
+		try
+		{
+			variableValues[words.at(lineNum).at(1)] = EvalExpression(unWrapVec(slice(words.at(lineNum), 3, -1)), variableValues);
+		}
+		catch (const std::exception&)
+		{
+			LogCriticalError("Error at line: " + to_string(lineNum) + ", " + unWrapVec(words.at(lineNum)) + ", couldn't initialize variable.");
+		}
 		return nullType;
 	}

@ -478,6 +502,7 @@ boost::any ProcessLine(const vector<vector<string>>& words, int& lineNum, unorde
 		vector<vector<string>> whileContents;
 		vector<string> whileParameters;

+		// Gather the parameters that must be == true for the loop to run
 		int numOfBrackets = 0;
 		for (int w = 1; w < (int)words.at(lineNum).size(); w++) {
 			if (count(words.at(lineNum).at(w), '{') == 0)
@ -490,7 +515,21 @@ boost::any ProcessLine(const vector<vector<string>>& words, int& lineNum, unorde
 			}
 		}

-		lineNum += 1;
+		// If the statement is already false, don't bother gathering the contents
+		if (BooleanLogic(whileParameters.at(0), whileParameters.at(1), whileParameters.at(2), variableValues) == false) {
+			lineNum++;
+			while (lineNum < (int)words.size())
+			{
+				numOfBrackets += countInVector(words.at(lineNum), "{") - countInVector(words.at(lineNum), "}");
+				if (numOfBrackets == 0)
+					break;
+				lineNum++;
+			}
+			return nullType;
+		}
+
+		// Gather the contents
+		lineNum++;
 		while (lineNum < (int)words.size())
 		{
 			numOfBrackets += countInVector(words.at(lineNum), "{") - countInVector(words.at(lineNum), "}");
@ -500,16 +539,30 @@ boost::any ProcessLine(const vector<vector<string>>& words, int& lineNum, unorde
 			lineNum++;
 		}

-		whileContents = removeTabsWdArry(whileContents, 1);
+		//whileContents = removeTabsWdArry(whileContents, 1);

+		// Loop while true
 		while (BooleanLogic(whileParameters.at(0), whileParameters.at(1), whileParameters.at(2), variableValues))
 		{
 			//Iterate through all lines in while loop
 			for (int lineNum = 0; lineNum < (int)whileContents.size(); lineNum++)
 			{
+				if (whileContents.at(lineNum).at(0) == "continue")
+					break; // Stops iterating through lines and return to beginning
+				if (whileContents.at(lineNum).at(0) == "break")
+					return nullType; // Stops iterating through lines and leave while loop
 				boost::any returnVal = ProcessLine(whileContents, lineNum, variableValues);
-				if (!returnVal.empty())
-					return returnVal;
+				if (!returnVal.empty()) {
+					try
+					{
+						BREAK t = any_cast<BREAK>(returnVal);
+						return nullType;
+					}
+					catch (boost::bad_any_cast)
+					{
+						return returnVal;
+					}
+				}
 			}
 		}
 		return nullType;
@ -521,6 +574,7 @@ boost::any ProcessLine(const vector<vector<string>>& words, int& lineNum, unorde
 		vector<vector<string>> ifContents;
 		vector<string> ifParameters;

+		// Gather the parameters that must be == true for the loop to run
 		int numOfBrackets = 0;
 		for (int w = 1; w < (int)words.at(lineNum).size(); w++) {
 			if (count(words.at(lineNum).at(w), '{') == 0)
@ -533,6 +587,20 @@ boost::any ProcessLine(const vector<vector<string>>& words, int& lineNum, unorde
 			}
 		}

+		// If the statement is already false, don't bother gathering the contents
+		if (BooleanLogic(ifParameters.at(0), ifParameters.at(1), ifParameters.at(2), variableValues) == false) {
+			lineNum++;
+			while (lineNum < (int)words.size())
+			{
+				numOfBrackets += countInVector(words.at(lineNum), "{") - countInVector(words.at(lineNum), "}");
+				if (numOfBrackets == 0)
+					break;
+				lineNum++;
+			}
+			return nullType;
+		}
+
+		// Gather the contents
 		lineNum++;
 		while (lineNum < (int)words.size())
 		{
@ -542,22 +610,24 @@ boost::any ProcessLine(const vector<vector<string>>& words, int& lineNum, unorde
 			ifContents.push_back(words.at(lineNum));
 			lineNum++;
 		}
+		//ifContents = removeTabsWdArry(ifContents, 1);

-		ifContents = removeTabsWdArry(ifContents, 1);
-
+		// Execute if true
 		if (BooleanLogic(ifParameters.at(0), ifParameters.at(1), ifParameters.at(2), variableValues))
 		{
 			//Iterate through all lines in if statement
 			for (int l = 0; l < (int)ifContents.size(); l++)
 			{
+				if (ifContents.at(l).at(0) == "break")
+					return breakReOp; // Stops iterating through lines and leave while loop
 				boost::any returnVal = ProcessLine(ifContents, l, variableValues);
 				if (!returnVal.empty())
 					return returnVal;
 			}
 		}
-		else if (words.size() > lineNum + 1)
+		else if (words.size() > lineNum)
 		{
-			if (words[lineNum + 1].at(0) == "else")
+			if (words[lineNum].at(0) == "else")
 			{
 				vector<vector<string>> elseContents;
 				vector<string> elseParameters;
@ -581,9 +651,9 @@ boost::any ProcessLine(const vector<vector<string>>& words, int& lineNum, unorde
 					lineNum++;
 				}

-				elseContents = removeTabsWdArry(elseContents, 1);
+				//elseContents = removeTabsWdArry(elseContents, 1);

-				//Iterate through all lines in if statement
+				//Iterate through all lines in else statement
 				for (int l = 0; l < (int)elseContents.size(); l++)
 				{
 					boost::any returnVal = ProcessLine(elseContents, l, variableValues);
@ -595,12 +665,6 @@ boost::any ProcessLine(const vector<vector<string>>& words, int& lineNum, unorde
 		}
 		return nullType;
 	}
-	//// Gathers else statement contents
-	//if (words[lineNum][0] == "else")
-	//{
-	//	
-	//}
-
 	return nullType;
 }

@ -619,7 +683,7 @@ boost::any ExecuteFunction(const string& functionName, const vector<boost::any>&
 		{
 			variableValues[funcArgs[i]] = inputVarVals[i];
 #if DEVELOPER_MESSAGES == true
-			cout << functionName + "  \x1B[33m" << funcArgs[i] << " == " << AnyAsString(inputVarVals[i]) << "\033[0m\t\t" << endl;
+			cout << "in " << functionName + "  " << funcArgs[i] << " == " << AnyAsString(inputVarVals[i]) << endl;
 #endif
 		}
 	}
@ -635,6 +699,7 @@ boost::any ExecuteFunction(const string& functionName, const vector<boost::any>&
 		}
 		catch (const std::exception&)
 		{
+			LogCriticalError("Error at line: " + to_string(lineNum) + ", " + unWrapVec(words.at(lineNum)));
 		}
 	}
 	return nullType;
@ -642,21 +707,33 @@ boost::any ExecuteFunction(const string& functionName, const vector<boost::any>&

 int parseZSharp(string script)
 {
-	script = replace(script, "    ", "\t"); // Replace spaces with tabs (not really required, and will break purposefull whitespace in strings etc.)
-#if DEVELOPER_MESSAGES
-	InterpreterLog("Contents:\n" + script);
-#endif
+	//script = replace(script, "    ", "\t"); // Replace spaces with tabs (not really required, and will break purposefull whitespace in strings etc.)

-	// Split the script by ;, signifying a line ending
-	vector<string> lines = split(script, '\n');
+	// Split the script by newline, signifying a line ending
+	vector<string> beforeProcessLines = split(script, '\n');
+	vector<string> lines;
+	for (int i = 0; i < (int)beforeProcessLines.size(); i++) { // Then split said lines into indiviual words
+		if (!startsWith(trim(beforeProcessLines.at(i)), "//") && trim(beforeProcessLines.at(i)) != "")
+		{ // dont include line if it is a comment or if it is blank
+			lines.push_back(trim(beforeProcessLines.at(i)));
+		}
+	}
+#if DEVELOPER_MESSAGES
+	InterpreterLog("Contents:\n");
+#endif
 	vector<vector<string>> words;
 	for (int i = 0; i < (int)lines.size(); i++) // Then split said lines into indiviual words
+	{
 		words.push_back(split(lines.at(i), ' '));
+#if DEVELOPER_MESSAGES
+		cout << unWrapVec(words.at(i)) << endl;
+#endif
+	}

 #if DEVELOPER_MESSAGES
 	InterpreterLog("Gather variables & functions...");
 #endif
-	// First go through entire script and iterate through all types to see if line is a variable
+	// Go through entire script and iterate through all types to see if line is a variable
 	// or function declaration, then store it with it's value
 	for (int lineNum = 0; lineNum < (int)words.size(); lineNum++)
 	{
@ -670,18 +747,35 @@ int parseZSharp(string script)
 			InterpreterLog("Load script function " + functName + "...");
 #endif

-			string args = "";
-			if (indexInStr(unWrapVec(words.at(lineNum)), ')') - indexInStr(unWrapVec(words.at(lineNum)), '(') > 1)
-				for (int w = 1; w < (int)words.at(lineNum).size(); w++) // Get all words from the instantiation line: these are the args
-				{
-					if (count(words.at(lineNum).at(w), '{') == 0)
-						args += replace(replace(words.at(lineNum).at(w), "(", " "), ")", "");
-				}
+			//string args = "";
+			//if (indexInStr(unWrapVec(words.at(lineNum)), ')') - indexInStr(unWrapVec(words.at(lineNum)), '(') > 1)
+			//	for (int w = 0; w < (int)words.at(lineNum).size(); w++) // Get all words from the instantiation line: these are the args
+			//	{
+			//		if (count(words.at(lineNum).at(w), '{') == 0)
+			//			args += replace(replace(words.at(lineNum).at(w), "(", " "), ")", "");
+			//	}
+			string args = betweenChars(unWrapVec(words.at(lineNum)), '(', ')');
+			//cout << functName << "<" << args << ">" << endl;

-			args = trim(replace(args, functName + " ", ""));
-			functionContents.push_back(split(args, ','));
+			//args = trim(replace(args, functName, ""));
+			functionContents.push_back(split(replace(args, " ", ""), ','));

-			int numOfBrackets = 0;
+
+			int numOfBrackets = countInVector(words.at(lineNum), "{") - countInVector(words.at(lineNum), "}");
+			// Gather the contents
+			lineNum++;
+			while (lineNum < (int)words.size())
+			{
+				numOfBrackets += countInVector(words.at(lineNum), "{") - countInVector(words.at(lineNum), "}");
+				if (numOfBrackets == 0)
+					break;
+				functionContents.push_back(words.at(lineNum));
+				//cout << functName << "<" << args << ">" << endl;
+				lineNum++;
+			}
+			//functionContents = removeTabsWdArry(functionContents, 1);
+
+			/*int numOfBrackets = 0;
 			for (int w = 1; w < (int)words.at(lineNum).size(); w++) {
 				if (count(words.at(lineNum).at(w), '{') != 0) {
 					numOfBrackets = 1;
@ -695,7 +789,7 @@ int parseZSharp(string script)
 				if (numOfBrackets == 0)
 					break;
 				functionContents.push_back(removeTabs(words.at(p), 1));
-			}
+			}*/
 			functionValues[functName] = functionContents;
 		}
 		else
@ -736,26 +830,34 @@ int parseZSharp(string script)
 				InterpreterLog("Load script variable " + words.at(lineNum).at(1) + "...");
 #endif
 			}
-			else if (words.at(lineNum).at(0) == "int") {
-				globalVariableValues[words.at(lineNum).at(1)] = stoi(words.at(lineNum).at(3));
-#if DEVELOPER_MESSAGES == true
-				InterpreterLog("Load script variable " + words.at(lineNum).at(1) + "...");
-#endif
+
+			// Iterate through all types to see if line inits or
+			// re-inits a variable then store it with it's value
+			else if (countInVector(types, trim(words.at(lineNum).at(0))) > 0)
+			{
+				//cout << words.at(lineNum).at(1) << "=" << unWrapVec(slice(words.at(lineNum), 3, -1)) << "=" << AnyAsString(EvalExpression(unWrapVec(slice(words.at(lineNum), 3, -1)), variableValues)) << endl;
+				globalVariableValues[words.at(lineNum).at(1)] = EvalExpression(unWrapVec(slice(words.at(lineNum), 3, -1)), globalVariableValues);
 			}
-			else if (words.at(lineNum).at(0) == "float") {
-				globalVariableValues[words.at(lineNum).at(1)] = stof(words.at(lineNum).at(3));
-#if DEVELOPER_MESSAGES == true
-				InterpreterLog("Load script variable " + words.at(lineNum).at(1) + "...");
-#endif
-			}
-			else if (words.at(lineNum).at(0) == "bool") {
-				globalVariableValues[words.at(lineNum).at(1)] = stob(words.at(lineNum).at(3));
-#if DEVELOPER_MESSAGES == true
-				InterpreterLog("Load script variable " + words.at(lineNum).at(1) + "...");
-#endif
-			}
-			/*else
-				LogWarning("unrecognized type \'" + words.at(lineNum).at(0) + "\' on line: " + to_string(lineNum));*/
+			//			else if (words.at(lineNum).at(0) == "int") {
+			//				globalVariableValues[words.at(lineNum).at(1)] = stoi(words.at(lineNum).at(3));
+			//#if DEVELOPER_MESSAGES == true
+			//				InterpreterLog("Load script variable " + words.at(lineNum).at(1) + "...");
+			//#endif
+			//			}
+			//			else if (words.at(lineNum).at(0) == "float") {
+			//				globalVariableValues[words.at(lineNum).at(1)] = stof(words.at(lineNum).at(3));
+			//#if DEVELOPER_MESSAGES == true
+			//				InterpreterLog("Load script variable " + words.at(lineNum).at(1) + "...");
+			//#endif
+			//			}
+			//			else if (words.at(lineNum).at(0) == "bool") {
+			//				globalVariableValues[words.at(lineNum).at(1)] = stob(words.at(lineNum).at(3));
+			//#if DEVELOPER_MESSAGES == true
+			//				InterpreterLog("Load script variable " + words.at(lineNum).at(1) + "...");
+			//#endif
+			//			}
+			else
+				LogWarning("unrecognized type \'" + words.at(lineNum).at(0) + "\' on line: " + to_string(lineNum));
 		}
 	}

@ -769,9 +871,9 @@ int main(int argc, char* argv[])
 	cout << endl << endl;

 	// Gathers builtin functions and variables
-	GetBuiltins(ZSContents);
-	functionValues = builtinFunctionValues;
-	globalVariableValues = builtinVarVals;
+	parseZSharp(ZSContents);
+	//functionValues = builtinFunctionValues;
+	//globalVariableValues = builtinVarVals;

 	std::string scriptTextContents;

@ -780,7 +882,7 @@ int main(int argc, char* argv[])
 	{
 		std::string scriptPath;
 		if (EXAMPLE_PROJECT)
-			scriptPath = "D:\\Code\\Z-Sharp\\Releases\\ZS-Win-x64-Base\\Pong-Example-Project\\script.zs";
+			scriptPath = "D:\\Code\\Z-Sharp\\examples\\Platformer\\script.zs";
 		else
 			scriptPath = argv[1];
 #if DEVELOPER_MESSAGES
@ -804,12 +906,11 @@ int main(int argc, char* argv[])
 		int chErr = chdir(projectDirectory.c_str());
 		if (chErr < 0)
 			LogCriticalError("Failed to change directory to: \"" + projectDirectory + "\", error num: " + to_string(chErr));
+
 #if DEVELOPER_MESSAGES
 		InterpreterLog("Changed directory to " + projectDirectory + "...");
 #endif
-#if DEVELOPER_MESSAGES
-		string newPath = filesystem::current_path();
-#endif
+
 #elif WINDOWS
 		// Get script contents as single string
 		ifstream script(scriptPath);
@ -831,9 +932,9 @@ int main(int argc, char* argv[])
 #endif
 	}
 	else
-	{ // If no script is provided as an argument then throw error
+	{ // If no script is provided as an argument throw error
 		LogWarning("No script provided! Please drag and drop .ZS file over interpreter executable file, or provide it's path as a command-line argument.");
-		cout << "Press Enter to Continue";
+		InterpreterLog("Press Enter to Exit...");
 		cin.ignore();
 		exit(1);
 	}
@ -858,7 +959,7 @@ int main(int argc, char* argv[])

 	// Entire script has been run, exit.
 #if DEVELOPER_MESSAGES // If built with developer messages, then verify exit
-	cout << "Press Enter to Continue";
+	InterpreterLog("Press Enter to Exit...");
 	cin.ignore();
 	exit(1);
 #else
@ -870,11 +971,17 @@ int main(int argc, char* argv[])

 		if (a == "-ve") // If the '-ve' (verify exit) option is used, ask for verification on exit
 		{
-			cout << "Press Enter to Continue";
+			InterpreterLog("Press Enter to Exit...");
 			cin.ignore();
 			exit(1);
 		}
 	}
+	else if (AnyAsBool(GetVariableValue("EXIT_WHEN_DONE", globalVariableValues)) == false)
+	{
+		InterpreterLog("Press Enter to Exit...");
+		cin.ignore();
+		exit(1);
+	}
 #endif // Else exit automatically
 	return 0;
 }
--- a/ZSharp/ZS.h
+++ b/ZSharp/ZS.h
@ -3,11 +3,18 @@
 using namespace std;

 std::string ZSContents = R"(
+////////////////////////////////////////////////////////////////////////////////
+//  BUILTIN 
+////////////////////////////////////////////////////////////////////////////////
+
 // Default variables, can be overwritten
 // if re-initialized or changed
 float PI = 3.14159265358979323846264338
 float EulersNumber = 2.71828183

+// This variable tells the interpreter if it should close the console window when the program has finished running.
+bool EXIT_WHEN_DONE = true
+
 // Trigonometric function Sin
 func Sin(input)
 {
@ -100,15 +107,15 @@ func SetPixel(x, y, r, g, b)
 }

 // Prints input value to console
-func Print(in)
+func Print(strToPrint)
 {
-	ZS.System.Print(in)
+	ZS.System.Print(strToPrint)
 }

 // Prints input value to console with appended newline '\n'
-func Printl(in)
+func Printl(strToPrint)
 {
-	ZS.System.PrintLine(in)
+	ZS.System.PrintLine(strToPrint)
 }

 // Creates new sprite class
@ -138,9 +145,79 @@ func GetKey(keyName)
 	return b
 }

-//func SplitThread(function)
-//{
-//	ZS.System.SplitThread(function)
-//}
+////////////////////////////
+// ↓ MADE BY KAPUTCHINO ↓ //
+////////////////////////////
+
+// Return the number of combinations
+func Comb(n, r)
+{
+    return Perm(n, r) / Fac(r)
+}
+
+// Return the factorial of a number
+func Fac(x)
+{
+    int r = 1
+    while x > 1
+    {
+        r = r * x
+        x = x - 1
+    }
+    return r
+}
+
+// Return exp(x) by using the taylor method, not extremly accurate
+func TaylorExp(x)
+{
+    float sum = 0
+    float term = 1
+    int i = 1
+    float sumterm = 1
+    while sum != sumterm
+    {
+        sum = sumterm
+        term = term * x / i
+        i = i + 1
+        sumterm = sumterm + term
+    }
+    return sum
+}
+
+// Return the number of permutations
+func Perm(n, r)
+{
+    if n < 0 
+    {
+        ZS.System.PrintLine("n must be superior or equal to 0")
+        return -1
+    }
+    if r < 0
+    {
+        ZS.System.PrintLine("r must be superior or equal to 0")
+        return -1
+    }
+    if r > n
+    {
+        ZS.System.PrintLine("r must be inferior or equal to n")
+        return -1
+    }
+    return Fac(n) / Fac(n - r)
+}
+
+//////////////////////////////////////////
+// ↓ MADE BY CONCHETUMARE_PRODUCTIONS ↓ //
+//////////////////////////////////////////
+func GetPercent(value, percent)
+{
+	float temp = value * percent / 100
+	return temp
+}
+//gets 100% of number
+func PercentToHundred(value, percent)
+{
+	float temp = value * 100 / percent
+	return temp
+}
 )"
-;
+;
--- a/ZSharp/ZSharpInstallerMakerInnoSetup.iss
+++ b/ZSharp/ZSharpInstallerMakerInnoSetup.iss
@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

 #define MyAppName "Z-Sharp"
-#define MyAppVersion "2.1.0-alpha"
+#define MyAppVersion "2.1.3-alpha"
 #define MyAppPublisher "AstroSam"
 #define MyAppURL "https://github.com/sam-astro/Z-Sharp"
 #define MyAppExeName "ZSharp.exe"
@ -25,6 +25,7 @@ DefaultDirName={autopf}\ZSharp
 DisableDirPage=yes
 ChangesAssociations=yes
 DisableProgramGroupPage=yes
+ChangesEnvironment=true
 LicenseFile=D:\Code\Z-Sharp\LICENSE
 ; Uncomment the following line to run in non administrative install mode (install for current user only.)
 ;PrivilegesRequired=lowest
@ -36,6 +37,21 @@ Compression=lzma
 SolidCompression=yes
 WizardStyle=modern

+[Tasks]
+Name: modifypath; Description: Add application directory to your environmental path (This allows you to easily use from command line); Flags: unchecked
+
+[Code]
+const
+    ModPathName = 'modifypath';
+    ModPathType = 'system';
+
+function ModPathDir(): TArrayOfString;
+begin
+    setArrayLength(Result, 1)
+    Result[0] := ExpandConstant('{app}');
+end;
+#include "modpath.iss"
+
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "armenian"; MessagesFile: "compiler:Languages\Armenian.isl"
--- a/ZSharp/builtin.h
+++ b/ZSharp/builtin.h
@ -1,6 +1,14 @@
 #ifndef BUILTIN_H
 #define BUILTIN_H

+#if defined(__unix__)
+#define UNIX true
+#define WINDOWS false
+#elif defined(_MSC_VER)
+#define UNIX false
+#define WINDOWS true
+#endif
+
 #include <iostream>
 #include <fstream>
 #include <string>
@ -13,6 +21,7 @@
 #include <ctime>
 #include <math.h>
 #include <sys/stat.h>
+#include <cstdlib> // for console command printing

 #include "strops.h"
 #include "graphics.h"
@ -28,8 +37,8 @@ using namespace boost;

 vector<string> types = { "int", "float", "string", "bool", "void", "null", "Sprite", "Vec2", "Text" };

-unordered_map<string, vector<vector<string>>> builtinFunctionValues;
-unordered_map<string, boost::any> builtinVarVals;
+//unordered_map<string, vector<vector<string>>> builtinFunctionValues;
+//unordered_map<string, boost::any> builtinVarVals;

 // Foreground colors
 const std::string blackFGColor = "\x1B[30m";
@ -72,8 +81,13 @@ class NullType {
 public:
 	string type = "NULL";
 };
+class BREAK {
+public:
+	string type = "BREAK";
+};

 boost::any nullType;
+boost::any breakReOp;

 float clamp(float v, float min, float max)
 {
@ -141,7 +155,7 @@ void PrintColored(std::string text, std::string fgColor, std::string bgColor, bo
 int LogWarning(const string& warningText)
 {
 	PrintColored("WARNING: ", yellowFGColor, "", true);
-	PrintColored(warningText, yellowFGColor, "", true);
+	PrintColored(escaped(warningText), yellowFGColor, "", true);
 	cerr << std::endl;
 	//cout << "\x1B[33mWARNING: " << warningText << "\033[0m\t\t" << endl;
 	return 1;
@ -157,7 +171,15 @@ int InterpreterLog(const string& logText)

 	tm bt{};
 #if UNIX
-	//localtime_r(&timer, &bt);
+	time_t currentTime;
+	struct tm* localTime;
+
+	time(&currentTime);                   // Get the current time
+	localTime = localtime(&currentTime);  // Convert the current time to the local time
+
+	Hour = localTime->tm_hour;
+	Min = localTime->tm_min;
+	Sec = localTime->tm_sec;
 #elif WINDOWS
 	localtime_s(&bt, &timer);
 	Hour = bt.tm_hour;
@ -171,7 +193,7 @@ int InterpreterLog(const string& logText)

 	PrintColored("[" + to_string(Hour) + ":" + to_string(Min) + ":" + to_string(Sec) + "] ", blueFGColor, "", true);
 	PrintColored("ZSharp: ", yellowFGColor, "", true);
-	PrintColored(logText, greenFGColor, "", true);
+	PrintColored(escaped(logText), greenFGColor, "", true);
 	cout << std::endl;
 	//cout << "\x1B[34m[" + to_string(Hour) + ":" + to_string(Min) + ":" + to_string(Sec) + "] \x1B[33mZSharp: \x1B[32m" << logText << "\033[0m\t\t" << endl;
 	return 1;
@ -185,9 +207,17 @@ int LogCriticalError(const string& errorText)
 	time_t timer = time(0);

 	tm bt{};
-#if defined(__unix__)
-	//localtime_r(&timer, &bt);
-#elif defined(_MSC_VER)
+#if UNIX
+	time_t currentTime;
+	struct tm* localTime;
+
+	time(&currentTime);                   // Get the current time
+	localTime = localtime(&currentTime);  // Convert the current time to the local time
+
+	Hour = localTime->tm_hour;
+	Min = localTime->tm_min;
+	Sec = localTime->tm_sec;
+#elif WINDOWS
 	localtime_s(&bt, &timer);
 	Hour = bt.tm_hour;
 	Min = bt.tm_min;
@ -200,9 +230,9 @@ int LogCriticalError(const string& errorText)

 	PrintColored("[" + to_string(Hour) + ":" + to_string(Min) + ":" + to_string(Sec) + "] ", blueFGColor, "", true);
 	PrintColored("ZSharp: ", yellowFGColor, "", true);
-	PrintColored(errorText, redFGColor, "", true);
+	PrintColored(escaped(errorText), redFGColor, "", true);
 	cerr << std::endl;
-	cout << "Press Enter to Continue";
+	InterpreterLog("Press Enter to Exit...");
 	cin.ignore();
 	exit(1);
 	//cerr << "\x1B[34m[" + to_string(Hour) + ":" + to_string(Min) + ":" + to_string(Sec) + "] \x1B[33mZSharp: \x1B[31mERROR: " << errorText << "\033[0m\t\t" << endl;
@ -276,90 +306,90 @@ bool AxisAlignedCollision(const Sprite& a, const Sprite& b) // AABB - AABB colli
 	return collisionX && collisionY;
 }

-// Initial script processing, which loads variables and functions from builtin
-int GetBuiltins(std::string s)
-{
-	std::string script = replace(s, "    ", "\t");
-
-	vector<string> lines = split(script, '\n');
-	vector<vector<string>> words;
-	for (int i = 0; i < (int)lines.size(); i++)
-	{
-		words.push_back(split(lines.at(i), ' '));
-	}
-
-	// Go through entire script and iterate through all types to see if line is a
-	// function declaration, then store it with it's value
-	for (int lineNum = 0; lineNum < (int)words.size(); lineNum++)
-	{
-		//Checks if it is function
-		if (words.at(lineNum).at(0) == "func")
-		{
-			vector<vector<string>> functionContents;
-
-			string functName = split(words.at(lineNum).at(1), '(')[0];
-
-#if DEVELOPER_MESSAGES == true
-			InterpreterLog("Load builtin function " + functName + "...");
-#endif
-
-			string args = "";
-			for (int w = 1; w < (int)words.at(lineNum).size(); w++) // Get all words from the instantiation line: these are the args
-			{
-				args += replace(replace(words.at(lineNum).at(w), "(", " "), ")", "");
-			}
-
-			args = replace(args, functName + " ", "");
-			functionContents.push_back(split(args, ','));
-
-			int numOfBrackets = 1;
-			for (int p = lineNum + 2; p < (int)words.size(); p++)
-			{
-				numOfBrackets += countInVector(words.at(p), "{") - countInVector(words.at(p), "}");
-				if (numOfBrackets == 0)
-					break;
-				functionContents.push_back(removeTabs(words.at(p), 1));
-			}
-			builtinFunctionValues[functName] = functionContents;
-			//cout << functName << " is \n" << Vec2Str(functionContents) << endl << endl;
-		}
-		else
-		{
-			if (words.at(lineNum).at(0) == "string")
-			{
-				builtinVarVals[words.at(lineNum).at(1)] = StringRaw(words.at(lineNum).at(3));
-#if DEVELOPER_MESSAGES == true
-				InterpreterLog("Load builtin variable " + words.at(lineNum).at(1) + "...");
-#endif
-			}
-			else if (words.at(lineNum).at(0) == "int")
-			{
-				builtinVarVals[words.at(lineNum).at(1)] = stoi(words.at(lineNum).at(3));
-#if DEVELOPER_MESSAGES == true
-				InterpreterLog("Load builtin variable " + words.at(lineNum).at(1) + "...");
-#endif
-			}
-			else if (words.at(lineNum).at(0) == "float")
-			{
-				builtinVarVals[words.at(lineNum).at(1)] = stof(words.at(lineNum).at(3));
-#if DEVELOPER_MESSAGES == true
-				InterpreterLog("Load builtin variable " + words.at(lineNum).at(1) + "...");
-#endif
-			}
-			else if (words.at(lineNum).at(0) == "bool")
-			{
-				builtinVarVals[words.at(lineNum).at(1)] = stob(words.at(lineNum).at(3));
-#if DEVELOPER_MESSAGES == true
-				InterpreterLog("Load builtin variable " + words.at(lineNum).at(1) + "...");
-#endif
-			}
-			//else
-			//	LogWarning("unrecognized type \'" + words[lineNum][0] + "\' on line: " + to_string(lineNum));
-		}
-	}
-
-	return 0;
-}
+//// Initial script processing, which loads variables and functions from builtin
+//int GetBuiltins(std::string s)
+//{
+//	std::string script = replace(s, "    ", "\t");
+//
+//	vector<string> lines = split(script, '\n');
+//	vector<vector<string>> words;
+//	for (int i = 0; i < (int)lines.size(); i++)
+//	{
+//		words.push_back(split(lines.at(i), ' '));
+//	}
+//
+//	// Go through entire script and iterate through all types to see if line is a
+//	// function declaration, then store it with it's value
+//	for (int lineNum = 0; lineNum < (int)words.size(); lineNum++)
+//	{
+//		//Checks if it is function
+//		if (words.at(lineNum).at(0) == "func")
+//		{
+//			vector<vector<string>> functionContents;
+//
+//			string functName = split(words.at(lineNum).at(1), '(')[0];
+//
+//#if DEVELOPER_MESSAGES == true
+//			InterpreterLog("Load builtin function " + functName + "...");
+//#endif
+//
+//			string args = "";
+//			for (int w = 1; w < (int)words.at(lineNum).size(); w++) // Get all words from the instantiation line: these are the args
+//			{
+//				args += replace(replace(words.at(lineNum).at(w), "(", " "), ")", "");
+//			}
+//
+//			args = replace(args, functName + " ", "");
+//			functionContents.push_back(split(args, ','));
+//
+//			int numOfBrackets = 1;
+//			for (int p = lineNum + 2; p < (int)words.size(); p++)
+//			{
+//				numOfBrackets += countInVector(words.at(p), "{") - countInVector(words.at(p), "}");
+//				if (numOfBrackets == 0)
+//					break;
+//				functionContents.push_back(removeTabs(words.at(p), 1));
+//			}
+//			builtinFunctionValues[functName] = functionContents;
+//			//cout << functName << " is \n" << Vec2Str(functionContents) << endl << endl;
+//		}
+//		else
+//		{
+//			if (words.at(lineNum).at(0) == "string")
+//			{
+//				builtinVarVals[words.at(lineNum).at(1)] = StringRaw(words.at(lineNum).at(3));
+//#if DEVELOPER_MESSAGES == true
+//				InterpreterLog("Load builtin variable " + words.at(lineNum).at(1) + "...");
+//#endif
+//			}
+//			else if (words.at(lineNum).at(0) == "int")
+//			{
+//				builtinVarVals[words.at(lineNum).at(1)] = stoi(words.at(lineNum).at(3));
+//#if DEVELOPER_MESSAGES == true
+//				InterpreterLog("Load builtin variable " + words.at(lineNum).at(1) + "...");
+//#endif
+//			}
+//			else if (words.at(lineNum).at(0) == "float")
+//			{
+//				builtinVarVals[words.at(lineNum).at(1)] = stof(words.at(lineNum).at(3));
+//#if DEVELOPER_MESSAGES == true
+//				InterpreterLog("Load builtin variable " + words.at(lineNum).at(1) + "...");
+//#endif
+//			}
+//			else if (words.at(lineNum).at(0) == "bool")
+//			{
+//				builtinVarVals[words.at(lineNum).at(1)] = stob(words.at(lineNum).at(3));
+//#if DEVELOPER_MESSAGES == true
+//				InterpreterLog("Load builtin variable " + words.at(lineNum).at(1) + "...");
+//#endif
+//			}
+//			//else
+//			//	LogWarning("unrecognized type \'" + words[lineNum][0] + "\' on line: " + to_string(lineNum));
+//		}
+//	}
+//
+//	return 0;
+//}

 // Executes 
 boost::any ZSFunction(const string& name, const vector<boost::any>& args)
@ -388,23 +418,44 @@ boost::any ZSFunction(const string& name, const vector<boost::any>& args)
 	}
 	else if (name == "ZS.Graphics.Sprite")
 	{
-		if (!fileExists(StringRaw(AnyAsString(args.at(0)))))
-			LogCriticalError("Failed to create 'Sprite' object: \"" + StringRaw(AnyAsString(args.at(0))) + "\"");
+		string path = StringRaw(AnyAsString(args.at(0)));
+		if (count(path, '/') == 0)
+			path = "./" + path;
+		if (!fileExists(path))
+			LogCriticalError("Failed to create 'Sprite' object: \"" + path + "\"");

 		Sprite s(StringRaw(AnyAsString(args.at(0))), any_cast<Vec2>(args.at(1)), any_cast<Vec2>(args.at(2)), AnyAsFloat(args.at(3)));
 		return s;
 	}
+	else if (name == "ZS.Graphics.DrawPixel")
+	{
+		SDL_SetRenderDrawColor(gRenderer, AnyAsInt(args.at(2)), AnyAsInt(args.at(3)), AnyAsInt(args.at(4)), 255);
+		SDL_RenderDrawPoint(gRenderer, AnyAsInt(args.at(0)), AnyAsInt(args.at(1)));
+		SDL_SetRenderDrawColor(gRenderer, 0, 0, 0, 0);
+	}
+		//DrawPixel(AnyAsInt(args.at(0)), AnyAsInt(args.at(1)), AnyAsInt(args.at(2)), AnyAsInt(args.at(3)), AnyAsInt(args.at(4)));
 	else if (name == "ZS.Graphics.Draw")
 		any_cast<Sprite>(args.at(0)).Draw();
 	else if (name == "ZS.Graphics.Load")
 		any_cast<Sprite>(args.at(0)).Load();
 	else if (name == "ZS.Graphics.Text")
 	{
-		if (!fileExists(StringRaw(AnyAsString(args.at(1)))))
-			LogCriticalError("Failed to create 'Text' object: \"" + StringRaw(AnyAsString(args.at(1))) + "\"");
+		string path = StringRaw(AnyAsString(args.at(1)));
+		if (count(path, '/') == 0)
+			path = "./" + path;
+		if (!fileExists(path))
+			LogCriticalError("Failed to create 'Text' object: \"" + path + "\"");

-		Text t(StringRaw(AnyAsString(args.at(0))), StringRaw(AnyAsString(args.at(1))), any_cast<Vec2>(args.at(2)), AnyAsFloat(args.at(3)), AnyAsFloat(args.at(4)), (Uint8)AnyAsFloat(args.at(5)), (Uint8)AnyAsFloat(args.at(6)), (Uint8)AnyAsFloat(args.at(7)));
-		return t;
+		if (args.size() <= 8)
+		{
+			Text t(StringRaw(AnyAsString(args.at(0))), path, any_cast<Vec2>(args.at(2)), AnyAsFloat(args.at(3)), AnyAsFloat(args.at(4)), (Uint8)AnyAsFloat(args.at(5)), (Uint8)AnyAsFloat(args.at(6)), (Uint8)AnyAsFloat(args.at(7)), true);
+			return t;
+		}
+		else
+		{
+			Text t(StringRaw(AnyAsString(args.at(0))), path, any_cast<Vec2>(args.at(2)), AnyAsFloat(args.at(3)), AnyAsFloat(args.at(4)), (Uint8)AnyAsFloat(args.at(5)), (Uint8)AnyAsFloat(args.at(6)), (Uint8)AnyAsFloat(args.at(7)), AnyAsBool(args.at(8)));
+			return t;
+		}
 	}
 	else if (name == "ZS.Graphics.DrawText")
 		any_cast<Text>(args.at(0)).Draw();
@ -425,6 +476,13 @@ boost::any ZSFunction(const string& name, const vector<boost::any>& args)
 		Vec2 v(AnyAsFloat(args.at(0)), AnyAsFloat(args.at(1)));
 		return v;
 	}
+	else if (name == "ZS.System.Command"){
+		string command = StringRaw(AnyAsString(args.at(0)));
+		//int command_len = command.length();
+		//char* command_char_arr=new char[command_len + 1];
+		//strcpy(command_char_arr, command.c_str()); // string into char arr
+		int k = system(command.c_str());
+	}
 	else
 		LogWarning("ZS function \'" + name + "\' does not exist.");

--- a/ZSharp/graphics.h
+++ b/ZSharp/graphics.h
@ -523,8 +523,8 @@ public:
 class Text
 {
 public:
-	Text(std::string content, std::string pathToFont, Vec2 position, float fontSize, double angle, Uint8 r, Uint8 g, Uint8 b)
-		: position(position), angle(angle), content(content), pathToFont(pathToFont), fontSize(fontSize), r(r), g(g), b(b)
+	Text(std::string content, std::string pathToFont, Vec2 position, float fontSize, double angle, Uint8 r, Uint8 g, Uint8 b, bool antialias)
+		: position(position), angle(angle), content(content), pathToFont(pathToFont), fontSize(fontSize), r(r), g(g), b(b), antialias(antialias)
 	{
 		rect.x = position.x;
 		rect.y = position.y;
@ -538,8 +538,12 @@ public:
 	{
 		SDL_Color color = { r, g, b };

-		SDL_Surface* surface = TTF_RenderText_Blended(font, content.c_str(), color);
-		
+		SDL_Surface* surface;
+		if (antialias)
+			surface = TTF_RenderText_Blended(font, content.c_str(), color);
+		else
+			surface = TTF_RenderText_Solid(font, content.c_str(), color);
+
 		texture = SDL_CreateTextureFromSurface(gRenderer, surface);

 		TTF_SizeText(font, content.c_str(), &rect.w, &rect.h);
@ -559,7 +563,11 @@ public:
 	{
 		SDL_Color color = { r, g, b };

-		SDL_Surface* surface = TTF_RenderText_Blended(font, content.c_str(), color);
+		SDL_Surface* surface;
+		if (antialias)
+			surface = TTF_RenderText_Blended(font, content.c_str(), color);
+		else
+			surface = TTF_RenderText_Solid(font, content.c_str(), color);

 		SDL_DestroyTexture(texture);
 		texture = SDL_CreateTextureFromSurface(gRenderer, surface);
@ -604,6 +612,8 @@ public:
 			return content;
 		if (componentName == "pathToFont")
 			return pathToFont;
+		if (componentName == "antialias")
+			return antialias;
 		return 0;
 	}

@ -711,12 +721,19 @@ public:
 			else if (oper == "+=")
 				content += AnyAsString(otherVal);
 		}
+		else if (componentName == "antialias")
+		{
+			if (oper == "=")
+				antialias = AnyAsBool(otherVal);
+		}

 		// Updates changes to text
 		Update();
 		return *this;
 	}

+	bool antialias = true;
+
 	Vec2 position;
 	Vec2 scale;
 	float fontSize;
@ -744,6 +761,12 @@ int cleanupGraphics()
 	return 0;
 }

+//void DrawPixel(int x, int y, int r, int g, int b) {
+//	SDL_SetRenderDrawColor(gRenderer, r, g, b, 255);
+//	SDL_RenderDrawPoint(gRenderer, x, y);
+//	SDL_SetRenderDrawColor(gRenderer, 0, 0, 0, 0);
+//}
+

 int updateLoop()
 {
--- a/ZSharp/modpath.iss
+++ b/ZSharp/modpath.iss
@ -0,0 +1,219 @@
+// ----------------------------------------------------------------------------
+//
+// Inno Setup Ver:	5.4.2
+// Script Version:	1.4.2
+// Author:			Jared Breland <jbreland@legroom.net>
+// Homepage:		http://www.legroom.net/software
+// License:			GNU Lesser General Public License (LGPL), version 3
+//						http://www.gnu.org/licenses/lgpl.html
+//
+// Script Function:
+//	Allow modification of environmental path directly from Inno Setup installers
+//
+// Instructions:
+//	Copy modpath.iss to the same directory as your setup script
+//
+//	Add this statement to your [Setup] section
+//		ChangesEnvironment=true
+//
+//	Add this statement to your [Tasks] section
+//	You can change the Description or Flags
+//	You can change the Name, but it must match the ModPathName setting below
+//		Name: modifypath; Description: &Add application directory to your environmental path; Flags: unchecked
+//
+//	Add the following to the end of your [Code] section
+//	ModPathName defines the name of the task defined above
+//	ModPathType defines whether the 'user' or 'system' path will be modified;
+//		this will default to user if anything other than system is set
+//	setArrayLength must specify the total number of dirs to be added
+//	Result[0] contains first directory, Result[1] contains second, etc.
+//		const
+//			ModPathName = 'modifypath';
+//			ModPathType = 'user';
+//
+//		function ModPathDir(): TArrayOfString;
+//		begin
+//			setArrayLength(Result, 1);
+//			Result[0] := ExpandConstant('{app}');
+//		end;
+//		#include "modpath.iss"
+// ----------------------------------------------------------------------------
+
+procedure ModPath();
+var
+	oldpath:	String;
+	newpath:	String;
+	updatepath:	Boolean;
+	pathArr:	TArrayOfString;
+	aExecFile:	String;
+	aExecArr:	TArrayOfString;
+	i, d:		Integer;
+	pathdir:	TArrayOfString;
+	regroot:	Integer;
+	regpath:	String;
+
+begin
+	// Get constants from main script and adjust behavior accordingly
+	// ModPathType MUST be 'system' or 'user'; force 'user' if invalid
+	if ModPathType = 'system' then begin
+		regroot := HKEY_LOCAL_MACHINE;
+		regpath := 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment';
+	end else begin
+		regroot := HKEY_CURRENT_USER;
+		regpath := 'Environment';
+	end;
+
+	// Get array of new directories and act on each individually
+	pathdir := ModPathDir();
+	for d := 0 to GetArrayLength(pathdir)-1 do begin
+		updatepath := true;
+
+		// Modify WinNT path
+		if UsingWinNT() = true then begin
+
+			// Get current path, split into an array
+			RegQueryStringValue(regroot, regpath, 'Path', oldpath);
+			oldpath := oldpath + ';';
+			i := 0;
+
+			while (Pos(';', oldpath) > 0) do begin
+				SetArrayLength(pathArr, i+1);
+				pathArr[i] := Copy(oldpath, 0, Pos(';', oldpath)-1);
+				oldpath := Copy(oldpath, Pos(';', oldpath)+1, Length(oldpath));
+				i := i + 1;
+
+				// Check if current directory matches app dir
+				if pathdir[d] = pathArr[i-1] then begin
+					// if uninstalling, remove dir from path
+					if IsUninstaller() = true then begin
+						continue;
+					// if installing, flag that dir already exists in path
+					end else begin
+						updatepath := false;
+					end;
+				end;
+
+				// Add current directory to new path
+				if i = 1 then begin
+					newpath := pathArr[i-1];
+				end else begin
+					newpath := newpath + ';' + pathArr[i-1];
+				end;
+			end;
+
+			// Append app dir to path if not already included
+			if (IsUninstaller() = false) AND (updatepath = true) then
+				newpath := newpath + ';' + pathdir[d];
+
+			// Write new path
+			RegWriteStringValue(regroot, regpath, 'Path', newpath);
+
+		// Modify Win9x path
+		end else begin
+
+			// Convert to shortened dirname
+			pathdir[d] := GetShortName(pathdir[d]);
+
+			// If autoexec.bat exists, check if app dir already exists in path
+			aExecFile := 'C:\AUTOEXEC.BAT';
+			if FileExists(aExecFile) then begin
+				LoadStringsFromFile(aExecFile, aExecArr);
+				for i := 0 to GetArrayLength(aExecArr)-1 do begin
+					if IsUninstaller() = false then begin
+						// If app dir already exists while installing, skip add
+						if (Pos(pathdir[d], aExecArr[i]) > 0) then
+							updatepath := false;
+							break;
+					end else begin
+						// If app dir exists and = what we originally set, then delete at uninstall
+						if aExecArr[i] = 'SET PATH=%PATH%;' + pathdir[d] then
+							aExecArr[i] := '';
+					end;
+				end;
+			end;
+
+			// If app dir not found, or autoexec.bat didn't exist, then (create and) append to current path
+			if (IsUninstaller() = false) AND (updatepath = true) then begin
+				SaveStringToFile(aExecFile, #13#10 + 'SET PATH=%PATH%;' + pathdir[d], True);
+
+			// If uninstalling, write the full autoexec out
+			end else begin
+				SaveStringsToFile(aExecFile, aExecArr, False);
+			end;
+		end;
+	end;
+end;
+
+// Split a string into an array using passed delimeter
+procedure MPExplode(var Dest: TArrayOfString; Text: String; Separator: String);
+var
+	i: Integer;
+begin
+	i := 0;
+	repeat
+		SetArrayLength(Dest, i+1);
+		if Pos(Separator,Text) > 0 then	begin
+			Dest[i] := Copy(Text, 1, Pos(Separator, Text)-1);
+			Text := Copy(Text, Pos(Separator,Text) + Length(Separator), Length(Text));
+			i := i + 1;
+		end else begin
+			 Dest[i] := Text;
+			 Text := '';
+		end;
+	until Length(Text)=0;
+end;
+
+
+procedure CurStepChanged(CurStep: TSetupStep);
+var
+	taskname:	String;
+begin
+	taskname := ModPathName;
+	if CurStep = ssPostInstall then
+		if IsTaskSelected(taskname) then
+			ModPath();
+end;
+
+procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
+var
+	aSelectedTasks:	TArrayOfString;
+	i:				Integer;
+	taskname:		String;
+	regpath:		String;
+	regstring:		String;
+	appid:			String;
+begin
+	// only run during actual uninstall
+	if CurUninstallStep = usUninstall then begin
+		// get list of selected tasks saved in registry at install time
+		appid := '{#emit SetupSetting("AppId")}';
+		if appid = '' then appid := '{#emit SetupSetting("AppName")}';
+		regpath := ExpandConstant('Software\Microsoft\Windows\CurrentVersion\Uninstall\'+appid+'_is1');
+		RegQueryStringValue(HKLM, regpath, 'Inno Setup: Selected Tasks', regstring);
+		if regstring = '' then RegQueryStringValue(HKCU, regpath, 'Inno Setup: Selected Tasks', regstring);
+
+		// check each task; if matches modpath taskname, trigger patch removal
+		if regstring <> '' then begin
+			taskname := ModPathName;
+			MPExplode(aSelectedTasks, regstring, ',');
+			if GetArrayLength(aSelectedTasks) > 0 then begin
+				for i := 0 to GetArrayLength(aSelectedTasks)-1 do begin
+					if comparetext(aSelectedTasks[i], taskname) = 0 then
+						ModPath();
+				end;
+			end;
+		end;
+	end;
+end;
+
+function NeedRestart(): Boolean;
+var
+	taskname:	String;
+begin
+	taskname := ModPathName;
+	if IsTaskSelected(taskname) and not UsingWinNT() then begin
+		Result := True;
+	end else begin
+		Result := False;
+	end;
+end;
--- a/ZSharp/strops.cpp
+++ b/ZSharp/strops.cpp
@ -8,7 +8,8 @@
 //#include "builtin.h"
 using namespace std;

-const string WHITESPACE = " \n\r\t\f\v";
+const string WHITESPACE = " \t\f";
+//const string WHITESPACE = " \n\r\t\f\v";


 bool isNumber(const string& str)
@ -25,6 +26,51 @@ bool stob(const string& str)
 	return b;
 }

+string unescape(const string& s)
+{
+	string res;
+	string::const_iterator it = s.begin();
+	while (it != s.end())
+	{
+		char c = *it++;
+		if (c == '\\' && it != s.end())
+		{
+			switch (*it++) {
+			case '\\': c = '\\'; break;
+			case 'n': c = '\n'; break;
+			case 't': c = '\t'; break;
+				// all other escapes
+			default:
+				// invalid escape sequence - skip it. alternatively you can copy it as is, throw an exception...
+				continue;
+			}
+		}
+		res += c;
+	}
+
+	return res;
+}
+
+std::string escaped(const std::string& input)
+{
+	std::string output;
+	output.reserve(input.size());
+	for (const char c : input) {
+		switch (c) {
+		case '\a':  output += "\\a";        break;
+		case '\b':  output += "\\b";        break;
+		case '\f':  output += "\\f";        break;
+		case '\n':  output += "\\n";        break;
+		case '\r':  output += "\\r";        break;
+		case '\t':  output += "\\t";        break;
+		case '\v':  output += "\\v";        break;
+		default:    output += c;            break;
+		}
+	}
+
+	return output;
+}
+
 string StringRaw(const string& s)
 {
 	string str = trim(s);
@ -42,7 +88,7 @@ string StringRaw(const string& s)
 	if (str[str.size() - 1] != '\"')
 		withoutQuotes += str[str.size() - 1];

-	return withoutQuotes;
+	return unescape(withoutQuotes);
 }

 string Quoted(const string& s)
@ -190,20 +236,25 @@ string betweenChars(const string& str, const char& openChar, const char& closeCh
 {
 	string content = "";

-	int waitingForClose = 0;
+	int startPos = 0;
+	int endPos = (int)str.size();

 	for (int i = 0; i < (int)str.size(); i++)
 	{
-		if (waitingForClose > 0 && !(str[i] == closeChar && waitingForClose == 1))
-			content += str[i];
-
-		if (str[i] == openChar)
-			waitingForClose++;
-		else if (str[i] == closeChar)
-			waitingForClose--;
+		if (str[i] == openChar){
+			startPos = i+1;
+			break;
+		}
+	}
+	for (int i = (int)str.size()-1; i >=0; i--)
+	{
+		if (str[i] == closeChar){
+			endPos = i-(startPos); // or startPos-1 idk I cant do math right now
+			break;
+		}
 	}

-	return content;
+	return str.substr(startPos, endPos);
 }

 bool startsWith(const string& str, const string& lookFor)
@ -420,4 +471,4 @@ bool isEscaped(const string& str, int curChar)
 			return true;

 	return false;
-}
+}
--- a/ZSharp/strops.h
+++ b/ZSharp/strops.h
@ -69,4 +69,6 @@ bool isEscaped(const string& str, int curChar);

 bool startsWith(const string& str, const string& lookFor);

+std::string escaped(const std::string& input);
+
 #endif
--- a/examples/Benchmark/mariostill.png
+++ b/examples/Benchmark/mariostill.png
--- a/examples/Benchmark/script.zs
+++ b/examples/Benchmark/script.zs
@ -0,0 +1,157 @@
+int g_screenw = 256
+int g_screenh = 224
+int g_resolutionScale = 3
+
+float g_playerWalkSpeed = 150
+float g_playerRunSpeed = 210
+float g_jumpHeight = 200
+float g_currPlayerSpeed = 400
+
+bool g_running = false
+bool g_colliding = false
+
+float g_gravitySpeed = 86
+
+bool g_jumping = false
+float g_jumpingTime = 0
+
+//include "./extra-include.zs"
+
+func Main()
+{
+	//SplitThread(ThreadedFunction())
+	EXIT_WHEN_DONE = false
+	
+	// Immediately creates the window, then runs Start(), then the game loop. The game loop calls Update() every frame
+	ZS.Graphics.Init("Platformer game", g_screenw, g_screenh, g_resolutionScale)
+}
+
+func Start()
+{
+	float centerX = g_screenw / 2
+	float centerY = g_screenh / 2
+	
+	
+	global Vec2 v_aa = NVec2(g_screenw / 2 + -40, g_screenh / 2 + -40)
+	global Sprite s_aa = ZS.Graphics.Sprite("./mariostill.png", v_aa, NVec2(16, 16), 0)
+	
+	global Vec2 v_ab = NVec2(g_screenw / 2 + -30, g_screenh / 2 + -40)
+	global Sprite s_ab = ZS.Graphics.Sprite("./mariostill.png", v_ab, NVec2(16, 16), 0)
+	
+	global Vec2 v_ac = NVec2(g_screenw / 2 + -20, g_screenh / 2 + -40)
+	global Sprite s_ac = ZS.Graphics.Sprite("./mariostill.png", v_ac, NVec2(16, 16), 0)
+	
+	global Vec2 v_ad = NVec2(g_screenw / 2 + -10, g_screenh / 2 + -40)
+	global Sprite s_ad = ZS.Graphics.Sprite("./mariostill.png", v_ad, NVec2(16, 16), 0)
+	
+	global Vec2 v_ae = NVec2(g_screenw / 2 + -0, g_screenh / 2 + -40)
+	global Sprite s_ae = ZS.Graphics.Sprite("./mariostill.png", v_ae, NVec2(16, 16), 0)
+	
+	global Vec2 v_af = NVec2(g_screenw / 2 + 10, g_screenh / 2 + -40)
+	global Sprite s_af = ZS.Graphics.Sprite("./mariostill.png", v_af, NVec2(16, 16), 0)
+	
+	global Vec2 v_ag = NVec2(g_screenw / 2 + 20, g_screenh / 2 + -40)
+	global Sprite s_ag = ZS.Graphics.Sprite("./mariostill.png", v_ag, NVec2(16, 16), 0)
+	
+	global Vec2 v_ah = NVec2(g_screenw / 2 + 30, g_screenh / 2 + -40)
+	global Sprite s_ah = ZS.Graphics.Sprite("./mariostill.png", v_ah, NVec2(16, 16), 0)
+	
+	global Vec2 v_ai = NVec2(g_screenw / 2 + 40, g_screenh / 2 + -40)
+	global Sprite s_ai = ZS.Graphics.Sprite("./mariostill.png", v_ai, NVec2(16, 16), 0)
+	
+	global Vec2 v_aj = NVec2(g_screenw / 2 + -40, g_screenh / 2 + -30)
+	global Sprite s_aj = ZS.Graphics.Sprite("./mariostill.png", v_aj, NVec2(16, 16), 0)
+	
+	global Vec2 v_ak = NVec2(g_screenw / 2 + -30, g_screenh / 2 + -30)
+	global Sprite s_ak = ZS.Graphics.Sprite("./mariostill.png", v_ak, NVec2(16, 16), 0)
+	
+	global Vec2 v_al = NVec2(g_screenw / 2 + -20, g_screenh / 2 + -30)
+	global Sprite s_al = ZS.Graphics.Sprite("./mariostill.png", v_al, NVec2(16, 16), 0)
+	
+	
+}
+
+func Update(deltaTime)
+{
+	float fps = 1 / deltaTime
+	Printl("FPS: " + fps)
+
+	// // Shift key lets you sprint
+	// g_running = GetKey("SHIFT_L")
+	
+	// if g_running == true
+	// {
+		// g_currPlayerSpeed = g_playerRunSpeed
+	// }
+	
+	// if g_running == false
+	// {
+		// g_currPlayerSpeed = g_playerWalkSpeed
+	// }
+
+	// // Move Left And Right
+	// if GetKey("D") == true
+	// {
+		// g_playerTargetPosition.x += g_currPlayerSpeed * deltaTime
+	// }
+	// if GetKey("A") == true
+	// {
+		// g_playerTargetPosition.x -= g_currPlayerSpeed * deltaTime
+	// }
+	
+	
+	// // Apply gravity
+	// g_colliding = Colliding(g_playerSprite, g_groundSprite)
+	// if g_colliding == false
+	// {
+		// if g_jumping == false
+		// {
+			// g_playerTargetPosition.y += deltaTime * g_gravitySpeed
+		// }
+		// if g_jumping == true
+		// {
+			// g_playerTargetPosition.y -= (g_jumpHeight * deltaTime) + (deltaTime * g_gravitySpeed * -g_jumpingTime * 5)
+		// }
+	// }
+	// if g_colliding == true
+	// {
+		// if GetKey("SPACE") == false
+		// {
+			// if g_jumpingTime > 1
+			// {
+				// g_jumping = false
+			// }
+		// }
+		// if GetKey("SPACE") == true
+		// {
+			// g_jumping = true
+			// g_jumpingTime = 0
+			// g_playerTargetPosition.y -= 2
+		// }
+	// }
+	
+	// // Lerps from old position to destination smoothly
+	// float stopSpeed = deltaTime * 15
+	// float lerpedX = Lerp(g_playerSprite.position.x, g_playerTargetPosition.x, stopSpeed)
+	// s_aa.position = NVec2(lerpedX, g_playerTargetPosition.y)
+	
+	// Finally draws all of the sprites
+	ZS.Graphics.Draw(s_aa)
+	ZS.Graphics.Draw(s_ab)
+	ZS.Graphics.Draw(s_ac)
+	ZS.Graphics.Draw(s_ad)
+	ZS.Graphics.Draw(s_ae)
+	ZS.Graphics.Draw(s_af)
+	ZS.Graphics.Draw(s_ag)
+	ZS.Graphics.Draw(s_ah)
+	ZS.Graphics.Draw(s_ai)
+	ZS.Graphics.Draw(s_aj)
+	ZS.Graphics.Draw(s_ak)
+	ZS.Graphics.Draw(s_al)
+}
+
+func Colliding(a, b)
+{
+	bool bo = ZS.Physics.AxisAlignedCollision(a, b)
+	return bo
+}
--- a/examples/Platformer/extra-include.zs
+++ b/examples/Platformer/extra-include.zs
@ -1,5 +1,103 @@
+// This is an "included" ZS file, which can keep your main script
+// tidier and more organized or easily share the same functions
+// across multiple programs.
+

 func TestInclude()
 {
-	print "Hello World!"
-}
+	Printl("Hello World!")
+}
+//////////////////////////////////////////////////////////////////////////////
+// Benchmark, to check if performance suffers from too many functions/variables
+//////////////////////////////////////////////////////////////////////////////
+func b1()
+{
+	Printl("Hello World!")
+}
+func b2()
+{
+	Printl("Hello World!")
+}
+func b3()
+{
+	Printl("Hello World!")
+}
+func b4()
+{
+	Printl("Hello World!")
+}
+func b5()
+{
+	Printl("Hello World!")
+}
+func b6()
+{
+	Printl("Hello World!")
+}
+func b7()
+{
+	Printl("Hello World!")
+}
+func b8()
+{
+	Printl("Hello World!")
+}
+func b9()
+{
+	Printl("Hello World!")
+}
+func b10()
+{
+	Printl("Hello World!")
+}
+func b11()
+{
+	Printl("Hello World!")
+}
+func b12()
+{
+	Printl("Hello World!")
+}
+func b13()
+{
+	Printl("Hello World!")
+}
+func b14()
+{
+	Printl("Hello World!")
+}
+func b15()
+{
+	Printl("Hello World!")
+}
+func b16()
+{
+	Printl("Hello World!")
+}
+
+int a = 4
+int b = 4
+int c = 4
+int d = 4
+int e = 4
+int f = 4
+int g = 4
+int h = 4
+int i = 4
+int j = 4
+int k = 4
+int l = 4
+int m = 4
+int n = 4
+int o = 4
+int p = 4
+int q = 4
+int r = 4
+int s = 4
+int t = 4
+int u = 4
+int v = 4
+int w = 4
+int x = 4
+int y = 4
+int z = 4
--- a/examples/Platformer/script.zs
+++ b/examples/Platformer/script.zs
@ -2,108 +2,127 @@ int g_screenw = 256
 int g_screenh = 224
 int g_resolutionScale = 3

-float g_playerWalkSpeed = 400
-float g_playerRunSpeed = 700
-float g_jumpHeight = 20
+float g_playerWalkSpeed = 150
+float g_playerRunSpeed = 210
+float g_jumpHeight = 200
 float g_currPlayerSpeed = 400

 bool g_running = false
+bool g_colliding = false

-float g_gravitySpeed = -86
+float g_gravitySpeed = 86

-include "./extra-include.zs"
+bool g_jumping = false
+float g_jumpingTime = 0
+
+//include "./extra-include.zs"

 func Main()
 {
 	//SplitThread(ThreadedFunction())
+	EXIT_WHEN_DONE = false
 	
-	// Immediately creates the window, then Start(), then the game loop. The game loop calls Update() every frame
+	// Immediately creates the window, then runs Start(), then the game loop. The game loop calls Update() every frame
 	ZS.Graphics.Init("Platformer game", g_screenw, g_screenh, g_resolutionScale)
 }

 func ThreadedFunction()
 {
-	print "threaded:"
+	Printl("threaded:")
 }

 func Start()
 {
 	float centerX = g_screenw / 2
 	float centerY = g_screenh / 2
-	global Vec2 g_screencenter = NVec2(centerX, centerY)
+	global Vec2 g_screencenter = NVec2(g_screenw / 2, g_screenh / 2)
 	
-	Vec2 playerPos = g_screencenter
-	Vec2 playerScale = NVec2(16, 16)
-	global Sprite g_playerSprite = ZS.Graphics.Sprite("./mariostill.png", playerPos, playerScale, 0)
+	global Sprite g_playerSprite = ZS.Graphics.Sprite("./mariostill.png", g_screencenter, NVec2(16, 16), 0)
 	
-	Vec2 groundPos = NVec2(g_screencenter.x, 192)
-	Vec2 groundScale = NVec2(256, 16)
-	global Sprite g_groundSprite = ZS.Graphics.Sprite("./square.png", groundPos, groundScale, 0)
+	global Sprite g_groundSprite = ZS.Graphics.Sprite("./square.png", NVec2(g_screencenter.x, 192), NVec2(256, 16), 0)
 	
-	Vec2 instructionsPos = NVec2(centerOfScreen.x, centerOfScreen.y)
-	global Text g_instructionsText = ZS.Graphics.Text("Use Arrow Keys or WASD to Move, and Spacebar to Jump", "./arial.ttf", instructionsPos, 20, 0, 255, 255, 255)
+	global Text g_instructionsText = ZS.Graphics.Text("Use Arrow Keys or WASD to Move and Spacebar to Jump", "./arial.ttf", NVec2(g_screencenter.x, g_screencenter.y), 8, 0, 255, 255, 255)
+	g_instructionsText.antialias = false
 	
-	global Vec2 g_playerTargetPosition = playerPos
-	
-	int i = 0
-	while i < 10 {
-		i += 1
-		print "while iter : " + i
-	}
+	global Vec2 g_playerTargetPosition = g_screencenter
 }

-func Update(deltaTime) {
+func Update(deltaTime)
+{
 	float fps = 1 / deltaTime
-	print "FPS: " + fps
+	g_jumpingTime += deltaTime
+	Printl("FPS: " + fps)
 	//TestInclude()
-	
-	//// Test automatic conversion from bool to int
-	//int c = GetKey("A")
-	//print "Test: " + c

 	// Shift key lets you sprint
 	g_running = GetKey("SHIFT_L")
 	
-	if g_running == true{
+	if g_running == true
+	{
 		g_currPlayerSpeed = g_playerRunSpeed
 	}
+	
 	if g_running == false
 	{
 		g_currPlayerSpeed = g_playerWalkSpeed
 	}

 	// Move Left And Right
-	if GetKey("A") == true
-	{
-		float newY = g_playerSprite.position.y
-		
-		float newX = g_playerTargetPosition.x - g_currPlayerSpeed * deltaTime
-		g_playerTargetPosition = NVec2(newX, newY)
-	}
 	if GetKey("D") == true
 	{
-		float newY = g_playerSprite.position.y
-		
-		float newX = g_playerTargetPosition.x + g_currPlayerSpeed * deltaTime
-		g_playerTargetPosition = NVec2(newX, newY)
+		g_playerTargetPosition.x += g_currPlayerSpeed * deltaTime
+	}
+	if GetKey("A") == true
+	{
+		g_playerTargetPosition.x -= g_currPlayerSpeed * deltaTime
 	}
-	// Lerps from old position to destination smoothly
-	float oldX = g_playerSprite.position.x
-	float newX = g_playerTargetPosition.x
-	float stopSpeed = deltaTime * 7
-	float lerpedX = Lerp(oldX, newX, stopSpeed)
-	g_playerSprite.position = NVec2(lerpedX, newY)
 	
 	
+	// Apply gravity
+	g_colliding = Colliding(g_playerSprite, g_groundSprite)
+	if g_colliding == false
+	{
+		if g_jumping == false
+		{
+			g_playerTargetPosition.y += deltaTime * g_gravitySpeed
+		}
+		if g_jumping == true
+		{
+			g_playerTargetPosition.y -= (g_jumpHeight * deltaTime) + (deltaTime * g_gravitySpeed * -g_jumpingTime * 5)
+		}
+	}
+	if g_colliding == true
+	{
+		if GetKey("SPACE") == false
+		{
+			if g_jumpingTime > 1
+			{
+				g_jumping = false
+			}
+		}
+		if GetKey("SPACE") == true
+		{
+			g_jumping = true
+			g_jumpingTime = 0
+			g_playerTargetPosition.y -= 2
+		}
+	}
+	
+	// Lerps from old position to destination smoothly
+	float stopSpeed = deltaTime * 15
+	float lerpedX = Lerp(g_playerSprite.position.x, g_playerTargetPosition.x, stopSpeed)
+	g_playerSprite.position = NVec2(lerpedX, g_playerTargetPosition.y)
+	
 	// Finally draws all of the sprites
 	ZS.Graphics.Draw(g_playerSprite)
 	ZS.Graphics.Draw(g_groundSprite)
 	
+	// Draw the text
 	ZS.Graphics.DrawText(g_instructionsText)
 }

 func Colliding(a, b)
 {
-	bool b = ZS.Physics.AxisAlignedCollision(a, b)
-	return b
+	bool bo = ZS.Physics.AxisAlignedCollision(a, b)
+	return bo
 }
--- a/examples/Pong-Example-Project/ball.png
+++ b/examples/Pong-Example-Project/ball.png
--- a/examples/Pong-Example-Project/script.zs
+++ b/examples/Pong-Example-Project/script.zs
@ -16,6 +16,8 @@ bool aiOn = false
 // so if you never call ZS.Graphics.Init, then Start won't run
 func Main()
 {
+	EXIT_WHEN_DONE = false
+	
 	// Immediately creates the window, then Start(), then the game loop. The game loop calls Update() every frame
 	ZS.Graphics.Init("This is a pong game", SCREENW, SCREENH)
 }
@ -39,7 +41,7 @@ func Start()
 	Vec2 rPaddlePosition = NVec2(rOffset, yPosPaddle)
 	global Vec2 rPaddleTargetPosition = NVec2(rOffset, yPosPaddle)
 	
-	global Sprite ballSpr = ZS.Graphics.Sprite("./square.png", ballPos, ballScale, 0)
+	global Sprite ballSpr = ZS.Graphics.Sprite("./ball.png", ballPos, ballScale, 0)
 	global Sprite lPaddle = ZS.Graphics.Sprite("./square.png", lPaddlePosition, paddleScale, 0)
 	global Sprite rPaddle = ZS.Graphics.Sprite("./square.png", rPaddlePosition, paddleScale, 0)
 	
@ -62,7 +64,7 @@ func Start()
 func Update(deltaTime)
 {
 	//float FPS = 1 / deltaTime
-	//print "FPS: " + FPS
+	//Printl("FPS: " + FPS)

 	// Handles Left Paddle Movement
 	//
@ -237,7 +239,7 @@ func HandleBallBounce()
 		difference -= ballY
 		float paddleHeight = rPaddle.scale.y
 		float normalizedRelativeIntersectionY = difference / (paddleHeight / 2)
-		float bounceAngle = normalizedRelativeIntersectionY * 0.523599
+		float bounceAngle = normalizedRelativeIntersectionY * -0.523599
 		float ballVx = ballSpeed
 		ballVx *= Cos(bounceAngle)
 		ballVx *= -1
--- a/examples/console_application.zs
+++ b/examples/console_application.zs
@ -0,0 +1,5 @@
+func Main()
+{
+	Printl("this is a test:")
+	ZS.System.Command("cls")
+}
Author	SHA1	Message	Date
sam-astro	a484bdc941	Clarify install requirements for linux	2023-03-05 13:15:51 -05:00
sam-astro	2292eb8abe	Update version	2022-08-28 12:52:33 -04:00
sam-astro	f591e13089	Merge pull request #44 from sam-astro/dev Add simple benchmark script	2022-08-28 12:44:38 -04:00
sam-astro	c8f51e0c94	Merge pull request #43 from Rexo35/patch-1 Add the "ZS.System.Command" function	2022-08-28 12:43:50 -04:00
sam-astro	d7c79c6601	Simplify and make work without warnings	2022-08-28 12:43:01 -04:00
sam-astro	66f1127c53	Add simple benchmark script	2022-08-28 12:27:25 -04:00
Rexo35	eda78e8c39	Update builtin.h	2022-08-23 22:11:15 +02:00
Rexo35	0af8f5fff7	Update builtin.h	2022-08-23 22:02:17 +02:00
Rexo35	adcbe1f232	Add the "ZS.System.Command" function Add the "ZS.System.Command" function in order to run console commands. Something like pythons os.system() function.	2022-08-23 18:29:36 +02:00
sam-astro	926a8e60f7	Fix link	2022-06-15 18:04:17 -04:00
sam-astro	0d10a90e1b	Merge pull request #34 from sam-astro/dev Dev	2022-06-08 16:11:41 -04:00
sam-astro	13715dae7a	Merge pull request #33 from bsikar/dev updated dependencies on readmd (made it more readable)	2022-06-08 16:10:14 -04:00
Brighton Sikarskie	bfce93649c	updated dependencies on readmd	2022-06-08 11:45:20 -05:00
sam-astro	33f28b898d	Merge pull request #30 from susyboy23/patch-1 Percent functions	2022-06-02 22:07:01 -04:00
sam-astro	0a8b8f47d9	Fix formatting and curly brackets	2022-06-02 22:05:58 -04:00
ConchetumareDev	fff73e5f14	idk, maybe someone will use it :)	2022-06-01 20:18:22 -04:00
sam-astro	0d2e0faa56	Merge pull request #29 from sam-astro/dev Probably final dev from me	2022-05-30 17:19:45 -04:00
sam-astro	d114cfe3fb	Update README.md	2022-05-30 10:40:17 -04:00
sam-astro	799b2d7d0b	Add Z-Sharp to PATH in Windows	2022-05-29 16:31:40 -04:00
sam-astro	f7926c44ad	I accidentally left debug things on	2022-05-29 15:19:27 -04:00
sam-astro	444fc24e1d	Fix dumdum issue with singles ARGs - again...	2022-05-29 15:15:46 -04:00
sam-astro	2c565d533f	Update README.md	2022-05-27 20:30:04 -04:00
sam-astro	304093386a	Merge pull request #25 from sam-astro/dev Features and bug fix v2.1.1-alpha	2022-05-27 20:26:10 -04:00
sam-astro	68c5ef214f	Update README.md	2022-05-27 20:21:27 -04:00
sam-astro	a8ed99a7b4	Don't print escape sequences in logs, print raw	2022-05-27 20:14:07 -04:00
sam-astro	b25fee150a	Update builtin.h	2022-05-27 20:00:15 -04:00
sam-astro	dc580c2257	Update builtin.h	2022-05-27 19:57:55 -04:00
sam-astro	c40d902cef	Attempt to fix unix time get	2022-05-27 19:51:25 -04:00
sam-astro	582656be7b	Update exit message	2022-05-27 19:43:39 -04:00
sam-astro	1188412769	Change version, fix wrong ball rotation, use circle sprite	2022-05-27 19:35:07 -04:00
sam-astro	d24044a242	Fix issues, add features * Allow for odd spacing, (ex. tabs, no tabs, spaces, etc.) * Rename from determinant to comparer * Fix syntax * Fix issues with single arg function calls, and `Print` and `Printl` functions now work * Escape sequences now work as they should	2022-05-27 19:16:41 -04:00
sam-astro	49429461e8	Add more error checking	2022-05-27 08:40:19 -04:00
sam-astro	438f366ba4	add `EXIT_WHEN_DONE = false`	2022-05-27 08:24:56 -04:00
sam-astro	33805294d3	add `EXIT_WHEN_DONE = false`	2022-05-27 08:24:30 -04:00
sam-astro	5e89ac5884	Fix typos, add `EXIT_WHEN_DONE` variable, change formatting	2022-05-27 08:17:57 -04:00
sam-astro	89392bc34d	Update Main.cpp Disable for comment checking, make `ZS.` check safer, allow more variables to be initialized outside of functions (global), let people set the global builtin variable of `EXIT_WHEN_DONE` to true or false, depending if they are a developer and want to leave the console window open after the program finishes.	2022-05-27 08:14:03 -04:00
sam-astro	bfc3c4d727	^	2022-05-26 21:02:08 -04:00
sam-astro	44b2e40e94	(broken) Allow for any amount of whitespace	2022-05-26 21:01:44 -04:00
sam-astro	f0321d9927	Update extra-include.zs	2022-05-26 10:49:10 -04:00
sam-astro	865c2761bb	Update Main.cpp	2022-05-26 08:36:45 -04:00
sam-astro	a4f7bdab2b	Remove useless lines during preprocessing	2022-05-26 08:16:38 -04:00
sam-astro	a1dcb55468	Antialiased text as an extra `Text` option, update platformer	2022-05-25 17:34:06 -04:00
sam-astro	70a2c8ce7e	Merge pull request #22 from Kaputchino/master Add mathematical functions	2022-05-25 15:21:37 -04:00
sam-astro	b321a36b7d	Fix formatting, spelling	2022-05-25 15:20:17 -04:00
Kaputchino	7ce2d39b93	sort correctly the added functions	2022-05-25 19:02:29 +02:00
Kaputchino	7d7033cd61	add functions	2022-05-25 18:56:07 +02:00
sam-astro	ba92119cfe	Add DLL requirements for windows	2022-05-25 11:10:56 -04:00
sam-astro	1ad7019940	Allow for single args as bool ex. `if 3` instead of `if 3 == 3`	2022-05-25 10:45:15 -04:00
sam-astro	e0966a7920	Update if and while Make `if` and `while` more efficient, and allow using the `break` and `continue` keywords	2022-05-25 10:33:59 -04:00
sam-astro	63ba06713c	Update betweenChars function To make more efficient and allow for strings with special characters as function arguments	2022-05-25 09:06:47 -04:00
sam-astro	86af2af61a	Optimize script	2022-05-25 07:46:22 -04:00
sam-astro	3d8fca05ba	Add description	2022-05-25 07:25:14 -04:00
sam-astro	2cce226575	Working on platformer	2022-05-24 21:40:58 -04:00
sam-astro	725ec88fd5	Merge branch 'master' into dev	2022-05-24 21:12:47 -04:00
sam-astro	8fd332495c	Merge branch 'dev' of https://github.com/sam-astro/Z-Sharp into dev	2022-05-24 18:24:42 -04:00
sam-astro	350072a6ac	Change from c_str to std::string	2022-05-24 18:24:32 -04:00