Browse Source

Tweaks for 1.3.7

mbunch_kascope 2 năm trước cách đây
mục cha
commit
e97de645bb

+ 7 - 4
Assets/CardEffect/BT17/Black/Keramon_BT17_053.cs

@@ -41,11 +41,14 @@ namespace DCGO.CardEffects.BT17
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    if(CardEffectCommons.CanTriggerOnPermanentPlay(hashtable, OpponentPermanentCondition))
-                        return true;
+                    if (CardEffectCommons.IsOpponentTurn(card))
+                    {
+                        if (CardEffectCommons.CanTriggerOnPermanentPlay(hashtable, OpponentPermanentCondition))
+                            return true;
 
-                    if (CardEffectCommons.CanTriggerWhenPermanentDigivolving(hashtable, OpponentPermanentCondition))
-                        return true;
+                        if (CardEffectCommons.CanTriggerWhenPermanentDigivolving(hashtable, OpponentPermanentCondition))
+                            return true;
+                    }                    
 
                     return false;
                 }

+ 2 - 1
Assets/CardEffect/BT17/Yellow/Bulkmon_BT17_034.cs

@@ -138,6 +138,7 @@ namespace DCGO.CardEffects.BT17
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("If a card is trashed from security and there's a Tamer in the digivolution cards, Recovery +1.", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, false, EffectDiscription());
+                activateClass.SetHashString("Recovery_BT17_034");
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()
@@ -152,7 +153,7 @@ namespace DCGO.CardEffects.BT17
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
+                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
                        if (CardEffectCommons.CanTriggerOnTrashSecurity(hashtable,  cardEffect => true, cardSource => cardSource.Owner == card.Owner))
                        {

+ 18 - 8
Assets/CardEffect/BT17/Yellow/HackerPride_BT17_098.cs

@@ -143,19 +143,29 @@ namespace DCGO.CardEffects.BT17
 
                                     if (!permanent.TopCard.IsToken)
                                     {
-                                        yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddSecurityCard(permanent.TopCard));
+                                        if (permanent.DigivolutionCards.Count < 1)
+                                        {
+                                            yield return ContinuousController.instance.StartCoroutine(new IPutSecurityPermanent(
+                                                permanent,
+                                                CardEffectCommons.CardEffectHashtable(activateClass),
+                                                true).PutSecurity());
+                                        }
+                                        else
+                                        {
+                                            yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddSecurityCard(permanent.TopCard));
 
-                                        yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateRecoveryEffect(permanent.TopCard.Owner));
+                                            yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateRecoveryEffect(permanent.TopCard.Owner));
 
-                                        yield return ContinuousController.instance.StartCoroutine(new IAddSecurity(permanent.TopCard.Owner).AddSecurity());
+                                            yield return ContinuousController.instance.StartCoroutine(new IAddSecurity(permanent.TopCard.Owner).AddSecurity());
 
-                                        permanent.willBeRemoveField = false;
+                                            permanent.willBeRemoveField = false;
 
-                                        if (permanent.ShowingPermanentCard != null)
-                                        {
-                                            if (permanent.ShowingPermanentCard.WillBeDeletedObject != null)
+                                            if (permanent.ShowingPermanentCard != null)
                                             {
-                                                permanent.ShowingPermanentCard.WillBeDeletedObject.SetActive(false);
+                                                if (permanent.ShowingPermanentCard.WillBeDeletedObject != null)
+                                                {
+                                                    permanent.ShowingPermanentCard.WillBeDeletedObject.SetActive(false);
+                                                }
                                             }
                                         }
                                     }

+ 1 - 1
Assets/Scripts/CardObjectController.cs

@@ -585,7 +585,7 @@ public class CardObjectController : MonoBehaviour
             yield return ContinuousController.instance.StartCoroutine(AddHandCard(cardSource, isDraw));
         }
 
-        if (GManager.instance.turnStateMachine.DoneStartGame)
+        if (GManager.instance.turnStateMachine.DoneStartGame && addedCards.Count > 0)
         {
             List<Player> Players = addedCards.Map(cardSource => cardSource.Owner).Distinct().ToList();
 

+ 1 - 1
ProjectSettings/ProjectSettings.asset

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