Moved StatusEffect related classes to their own folder and PropertyConditional to its own file.

Barotrauma/BarotraumaShared/BarotraumaShared.projitems

@@ -1468,14 +1468,15 @@
     <Compile Include="$(MSBuildThisFileDirectory)Source\Characters\CharacterInfo.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Source\Characters\CharacterNetworking.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Source\Characters\DamageModifier.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Source\Characters\DelayedEffect.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Source\StatusEffects\DelayedEffect.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Source\Characters\HuskInfection.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Source\Characters\Jobs\Job.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Source\Characters\Jobs\JobPrefab.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Source\Characters\Jobs\Skill.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Source\Characters\Jobs\SkillPrefab.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Source\Characters\Limb.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Source\Characters\StatusEffect.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Source\StatusEffects\PropertyConditional.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Source\StatusEffects\StatusEffect.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Source\ContentPackage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Source\CoroutineManager.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Source\DebugConsole.cs" />

Barotrauma/BarotraumaShared/Source/StatusEffects/PropertyConditional.cs

@@ -0,0 +1,149 @@
+using System;
+using System.Xml.Linq;
+
+namespace Barotrauma
+{
+    class PropertyConditional
+    {
+        public readonly string Attribute;
+        public readonly string Operator;
+        public readonly object Value;
+
+        public PropertyConditional(XAttribute attribute)
+        {
+            string attributeString = attribute.Value.ToString();
+            string atStr = attributeString;
+            string[] splitString = atStr.Split(' ');
+            string op = splitString[0];
+            if (splitString.Length > 0)
+            {
+                for (int i = 1; i < splitString.Length; i++)
+                {
+                    atStr = splitString[i] + (i > 1 && i < splitString.Length ? " " : "");
+                }
+            }
+            //thanks xml for not letting me use < or > in attributes :(
+            switch (op)
+            {
+                case "e":
+                case "eq":
+                case "equals":
+                    op = "==";
+                    break;
+                case "ne":
+                case "neq":
+                case "notequals":
+                case "!":
+                case "!e":
+                case "!eq":
+                case "!equals":
+                    op = "!=";
+                    break;
+                case "gt":
+                case "greaterthan":
+                    op = ">";
+                    break;
+                case "lt":
+                case "lessthan":
+                    op = "<";
+                    break;
+                case "gte":
+                case "gteq":
+                case "greaterthanequals":
+                    op = ">=";
+                    break;
+                case "lte":
+                case "lteq":
+                case "lessthanequals":
+                    op = "<=";
+                    break;
+                default:
+                    if (op != "==" && op != "!=" && op != ">" && op != "<" && op != ">=" && op != "<=") //Didn't use escape strings or anything
+                    {
+                        atStr = attributeString; //We probably don't even have an operator
+                        op = "==";
+                    }
+                    break;
+            }
+
+            Attribute = attribute.Name.ToString().ToLowerInvariant();
+            Operator = op;
+            Value = atStr;            
+        }
+
+        public PropertyConditional(string Attribute, string Operator, object Value)
+        {
+            this.Attribute = Attribute;
+            this.Operator = Operator;
+            this.Value = Value;
+        }
+
+        public bool Matches(SerializableProperty property)
+        {
+            if (property.GetValue() == null)
+            {
+                DebugConsole.ThrowError("Couldn't compare " + Value.ToString() + " (" + Value.GetType() + ") to property \"" + property.Name + "- property.GetValue() returns null!!");
+                return false;
+            }
+            Type type = property.GetValue().GetType();
+
+            float? floatValue = null;
+            float? floatProperty = null;
+            if (type == typeof(float) || type == typeof(int))
+            {
+                floatValue = Convert.ToSingle(Value);
+                floatProperty = Convert.ToSingle(property.GetValue());
+            }
+
+            switch (Operator)
+            {
+                case "==":
+                    if (property.GetValue().Equals(floatValue == null ? Value : floatValue))
+                        return true;
+                    break;
+                case "!=":
+                    if (property.GetValue().Equals(floatValue == null ? Value : floatValue))
+                        return true;
+                    break;
+                case ">":
+                    if (floatValue == null)
+                    {
+                        DebugConsole.ThrowError("Couldn't compare " + Value.ToString() + " (" + Value.GetType() + ") to property \"" + property.Name + "\" (" + type + ")! "
+                            + "Make sure the type of the value set in the config files matches the type of the property.");
+                    }
+                    else if (floatProperty > floatValue)
+                        return true;
+                    break;
+                case "<":
+                    if (floatValue == null)
+                    {
+                        DebugConsole.ThrowError("Couldn't compare " + Value.ToString() + " (" + Value.GetType() + ") to property \"" + property.Name + "\" (" + type + ")! "
+                            + "Make sure the type of the value set in the config files matches the type of the property.");
+                    }
+                    else if (floatProperty < floatValue)
+                        return true;
+                    break;
+                case ">=":
+                    if (floatValue == null)
+                    {
+                        DebugConsole.ThrowError("Couldn't compare " + Value.ToString() + " (" + Value.GetType() + ") to property \"" + property.Name + "\" (" + type + ")! "
+                            + "Make sure the type of the value set in the config files matches the type of the property.");
+                    }
+                    else if (floatProperty >= floatValue)
+                        return true;
+                    break;
+                case "<=":
+                    if (floatValue == null)
+                    {
+                        DebugConsole.ThrowError("Couldn't compare " + Value.ToString() + " (" + Value.GetType() + ") to property \"" + property.Name + "\" (" + type + ")! "
+                            + "Make sure the type of the value set in the config files matches the type of the property.");
+                    }
+                    else if (floatProperty <= floatValue)
+                        return true;
+                    break;
+            }
+            return false;
+        }
+    }
+
+}

