1.4.18 update

Assets/CardBaseEntity/BT7/Green/Digimon/エンシェントビートモン-BT7-054.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e3012428273a60d15e7d2788f83088d4f18f136e093a0356824e0548e2eb3dc7
-size 2524
+oid sha256:e41132589369bc37a97727438a175801baff923dd1f0c4f08212dba2c23aefdd
+size 2511

Assets/CardBaseEntity/BT7/Green/Digimon/エンシェントビートモン-BT7-054_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:18bd5449c567d67b848e1e8e4631d11373d9bc156fd4099f95e5b55199898019
-size 2530
+oid sha256:a13501cf67c3858150221d350f9bb2a9400e32a43c2a1f292b3e599e7bbb6941
+size 2517

Assets/CardEffect/BT14/Yellow/Chumon_BT14_032.cs

@@ -65,7 +65,8 @@ public class Chumon_BT14_032 : CEntity_Effect
 
                     yield return ContinuousController.instance.StartCoroutine(new IReduceSecurity(
                         player: card.Owner,
-                        refSkillInfos: ref ContinuousController.instance.nullSkillInfos).ReduceSecurity());
+                        refSkillInfos: ref ContinuousController.instance.nullSkillInfos,
+                        activateClass).ReduceSecurity());
                 }
 
                 if (card.Owner.CanAddSecurity(activateClass))

Assets/CardEffect/BT14/Yellow/TakaishiTakeru_BT14_084.cs

@@ -66,7 +66,8 @@ public class TakaishiTakeru_BT14_084 : CEntity_Effect
 
                     yield return ContinuousController.instance.StartCoroutine(new IReduceSecurity(
                         player: card.Owner,
-                        refSkillInfos: ref ContinuousController.instance.nullSkillInfos).ReduceSecurity());
+                        refSkillInfos: ref ContinuousController.instance.nullSkillInfos,
+                        activateClass).ReduceSecurity());
 
                     if (card.Owner.HandCards.Count(CanSelectCardCondition) >= 1)
                     {

Assets/CardEffect/BT17/Red/TakatoMatsuki_BT17_080.cs

@@ -146,7 +146,8 @@ namespace DCGO.CardEffects.BT17
                             if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                             {
                                 return CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectGrowlmonCardCondition) &&
-                                       CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectWarGrowlmonCardCondition);
+                                       CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectWarGrowlmonCardCondition) &&
+                                       CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectGallantmonCardCondition);
                             }
                         }
                     }

Assets/CardEffect/BT3/Yellow/Ropmon_BT3_034.cs

@@ -77,7 +77,8 @@ public class Ropmon_BT3_034 : CEntity_Effect
                         {
                             yield return ContinuousController.instance.StartCoroutine(new IReduceSecurity(
                                 player: card.Owner,
-                                refSkillInfos: ref ContinuousController.instance.nullSkillInfos).ReduceSecurity());
+                                refSkillInfos: ref ContinuousController.instance.nullSkillInfos,
+                                activateClass).ReduceSecurity());
 
                             yield return ContinuousController.instance.StartCoroutine(new DrawClass(card.Owner, 1, activateClass).Draw());
                         }

Assets/CardEffect/EX3/Yellow/Airdramon_EX3_029.cs

@@ -92,7 +92,8 @@ public class Airdramon_EX3_029 : CEntity_Effect
                                 {
                                     yield return ContinuousController.instance.StartCoroutine(new IReduceSecurity(
                                         player: card.Owner,
-                                        refSkillInfos: ref ContinuousController.instance.nullSkillInfos).ReduceSecurity());
+                                        refSkillInfos: ref ContinuousController.instance.nullSkillInfos,
+                                        activateClass).ReduceSecurity());
                                 }
 
                                 yield return null;

Assets/Editor/Fixing Scripts/ScriptableObjects/CardEntity_Inconsistency.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4717ec38a3e967bbfa3a4a9b388d3138607bc8b811bd40f8207c77f05fe2dfda
-size 503
+oid sha256:ec0a216e53f66396c5929fdb72b9a4826941a511c02f73432d62573c24ac17b4
+size 492

Assets/Prefab/HandCard.prefab

@@ -6694,13 +6694,13 @@ MonoBehaviour:
   cardPositionText: {fileID: 7694961108546186613}
   handCardCommandPanel: {fileID: 8570590349541479723}
   CostIcons:
-  - {fileID: 5922251563477394441}
-  - {fileID: 5280413575428409572}
-  - {fileID: 6568027735918928074}
-  - {fileID: 2651622044325768492}
-  - {fileID: 3088076432393428445}
-  - {fileID: 8295827933361417547}
   - {fileID: 1440511807545585426}
