Jelajahi Sumber

1.5.14 update

mbunch_kascope 1 tahun lalu
induk
melakukan
c9327723f9

+ 14 - 20
Assets/CardEffect/BT18/Green/AncientKazemon_BT18_054.cs

@@ -126,21 +126,18 @@ namespace DCGO.CardEffects.BT18
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.HasMatchConditionPermanent(SuspendPermanentCondition))
-                    {
-                        List<Permanent> tappedPermanents = new List<Permanent>();
+                    List<Permanent> tappedPermanents = new List<Permanent>();
 
-                        foreach (Permanent permanent in card.Owner.Enemy.GetBattleAreaDigimons())
+                    foreach (Permanent permanent in card.Owner.Enemy.GetBattleAreaDigimons())
+                    {
+                        if (SuspendPermanentCondition(permanent))
                         {
-                            if (SuspendPermanentCondition(permanent))
-                            {
-                                tappedPermanents.Add(permanent);
-                            }
+                            tappedPermanents.Add(permanent);
                         }
-
-                        yield return ContinuousController.instance.StartCoroutine(new SuspendPermanentsClass(tappedPermanents, hashtable).Tap());
                     }
 
+                    yield return ContinuousController.instance.StartCoroutine(new SuspendPermanentsClass(tappedPermanents, hashtable).Tap());
+
                     bool PermanentCondition(Permanent permanent)
                     {
                         return CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card) &&
@@ -189,21 +186,18 @@ namespace DCGO.CardEffects.BT18
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.HasMatchConditionPermanent(SuspendPermanentCondition))
-                    {
-                        List<Permanent> tappedPermanents = new List<Permanent>();
+                    List<Permanent> tappedPermanents = new List<Permanent>();
 
-                        foreach (Permanent permanent in card.Owner.Enemy.GetBattleAreaDigimons())
+                    foreach (Permanent permanent in card.Owner.Enemy.GetBattleAreaDigimons())
+                    {
+                        if (SuspendPermanentCondition(permanent))
                         {
-                            if (SuspendPermanentCondition(permanent))
-                            {
-                                tappedPermanents.Add(permanent);
-                            }
+                            tappedPermanents.Add(permanent);
                         }
-
-                        yield return ContinuousController.instance.StartCoroutine(new SuspendPermanentsClass(tappedPermanents, hashtable).Tap());
                     }
 
+                    yield return ContinuousController.instance.StartCoroutine(new SuspendPermanentsClass(tappedPermanents, hashtable).Tap());
+
                     bool PermanentCondition(Permanent permanent)
                     {
                         return CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card) &&

+ 1 - 1
Assets/CardEffect/BT18/Purple/Velgrmon_BT18_079.cs

@@ -177,7 +177,7 @@ namespace DCGO.CardEffects.BT18
             if (timing == EffectTiming.OnEndAttack)
             {
                 ActivateClass activateClass = new ActivateClass();
-                activateClass.SetUpICardEffect("Delete 1 Digimon to delete all of your opponent's Digimon with the same level",
+                activateClass.SetUpICardEffect("Delete 1 Digimon to delete all of your opponent's Digimon with the lowest level",
                     CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDescription());
                 cardEffects.Add(activateClass);

+ 23 - 1
Assets/CardEffect/BT19/Black/Monitamon_BT19_055.cs

@@ -49,7 +49,9 @@ namespace DCGO.CardEffects.BT19
                     int tamerCount = Math.Min(1, CardEffectCommons.MatchConditionOwnersPermanentCount(card, MyTamer));
                     CardSource tuckedCard = null;
 
-                    yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.SimplifiedRevealDeckTopCardsAndSelect(
+                    if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, MyTamer))
+                    {
+                       yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.SimplifiedRevealDeckTopCardsAndSelect(
                        revealCount: 3,
                        simplifiedSelectCardConditions:
                        new SimplifiedSelectCardConditionClass[]
@@ -69,6 +71,26 @@ namespace DCGO.CardEffects.BT19
                        },
                        remainingCardsPlace: RemainingCardsPlace.DeckBottom,
                        activateClass: activateClass));
+                    }
+                    else
+                    {
+                       yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.SimplifiedRevealDeckTopCardsAndSelect(
+                       revealCount: 3,
+                       simplifiedSelectCardConditions:
+                       new SimplifiedSelectCardConditionClass[]
+                       {
+                            new SimplifiedSelectCardConditionClass(
+                                canTargetCondition:SelectKnightmonOrTwilight,
+                                message: "Select 1 card with [Knightmon] in its text or the [Twilight] trait.",
+                                mode: SelectCardEffect.Mode.AddHand,
+                                maxCount: 1,
+                                selectCardCoroutine: null),
+                       },
+                       remainingCardsPlace: RemainingCardsPlace.DeckBottom,
+                       activateClass: activateClass));
+                    }
+
+                        
 
                     IEnumerator PlaceUnderTamer(CardSource source)
                     {

+ 3 - 3
Assets/CardEffect/BT19/Blue/Puyoyomon_BT19_002.cs

@@ -16,7 +16,7 @@ namespace DCGO.CardEffects.BT19
                 int bouncedLevel = 0;
 
                 ActivateClass activateClass = new ActivateClass();
-                activateClass.SetUpICardEffect("Bottom deck this Digimon to bottom deck and opponent's Digimon with the same level", CanUseCondition, card);
+                activateClass.SetUpICardEffect("Bottom deck this Digimon to return to hand an opponent's Digimon with the same level", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDescription());
                 activateClass.SetIsInheritedEffect(true);
                 cardEffects.Add(activateClass);
@@ -75,8 +75,8 @@ namespace DCGO.CardEffects.BT19
                             mode: SelectPermanentEffect.Mode.Bounce,
                             cardEffect: activateClass);
 
