Core - Split up layer conditions into static- and event-conditions

src/Artemis.Storage/Entities/Profile/Abstract/RenderElementEntity.cs

@@ -14,7 +14,7 @@ namespace Artemis.Storage.Entities.Profile.Abstract
         public List<PropertyEntity> PropertyEntities { get; set; }
         public List<string> ExpandedPropertyGroups { get; set; }
 
-        public DataModelConditionGroupEntity DisplayCondition { get; set; }
+        public IConditionEntity DisplayCondition { get; set; }
         public TimelineEntity Timeline { get; set; }
 
         public NodeScriptEntity NodeScript { get; set; }

src/Artemis.Storage/Entities/Profile/AdaptionHints/CategoryAdaptionHintEntity.cs

@@ -8,6 +8,4 @@
         public int Skip { get; set; }
         public int Amount { get; set; }
     }
-
-
 }

src/Artemis.Storage/Entities/Profile/Conditions/DataModelConditionEventEntity.cs

@@ -1,15 +0,0 @@
-using System.Collections.Generic;
-using Artemis.Storage.Entities.Profile.Abstract;
-
-namespace Artemis.Storage.Entities.Profile.Conditions
-{
-    public class DataModelConditionEventEntity : DataModelConditionPartEntity
-    {
-        public DataModelConditionEventEntity()
-        {
-            Children = new List<DataModelConditionPartEntity>();
-        }
-
-        public DataModelPathEntity EventPath { get; set; }
-    }
-}

src/Artemis.Storage/Entities/Profile/Conditions/DataModelConditionEventPredicateEntity.cs

@@ -1,6 +0,0 @@
-namespace Artemis.Storage.Entities.Profile.Conditions
-{
-    public class DataModelConditionEventPredicateEntity : DataModelConditionPredicateEntity
-    {
-    }
-}

src/Artemis.Storage/Entities/Profile/Conditions/DataModelConditionGeneralPredicateEntity.cs

@@ -1,6 +0,0 @@
-namespace Artemis.Storage.Entities.Profile.Conditions
-{
-    public class DataModelConditionGeneralPredicateEntity : DataModelConditionPredicateEntity
-    {
-    }
-}

src/Artemis.Storage/Entities/Profile/Conditions/DataModelConditionGroupEntity.cs

@@ -1,15 +0,0 @@
-using System.Collections.Generic;
-using Artemis.Storage.Entities.Profile.Abstract;
-
-namespace Artemis.Storage.Entities.Profile.Conditions
-{
-    public class DataModelConditionGroupEntity : DataModelConditionPartEntity
-    {
-        public DataModelConditionGroupEntity()
-        {
-            Children = new List<DataModelConditionPartEntity>();
-        }
-
-        public int BooleanOperator { get; set; }
-    }
-}

src/Artemis.Storage/Entities/Profile/Conditions/DataModelConditionListEntity.cs

@@ -1,16 +0,0 @@
-using System.Collections.Generic;
-using Artemis.Storage.Entities.Profile.Abstract;
-
-namespace Artemis.Storage.Entities.Profile.Conditions
-{
-    public class DataModelConditionListEntity : DataModelConditionPartEntity
-    {
-        public DataModelConditionListEntity()
-        {
-            Children = new List<DataModelConditionPartEntity>();
-        }
-
-        public DataModelPathEntity ListPath { get; set; }
-        public int ListOperator { get; set; }
-    }
-}

src/Artemis.Storage/Entities/Profile/Conditions/DataModelConditionListPredicateEntity.cs

@@ -1,6 +0,0 @@
-namespace Artemis.Storage.Entities.Profile.Conditions
-{
-    public class DataModelConditionListPredicateEntity : DataModelConditionPredicateEntity
-    {
-    }
-}

src/Artemis.Storage/Entities/Profile/Conditions/DataModelConditionPredicateEntity.cs

@@ -1,18 +0,0 @@
-using System;
-using Artemis.Storage.Entities.Profile.Abstract;
-
-namespace Artemis.Storage.Entities.Profile.Conditions
-{
-    public abstract class DataModelConditionPredicateEntity : DataModelConditionPartEntity
-    {
-        public int PredicateType { get; set; }
-        public DataModelPathEntity LeftPath { get; set; }
-        public DataModelPathEntity RightPath { get; set; }
-
-        public string OperatorType { get; set; }
-        public Guid? OperatorPluginGuid { get; set; }
-
-        // Stored as a string to be able to control serialization and deserialization ourselves
-        public string RightStaticValue { get; set; }
-    }
-}

src/Artemis.Storage/Entities/Profile/Conditions/EventsConditionEntity.cs

@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using Artemis.Storage.Entities.Profile.Abstract;
+using Artemis.Storage.Entities.Profile.Nodes;
+
+namespace Artemis.Storage.Entities.Profile.Conditions
+{
+    public class EventsConditionEntity : IConditionEntity
+    {
+        public int EventOverlapMode { get; set; }
+        public List<EventConditionEntity> Events { get; set; } = new();
+    }
+
+    public class EventConditionEntity
+    {
+        public DataModelPathEntity EventPath { get; set; }
+        public NodeScriptEntity Script { get; set; }
+    }
+}

src/Artemis.Storage/Entities/Profile/Conditions/IConditionEntity.cs

@@ -0,0 +1,6 @@
+namespace Artemis.Storage.Entities.Profile.Abstract
+{
+    public interface IConditionEntity
+    {
+    }
+}

src/Artemis.Storage/Entities/Profile/Conditions/StaticConditionEntity.cs

@@ -0,0 +1,10 @@
+using Artemis.Storage.Entities.Profile.Abstract;
+using Artemis.Storage.Entities.Profile.Nodes;
+
+namespace Artemis.Storage.Entities.Profile.Conditions
+{
+    public class StaticConditionEntity : IConditionEntity
+    {
+        public NodeScriptEntity Script { get; set; }
+    }
+}