+  - {fileID: 8295827933361417547}
+  - {fileID: 3088076432393428445}
+  - {fileID: 2651622044325768492}
+  - {fileID: 6568027735918928074}
+  - {fileID: 5280413575428409572}
+  - {fileID: 5922251563477394441}
   CostText: {fileID: 434856233017077518}
   LevelIcons:
   - {fileID: 7591777052740348891}

Assets/Scripts/CardController.cs

@@ -1272,7 +1272,8 @@ public class PlayPermanentClass
                 {
                     yield return ContinuousController.instance.StartCoroutine(new IReduceSecurity(
                         player: card.Owner,
-                        refSkillInfos: ref ContinuousController.instance.nullSkillInfos).ReduceSecurity());
+                        refSkillInfos: ref ContinuousController.instance.nullSkillInfos,
+                        CardEffectCommons.GetCardEffectFromHashtable(_hashtable)).ReduceSecurity());
                 }
 
                 if (isEvolution)
@@ -3589,7 +3590,12 @@ public class IBattle
                 #endregion
 
                 #region effect when determine whether to do security check
-                List<SkillInfo> skillInfos_Pierce = AutoProcessing.GetSkillInfos(hashtable, EffectTiming.OnDetermineDoSecurityCheck)
+                Hashtable piercingHashtable = new Hashtable()
+                {
+                    {"battle", this}
+                };
+
+                List<SkillInfo> skillInfos_Pierce = AutoProcessing.GetSkillInfos(piercingHashtable, EffectTiming.OnDetermineDoSecurityCheck)
                     .Filter(skillInfo => skillInfo.CardEffect != null && skillInfo.CardEffect.CanActivate(skillInfo.Hashtable));
 
                 if (skillInfos_Pierce.Count >= 1)

Assets/Scripts/CardEffectFactory/KeyWordEffects/BlastDNADigivolution.cs

@@ -64,7 +64,7 @@ public partial class CardEffectFactory
         }
 
         bool HasValidDNATargets()
-        {//TODO: General - Line 20
+        {
             if (blastDNAConditions[0].Permanents.Count(permanent => !permanent.TopCard.CanNotEvolve(permanent)) > 0 && blastDNAConditions[1].CardSources.Count > 0)
                 return true;
 
@@ -213,19 +213,8 @@ public partial class CardEffectFactory
 
                     yield return ContinuousController.instance.StartCoroutine(CardObjectController.CreateNewPermanent(playedPermanent, frameID));
                 }
-                
-                int[] JogressEvoRootsFrameIDs = { 0, 0 };
 
-                if (selectedPermanent.TopCard.EqualsCardName(blastDNAConditions[0].Name))
-                {
-                    JogressEvoRootsFrameIDs[0] = selectedPermanent.PermanentFrame.FrameID;
-                    JogressEvoRootsFrameIDs[1] = selectedCardSource.PermanentOfThisCard().PermanentFrame.FrameID;
-                }
-                else
-                {
-                    JogressEvoRootsFrameIDs[0] = selectedCardSource.PermanentOfThisCard().PermanentFrame.FrameID;
-                    JogressEvoRootsFrameIDs[1] = selectedPermanent.PermanentFrame.FrameID;
-                }                
+                int[] JogressEvoRootsFrameIDs = { selectedPermanent.PermanentFrame.FrameID, selectedCardSource.PermanentOfThisCard().PermanentFrame.FrameID };
 
                 if (card.CanPlayJogress(true))
                 {

Assets/Scripts/CardSource.cs

@@ -399,10 +399,10 @@ public class CardSource : MonoBehaviour
                     .Map<EvoCost, Func<Permanent, int>>(evoCost =>
                     (targetPermanent) =>
                     {
-                        if(ignore.Equals(CardEffectCommons.IgnoreRequirement.All) && !Owner.CanIgnoreDigivolutionRequirement(targetPermanent, this))
+                        if(ignore.Equals(CardEffectCommons.IgnoreRequirement.All) && Owner.CanIgnoreDigivolutionRequirement(targetPermanent, this))
                             return evoCost.MemoryCost;
 
-                        if ((ignore.Equals(CardEffectCommons.IgnoreRequirement.Color) && !Owner.CanIgnoreDigivolutionRequirement(targetPermanent, this))
+                        if ((ignore.Equals(CardEffectCommons.IgnoreRequirement.Color) && Owner.CanIgnoreDigivolutionRequirement(targetPermanent, this))
                             || targetPermanent.TopCard.CardColors.Contains(evoCost.CardColor))
                         {
                             if ((ignore.Equals(CardEffectCommons.IgnoreRequirement.Level) && Owner.CanIgnoreDigivolutionRequirement(targetPermanent, this))

ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bff84979492f68d725a4489ca4f27b7eaa0bbdbf721069840b8ee1cc440f1cfc
+oid sha256:79a3e62501b3b80f6bfaf0698d1d4e6cf8f7dc8878761b2b6a2322d75a1955fa
 size 20167