-                        selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon to bottom deck.",
-                            "The opponent is selecting 1 Digimon to bottom deck.");
+                        selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon to return to hand.",
+                            "The opponent is selecting 1 Digimon to return to hand.");
 
                         yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
                     }

+ 22 - 17
Assets/CardEffect/BT3/Blue/DesperadeBluster_BT3_100.cs

@@ -61,27 +61,32 @@ public class DesperadeBluster_BT3_100 : CEntity_Effect
 
                 if (selectedPermanents.Count >= 1)
                 {
-                    foreach (Permanent selectedPermanent in selectedPermanents)
-                    {
-                        int maxCount = Math.Min(2, selectedPermanent.DigivolutionCards.Count);
+                    int trashCount = 0;
 
-                        SelectCountEffect selectCountEffect = GManager.instance.GetComponent<SelectCountEffect>();
+                    SelectCountEffect selectCountEffect = GManager.instance.GetComponent<SelectCountEffect>();
 
-                        selectCountEffect.SetUp(
-                            SelectPlayer: card.Owner,
-                            targetPermanent: selectedPermanent,
-                            MaxCount: maxCount,
-                            CanNoSelect: false,
-                            Message: $"How many digivolution cards will you trash from {selectedPermanent.TopCard.CardNames[0]}?",
-                            Message_Enemy: $"The opponent is choosing how many digivolution cards to trash from {selectedPermanent.TopCard.CardNames[0]}.",
-                            SelectCountCoroutine: SelectCountCoroutine);
+                    selectCountEffect.SetUp(
+                        SelectPlayer: card.Owner,
+                        targetPermanent: null,
+                        MaxCount: 2,
+                        CanNoSelect: false,
+                        Message: $"How many digivolution cards will you trash?",
+                        Message_Enemy: $"The opponent is choosing how many digivolution cards to trash.",
+                        SelectCountCoroutine: SelectCountCoroutine);
 
-                        yield return ContinuousController.instance.StartCoroutine(selectCountEffect.Activate());
+                    yield return ContinuousController.instance.StartCoroutine(selectCountEffect.Activate());
 
-                        IEnumerator SelectCountCoroutine(int count)
-                        {
-                            yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.TrashDigivolutionCardsFromTopOrBottom(targetPermanent: selectedPermanent, trashCount: count, isFromTop: false, activateClass: activateClass));
-                        }
+                    IEnumerator SelectCountCoroutine(int count)
+                    {
+                        trashCount = count;
+                        yield return null;
+                    }
+
+                    foreach (Permanent selectedPermanent in selectedPermanents)
+                    {
+                        int maxCount = Math.Min(trashCount, selectedPermanent.DigivolutionCards.Count);
+
+                        yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.TrashDigivolutionCardsFromTopOrBottom(targetPermanent: selectedPermanent, trashCount: maxCount, isFromTop: false, activateClass: activateClass));
                     }
                 }
 

+ 2 - 2
Assets/CardEffect/EX6/White/UltimateChaosmon_EX6_062.cs

@@ -122,7 +122,7 @@ namespace DCGO.CardEffects.EX6
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Place lvl 6 cards from trash to digivolution cards", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()
@@ -157,7 +157,7 @@ namespace DCGO.CardEffects.EX6
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleArea(card) && CardEffectCommons.IsJogress(_hashtable))
+                    if (CardEffectCommons.IsJogress(_hashtable))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition))
                         {

+ 2 - 9
Assets/CardEffect/EX7/Black/Gundramon_EX7_048.cs

@@ -136,8 +136,6 @@ namespace DCGO.CardEffects.EX7
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
-                    CardSource selectedCard = null;
-
                     yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.SimplifiedRevealDeckTopCardsAndSelect(
                         revealCount: 6,
                         simplifiedSelectCardConditions:
@@ -156,21 +154,16 @@ namespace DCGO.CardEffects.EX7
                     ));
 
                     IEnumerator SelectCardCoroutine(CardSource cardSource)
-                    {
-                        selectedCard = cardSource;
-                        yield return null;
-                    }
-
-                    if (selectedCard != null)
                     {
                         yield return ContinuousController.instance.StartCoroutine(
                             CardEffectCommons.PlayOptionCards(
-                                cardSources: new List<CardSource>() { selectedCard },
+                                cardSources: new List<CardSource>() { cardSource },
                                 activateClass: activateClass,
                                 payCost: false,
                                 root: SelectCardEffect.Root.Library
                             )
                         );
+                        yield return null;
                     }
                 }
             }

+ 2 - 2
Assets/CardEffect/RB1/White/AmanokawaHokuto_RB1_035.cs

@@ -112,12 +112,12 @@ public class AmanokawaHokuto_RB1_035 : CEntity_Effect
 
                 if (permanents != null)
                 {
-                    if (permanents.Some(permanent => permanent.Level >= 4))
+                    if (permanents.Some(permanent => permanent.TopCard.HasLevel && permanent.Level >= 4))
                     {
                         yield return ContinuousController.instance.StartCoroutine(card.Owner.AddMemory(1, activateClass));
                     }
 
-                    if (permanents.Some(permanent => permanent.Level == 3))
+                    if (permanents.Some(permanent => permanent.TopCard.HasLevel &&  permanent.Level == 3))
                     {
                         yield return ContinuousController.instance.StartCoroutine(new DrawClass(card.Owner, 1, activateClass).Draw());
                     }

File diff ditekan karena terlalu besar
+ 202 - 111
Assets/Scenes/Opening.unity


+ 1 - 1
ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b0d83eec00099a3f0099d3250c087c25e4c192aaf729952a53f20c7efa249551
+oid sha256:118094a0606614704b8b832b584f5135b50ab2e56a4477bb9ed6928610e7c880
 size 20167

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini