From f8ea7807be3f81dbbe5850d55c6d5aa6a8fa6bcf Mon Sep 17 00:00:00 2001
From: Lukasz Baldyga <c3ypt1c@gmail.com>
Date: Mon, 30 Nov 2020 12:08:02 +0000
Subject: [PATCH] Fixed bug where colours wouldn't work

---
 .../Verbs/Value/ValueHelper.cs                | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueHelper.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueHelper.cs
index cef19b6..ac0b792 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueHelper.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueHelper.cs	
@@ -131,12 +131,19 @@ namespace Advanced_Software_Engineering.Verbs.Value {
                             return ValueFactory.CreateValue(text, "int");
                         } catch (Exception) { }
                     }
+
                     //Check if string is a double
                     else {
                         try {
                             return ValueFactory.CreateValue(text, "double");
                         } catch (Exception) { }
                     }
+
+                    //Check if color
+                    try {
+                        return ValueFactory.CreateValue(text, "color");
+                    } catch (Exception) { }
+
                     //check for expression
                     if (storage != null) {
                         try {
@@ -167,14 +174,14 @@ namespace Advanced_Software_Engineering.Verbs.Value {
                             }
                         } catch (Exception) { }
                     }
+                } else {
+                    //Check if color
+                    try {
+                        return ValueFactory.CreateValue(text, "color");
+                    } catch (Exception) { }
                 }
-
-                //Check if color
-                try {
-                    return ValueFactory.CreateValue(text, "color");
-                } catch (Exception) { }
             } else {
-                //Check if string is a bool TODO
+                //Check if string is a bool
 
                 //Check if expression
                 if (storage != null) {