mbunch_kascope 1 år sedan
förälder
incheckning
5abe50c3b8

+ 1 - 1
Assets/CardBaseEntity/ST13/Black/Option/ST13_16_P1.asset

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

+ 1 - 1
Assets/CardBaseEntity/ST13/Black/Option/ST13_16_P2.asset

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

+ 1 - 1
Assets/CardBaseEntity/ST13/Black/Option/ST13_16_P3.asset

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

+ 20 - 20
Assets/CardEffect/BT15/Black/BT15_064.cs

@@ -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)
                     {

+ 9 - 2
Assets/Scripts/Permanent.cs

@@ -1199,9 +1199,16 @@ public class Permanent
                         {
                             if (cardEffect != null)
                             {
-                                if (isTopCard == cardEffect.IsInheritedEffect || isTopCard == cardEffect.IsLinkedEffect)
+                                if (cardEffect.IsInheritedEffect)
                                 {
-                                    continue;
+                                    if (isTopCard)
+                                        continue;
+                                }
+
+                                if (cardEffect.IsLinkedEffect)
+                                {
+                                    if (isTopCard)
+                                        continue;
                                 }
 
                                 _EffectList.Add(cardEffect);

+ 1 - 1
ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fc70de94c0f23bc320bab1dcaed46ec6cbb92ad5eefde28beb4356665992a291
+oid sha256:277c456ea1aea6219df3c804f9bc5117fd1bb3813a7ef9902977639bbd1d61c4
 size 20166