Barotrauma/BarotraumaShared/Source/StatusEffects/StatusEffect.cs

@@ -16,86 +16,7 @@ namespace Barotrauma
         public List<ISerializableEntity> Targets;
         public float StartTimer;
     }
-    partial class PropertyConditional
-    {
-        public string Attribute;
-        public string Operator;
-        public object Value;
 
-        public PropertyConditional(string Attribute, string Operator, object Value)
-        {
-            this.Attribute = Attribute;
-            this.Operator = Operator;
-            this.Value = Value;
-        }
-
-        public bool Matches(SerializableProperty property)
-        {
-            if (property.GetValue() == null)
-            {
-                DebugConsole.ThrowError("Couldn't compare " + Value.ToString() + " (" + Value.GetType() + ") to property \"" + property.Name + "- property.GetValue() returns null!!");
-                return false;
-            }
-            Type type = property.GetValue().GetType();
-
-            float? floatValue = null;
-            float? floatProperty = null;
-            if (type == typeof(float) || type == typeof(int))
-            {
-                floatValue = Convert.ToSingle(Value);
-                floatProperty = Convert.ToSingle(property.GetValue());
-            }
-
-            switch (Operator)
-            {
-                case "==":
-                    if (property.GetValue().Equals(floatValue == null ? Value : floatValue))
-                        return true;
-                    break;
-                case "!=":
-                    if (property.GetValue().Equals(floatValue == null ? Value : floatValue))
-                        return true;
-                    break;
-                case ">":
-                    if (floatValue == null)
-                    {
-                        DebugConsole.ThrowError("Couldn't compare " + Value.ToString() + " (" + Value.GetType() + ") to property \"" + property.Name + "\" (" + type + ")! "
-                            + "Make sure the type of the value set in the config files matches the type of the property.");
-                    }
-                    else if (floatProperty > floatValue)
-                        return true;
-                    break;
-                case "<":
-                    if (floatValue == null)
-                    {
-                        DebugConsole.ThrowError("Couldn't compare " + Value.ToString() + " (" + Value.GetType() + ") to property \"" + property.Name + "\" (" + type + ")! "
-                            + "Make sure the type of the value set in the config files matches the type of the property.");
-                    }
-                    else if (floatProperty < floatValue)
-                        return true;
-                    break;
-                case ">=":
-                    if (floatValue == null)
-                    {
-                        DebugConsole.ThrowError("Couldn't compare " + Value.ToString() + " (" + Value.GetType() + ") to property \"" + property.Name + "\" (" + type + ")! "
-                            + "Make sure the type of the value set in the config files matches the type of the property.");
-                    }
-                    else if (floatProperty >= floatValue)
-                        return true;
-                    break;
-                case "<=":
-                    if (floatValue == null)
-                    {
-                        DebugConsole.ThrowError("Couldn't compare " + Value.ToString() + " (" + Value.GetType() + ") to property \"" + property.Name + "\" (" + type + ")! "
-                            + "Make sure the type of the value set in the config files matches the type of the property.");
-                    }
-                    else if (floatProperty <= floatValue)
-                        return true;
-                    break;
-            }
-            return false;
-        }
-    }
     partial class StatusEffect
     {
         [Flags]
@@ -295,8 +216,7 @@ namespace Barotrauma
                     case "cancelstatuseffect":
                         //This only works if there's a conditional checking for status effect tags. There is no way to cancel *all* status effects atm.
                         cancelStatusEffect = 1;
-                        if (subElement.GetAttributeBool("all", false) == true)
+                        if (subElement.GetAttributeBool("all", false)) cancelStatusEffect = 2;
-                            cancelStatusEffect = 2;
                         break;
                     case "requireditem":
                     case "requireditems":
@@ -308,63 +228,9 @@ namespace Barotrauma
                         break;
                     case "conditional":
                         IEnumerable<XAttribute> conditionalAttributes = subElement.Attributes();
-                        foreach(XAttribute attribute in conditionalAttributes)
+                        foreach (XAttribute attribute in conditionalAttributes)
                         {
-                            string attributeString = XMLExtensions.GetAttributeObject(attribute).ToString();
+                            propertyConditionals.Add(new PropertyConditional(attribute));
-                            string atStr = attributeString;
-                            string[] splitString = atStr.Split(' ');
-                            string op = splitString[0];
-                            if (splitString.Length > 0)
-                            {
-                                for (int i=1; i<splitString.Length; i++)
-                                {
-                                    atStr = splitString[i] + (i > 1 && i < splitString.Length ? " " : "");
-                                }
-                            }
-                            //thanks xml for not letting me use < or > in attributes :(
-                            switch (op)
-                            {
-                                case "e":
-                                case "eq":
-                                case "equals":
-                                    op = "==";
-                                    break;
-                                case "ne":
-                                case "neq":
-                                case "notequals":
-                                case "!":
-                                case "!e":
-                                case "!eq":
-                                case "!equals":
-                                    op = "!=";
-                                    break;
-                                case "gt":
-                                case "greaterthan":
-                                    op = ">";
-                                    break;
-                                case "lt":
-                                case "lessthan":
-                                    op = "<";
-                                    break;
-                                case "gte":
-                                case "gteq":
-                                case "greaterthanequals":
-                                    op = ">=";
-                                    break;
-                                case "lte":
-                                case "lteq":
-                                case "lessthanequals":
-                                    op = "<=";
-                                    break;
-                                default:
-                                    if (op != "==" && op != "!=" && op != ">" && op != "<" && op != ">=" && op != "<=") //Didn't use escape strings or anything
-                                    {
-                                        atStr = attributeString; //We probably don't even have an operator
-                                        op = "==";
-                                    }
-                                    break;
-                            }
-                            propertyConditionals.Add(new PropertyConditional(attribute.Name.ToString().ToLowerInvariant(), op, atStr));
                         }
                         break;
 #if CLIENT