Merge branch 'BT21' into EX9

Assets/CardBaseEntity/BT12/Black/Digimon/BT12_063.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:afe9456e0551ba2e21ddb1b3a67765e92f435a2f0ce33d2bbad280db6806e3e4
-size 3223
+oid sha256:c470b1e710cafdbcde93f7e1fb1961af5fe66214e019c3244591748d4f183e61
+size 3236

Assets/CardBaseEntity/ST13/Black/Option/ST13_16_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7cd7f53517b3d9fc1872aac76d411c7cafc800c6e50a8d42182e7be4a8156c9d
-size 1554
+oid sha256:5fad1cd9abc4f5d6419565aa33fa5d869a29bb4b01bd91204060620bf7d78cf3
+size 1541

Assets/CardBaseEntity/ST13/Black/Option/ST13_16_P2.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:665e287edc24ac8cbcf78ff9efbc718f3b321471c986825efc9032218f69a84c
-size 1554
+oid sha256:c00d0b4561cbddd301557b525b970038ee9375eb91a16a61d2ac453ee50bfdd1
+size 1541

Assets/CardBaseEntity/ST13/Black/Option/ST13_16_P3.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d0a3e2731dbaa0653a3831645338053ab320280168fd3b7408c16855547aeaad
-size 1554
+oid sha256:8d7341176e5f422500912397efa27b6308b96f04bf79e1c5d7c2fca1686c9593
+size 1541

Assets/CardBaseEntity/ST5/Black/Digimon/ST5_08_P2.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:287167593c3316d59bc37c71bbabebf7e7e8819f1106b28a121621a194b577d2
+oid sha256:6d5034a8cdd62105b19627849b3dbf64d6ef1995e9bdae245ab11cbd0083cc2a
 size 1102

Assets/CardEffect/BT15/Black/BT15_064.cs

@@ -231,26 +231,26 @@ namespace DCGO.CardEffects.BT15
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
                 {
                     yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.SimplifiedRevealDeckTopCardsAndSelect(
-                                        revealCount: 3,
-                                        simplifiedSelectCardConditions:
-                                        new SimplifiedSelectCardConditionClass[]
-                                        {
-                        new SimplifiedSelectCardConditionClass(
-                            canTargetCondition:CanSelectCardCondition,
-                            message: "Select 1 [Machine],[Cyborg] or [SoC].",
-                            mode: SelectCardEffect.Mode.Custom,
-                            maxCount: 1,
-                            selectCardCoroutine: SelectCardCoroutine),
-                        new SimplifiedSelectCardConditionClass(
-                            canTargetCondition:CanSelectCardCondition1,
-                            message: "Select 1 [Machine],[Cyborg] or [SoC].",
-                            mode: SelectCardEffect.Mode.AddHand,
-                            maxCount: 1,
-                            selectCardCoroutine: null),
-                                        },
-                                        remainingCardsPlace: RemainingCardsPlace.Trash,
-                                        activateClass: activateClass
-                                    ));
+                        revealCount: 3,
+                        simplifiedSelectCardConditions:
+                            new SimplifiedSelectCardConditionClass[]
+                            {
+                                new SimplifiedSelectCardConditionClass(
+                                    canTargetCondition:CanSelectCardCondition,
+                                    message: "Select 1 [Machine], [Cyborg] or [SoC] to place in sources.",
+                                    mode: SelectCardEffect.Mode.Custom,
+                                    maxCount: 1,
+                                    selectCardCoroutine: SelectCardCoroutine),
+                                new SimplifiedSelectCardConditionClass(
+                                    canTargetCondition:CanSelectCardCondition1,
+                                    message: "Select 1 [Machine], [Cyborg] or [SoC] to add to hand.",
+                                    mode: SelectCardEffect.Mode.AddHand,
+                                    maxCount: 1,
+                                    selectCardCoroutine: null),
+                            },
+                        remainingCardsPlace: RemainingCardsPlace.Trash,
+                        activateClass: activateClass
+                    ));
 
                     IEnumerator SelectCardCoroutine(CardSource cardSource)
                     {
@@ -309,26 +309,26 @@ namespace DCGO.CardEffects.BT15
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
                 {
                     yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.SimplifiedRevealDeckTopCardsAndSelect(
-                                        revealCount: 3,
-                                        simplifiedSelectCardConditions:
-                                        new SimplifiedSelectCardConditionClass[]
-                                        {
-                        new SimplifiedSelectCardConditionClass(
-                            canTargetCondition:CanSelectCardCondition,
-                            message: "Select 1 [Machine],[Cyborg] or [SoC].",
-                            mode: SelectCardEffect.Mode.Custom,
-                            maxCount: 1,
-                            selectCardCoroutine: SelectCardCoroutine),
-                        new SimplifiedSelectCardConditionClass(
-                            canTargetCondition:CanSelectCardCondition1,
-                            message: "Select 1 [Machine],[Cyborg] or [SoC].",
-                            mode: SelectCardEffect.Mode.AddHand,
-                            maxCount: 1,
-                            selectCardCoroutine: null),
-                                        },
-                                        remainingCardsPlace: RemainingCardsPlace.Trash,
-                                        activateClass: activateClass
-                                    ));
+                        revealCount: 3,
+                        simplifiedSelectCardConditions:
+                            new SimplifiedSelectCardConditionClass[]
+                            {
+                                new SimplifiedSelectCardConditionClass(
+                                    canTargetCondition:CanSelectCardCondition,
+                                    message: "Select 1 [Machine], [Cyborg] or [SoC] to place in sources.",
+                                    mode: SelectCardEffect.Mode.Custom,
+                                    maxCount: 1,
+                                    selectCardCoroutine: SelectCardCoroutine),
+                                new SimplifiedSelectCardConditionClass(
+                                    canTargetCondition:CanSelectCardCondition1,
+                                    message: "Select 1 [Machine], [Cyborg] or [SoC] to add to hand.",
+                                    mode: SelectCardEffect.Mode.AddHand,
+                                    maxCount: 1,
+                                    selectCardCoroutine: null),
+                            },
+                        remainingCardsPlace: RemainingCardsPlace.Trash,
+                        activateClass: activateClass
+                    ));
 
                     IEnumerator SelectCardCoroutine(CardSource cardSource)
                     {

Assets/CardEffect/EX6/Green/EX6_035.cs

@@ -133,7 +133,7 @@ namespace DCGO.CardEffects.EX6
                             mode: SelectHandEffect.Mode.Custom,
                             cardEffect: activateClass);
 
