data changes, entity changes, started UI changes

Assets/Editor/JSONLoader_CardEntity.cs

@@ -158,6 +158,9 @@ namespace DCGO.CardEntities
             cardEntity.LinkEffect = card.linkEffect;
             cardEntity.LinkRequirement = card.linkRequirement;
 
+            cardEntity.OptionCardColorRequirements = GetCardColors(card.optionCardColourRequirment);
+            cardEntity.OptionEffect = card.optionCardEffect;
+
             cardEntity.name = cardEntity.CardSpriteName.Replace("-Errata","").Replace("-","_");
 
             if (cardEntity.cardKind == CardKind.DigiEgg && cardEntity.PlayCost == 0)

Assets/Scripts/Script/CEntity_Base.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using WebSocketSharp;
 using UnityEngine;
 
 [CreateAssetMenu(menuName = "Create/CEntity_Base")]
@@ -36,6 +37,10 @@ public class CEntity_Base : ScriptableObject
     [TextArea] public string LinkEffect = "";
     [TextArea] public string LinkRequirement = "";
 
+    public string dualEffect = "";
+    public List<CardColor> OptionCardColorRequirements = new List<CardColor>();
+    [TextArea] public string OptionEffect = "";
+
     public bool HasInhetitedEffect => !string.IsNullOrEmpty(InheritedEffectDiscription_ENG) && !InheritedEffectDiscription_ENG.Equals("-");
     public bool HasSecutiryEffect => !string.IsNullOrEmpty(SecurityEffectDiscription_ENG) && !SecurityEffectDiscription_ENG.Equals("-");
     public string CardID = "";
@@ -69,6 +74,8 @@ public class CEntity_Base : ScriptableObject
     public bool IsACE => OverflowMemory >= 1;
     public bool IsStandardValid => true;
 
+    public bool IsDualCard => !dualEffect.IsNullOrEmpty();
+
     #region regulation mark
     public string RegulationMark
     {

Assets/Scripts/Script/JsonSerializedClass.cs

@@ -17,6 +17,7 @@ namespace DCGO.CardEntities
         public List<AlternateArt> JAAs;
 
         public string aceEffect;
+        public string assembly;
         public string attribute;
         public List<string> block;
         public string burstDigivolve;
@@ -30,6 +31,7 @@ namespace DCGO.CardEntities
         public string digivolveEffect;
         public string dnaDigivolve;
         public string dp;
+        public string dualEffect;
         public string effect;
         public string form;
         public string id;
@@ -39,6 +41,8 @@ namespace DCGO.CardEntities
         public string linkRequirement;
         public CardName name;
         public string notes;
+        public string optionCardColourRequirment;
+        public string optionCardEffect;
         public string playCost;
         public string rarity;
         public Restriction restrictions;