From f5fcc84d022479d59dac45eb7deaf52aeee4c916 Mon Sep 17 00:00:00 2001
From: Will Bennion <will.bennion@outlook.com>
Date: Sun, 17 May 2020 23:49:32 +0100
Subject: [PATCH] Fixed some merge issues x)

---
 .../Settings/Overrides/Logic/Boolean/Boolean_GameState.cs     | 2 +-
 .../Settings/Overrides/Logic/Number/Number_GameState.cs       | 4 ++--
 .../Settings/Overrides/Logic/String/String_GameState.cs       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_GameState.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_GameState.cs
index 983fb78d9..7ffb5f5e2 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_GameState.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Boolean/Boolean_GameState.cs
@@ -29,7 +29,7 @@ public BooleanGSIBoolean() { }
         /// <summary>Fetches the given boolean value from the game state and returns it.</summary>
         protected override bool Execute(IGameState gameState) => gameState.GetBool(VariablePath);
 
-        public Evaluatable<bool> Clone() => new BooleanGSIBoolean { VariablePath = VariablePath };
+        public override Evaluatable<bool> Clone() => new BooleanGSIBoolean { VariablePath = VariablePath };
     }
 
 
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_GameState.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_GameState.cs
index e27c02b76..8d1b1391b 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_GameState.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/Number/Number_GameState.cs
@@ -24,13 +24,13 @@ public NumberGSINumeric() { }
         public string VariablePath { get; set; }
 
         // Control assigned to this evaluatable
-        public Visual GetControl() => new GameStateParameterPicker { PropertyType = GSIPropertyType.Number }
+        public override Visual GetControl() => new GameStateParameterPicker { PropertyType = GSIPropertyType.Number }
             .WithBinding(GameStateParameterPicker.ApplicationProperty, new AttachedApplicationBinding())
             .WithBinding(GameStateParameterPicker.SelectedPathProperty, new Binding("VariablePath") { Source = this });
 
         /// <summary>Parses the numbers, compares the result, and returns the result.</summary>
         protected override double Execute(IGameState gameState) => gameState.GetNumber(VariablePath);
 
-        public IEvaluatable<double> Clone() => new NumberGSINumeric { VariablePath = VariablePath };
+        public override Evaluatable<double> Clone() => new NumberGSINumeric { VariablePath = VariablePath };
     }
 }
diff --git a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_GameState.cs b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_GameState.cs
index ed8394d53..cd48429fd 100755
--- a/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_GameState.cs
+++ b/Project-Aurora/Project-Aurora/Settings/Overrides/Logic/String/String_GameState.cs
@@ -16,7 +16,7 @@ public class StringGSIString : Evaluatable<string> {
         public string VariablePath { get; set; } = "";
 
         /// <summary>Control assigned to this logic node.</summary>
-        public Visual GetControl() => new GameStateParameterPicker { PropertyType = GSIPropertyType.String }
+        public override Visual GetControl() => new GameStateParameterPicker { PropertyType = GSIPropertyType.String }
             .WithBinding(GameStateParameterPicker.ApplicationProperty, new AttachedApplicationBinding())
             .WithBinding(GameStateParameterPicker.SelectedPathProperty, new Binding("VariablePath") { Source = this });