-                        selectHandEffect.SetUpCustomMessage("Play 1 Digimon from hand, Then -6k DP for each digimon", "The opponent is selecting 1 card to play.");
+                        selectHandEffect.SetUpCustomMessage("Select 1 card to play.", "The opponent is selecting 1 card to play.");
                         selectHandEffect.SetUpCustomMessage_ShowCard("Played Card");
 
                         yield return StartCoroutine(selectHandEffect.Activate());

Assets/CardEffect/P/Black/P_179.cs

@@ -46,7 +46,7 @@ namespace DCGO.CardEffects.P
             if (timing == EffectTiming.OnEnterFieldAnyone)
             {
                 ActivateClass activateClass = new ActivateClass();
-                activateClass.SetUpICardEffect("Play [Device] option from hand or trash", CanUseCondition, card);
+                activateClass.SetUpICardEffect("Place [Device] option from hand or trash", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
                 cardEffects.Add(activateClass);
 
@@ -152,16 +152,11 @@ namespace DCGO.CardEffects.P
                     {
                         yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.PlaceDelayOptionCards(card: selectedDevice, cardEffect: activateClass));
 
-                        ChangeBaseDPClass changeDPClass = new ChangeBaseDPClass();
-                        changeDPClass.SetUpICardEffect("+3000 DP", (hashtable) => true, card);
-                        changeDPClass.SetUpChangeBaseDPClass(changeDPFunc: ChangeDP, permanentCondition: permanentCondition, isUpDownFunc: () => false, isMinusDPFunc: () => false);
-                        selectedDevice.PermanentOfThisCard().UntilEachTurnEndEffects.Add((_timing) => changeDPClass);
-
-                        int ChangeDP(Permanent permanent, int DP)
-                            => DP + 3000;
-
-                        bool permanentCondition(Permanent permanent)
-                            => permanent != null && permanent.TopCard != null && permanent == selectedDevice.PermanentOfThisCard();
+                        yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ChangeDigimonDP(
+                                        targetPermanent: card.PermanentOfThisCard(), 
+                                        changeValue: 3000, 
+                                        effectDuration: EffectDuration.UntilOpponentTurnEnd, 
+                                        activateClass: activateClass));
                     }
                 }
             }

Assets/CardEffect/ST21/Purple/ST21_11.cs

@@ -139,6 +139,7 @@ namespace DCGO.CardEffects.ST21
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Play level 4", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, true, EffectDescription());
+                activateClass.SetHashString("WA_ST21-11");
                 cardEffects.Add(activateClass);
                 
                 string EffectDescription()
@@ -211,6 +212,7 @@ namespace DCGO.CardEffects.ST21
                 }
             }
             #endregion
+
             return cardEffects;
         }
     }

Assets/CardEffect/ST21/Yellow/ST21_06.cs

@@ -93,13 +93,8 @@ namespace DCGO.CardEffects.ST21
 
                     IEnumerator SelectPermanentCoroutine(Permanent permanent)
                     {
-                        if (!permanent.IsToken)
-                        {
-                            Player selectedOwner = permanent.TopCard.Owner;
-                            yield return ContinuousController.instance.StartCoroutine(new IPutSecurityPermanent(permanent, CardEffectCommons.CardEffectHashtable(activateClass), toTop: true).PutSecurity());
-                        }
-
-                        yield return null;
+                        Player selectedOwner = permanent.TopCard.Owner;
+                        yield return ContinuousController.instance.StartCoroutine(new IPutSecurityPermanent(permanent, CardEffectCommons.CardEffectHashtable(activateClass), toTop: true).PutSecurity());
                     }
                 }
             }
@@ -161,13 +156,8 @@ namespace DCGO.CardEffects.ST21
 
                     IEnumerator SelectPermanentCoroutine(Permanent permanent)
                     {
-                        if (!permanent.IsToken)
-                        {
-                            Player selectedOwner = permanent.TopCard.Owner;
-                            yield return ContinuousController.instance.StartCoroutine(new IPutSecurityPermanent(permanent, CardEffectCommons.CardEffectHashtable(activateClass), toTop: true).PutSecurity());
-                        }
-
-                        yield return null;
+                        Player selectedOwner = permanent.TopCard.Owner;
+                        yield return ContinuousController.instance.StartCoroutine(new IPutSecurityPermanent(permanent, CardEffectCommons.CardEffectHashtable(activateClass), toTop: true).PutSecurity());
                     }
                 }
             }

