EZCode v2.0.9 : Added stop restart, Fixed system:random, Fixed list:contains

Author: JBrosDevelopment

EZCode/EZCode.cs

@@ -305,7 +305,7 @@ enum controlType
         #region EZCode_Script_Player
         Method? currentmethod = null;
         string returnOutput = "";
-        bool devDisplay = true, lastif = true;
+        bool devDisplay = true, lastif = true, restart = false;
         int devportal = 0, ifmany = 0, loopmany = 0;
         async Task<string[]> PlaySwitch(string[]? _parts = null, string jumpsto = "", string[]? splitcode = null, int currentindex = 0, Debugger? debugger = null)
         {
@@ -1028,6 +1028,10 @@ async Task<string[]> PlaySwitch(string[]? _parts = null, string jumpsto = "", st
                                 case "return":
                                     stillInFile = false;
                                     break;
+                                case "restart":
+                                    playing = false;
+                                    restart = true;
+                                    break;
                                 default:
                                     ErrorText(parts, ErrorTypes.custom, custom: $"Expected 'all' or 'return' in {SegmentSeperator} {codeLine}");
                                     break;
@@ -3446,7 +3450,7 @@ string ColonResponse(string value, string[] parts = null)
                                     Random rand = new Random();
                                     try
                                     {
-                                        value = rand.Next(v1, v2 - 1).ToString();
+                                        value = rand.Next(v1, v2 + 1).ToString();
                                     }
                                     catch
                                     {
@@ -3898,11 +3902,17 @@ string ColonResponse(string value, string[] parts = null)
                         }
                         break;
                     case "contains":
-                        if (ind.Length > 2)
+                        value = var.Description == Types.Array ? var.array.Length.ToString() : var.text.Length.ToString();
+                        if (ind.Length > 2 && !var.isArray())
                         {
                             string v = ind[2];
                             value = var.Value.Contains(v) ? "1" : "0";
                         }
+                        else if (ind.Length > 2 && var.isArray())
+                        {
+                            string[] v = getString_value(ind, 2, usecolon: false);
+                            value = var.Value.Contains(v[0]) ? "1" : "0";
+                        }
                         else
                         {
                             ErrorText(parts, ErrorTypes.custom, custom: $"Expected a value to check in '{ind[0]}:{ind[1]}' for in {SegmentSeperator} {codeLine}");
@@ -5190,7 +5200,15 @@ public async Task<string> Play(string code, bool clearsconsole = true, Debugger?
 
             for (int i = 0; i < lines.Count; i++)
             {
-                if (!playing) return output;
+                if (!playing)
+                {
+                    if (restart)
+                    {
+                        restart = false;
+                        await Play(Code, false);
+                    }
+                    return output;
+                }
                 codeLine = i + 1;
                 List<string> parts = lines[i].Split(new char[] { ' ' }).Where(x => x != "").ToList();
                 for (int j = 0; j < parts.Count; j++)
@@ -5214,6 +5232,11 @@ public async Task<string> Play(string code, bool clearsconsole = true, Debugger?
                 output += task[0];
                 ConsoleText = output;
             }
+            if (restart)
+            {
+                restart = false;
+                await Play(Code, false);
+            }
             if (playing) playing = false;
             StopAllSounds();
             return output;
@@ -5241,6 +5264,8 @@ public async Task<string> PlayFromProj(EZProj proj)
         public void Stop()
         {
             _pplaying = false;
+            restart = false;
+            playing = false;
             returnOutput = "";
             devDisplay = true;
             devportal = 0;

EZ_IDE/EZCode_Syntax.xml

@@ -1,6 +1,6 @@
 <doc>
 	<style name="Comment" color="Green" fontStyle="Regular"/>
-	<rule style="Comment">//.*</rule>
+	<rule style="Comment">\/\/(.*?)(?:\||$|(?:\r?\n|$))</rule>
 
 	<style name="Hashtag" color="Orange" fontStyle="Regular"/>
 	<rule style="Hashtag"> #.*|^\s*#.*|\n#.*</rule>