Преглед изворни кода

Merge branch '1.1.2-Hotfix' of https://github.com/DCGO2/DCGO into 1.1.2-Hotfix

mbunch_kascope пре 2 година
родитељ
комит
9be2db39d4

+ 1 - 1
Assets/CardEffect/BT16/Black/Dorugoramon_BT16_064.cs

@@ -93,7 +93,7 @@ namespace DCGO.CardEffects.BT16
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
-                    if(card.PermanentOfThisCard().DigivolutionCards.Count(HasTamerWithTrait) > 0)
+                    if(card.PermanentOfThisCard().DigivolutionCards.Count(HasTamerWithTrait) >= 1)
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         {

+ 3 - 3
Assets/CardEffect/BT16/Purple/MadLeomon_BT16_071.cs

@@ -48,11 +48,11 @@ namespace DCGO.CardEffects.BT16
                     return "[When Attacking] This Digimon may digivolve into a Digimon card with [Leomon] in it's name from your hand or trash.";
                 }
 
-                bool CanSelectCardCondition(CardSource card)
+                bool CanSelectCardCondition(CardSource cardSource)
                 {
-                    if (card.IsDigimon)
+                    if (cardSource.IsDigimon)
                     {
-                        if (card.ContainsCardName("Leomon"))
+                        if (cardSource.ContainsCardName("Leomon"))
                         {
                             return true;
                         }

+ 4 - 7
Assets/CardEffect/BT16/Purple/Soloogarmon_BT16_076.cs

@@ -270,7 +270,7 @@ namespace DCGO.CardEffects.BT16
 
                 string EffectDiscription()
                 {
-                    return "[All Turns] When one of your other Digimon with the [SoC] trait is deleted, this Digimon with a Tamer with the [SoC] trait in its digivolution cardsmay digivolve into [FenriLoogamon] from your trash without paying the cost.";
+                    return "[All Turns] When one of your other Digimon with the [SoC] trait is deleted, this Digimon with a Tamer with the [SoC] trait in its digivolution cards may digivolve into [FenriLoogamon] from your trash without paying the cost.";
                 }
 
                 bool PermanentCondition(Permanent permanent)
@@ -293,13 +293,10 @@ namespace DCGO.CardEffects.BT16
                 {
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     {
-                        if (CardEffectCommons.IsOwnerTurn(card))
+                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, PermanentCondition))
                         {
-                            if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, PermanentCondition))
-                            {
-                                return true;
-                            }
-                        }
+                            return true;
+                        } 
                     }
 
                     return false;

+ 10 - 11
Assets/CardEffect/BT16/Yellow/DragonBreath_BT16_094.cs

@@ -278,7 +278,7 @@ namespace DCGO.CardEffects.BT16
                                         yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ChangeDigimonDP(
                                             selectedPermanent,
                                             -7000,
-                                            EffectDuration.UntilEachTurnEnd,
+                                            EffectDuration.UntilOpponentTurnEnd,
                                             activateClass)
                                             );
                                     }
@@ -308,10 +308,7 @@ namespace DCGO.CardEffects.BT16
                 {
                     if (CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card))
                     {
-                        if (permanent.CanSelectBySkill(activateClass))
-                        {
-                            return true;
-                        }
+                        return true;
                     }
 
                     return false;
@@ -343,6 +340,10 @@ namespace DCGO.CardEffects.BT16
                             mode: SelectPermanentEffect.Mode.Custom,
                             cardEffect: activateClass);
 
+                        selectPermanentEffect.SetUpCustomMessage(
+                        "Select 1 Digimon that will get DP -7000.",
+                        "The opponent is selecting 1 Digimon that will get DP -7000.");
+
                         yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
 
                         IEnumerator SelectPermanentCoroutine(Permanent permanent)
@@ -352,17 +353,15 @@ namespace DCGO.CardEffects.BT16
                             yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ChangeDigimonDP(
                                 selectedPermanent,
                                 -7000,
-                                EffectDuration.UntilEachTurnEnd,
+                                EffectDuration.UntilOpponentTurnEnd,
                                 activateClass)
                                 );
+                     
                         }
                     }
-                }
-            }
 
-            if (timing == EffectTiming.SecuritySkill)
-            {
-                cardEffects.Add(CardEffectFactory.PlaceSelfDelayOptionSecurityEffect(card));
+                    yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.PlaceDelayOptionCards(card: card, cardEffect: activateClass));
+                }
             }
             #endregion