Assets/Scenes/ContinuousControllerScene.unity

@@ -475,6 +475,133 @@ MonoBehaviour:
   - {fileID: 11400000, guid: da9668fcd6fbaa840a776f7485c94449, type: 2}
   - {fileID: 11400000, guid: 797dda43c25650946911d1b4c8699a2b, type: 2}
   - {fileID: 11400000, guid: 384cbeced540f9242907b9e15cd9cbf5, type: 2}
+  - {fileID: 11400000, guid: 3ed3b18e68c8f214eb68ad82c9d7e194, type: 2}
+  - {fileID: 11400000, guid: 5f7705c1dc123c44b9d62a6ee3d43cce, type: 2}
+  - {fileID: 11400000, guid: 073e39c28c08f144098d8a33d9cce18c, type: 2}
+  - {fileID: 11400000, guid: 250ace19895b5ec42901d60e1e6e8875, type: 2}
+  - {fileID: 11400000, guid: ea94c6e312c39784082e7fe041b3b2ba, type: 2}
+  - {fileID: 11400000, guid: 631afdaa4a3544547ae4851c312e29a4, type: 2}
+  - {fileID: 11400000, guid: e8a8a4c6c60ba464ba917093e502159b, type: 2}
+  - {fileID: 11400000, guid: 18a0d95e02e98e84bb125256a0ecb449, type: 2}
+  - {fileID: 11400000, guid: 82ce8056244ace542b57f1d4055f70a5, type: 2}
+  - {fileID: 11400000, guid: 83e182e7bc07e4f449d6ae86c0196a7c, type: 2}
+  - {fileID: 11400000, guid: 9a2bf7303d5a74848b684150e41b30d3, type: 2}
+  - {fileID: 11400000, guid: eedd7b001d2c9b54d9abb47a97a291e3, type: 2}
+  - {fileID: 11400000, guid: 11fbbf03764fb1747afcf7de0ee9394c, type: 2}
+  - {fileID: 11400000, guid: 5e90ac0dbdd8ac84e8c05886845d88d8, type: 2}
+  - {fileID: 11400000, guid: b38100ccc381ee84290bf31f25fb0987, type: 2}
+  - {fileID: 11400000, guid: d01607b06d4051d4b84599c21651f79d, type: 2}
+  - {fileID: 11400000, guid: 35c774f592f16bc4cb901c794215041f, type: 2}
+  - {fileID: 11400000, guid: 02cb51b35b7eabf41acb15157cb91c34, type: 2}
+  - {fileID: 11400000, guid: 0c4df93eddc377248880d0c6d463bf4f, type: 2}
+  - {fileID: 11400000, guid: 58013915ece4c8741a3613fc3e711442, type: 2}
+  - {fileID: 11400000, guid: 20cccbcf7c4e711429e6ab3de578e3a8, type: 2}
+  - {fileID: 11400000, guid: 85de7325abd14a74086d250318f3a70a, type: 2}
+  - {fileID: 11400000, guid: 3829a0e250cc5f64ba708819031db28d, type: 2}
+  - {fileID: 11400000, guid: bddbad41a162b984e93d2b24ca82eff6, type: 2}
+  - {fileID: 11400000, guid: cdfb17a2351bd474599652e9bfd7a059, type: 2}
+  - {fileID: 11400000, guid: aa065c81982b15b419c6b692ca10a6e3, type: 2}
+  - {fileID: 11400000, guid: 0c9b0b85497512b4880433b9eeaf82ee, type: 2}
+  - {fileID: 11400000, guid: 6c876df2b889a974f95790af480bed27, type: 2}
+  - {fileID: 11400000, guid: 3573db064c877c248bfaf439d827ba94, type: 2}
+  - {fileID: 11400000, guid: a8bf5af596d2e344fb421499802812e6, type: 2}
+  - {fileID: 11400000, guid: 4018e159d18b9aa4b9320b036f888d07, type: 2}
+  - {fileID: 11400000, guid: e3a2d1d368b1a584592a57f78d1a0c93, type: 2}
+  - {fileID: 11400000, guid: dad9f07d084dd154792c24b22554d3fc, type: 2}
+  - {fileID: 11400000, guid: bf1f1275973050641b84f5dd5b1f4afc, type: 2}
+  - {fileID: 11400000, guid: cb28d0c288217c34bbdbb7ef5b5380af, type: 2}
+  - {fileID: 11400000, guid: f716e9afc9298644dacb571908840db7, type: 2}
+  - {fileID: 11400000, guid: d9d49be4cf920544fa8cb908862bf7a2, type: 2}
+  - {fileID: 11400000, guid: a5db2222b98a7ab46a67201a5e2566fa, type: 2}
+  - {fileID: 11400000, guid: de394ad585e9585438ccecb95b832b82, type: 2}
+  - {fileID: 11400000, guid: 4998e283329f6c444b729fc8e3903f7a, type: 2}
+  - {fileID: 11400000, guid: 5ae81a3556f78914fb794f06077bbf36, type: 2}
+  - {fileID: 11400000, guid: 263da4fe3cfcfad4d9052f1f35962d40, type: 2}
+  - {fileID: 11400000, guid: 7bcb202a20ed99c4d99cb47f95ad0ae3, type: 2}
+  - {fileID: 11400000, guid: 53fa4fe648cb11647be68a5f37cc3afe, type: 2}
+  - {fileID: 11400000, guid: f2b9f482f37774d4b8a3e632117243bb, type: 2}
+  - {fileID: 11400000, guid: c01579b4109f0b84d9cae25522c6859c, type: 2}
+  - {fileID: 11400000, guid: 51cc92b591ee58f41b9ffa3169b003e5, type: 2}
+  - {fileID: 11400000, guid: 1a8ee7b5f391d5741bea7b6222251b2a, type: 2}
+  - {fileID: 11400000, guid: ede5bea38fde457419f859ee99b0308e, type: 2}
+  - {fileID: 11400000, guid: d949f88085b41194aa5a0f7c14faefaa, type: 2}
+  - {fileID: 11400000, guid: 89884a118f002504d9d2f77ca8e92408, type: 2}
+  - {fileID: 11400000, guid: 4eac4f377f48dda4e9f95676543b6c1a, type: 2}
+  - {fileID: 11400000, guid: 53ab1f010665844428890747b91a45da, type: 2}
+  - {fileID: 11400000, guid: 8bbc29f621018ff45a06ca0afcf865c9, type: 2}
+  - {fileID: 11400000, guid: 8bc2da7ca3a8262448015610d4612c18, type: 2}
+  - {fileID: 11400000, guid: c7cf5fd04e37ec040b4aee9676c35d22, type: 2}
+  - {fileID: 11400000, guid: 262a24bd5f60300488c31b37bb67ca8d, type: 2}
+  - {fileID: 11400000, guid: d7af271ea300a7e48bffc8d3bebbe8d8, type: 2}
+  - {fileID: 11400000, guid: cf45b39b6546f1940bf687182488123e, type: 2}
+  - {fileID: 11400000, guid: 6b885bbffbf650446b6a7153b9f2ab57, type: 2}
+  - {fileID: 11400000, guid: 2bb83ab5cb1ed4e43a62cde62d5c337e, type: 2}
+  - {fileID: 11400000, guid: c47aa39945d3ecd4dacce97adbbfb059, type: 2}
+  - {fileID: 11400000, guid: 17011a82b6b50eb41b431db24e2d464a, type: 2}
+  - {fileID: 11400000, guid: bc9367cbdf37dd24e8f525649517b4c1, type: 2}
+  - {fileID: 11400000, guid: 2980d5f8c4e9adf4dbf5c81e4f7c4c45, type: 2}
+  - {fileID: 11400000, guid: 4cf018bf3ec0e8244bf8b563f4180582, type: 2}
+  - {fileID: 11400000, guid: 529ecb9ad3b0a724e8fbf857d810b4b7, type: 2}
+  - {fileID: 11400000, guid: c885661f59d4bff459ab21b239b63cbc, type: 2}
+  - {fileID: 11400000, guid: d6d19eccce1d37d4b8c8512b8a1e7a7f, type: 2}
+  - {fileID: 11400000, guid: 72a8dc8a1b9efdb46918d85a8740f361, type: 2}
+  - {fileID: 11400000, guid: 1c043b4acc94b124a99132a0b0cfc946, type: 2}
+  - {fileID: 11400000, guid: fe132788febb6154b906c25ea75104a5, type: 2}
+  - {fileID: 11400000, guid: f89a0ef0d1d7786459f3387e5e50d3a2, type: 2}
+  - {fileID: 11400000, guid: d7fe46bbeb873014da4390d975630b4f, type: 2}
+  - {fileID: 11400000, guid: 5bc0407a800e82f40b0844735575d3ba, type: 2}
+  - {fileID: 11400000, guid: 687b2822e5e90224cb1ea9e0e28f4d82, type: 2}
+  - {fileID: 11400000, guid: f9013289cc196cc45a67fe5cdf72ce41, type: 2}
+  - {fileID: 11400000, guid: 026308dae51e1ec4ab3b4e682b04f69d, type: 2}
+  - {fileID: 11400000, guid: ae3d8b49f2408844c98120b29fb44cbd, type: 2}
+  - {fileID: 11400000, guid: c588f0625ecba444996355726c6edf03, type: 2}
+  - {fileID: 11400000, guid: 1d78bdcefafb5c246a8c87065027a2c0, type: 2}
+  - {fileID: 11400000, guid: 160d2c4c1a78b3b4caf22b38f581a836, type: 2}
+  - {fileID: 11400000, guid: ed91a929968a33e42b51f5565af2208f, type: 2}
+  - {fileID: 11400000, guid: a8d027591f902b44898cf79575f1247f, type: 2}
+  - {fileID: 11400000, guid: 969ad3ab3943733449fe73c1090c2320, type: 2}
+  - {fileID: 11400000, guid: 2f9807d23a7958946a05a69551ec9c29, type: 2}
+  - {fileID: 11400000, guid: 9ab0d582e7149ad4ea42a340cb18afdc, type: 2}
+  - {fileID: 11400000, guid: f93d6664bb8678a4f8d48c763b6f03d4, type: 2}
+  - {fileID: 11400000, guid: 9c3cb3572296f1c4386ed3de2d1123f9, type: 2}
+  - {fileID: 11400000, guid: e009872d616586e449320d657c3063dc, type: 2}
+  - {fileID: 11400000, guid: c59a1eef34d210a4884577b979707b73, type: 2}
+  - {fileID: 11400000, guid: cfd4b47a0baeba54484828f2a9847a8e, type: 2}
+  - {fileID: 11400000, guid: 416af0dcb3ebdab41a1eac5ee2e7bb48, type: 2}
+  - {fileID: 11400000, guid: dbd1840c9c4efc24b80b4c0a8607bda8, type: 2}
+  - {fileID: 11400000, guid: 61f81a1d626048543a9db72a6f5ccba3, type: 2}
+  - {fileID: 11400000, guid: 07bde7c6dee513f448d04f2e2016d8cd, type: 2}
+  - {fileID: 11400000, guid: 7a61491989db60f4492eae5791d16b8d, type: 2}
+  - {fileID: 11400000, guid: beea9b2ae3c10eb4d88afcfed784938f, type: 2}
+  - {fileID: 11400000, guid: c355a4eec96d911428103416e883f4e8, type: 2}
+  - {fileID: 11400000, guid: 600aad688240de14589c98a475e1657b, type: 2}
+  - {fileID: 11400000, guid: da08ec4d55f4cd240bbb9ec98d305be1, type: 2}
+  - {fileID: 11400000, guid: 6650392b5291bfb48a354d8f65bccde3, type: 2}
+  - {fileID: 11400000, guid: af0dd9ab631716c4197e20287fd97d57, type: 2}
+  - {fileID: 11400000, guid: 220fb8a891e4b7941b243e1d478c78e5, type: 2}
+  - {fileID: 11400000, guid: 2f166e277c90a0f45ae7d38b472ff9e8, type: 2}
+  - {fileID: 11400000, guid: 7c985ba49488ea24dbfdf65fb22537ea, type: 2}
+  - {fileID: 11400000, guid: 012734e1e7168944bb4e96c6625b2086, type: 2}
+  - {fileID: 11400000, guid: 687882638adc6d84996ba3073ebec395, type: 2}
+  - {fileID: 11400000, guid: 208b21ca6e80f6a41918ab975df96b80, type: 2}
+  - {fileID: 11400000, guid: f1fe0b65c2dcb354a99bc30ec429e9a1, type: 2}
+  - {fileID: 11400000, guid: 4e92de07dc1f31a42a2026e27e815b16, type: 2}
+  - {fileID: 11400000, guid: 4ad2907c2c7be6941a6641996be8c69b, type: 2}
+  - {fileID: 11400000, guid: 2f43d377f7e21d0468c52bd71a1c2883, type: 2}
+  - {fileID: 11400000, guid: 2433195b94b2fb942bd07c31653e8740, type: 2}
+  - {fileID: 11400000, guid: 1139c84088877704a8dbf08f08e18fa3, type: 2}
+  - {fileID: 11400000, guid: bcd4d5307210e2d4ba84c344359b7759, type: 2}
+  - {fileID: 11400000, guid: c4a33f5c1e601d8478d4654582fdb06a, type: 2}
+  - {fileID: 11400000, guid: 7421b8adac0a95645bbf8086636aa753, type: 2}
+  - {fileID: 11400000, guid: 8fcc7c72335181149812e5441172d4ed, type: 2}
+  - {fileID: 11400000, guid: 13a26e8186c9b4f4cb3b3ef7246da41f, type: 2}
+  - {fileID: 11400000, guid: 0588dddb2b999c747897a2d15eccfe22, type: 2}
+  - {fileID: 11400000, guid: 225897bebb266f148ac0dcd5674a6a73, type: 2}
+  - {fileID: 11400000, guid: f1eacb015e7943341b10b926bd0e76f8, type: 2}
+  - {fileID: 11400000, guid: 4cb628b6893510a48a68370f7213ff12, type: 2}
+  - {fileID: 11400000, guid: 3612487f0205f51459cf870f51534665, type: 2}
+  - {fileID: 11400000, guid: 88ef20d7ed7837d42b7919d63ed48083, type: 2}
+  - {fileID: 11400000, guid: ba6c39b4312391e46beb7f4c23ab5875, type: 2}
   - {fileID: 11400000, guid: ca8d66a5bc9b36b49ba64f61b6285e8e, type: 2}
   - {fileID: 11400000, guid: f4d03b0e7bac3404a9d7abf6ab5b0538, type: 2}
   - {fileID: 11400000, guid: 8157df890bd6dc649b8d64cc19f9c6c1, type: 2}
@@ -11263,6 +11390,133 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 2810ef8b3aa52814aaf8534ffd7bc0e2, type: 2}
   - {fileID: 11400000, guid: b0b6601d664fcd642bb53d13bc8083de, type: 2}
   - {fileID: 11400000, guid: 9a61817ebf1af2847b4587be1bd0fef1, type: 2}
+  - {fileID: 11400000, guid: 3ed3b18e68c8f214eb68ad82c9d7e194, type: 2}
+  - {fileID: 11400000, guid: 5f7705c1dc123c44b9d62a6ee3d43cce, type: 2}
+  - {fileID: 11400000, guid: c01579b4109f0b84d9cae25522c6859c, type: 2}
+  - {fileID: 11400000, guid: 6b885bbffbf650446b6a7153b9f2ab57, type: 2}
+  - {fileID: 11400000, guid: 72a8dc8a1b9efdb46918d85a8740f361, type: 2}
+  - {fileID: 11400000, guid: 160d2c4c1a78b3b4caf22b38f581a836, type: 2}
+  - {fileID: 11400000, guid: 073e39c28c08f144098d8a33d9cce18c, type: 2}
+  - {fileID: 11400000, guid: 250ace19895b5ec42901d60e1e6e8875, type: 2}
+  - {fileID: 11400000, guid: ea94c6e312c39784082e7fe041b3b2ba, type: 2}
+  - {fileID: 11400000, guid: 631afdaa4a3544547ae4851c312e29a4, type: 2}
+  - {fileID: 11400000, guid: e8a8a4c6c60ba464ba917093e502159b, type: 2}
+  - {fileID: 11400000, guid: 18a0d95e02e98e84bb125256a0ecb449, type: 2}
+  - {fileID: 11400000, guid: 82ce8056244ace542b57f1d4055f70a5, type: 2}
+  - {fileID: 11400000, guid: 83e182e7bc07e4f449d6ae86c0196a7c, type: 2}
+  - {fileID: 11400000, guid: 9a2bf7303d5a74848b684150e41b30d3, type: 2}
+  - {fileID: 11400000, guid: eedd7b001d2c9b54d9abb47a97a291e3, type: 2}
+  - {fileID: 11400000, guid: 11fbbf03764fb1747afcf7de0ee9394c, type: 2}
+  - {fileID: 11400000, guid: 5e90ac0dbdd8ac84e8c05886845d88d8, type: 2}
+  - {fileID: 11400000, guid: b38100ccc381ee84290bf31f25fb0987, type: 2}
+  - {fileID: 11400000, guid: d01607b06d4051d4b84599c21651f79d, type: 2}
+  - {fileID: 11400000, guid: 35c774f592f16bc4cb901c794215041f, type: 2}
+  - {fileID: 11400000, guid: 02cb51b35b7eabf41acb15157cb91c34, type: 2}
+  - {fileID: 11400000, guid: 0c4df93eddc377248880d0c6d463bf4f, type: 2}
+  - {fileID: 11400000, guid: 58013915ece4c8741a3613fc3e711442, type: 2}
+  - {fileID: 11400000, guid: 20cccbcf7c4e711429e6ab3de578e3a8, type: 2}
+  - {fileID: 11400000, guid: 85de7325abd14a74086d250318f3a70a, type: 2}
+  - {fileID: 11400000, guid: 3829a0e250cc5f64ba708819031db28d, type: 2}
+  - {fileID: 11400000, guid: bddbad41a162b984e93d2b24ca82eff6, type: 2}
+  - {fileID: 11400000, guid: cdfb17a2351bd474599652e9bfd7a059, type: 2}
+  - {fileID: 11400000, guid: aa065c81982b15b419c6b692ca10a6e3, type: 2}
+  - {fileID: 11400000, guid: 0c9b0b85497512b4880433b9eeaf82ee, type: 2}
+  - {fileID: 11400000, guid: 6c876df2b889a974f95790af480bed27, type: 2}
+  - {fileID: 11400000, guid: 3573db064c877c248bfaf439d827ba94, type: 2}
+  - {fileID: 11400000, guid: a8bf5af596d2e344fb421499802812e6, type: 2}
+  - {fileID: 11400000, guid: 4018e159d18b9aa4b9320b036f888d07, type: 2}
+  - {fileID: 11400000, guid: 51cc92b591ee58f41b9ffa3169b003e5, type: 2}
+  - {fileID: 11400000, guid: 1a8ee7b5f391d5741bea7b6222251b2a, type: 2}
+  - {fileID: 11400000, guid: ede5bea38fde457419f859ee99b0308e, type: 2}
+  - {fileID: 11400000, guid: d949f88085b41194aa5a0f7c14faefaa, type: 2}
+  - {fileID: 11400000, guid: 89884a118f002504d9d2f77ca8e92408, type: 2}
+  - {fileID: 11400000, guid: 4eac4f377f48dda4e9f95676543b6c1a, type: 2}
+  - {fileID: 11400000, guid: 53ab1f010665844428890747b91a45da, type: 2}
+  - {fileID: 11400000, guid: 8bbc29f621018ff45a06ca0afcf865c9, type: 2}
+  - {fileID: 11400000, guid: 8bc2da7ca3a8262448015610d4612c18, type: 2}
+  - {fileID: 11400000, guid: 2bb83ab5cb1ed4e43a62cde62d5c337e, type: 2}
+  - {fileID: 11400000, guid: c47aa39945d3ecd4dacce97adbbfb059, type: 2}
+  - {fileID: 11400000, guid: 17011a82b6b50eb41b431db24e2d464a, type: 2}
+  - {fileID: 11400000, guid: bc9367cbdf37dd24e8f525649517b4c1, type: 2}
+  - {fileID: 11400000, guid: 2980d5f8c4e9adf4dbf5c81e4f7c4c45, type: 2}
+  - {fileID: 11400000, guid: 4cf018bf3ec0e8244bf8b563f4180582, type: 2}
+  - {fileID: 11400000, guid: 1c043b4acc94b124a99132a0b0cfc946, type: 2}
+  - {fileID: 11400000, guid: fe132788febb6154b906c25ea75104a5, type: 2}
+  - {fileID: 11400000, guid: f89a0ef0d1d7786459f3387e5e50d3a2, type: 2}
+  - {fileID: 11400000, guid: d7fe46bbeb873014da4390d975630b4f, type: 2}
+  - {fileID: 11400000, guid: 5bc0407a800e82f40b0844735575d3ba, type: 2}
+  - {fileID: 11400000, guid: 687b2822e5e90224cb1ea9e0e28f4d82, type: 2}
+  - {fileID: 11400000, guid: f9013289cc196cc45a67fe5cdf72ce41, type: 2}
+  - {fileID: 11400000, guid: 026308dae51e1ec4ab3b4e682b04f69d, type: 2}
+  - {fileID: 11400000, guid: ae3d8b49f2408844c98120b29fb44cbd, type: 2}
+  - {fileID: 11400000, guid: c588f0625ecba444996355726c6edf03, type: 2}
+  - {fileID: 11400000, guid: ed91a929968a33e42b51f5565af2208f, type: 2}
+  - {fileID: 11400000, guid: a8d027591f902b44898cf79575f1247f, type: 2}
+  - {fileID: 11400000, guid: 969ad3ab3943733449fe73c1090c2320, type: 2}
+  - {fileID: 11400000, guid: 2f9807d23a7958946a05a69551ec9c29, type: 2}
+  - {fileID: 11400000, guid: 9ab0d582e7149ad4ea42a340cb18afdc, type: 2}
+  - {fileID: 11400000, guid: f93d6664bb8678a4f8d48c763b6f03d4, type: 2}
+  - {fileID: 11400000, guid: 9c3cb3572296f1c4386ed3de2d1123f9, type: 2}
+  - {fileID: 11400000, guid: e009872d616586e449320d657c3063dc, type: 2}
+  - {fileID: 11400000, guid: c59a1eef34d210a4884577b979707b73, type: 2}
+  - {fileID: 11400000, guid: cfd4b47a0baeba54484828f2a9847a8e, type: 2}
+  - {fileID: 11400000, guid: 416af0dcb3ebdab41a1eac5ee2e7bb48, type: 2}
+  - {fileID: 11400000, guid: dbd1840c9c4efc24b80b4c0a8607bda8, type: 2}
+  - {fileID: 11400000, guid: 61f81a1d626048543a9db72a6f5ccba3, type: 2}
+  - {fileID: 11400000, guid: c355a4eec96d911428103416e883f4e8, type: 2}
+  - {fileID: 11400000, guid: 600aad688240de14589c98a475e1657b, type: 2}
+  - {fileID: 11400000, guid: da08ec4d55f4cd240bbb9ec98d305be1, type: 2}
+  - {fileID: 11400000, guid: 6650392b5291bfb48a354d8f65bccde3, type: 2}
+  - {fileID: 11400000, guid: af0dd9ab631716c4197e20287fd97d57, type: 2}
+  - {fileID: 11400000, guid: 220fb8a891e4b7941b243e1d478c78e5, type: 2}
+  - {fileID: 11400000, guid: 2f166e277c90a0f45ae7d38b472ff9e8, type: 2}
+  - {fileID: 11400000, guid: 7c985ba49488ea24dbfdf65fb22537ea, type: 2}
+  - {fileID: 11400000, guid: 012734e1e7168944bb4e96c6625b2086, type: 2}
+  - {fileID: 11400000, guid: 687882638adc6d84996ba3073ebec395, type: 2}
+  - {fileID: 11400000, guid: 208b21ca6e80f6a41918ab975df96b80, type: 2}
+  - {fileID: 11400000, guid: f1fe0b65c2dcb354a99bc30ec429e9a1, type: 2}
+  - {fileID: 11400000, guid: 4e92de07dc1f31a42a2026e27e815b16, type: 2}
+  - {fileID: 11400000, guid: 4ad2907c2c7be6941a6641996be8c69b, type: 2}
+  - {fileID: 11400000, guid: 2f43d377f7e21d0468c52bd71a1c2883, type: 2}
+  - {fileID: 11400000, guid: 2433195b94b2fb942bd07c31653e8740, type: 2}
+  - {fileID: 11400000, guid: 1139c84088877704a8dbf08f08e18fa3, type: 2}
+  - {fileID: 11400000, guid: e3a2d1d368b1a584592a57f78d1a0c93, type: 2}
+  - {fileID: 11400000, guid: dad9f07d084dd154792c24b22554d3fc, type: 2}
+  - {fileID: 11400000, guid: bf1f1275973050641b84f5dd5b1f4afc, type: 2}
+  - {fileID: 11400000, guid: cb28d0c288217c34bbdbb7ef5b5380af, type: 2}
+  - {fileID: 11400000, guid: f716e9afc9298644dacb571908840db7, type: 2}
+  - {fileID: 11400000, guid: d9d49be4cf920544fa8cb908862bf7a2, type: 2}
+  - {fileID: 11400000, guid: a5db2222b98a7ab46a67201a5e2566fa, type: 2}
+  - {fileID: 11400000, guid: de394ad585e9585438ccecb95b832b82, type: 2}
+  - {fileID: 11400000, guid: 4998e283329f6c444b729fc8e3903f7a, type: 2}
+  - {fileID: 11400000, guid: 5ae81a3556f78914fb794f06077bbf36, type: 2}
+  - {fileID: 11400000, guid: c7cf5fd04e37ec040b4aee9676c35d22, type: 2}
+  - {fileID: 11400000, guid: 262a24bd5f60300488c31b37bb67ca8d, type: 2}
+  - {fileID: 11400000, guid: 529ecb9ad3b0a724e8fbf857d810b4b7, type: 2}
+  - {fileID: 11400000, guid: c885661f59d4bff459ab21b239b63cbc, type: 2}
+  - {fileID: 11400000, guid: 07bde7c6dee513f448d04f2e2016d8cd, type: 2}
+  - {fileID: 11400000, guid: 7a61491989db60f4492eae5791d16b8d, type: 2}
+  - {fileID: 11400000, guid: bcd4d5307210e2d4ba84c344359b7759, type: 2}
+  - {fileID: 11400000, guid: c4a33f5c1e601d8478d4654582fdb06a, type: 2}
+  - {fileID: 11400000, guid: 7421b8adac0a95645bbf8086636aa753, type: 2}
+  - {fileID: 11400000, guid: 8fcc7c72335181149812e5441172d4ed, type: 2}
+  - {fileID: 11400000, guid: 263da4fe3cfcfad4d9052f1f35962d40, type: 2}
+  - {fileID: 11400000, guid: 7bcb202a20ed99c4d99cb47f95ad0ae3, type: 2}
+  - {fileID: 11400000, guid: 53fa4fe648cb11647be68a5f37cc3afe, type: 2}
+  - {fileID: 11400000, guid: f2b9f482f37774d4b8a3e632117243bb, type: 2}
+  - {fileID: 11400000, guid: d7af271ea300a7e48bffc8d3bebbe8d8, type: 2}
+  - {fileID: 11400000, guid: cf45b39b6546f1940bf687182488123e, type: 2}
+  - {fileID: 11400000, guid: d6d19eccce1d37d4b8c8512b8a1e7a7f, type: 2}
+  - {fileID: 11400000, guid: 1d78bdcefafb5c246a8c87065027a2c0, type: 2}
+  - {fileID: 11400000, guid: beea9b2ae3c10eb4d88afcfed784938f, type: 2}
+  - {fileID: 11400000, guid: 13a26e8186c9b4f4cb3b3ef7246da41f, type: 2}
+  - {fileID: 11400000, guid: 0588dddb2b999c747897a2d15eccfe22, type: 2}
+  - {fileID: 11400000, guid: 225897bebb266f148ac0dcd5674a6a73, type: 2}
+  - {fileID: 11400000, guid: f1eacb015e7943341b10b926bd0e76f8, type: 2}
+  - {fileID: 11400000, guid: 4cb628b6893510a48a68370f7213ff12, type: 2}
+  - {fileID: 11400000, guid: 3612487f0205f51459cf870f51534665, type: 2}
+  - {fileID: 11400000, guid: 88ef20d7ed7837d42b7919d63ed48083, type: 2}
+  - {fileID: 11400000, guid: ba6c39b4312391e46beb7f4c23ab5875, type: 2}
   - {fileID: 11400000, guid: 03f5e14579a633043a99437490dfef8d, type: 2}
   - {fileID: 11400000, guid: f722aa20dbee0824b9b2638096816697, type: 2}
   - {fileID: 11400000, guid: e085fbfb0bc42744f9eb98b5afffaac0, type: 2}

Assets/Scripts/CardSource.cs

@@ -2612,23 +2612,17 @@ public class CardSource : MonoBehaviour
                         {
                             if (!this.CanNotEvolve(targetPermanent))
                             {
-                                if (appFusionCondition.digimonCondition(targetPermanent))
+                                if (linkCondition.digimonCondition(targetPermanent))
                                 {
-                                    foreach (CardSource linkedCard in targetPermanent.LinkedCards)
+                                    if (PayCost)
                                     {
-                                        if (appFusionCondition.linkedCondition(linkedCard))
-                                        {
-                                            if (PayCost)
-                                            {
-                                                int cost = appFusionCondition.cost;
+                                        int cost = linkCondition.cost;
 
-                                                cost = GetChangedCostItselef(cost, SelectCardEffect.Root.Hand, new List<Permanent>() { targetPermanent }, checkAvailability: true);
+                                        cost = GetChangedCostItselef(cost, SelectCardEffect.Root.Hand, new List<Permanent>() { targetPermanent }, checkAvailability: true);
 
-                                                if (Owner.MaxMemoryCost < cost)
-                                                {
-                                                    return false;
-                                                }
-                                            }
+                                        if (Owner.MaxMemoryCost < cost)
+                                        {
+                                            return false;
                                         }
                                     }
                                 }

Assets/Scripts/Permanent.cs

@@ -1186,7 +1186,7 @@ public class Permanent
                         {
                             if (cardEffect != null)
                             {
-                                if (isTopCard == cardEffect.IsInheritedEffect && isTopCard == cardEffect.IsLinkedEffect)
+                                if (isTopCard == cardEffect.IsInheritedEffect)
                                 {
                                     continue;
                                 }

ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d59bdfba6775c2da342aff0bda197d941edaeb95d316818d2f68788ca597dc2
-size 20168
+oid sha256:e17c09e964d196f50f936e2cceadefd34c29a7c1f188f4184a9f1f6d1dda9504
+size 262