Prechádzať zdrojové kódy

Add methods to track that cards remain in correct location

hooperk 2 mesiacov pred
rodič
commit
f56056da29
100 zmenil súbory, kde vykonal 171 pridanie a 171 odobranie
  1. 2 2
      Assets/Scripts/CardEffect/BT1/Blue/BT1_030.cs
  2. 2 2
      Assets/Scripts/CardEffect/BT1/Blue/BT1_035.cs
  3. 2 2
      Assets/Scripts/CardEffect/BT1/Yellow/BT1_049.cs
  4. 2 2
      Assets/Scripts/CardEffect/BT10/Black/BT10_069.cs
  5. 2 2
      Assets/Scripts/CardEffect/BT10/Black/BT10_092.cs
  6. 2 2
      Assets/Scripts/CardEffect/BT10/Blue/BT10_018.cs
  7. 2 2
      Assets/Scripts/CardEffect/BT10/Green/BT10_056.cs
  8. 2 2
      Assets/Scripts/CardEffect/BT10/Purple/BT10_078.cs
  9. 2 2
      Assets/Scripts/CardEffect/BT10/Purple/BT10_080.cs
  10. 2 2
      Assets/Scripts/CardEffect/BT10/Purple/BT10_081.cs
  11. 2 2
      Assets/Scripts/CardEffect/BT10/Purple/BT10_083.cs
  12. 1 1
      Assets/Scripts/CardEffect/BT11/Black/BT11_005.cs
  13. 2 2
      Assets/Scripts/CardEffect/BT11/Black/BT11_071.cs
  14. 2 2
      Assets/Scripts/CardEffect/BT11/Black/BT11_072.cs
  15. 1 1
      Assets/Scripts/CardEffect/BT11/Black/BT11_106.cs
  16. 2 2
      Assets/Scripts/CardEffect/BT11/Blue/BT11_031.cs
  17. 2 2
      Assets/Scripts/CardEffect/BT11/Purple/BT11_079.cs
  18. 2 2
      Assets/Scripts/CardEffect/BT11/Purple/BT11_082.cs
  19. 2 2
      Assets/Scripts/CardEffect/BT11/Red/BT11_001.cs
  20. 2 2
      Assets/Scripts/CardEffect/BT11/Red/BT11_007.cs
  21. 2 2
      Assets/Scripts/CardEffect/BT11/Red/BT11_011.cs
  22. 2 2
      Assets/Scripts/CardEffect/BT11/Red/BT11_016.cs
  23. 2 2
      Assets/Scripts/CardEffect/BT11/Yellow/BT11_036.cs
  24. 2 2
      Assets/Scripts/CardEffect/BT11/Yellow/BT11_038.cs
  25. 2 2
      Assets/Scripts/CardEffect/BT11/Yellow/BT11_040.cs
  26. 1 1
      Assets/Scripts/CardEffect/BT12/Black/BT12_063.cs
  27. 1 1
      Assets/Scripts/CardEffect/BT12/Black/BT12_064.cs
  28. 1 1
      Assets/Scripts/CardEffect/BT12/Black/BT12_071.cs
  29. 1 1
      Assets/Scripts/CardEffect/BT12/Blue/BT12_032.cs
  30. 1 1
      Assets/Scripts/CardEffect/BT12/Green/BT12_051.cs
  31. 1 1
      Assets/Scripts/CardEffect/BT12/Green/BT12_054.cs
  32. 1 1
      Assets/Scripts/CardEffect/BT12/Green/BT12_105.cs
  33. 2 2
      Assets/Scripts/CardEffect/BT12/Purple/BT12_006.cs
  34. 1 1
      Assets/Scripts/CardEffect/BT12/Purple/BT12_077.cs
  35. 1 1
      Assets/Scripts/CardEffect/BT12/Purple/BT12_084.cs
  36. 1 1
      Assets/Scripts/CardEffect/BT12/Purple/BT12_085.cs
  37. 1 1
      Assets/Scripts/CardEffect/BT12/Red/BT12_011.cs
  38. 4 4
      Assets/Scripts/CardEffect/BT12/Red/BT12_012.cs
  39. 1 1
      Assets/Scripts/CardEffect/BT12/Red/BT12_015.cs
  40. 1 1
      Assets/Scripts/CardEffect/BT12/Red/BT12_017.cs
  41. 1 1
      Assets/Scripts/CardEffect/BT12/Yellow/BT12_037.cs
  42. 1 1
      Assets/Scripts/CardEffect/BT12/Yellow/BT12_041.cs
  43. 2 2
      Assets/Scripts/CardEffect/BT12/Yellow/BT12_042.cs
  44. 2 2
      Assets/Scripts/CardEffect/BT13/Black/BT13_061.cs
  45. 2 2
      Assets/Scripts/CardEffect/BT13/Black/BT13_062.cs
  46. 1 1
      Assets/Scripts/CardEffect/BT13/Black/BT13_064.cs
  47. 1 1
      Assets/Scripts/CardEffect/BT13/Black/BT13_065.cs
  48. 1 1
      Assets/Scripts/CardEffect/BT13/Black/BT13_068.cs
  49. 1 1
      Assets/Scripts/CardEffect/BT13/Black/BT13_070.cs
  50. 1 1
      Assets/Scripts/CardEffect/BT13/Black/BT13_073.cs
  51. 1 1
      Assets/Scripts/CardEffect/BT13/Black/BT13_076.cs
  52. 2 2
      Assets/Scripts/CardEffect/BT13/Purple/BT13_006.cs
  53. 1 1
      Assets/Scripts/CardEffect/BT13/Purple/BT13_078.cs
  54. 2 2
      Assets/Scripts/CardEffect/BT13/Purple/BT13_079.cs
  55. 1 1
      Assets/Scripts/CardEffect/BT13/Purple/BT13_080.cs
  56. 1 1
      Assets/Scripts/CardEffect/BT13/Purple/BT13_081.cs
  57. 2 2
      Assets/Scripts/CardEffect/BT13/Purple/BT13_082.cs
  58. 2 2
      Assets/Scripts/CardEffect/BT13/Purple/BT13_083.cs
  59. 2 2
      Assets/Scripts/CardEffect/BT13/Purple/BT13_085.cs
  60. 1 1
      Assets/Scripts/CardEffect/BT13/Purple/BT13_086.cs
  61. 1 1
      Assets/Scripts/CardEffect/BT13/Purple/BT13_089.cs
  62. 2 2
      Assets/Scripts/CardEffect/BT13/Red/BT13_001.cs
  63. 2 2
      Assets/Scripts/CardEffect/BT13/Red/BT13_010.cs
  64. 2 2
      Assets/Scripts/CardEffect/BT13/Red/BT13_011.cs
  65. 2 2
      Assets/Scripts/CardEffect/BT13/Red/BT13_014.cs
  66. 2 2
      Assets/Scripts/CardEffect/BT13/Red/BT13_015.cs
  67. 1 1
      Assets/Scripts/CardEffect/BT13/Red/BT13_094.cs
  68. 2 2
      Assets/Scripts/CardEffect/BT13/White/BT13_093.cs
  69. 1 1
      Assets/Scripts/CardEffect/BT13/Yellow/BT13_035.cs
  70. 1 1
      Assets/Scripts/CardEffect/BT13/Yellow/BT13_039.cs
  71. 2 2
      Assets/Scripts/CardEffect/BT13/Yellow/BT13_041.cs
  72. 1 1
      Assets/Scripts/CardEffect/BT13/Yellow/BT13_042.cs
  73. 2 2
      Assets/Scripts/CardEffect/BT14/Black/BT14_063.cs
  74. 1 1
      Assets/Scripts/CardEffect/BT14/Black/BT14_064.cs
  75. 2 2
      Assets/Scripts/CardEffect/BT14/Black/BT14_066.cs
  76. 1 1
      Assets/Scripts/CardEffect/BT14/Blue/BT14_030.cs
  77. 2 2
      Assets/Scripts/CardEffect/BT14/Purple/BT14_075.cs
  78. 1 1
      Assets/Scripts/CardEffect/BT14/Purple/BT14_076.cs
  79. 2 2
      Assets/Scripts/CardEffect/BT14/Purple/BT14_078.cs
  80. 2 2
      Assets/Scripts/CardEffect/BT14/Yellow/BT14_032.cs
  81. 2 2
      Assets/Scripts/CardEffect/BT14/Yellow/BT14_034.cs
  82. 4 4
      Assets/Scripts/CardEffect/BT14/Yellow/BT14_038.cs
  83. 4 4
      Assets/Scripts/CardEffect/BT14/Yellow/BT14_102.cs
  84. 4 4
      Assets/Scripts/CardEffect/BT15/Black/BT15_057.cs
  85. 2 2
      Assets/Scripts/CardEffect/BT15/Blue/BT15_030.cs
  86. 2 2
      Assets/Scripts/CardEffect/BT15/Green/BT15_044.cs
  87. 1 1
      Assets/Scripts/CardEffect/BT15/Green/BT15_095.cs
  88. 2 2
      Assets/Scripts/CardEffect/BT15/Purple/BT15_006.cs
  89. 1 1
      Assets/Scripts/CardEffect/BT15/Purple/BT15_068.cs
  90. 2 2
      Assets/Scripts/CardEffect/BT15/Purple/BT15_069.cs
  91. 2 2
      Assets/Scripts/CardEffect/BT15/Purple/BT15_073.cs
  92. 2 2
      Assets/Scripts/CardEffect/BT15/Purple/BT15_078.cs
  93. 2 2
      Assets/Scripts/CardEffect/BT15/Purple/BT15_080.cs
  94. 2 2
      Assets/Scripts/CardEffect/BT15/Purple/BT15_098.cs
  95. 2 2
      Assets/Scripts/CardEffect/BT15/Red/BT15_001.cs
  96. 2 2
      Assets/Scripts/CardEffect/BT15/Red/BT15_016.cs
  97. 2 2
      Assets/Scripts/CardEffect/BT15/Red/BT15_017.cs
  98. 2 2
      Assets/Scripts/CardEffect/BT15/Yellow/BT15_035.cs
  99. 2 2
      Assets/Scripts/CardEffect/BT15/Yellow/BT15_036.cs
  100. 2 2
      Assets/Scripts/CardEffect/BT15/Yellow/BT15_039.cs

+ 2 - 2
Assets/Scripts/CardEffect/BT1/Blue/BT1_030.cs

@@ -27,12 +27,12 @@ public class BT1_030 : CEntity_Effect
 
 
             bool CanUseCondition(Hashtable hashtable)
             bool CanUseCondition(Hashtable hashtable)
             {
             {
-                return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
             }
             }
 
 
             bool CanActivateCondition(Hashtable hashtable)
             bool CanActivateCondition(Hashtable hashtable)
             {
             {
-                if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
+                if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                 {
                 {
                     if (card.Owner.CanAddMemory(activateClass))
                     if (card.Owner.CanAddMemory(activateClass))
                     {
                     {

+ 2 - 2
Assets/Scripts/CardEffect/BT1/Blue/BT1_035.cs

@@ -26,12 +26,12 @@ public class BT1_035 : CEntity_Effect
 
 
             bool CanUseCondition(Hashtable hashtable)
             bool CanUseCondition(Hashtable hashtable)
             {
             {
-                return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
             }
             }
 
 
             bool CanActivateCondition(Hashtable hashtable)
             bool CanActivateCondition(Hashtable hashtable)
             {
             {
-                if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                 {
                 {
                     if (card.Owner.CanAddMemory(activateClass))
                     if (card.Owner.CanAddMemory(activateClass))
                     {
                     {

+ 2 - 2
Assets/Scripts/CardEffect/BT1/Yellow/BT1_049.cs

@@ -22,7 +22,7 @@ public class BT1_049 : CEntity_Effect
 
 
             string EffectDiscription()
             string EffectDiscription()
             {
             {
-                return "[Your Turn] When an opponent's Digimon is deleted by dropping to 0 DPC trigger <Draw 1> (Draw 1 card from your deck).";
+                return "[Your Turn] When an opponent's Digimon is deleted by dropping to 0 DP�C trigger <Draw 1> (Draw 1 card from your deck).";
             }
             }
 
 
             bool PermanentCondition(Permanent permanent)
             bool PermanentCondition(Permanent permanent)
@@ -36,7 +36,7 @@ public class BT1_049 : CEntity_Effect
                 {
                 {
                     if (CardEffectCommons.IsOwnerTurn(card))
                     if (CardEffectCommons.IsOwnerTurn(card))
                     {
                     {
-                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, PermanentCondition))
+                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, PermanentCondition, activateClass))
                         {
                         {
                             if (CardEffectCommons.IsDPZeroDelete(hashtable))
                             if (CardEffectCommons.IsDPZeroDelete(hashtable))
                             {
                             {

+ 2 - 2
Assets/Scripts/CardEffect/BT10/Black/BT10_069.cs

@@ -170,12 +170,12 @@ namespace DCGO.CardEffects.BT10
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT10/Black/BT10_092.cs

@@ -134,12 +134,12 @@ namespace DCGO.CardEffects.BT10
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.CanAddMemory(activateClass))
                         if (card.Owner.CanAddMemory(activateClass))
                         {
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT10/Blue/BT10_018.cs

@@ -56,12 +56,12 @@ namespace DCGO.CardEffects.BT10
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         if (card.Owner.HandCards.Count >= 1)
                         {
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT10/Green/BT10_056.cs

@@ -170,7 +170,7 @@ namespace DCGO.CardEffects.BT10
                         {
                         {
                             if (CardSourceCondition(cardSource))
                             if (CardSourceCondition(cardSource))
                             {
                             {
-                                if (CardEffectCommons.CanTriggerOnDeletion(hashtable, cardSource))
+                                if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, permanent => permanent == cardSource.PermanentOfThisCard(), activateClass1))
                                 {
                                 {
                                     return true;
                                     return true;
                                 }
                                 }
@@ -181,7 +181,7 @@ namespace DCGO.CardEffects.BT10
 
 
                         bool CanActivateCondition1(Hashtable hashtable)
                         bool CanActivateCondition1(Hashtable hashtable)
                         {
                         {
-                            if (CardEffectCommons.CanActivateOnDeletion(hashtable, cardSource))
+                            if (CardEffectCommons.CanActivateOnDeletion(cardSource, activateClass1))
                             {
                             {
                                 return true;
                                 return true;
                             }
                             }

+ 2 - 2
Assets/Scripts/CardEffect/BT10/Purple/BT10_078.cs

@@ -75,12 +75,12 @@ namespace DCGO.CardEffects.BT10
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT10/Purple/BT10_080.cs

@@ -224,12 +224,12 @@ namespace DCGO.CardEffects.BT10
 
 
                             bool CanUseCondition1(Hashtable hashtable1)
                             bool CanUseCondition1(Hashtable hashtable1)
                             {
                             {
-                                return CardEffectCommons.CanTriggerOnDeletion(hashtable1, card);
+                                return CardEffectCommons.CanTriggerOnDeletion(hashtable1, card, activateClass1);
                             }
                             }
 
 
                             bool CanActivateCondition1(Hashtable hashtable1)
                             bool CanActivateCondition1(Hashtable hashtable1)
                             {
                             {
-                                if (CardEffectCommons.CanActivateOnDeletion(hashtable1, card))
+                                if (CardEffectCommons.CanActivateOnDeletion(card, activateClass1))
                                 {
                                 {
                                     if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                                     if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                                     {
                                     {

+ 2 - 2
Assets/Scripts/CardEffect/BT10/Purple/BT10_081.cs

@@ -98,12 +98,12 @@ namespace DCGO.CardEffects.BT10
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT10/Purple/BT10_083.cs

@@ -170,12 +170,12 @@ namespace DCGO.CardEffects.BT10
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {
                         {

+ 1 - 1
Assets/Scripts/CardEffect/BT11/Black/BT11_005.cs

@@ -34,7 +34,7 @@ namespace DCGO.CardEffects.BT11
                     {
                     {
                         if (CardEffectCommons.IsOpponentTurn(card))
                         if (CardEffectCommons.IsOpponentTurn(card))
                         {
                         {
-                            if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, PermanentCondition))
+                            if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, PermanentCondition, activateClass))
                             {
                             {
                                 return true;
                                 return true;
                             }
                             }

+ 2 - 2
Assets/Scripts/CardEffect/BT11/Black/BT11_071.cs

@@ -501,12 +501,12 @@ namespace DCGO.CardEffects.BT11
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition))
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition))
                         {
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT11/Black/BT11_072.cs

@@ -254,12 +254,12 @@ namespace DCGO.CardEffects.BT11
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.GetBattleAreaPermanents().Count(CanSelectPermanentCondition) >= 1)
                         if (card.Owner.GetBattleAreaPermanents().Count(CanSelectPermanentCondition) >= 1)
                         {
                         {

+ 1 - 1
Assets/Scripts/CardEffect/BT11/Black/BT11_106.cs

@@ -167,7 +167,7 @@ namespace DCGO.CardEffects.BT11
                                 {
                                 {
                                     if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                                     if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                                     {
                                     {
-                                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable1, (permanent) => permanent == selectedPermanent))
+                                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable1, (permanent) => permanent == selectedPermanent, activateClass))
                                         {
                                         {
                                             if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass))
                                             if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass))
                                             {
                                             {

+ 2 - 2
Assets/Scripts/CardEffect/BT11/Blue/BT11_031.cs

@@ -176,7 +176,7 @@ namespace DCGO.CardEffects.BT11
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
@@ -186,7 +186,7 @@ namespace DCGO.CardEffects.BT11
                         return true;
                         return true;
                     }
                     }
 
 
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.GetBattleAreaPermanents().Count(CanSelectPermanentCondition1) >= 1)
                         if (card.Owner.GetBattleAreaPermanents().Count(CanSelectPermanentCondition1) >= 1)
                         {
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT11/Purple/BT11_079.cs

@@ -28,12 +28,12 @@ namespace DCGO.CardEffects.BT11
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.LibraryCards.Count >= 1)
                         if (card.Owner.LibraryCards.Count >= 1)
                         {
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT11/Purple/BT11_082.cs

@@ -113,12 +113,12 @@ namespace DCGO.CardEffects.BT11
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT11/Red/BT11_001.cs

@@ -24,12 +24,12 @@ namespace DCGO.CardEffects.BT11
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.LibraryCards.Count >= 1)
                         if (card.Owner.LibraryCards.Count >= 1)
                         {
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT11/Red/BT11_007.cs

@@ -110,12 +110,12 @@ namespace DCGO.CardEffects.BT11
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.CanAddMemory(activateClass))
                         if (card.Owner.CanAddMemory(activateClass))
                         {
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT11/Red/BT11_011.cs

@@ -49,12 +49,12 @@ namespace DCGO.CardEffects.BT11
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         if (card.Owner.HandCards.Count >= 1)
                         {
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT11/Red/BT11_016.cs

@@ -195,12 +195,12 @@ namespace DCGO.CardEffects.BT11
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         if (card.Owner.HandCards.Count >= 1)
                         {
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT11/Yellow/BT11_036.cs

@@ -78,12 +78,12 @@ namespace DCGO.CardEffects.BT11
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT11/Yellow/BT11_038.cs

@@ -44,12 +44,12 @@ namespace DCGO.CardEffects.BT11
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT11/Yellow/BT11_040.cs

@@ -43,12 +43,12 @@ namespace DCGO.CardEffects.BT11
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.LibraryCards.Count >= 1)
                         if (card.Owner.LibraryCards.Count >= 1)
                         {
                         {

+ 1 - 1
Assets/Scripts/CardEffect/BT12/Black/BT12_063.cs

@@ -243,7 +243,7 @@ namespace DCGO.CardEffects.BT12
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)

+ 1 - 1
Assets/Scripts/CardEffect/BT12/Black/BT12_064.cs

@@ -190,7 +190,7 @@ namespace DCGO.CardEffects.BT12
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)

+ 1 - 1
Assets/Scripts/CardEffect/BT12/Black/BT12_071.cs

@@ -151,7 +151,7 @@ namespace DCGO.CardEffects.BT12
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)

+ 1 - 1
Assets/Scripts/CardEffect/BT12/Blue/BT12_032.cs

@@ -207,7 +207,7 @@ namespace DCGO.CardEffects.BT12
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)

+ 1 - 1
Assets/Scripts/CardEffect/BT12/Green/BT12_051.cs

@@ -258,7 +258,7 @@ namespace DCGO.CardEffects.BT12
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)

+ 1 - 1
Assets/Scripts/CardEffect/BT12/Green/BT12_054.cs

@@ -49,7 +49,7 @@ namespace DCGO.CardEffects.BT12
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)

+ 1 - 1
Assets/Scripts/CardEffect/BT12/Green/BT12_105.cs

@@ -128,7 +128,7 @@ namespace DCGO.CardEffects.BT12
                                 {
                                 {
                                     if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                                     if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                                     {
                                     {
-                                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable1, (permanent) => permanent == selectedPermanent))
+                                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable1, (permanent) => permanent == selectedPermanent, activateClass))
                                         {
                                         {
                                             if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass))
                                             if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass))
                                             {
                                             {

+ 2 - 2
Assets/Scripts/CardEffect/BT12/Purple/BT12_006.cs

@@ -24,12 +24,12 @@ namespace DCGO.CardEffects.BT12
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.LibraryCards.Count >= 1)
                         if (card.Owner.LibraryCards.Count >= 1)
                         {
                         {

+ 1 - 1
Assets/Scripts/CardEffect/BT12/Purple/BT12_077.cs

@@ -108,7 +108,7 @@ namespace DCGO.CardEffects.BT12
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)

+ 1 - 1
Assets/Scripts/CardEffect/BT12/Purple/BT12_084.cs

@@ -574,7 +574,7 @@ namespace DCGO.CardEffects.BT12
                 {
                 {
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     {
                     {
-                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, PermanentCondition))
+                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, PermanentCondition, activateClass))
                         {
                         {
                             return true;
                             return true;
                         }
                         }

+ 1 - 1
Assets/Scripts/CardEffect/BT12/Purple/BT12_085.cs

@@ -105,7 +105,7 @@ namespace DCGO.CardEffects.BT12
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)

+ 1 - 1
Assets/Scripts/CardEffect/BT12/Red/BT12_011.cs

@@ -258,7 +258,7 @@ namespace DCGO.CardEffects.BT12
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)

+ 4 - 4
Assets/Scripts/CardEffect/BT12/Red/BT12_012.cs

@@ -62,12 +62,12 @@ namespace DCGO.CardEffects.BT12
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         if (card.Owner.HandCards.Count >= 1)
                         {
                         {
@@ -152,12 +152,12 @@ namespace DCGO.CardEffects.BT12
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         if (card.Owner.HandCards.Count >= 1)
                         {
                         {

+ 1 - 1
Assets/Scripts/CardEffect/BT12/Red/BT12_015.cs

@@ -423,7 +423,7 @@ namespace DCGO.CardEffects.BT12
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)

+ 1 - 1
Assets/Scripts/CardEffect/BT12/Red/BT12_017.cs

@@ -129,7 +129,7 @@ namespace DCGO.CardEffects.BT12
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)

+ 1 - 1
Assets/Scripts/CardEffect/BT12/Yellow/BT12_037.cs

@@ -248,7 +248,7 @@ namespace DCGO.CardEffects.BT12
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)

+ 1 - 1
Assets/Scripts/CardEffect/BT12/Yellow/BT12_041.cs

@@ -128,7 +128,7 @@ namespace DCGO.CardEffects.BT12
                     {
                     {
                         if (CardEffectCommons.IsOwnerTurn(card))
                         if (CardEffectCommons.IsOwnerTurn(card))
                         {
                         {
-                            if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, PermanentCondition))
+                            if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, PermanentCondition, activateClass))
                             {
                             {
                                 if (CardEffectCommons.IsDPZeroDelete(hashtable))
                                 if (CardEffectCommons.IsDPZeroDelete(hashtable))
                                 {
                                 {

+ 2 - 2
Assets/Scripts/CardEffect/BT12/Yellow/BT12_042.cs

@@ -105,7 +105,7 @@ namespace DCGO.CardEffects.BT12
                 {
                 {
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     {
                     {
-                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, PermanentCondition))
+                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, PermanentCondition, activateClass))
                         {
                         {
                             return true;
                             return true;
                         }
                         }
@@ -224,7 +224,7 @@ namespace DCGO.CardEffects.BT12
                 {
                 {
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     {
                     {
-                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, PermanentCondition))
+                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, PermanentCondition, activateClass))
                         {
                         {
                             return true;
                             return true;
                         }
                         }

+ 2 - 2
Assets/Scripts/CardEffect/BT13/Black/BT13_061.cs

@@ -33,12 +33,12 @@ namespace DCGO.CardEffects.BT13
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.LibraryCards.Count >= 1)
                         if (card.Owner.LibraryCards.Count >= 1)
                         {
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT13/Black/BT13_062.cs

@@ -187,12 +187,12 @@ namespace DCGO.CardEffects.BT13
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {
                         {

+ 1 - 1
Assets/Scripts/CardEffect/BT13/Black/BT13_064.cs

@@ -69,7 +69,7 @@ namespace DCGO.CardEffects.BT13
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)

+ 1 - 1
Assets/Scripts/CardEffect/BT13/Black/BT13_065.cs

@@ -29,7 +29,7 @@ namespace DCGO.CardEffects.BT13
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)

+ 1 - 1
Assets/Scripts/CardEffect/BT13/Black/BT13_068.cs

@@ -67,7 +67,7 @@ namespace DCGO.CardEffects.BT13
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)

+ 1 - 1
Assets/Scripts/CardEffect/BT13/Black/BT13_070.cs

@@ -67,7 +67,7 @@ namespace DCGO.CardEffects.BT13
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)

+ 1 - 1
Assets/Scripts/CardEffect/BT13/Black/BT13_073.cs

@@ -53,7 +53,7 @@ namespace DCGO.CardEffects.BT13
                 {
                 {
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     {
                     {
-                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, PermanentCondition))
+                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, PermanentCondition, activateClass))
                         {
                         {
                             return true;
                             return true;
                         }
                         }

+ 1 - 1
Assets/Scripts/CardEffect/BT13/Black/BT13_076.cs

@@ -66,7 +66,7 @@ namespace DCGO.CardEffects.BT13
                 {
                 {
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     {
                     {
-                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, PermanentCondition))
+                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, PermanentCondition, activateClass))
                         {
                         {
                             return true;
                             return true;
                         }
                         }

+ 2 - 2
Assets/Scripts/CardEffect/BT13/Purple/BT13_006.cs

@@ -41,12 +41,12 @@ namespace DCGO.CardEffects.BT13
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         if (card.Owner.HandCards.Count >= 1)
                         {
                         {

+ 1 - 1
Assets/Scripts/CardEffect/BT13/Purple/BT13_078.cs

@@ -23,7 +23,7 @@ namespace DCGO.CardEffects.BT13
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)

+ 2 - 2
Assets/Scripts/CardEffect/BT13/Purple/BT13_079.cs

@@ -107,12 +107,12 @@ namespace DCGO.CardEffects.BT13
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (!CardEffectCommons.IsByBattle(hashtable))
                         if (!CardEffectCommons.IsByBattle(hashtable))
                         {
                         {

+ 1 - 1
Assets/Scripts/CardEffect/BT13/Purple/BT13_080.cs

@@ -418,7 +418,7 @@ namespace DCGO.CardEffects.BT13
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)

+ 1 - 1
Assets/Scripts/CardEffect/BT13/Purple/BT13_081.cs

@@ -112,7 +112,7 @@ namespace DCGO.CardEffects.BT13
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)

+ 2 - 2
Assets/Scripts/CardEffect/BT13/Purple/BT13_082.cs

@@ -30,12 +30,12 @@ namespace DCGO.CardEffects.BT13
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (!CardEffectCommons.IsByBattle(hashtable))
                         if (!CardEffectCommons.IsByBattle(hashtable))
                         {
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT13/Purple/BT13_083.cs

@@ -413,12 +413,12 @@ namespace DCGO.CardEffects.BT13
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.TrashCards.Count(CanSelectCardCondition) >= 2)
                         if (card.Owner.TrashCards.Count(CanSelectCardCondition) >= 2)
                         {
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT13/Purple/BT13_085.cs

@@ -101,12 +101,12 @@ namespace DCGO.CardEffects.BT13
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (!CardEffectCommons.IsByBattle(hashtable))
                         if (!CardEffectCommons.IsByBattle(hashtable))
                         {
                         {

+ 1 - 1
Assets/Scripts/CardEffect/BT13/Purple/BT13_086.cs

@@ -437,7 +437,7 @@ namespace DCGO.CardEffects.BT13
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)

+ 1 - 1
Assets/Scripts/CardEffect/BT13/Purple/BT13_089.cs

@@ -198,7 +198,7 @@ namespace DCGO.CardEffects.BT13
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)

+ 2 - 2
Assets/Scripts/CardEffect/BT13/Red/BT13_001.cs

@@ -38,12 +38,12 @@ namespace DCGO.CardEffects.BT13
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         {
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT13/Red/BT13_010.cs

@@ -147,12 +147,12 @@ namespace DCGO.CardEffects.BT13
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.LibraryCards.Count >= 1)
                         if (card.Owner.LibraryCards.Count >= 1)
                         {
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT13/Red/BT13_011.cs

@@ -163,12 +163,12 @@ namespace DCGO.CardEffects.BT13
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.LibraryCards.Count >= 1)
                         if (card.Owner.LibraryCards.Count >= 1)
                         {
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT13/Red/BT13_014.cs

@@ -218,12 +218,12 @@ namespace DCGO.CardEffects.BT13
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         {
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT13/Red/BT13_015.cs

@@ -153,7 +153,7 @@ namespace DCGO.CardEffects.BT13
                 {
                 {
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     {
                     {
-                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, PermanentCondition))
+                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, PermanentCondition, activateClass))
                         {
                         {
                             return true;
                             return true;
                         }
                         }
@@ -275,7 +275,7 @@ namespace DCGO.CardEffects.BT13
                 {
                 {
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     {
                     {
-                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, PermanentCondition))
+                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, PermanentCondition, activateClass))
                         {
                         {
                             return true;
                             return true;
                         }
                         }

+ 1 - 1
Assets/Scripts/CardEffect/BT13/Red/BT13_094.cs

@@ -177,7 +177,7 @@ namespace DCGO.CardEffects.BT13
                                         {
                                         {
                                             if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                                             if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                                             {
                                             {
-                                                if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable1, (permanent) => permanent == selectedPermanent))
+                                                if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable1, (permanent) => permanent == selectedPermanent, activateClass))
                                                 {
                                                 {
                                                     if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass))
                                                     if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass))
                                                     {
                                                     {

+ 2 - 2
Assets/Scripts/CardEffect/BT13/White/BT13_093.cs

@@ -94,12 +94,12 @@ namespace DCGO.CardEffects.BT13
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.HandCards.Count(CanSelectCardCondition) >= 1)
                         if (card.Owner.HandCards.Count(CanSelectCardCondition) >= 1)
                         {
                         {

+ 1 - 1
Assets/Scripts/CardEffect/BT13/Yellow/BT13_035.cs

@@ -58,7 +58,7 @@ namespace DCGO.CardEffects.BT13
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)

+ 1 - 1
Assets/Scripts/CardEffect/BT13/Yellow/BT13_039.cs

@@ -62,7 +62,7 @@ namespace DCGO.CardEffects.BT13
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)

+ 2 - 2
Assets/Scripts/CardEffect/BT13/Yellow/BT13_041.cs

@@ -52,12 +52,12 @@ namespace DCGO.CardEffects.BT13
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         if (card.Owner.HandCards.Count >= 1)
                         {
                         {

+ 1 - 1
Assets/Scripts/CardEffect/BT13/Yellow/BT13_042.cs

@@ -62,7 +62,7 @@ namespace DCGO.CardEffects.BT13
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)

+ 2 - 2
Assets/Scripts/CardEffect/BT14/Black/BT14_063.cs

@@ -54,12 +54,12 @@ namespace DCGO.CardEffects.BT14
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.LibraryCards.Count >= 1)
                         if (card.Owner.LibraryCards.Count >= 1)
                         {
                         {

+ 1 - 1
Assets/Scripts/CardEffect/BT14/Black/BT14_064.cs

@@ -235,7 +235,7 @@ namespace DCGO.CardEffects.BT14
                 {
                 {
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     {
                     {
-                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, PermanentCondition))
+                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, PermanentCondition, activateClass))
                         {
                         {
                             return true;
                             return true;
                         }
                         }

+ 2 - 2
Assets/Scripts/CardEffect/BT14/Black/BT14_066.cs

@@ -220,12 +220,12 @@ namespace DCGO.CardEffects.BT14
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         if (card.Owner.HandCards.Count >= 1)
                         {
                         {

+ 1 - 1
Assets/Scripts/CardEffect/BT14/Blue/BT14_030.cs

@@ -323,7 +323,7 @@ namespace DCGO.CardEffects.BT14
                     {
                     {
                         if (CardEffectCommons.IsOwnerTurn(card))
                         if (CardEffectCommons.IsOwnerTurn(card))
                         {
                         {
-                            if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, PermanentCondition))
+                            if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, PermanentCondition, activateClass))
                             {
                             {
                                 return true;
                                 return true;
                             }
                             }

+ 2 - 2
Assets/Scripts/CardEffect/BT14/Purple/BT14_075.cs

@@ -122,12 +122,12 @@ namespace DCGO.CardEffects.BT14
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.Enemy.HandCards.Count >= 1)
                         if (card.Owner.Enemy.HandCards.Count >= 1)
                         {
                         {

+ 1 - 1
Assets/Scripts/CardEffect/BT14/Purple/BT14_076.cs

@@ -190,7 +190,7 @@ namespace DCGO.CardEffects.BT14
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)

+ 2 - 2
Assets/Scripts/CardEffect/BT14/Purple/BT14_078.cs

@@ -117,12 +117,12 @@ namespace DCGO.CardEffects.BT14
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanActivateOnDeletion(card, activateClass);
                 }
                 }
 
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)

+ 2 - 2
Assets/Scripts/CardEffect/BT14/Yellow/BT14_032.cs

@@ -135,12 +135,12 @@ namespace DCGO.CardEffects.BT14
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         {
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT14/Yellow/BT14_034.cs

@@ -35,12 +35,12 @@ namespace DCGO.CardEffects.BT14
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         {
                         {

+ 4 - 4
Assets/Scripts/CardEffect/BT14/Yellow/BT14_038.cs

@@ -148,12 +148,12 @@ namespace DCGO.CardEffects.BT14
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.CanAddSecurity(activateClass))
                         if (card.Owner.CanAddSecurity(activateClass))
                         {
                         {
@@ -193,12 +193,12 @@ namespace DCGO.CardEffects.BT14
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.TrashCards.Some(CanSelectCardCondition))
                         if (card.Owner.TrashCards.Some(CanSelectCardCondition))
                         {
                         {

+ 4 - 4
Assets/Scripts/CardEffect/BT14/Yellow/BT14_102.cs

@@ -205,12 +205,12 @@ namespace DCGO.CardEffects.BT14
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.CanAddSecurity(activateClass))
                         if (card.Owner.CanAddSecurity(activateClass))
                         {
                         {
@@ -263,12 +263,12 @@ namespace DCGO.CardEffects.BT14
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         if (card.Owner.HandCards.Count >= 1)
                         {
                         {

+ 4 - 4
Assets/Scripts/CardEffect/BT15/Black/BT15_057.cs

@@ -61,7 +61,7 @@ namespace DCGO.CardEffects.BT15
 
 
                 bool CanUseOnDeletion(Hashtable hashtable)
                 bool CanUseOnDeletion(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanTriggerOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateDeletion))
                     {
                     {
                         if (card.PermanentOfThisCard().DigivolutionCards.Count((cardSource) => (cardSource.ContainsCardName("Numemon") || cardSource.CardNames.Contains("XAntibody") || cardSource.CardNames.Contains("X Antibody"))) >= 1)
                         if (card.PermanentOfThisCard().DigivolutionCards.Count((cardSource) => (cardSource.ContainsCardName("Numemon") || cardSource.CardNames.Contains("XAntibody") || cardSource.CardNames.Contains("X Antibody"))) >= 1)
                         {
                         {
@@ -73,7 +73,7 @@ namespace DCGO.CardEffects.BT15
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateDeletion))
                     {
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {
                         {
@@ -168,12 +168,12 @@ namespace DCGO.CardEffects.BT15
 
 
                 bool CanUseOnDeletion(Hashtable hashtable)
                 bool CanUseOnDeletion(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateDeletion);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateDeletion))
                     {
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT15/Blue/BT15_030.cs

@@ -146,14 +146,14 @@ namespace DCGO.CardEffects.BT15
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card); ;
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass); ;
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
                     if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                     if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                     {
                     {
-                        if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                        if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                         {
                         {
                             return true;
                             return true;
                         }
                         }

+ 2 - 2
Assets/Scripts/CardEffect/BT15/Green/BT15_044.cs

@@ -29,12 +29,12 @@ namespace DCGO.CardEffects.BT15
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         {
                         {

+ 1 - 1
Assets/Scripts/CardEffect/BT15/Green/BT15_095.cs

@@ -111,7 +111,7 @@ namespace DCGO.CardEffects.BT15
                                     {
                                     {
                                         if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                                         if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                                         {
                                         {
-                                            if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable1, (permanent) => permanent == selectedPermanent))
+                                            if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable1, (permanent) => permanent == selectedPermanent, activateClass))
                                             {
                                             {
                                                 if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass))
                                                 if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass))
                                                 {
                                                 {

+ 2 - 2
Assets/Scripts/CardEffect/BT15/Purple/BT15_006.cs

@@ -41,12 +41,12 @@ namespace DCGO.CardEffects.BT15
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         if (card.Owner.HandCards.Count >= 1)
                         {
                         {

+ 1 - 1
Assets/Scripts/CardEffect/BT15/Purple/BT15_068.cs

@@ -96,7 +96,7 @@ namespace DCGO.CardEffects.BT15
                                 {
                                 {
                                     if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                                     if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                                     {
                                     {
-                                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable1, (permanent) => permanent == selectedPermanent))
+                                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable1, (permanent) => permanent == selectedPermanent, activateClass))
                                         {
                                         {
                                             if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass))
                                             if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass))
                                             {
                                             {

+ 2 - 2
Assets/Scripts/CardEffect/BT15/Purple/BT15_069.cs

@@ -23,12 +23,12 @@ namespace DCGO.CardEffects.BT15
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.Enemy.MemoryForPlayer <= 1)
                         if (card.Owner.Enemy.MemoryForPlayer <= 1)
                         {
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT15/Purple/BT15_073.cs

@@ -85,12 +85,12 @@ namespace DCGO.CardEffects.BT15
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         return true;
                         return true;
                     }
                     }

+ 2 - 2
Assets/Scripts/CardEffect/BT15/Purple/BT15_078.cs

@@ -137,7 +137,7 @@ namespace DCGO.CardEffects.BT15
                             {
                             {
                                 if (CardSourceCondition(cardSource))
                                 if (CardSourceCondition(cardSource))
                                 {
                                 {
-                                    if (CardEffectCommons.CanTriggerOnDeletion(hashtable, cardSource))
+                                    if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, permanent => permanent == cardSource.PermanentOfThisCard(), activateClass1))
                                     {
                                     {
                                         return true;
                                         return true;
                                     }
                                     }
@@ -148,7 +148,7 @@ namespace DCGO.CardEffects.BT15
 
 
                             bool CanActivateCondition1(Hashtable hashtable)
                             bool CanActivateCondition1(Hashtable hashtable)
                             {
                             {
-                                if (CardEffectCommons.CanActivateOnDeletion(hashtable, cardSource))
+                                if (CardEffectCommons.CanActivateOnDeletion(cardSource, activateClass1))
                                 {
                                 {
                                     return true;
                                     return true;
                                 }
                                 }

+ 2 - 2
Assets/Scripts/CardEffect/BT15/Purple/BT15_080.cs

@@ -170,12 +170,12 @@ namespace DCGO.CardEffects.BT15
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         {
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT15/Purple/BT15_098.cs

@@ -153,7 +153,7 @@ namespace DCGO.CardEffects.BT15
 
 
                 string EffectDiscription()
                 string EffectDiscription()
                 {
                 {
-                    return "[All Turns] When one of your [Myotismon] is deleted, <Delay>.\r\n You may play 1 [VenomMyotismon] from your trash without paying the cost.";
+                    return "[All Turns] When one of your [Myotismon] is deleted, <Delay>.\r\n� You may play 1 [VenomMyotismon] from your trash without paying the cost.";
                 }
                 }
 
 
                 bool PermanentCondition(Permanent permanent)
                 bool PermanentCondition(Permanent permanent)
@@ -172,7 +172,7 @@ namespace DCGO.CardEffects.BT15
                 {
                 {
                     if (CardEffectCommons.CanDeclareOptionDelayEffect(card))
                     if (CardEffectCommons.CanDeclareOptionDelayEffect(card))
                     {
                     {
-                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, PermanentCondition))
+                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, PermanentCondition, activateClass))
                         {
                         {
                             return true;
                             return true;
                         }
                         }

+ 2 - 2
Assets/Scripts/CardEffect/BT15/Red/BT15_001.cs

@@ -39,12 +39,12 @@ namespace DCGO.CardEffects.BT15
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition))
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition))
                         {
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT15/Red/BT15_016.cs

@@ -304,12 +304,12 @@ namespace DCGO.CardEffects.BT15
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         {
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT15/Red/BT15_017.cs

@@ -111,12 +111,12 @@ namespace DCGO.CardEffects.BT15
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.Enemy.SecurityCards.Count <= 3)
                         if (card.Owner.Enemy.SecurityCards.Count <= 3)
                         {
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT15/Yellow/BT15_035.cs

@@ -205,12 +205,12 @@ namespace DCGO.CardEffects.BT15
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         if (card.Owner.HandCards.Count >= 1)
                         {
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT15/Yellow/BT15_036.cs

@@ -31,7 +31,7 @@ namespace DCGO.CardEffects.BT15
 
 
                 bool CanActivateCondition(Hashtable hashtable)
                 bool CanActivateCondition(Hashtable hashtable)
                 {
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateClass))
                     {
                     {
                         if (card.Owner.SecurityCards.Count >= 1)
                         if (card.Owner.SecurityCards.Count >= 1)
                         {
                         {
@@ -44,7 +44,7 @@ namespace DCGO.CardEffects.BT15
 
 
                 bool CanUseCondition(Hashtable hashtable)
                 bool CanUseCondition(Hashtable hashtable)
                 {
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateClass);
                 }
                 }
 
 
                 bool CanSelectPermanent(Permanent permanent)
                 bool CanSelectPermanent(Permanent permanent)

+ 2 - 2
Assets/Scripts/CardEffect/BT15/Yellow/BT15_039.cs

@@ -116,7 +116,7 @@ namespace DCGO.CardEffects.BT15
                                 {
                                 {
                                     if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                                     if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                                     {
                                     {
-                                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable1, (permanent) => permanent == selectedPermanent))
+                                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable1, (permanent) => permanent == selectedPermanent, activateClass))
                                         {
                                         {
                                             if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass))
                                             if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass))
                                             {
                                             {
@@ -247,7 +247,7 @@ namespace DCGO.CardEffects.BT15
                                 {
                                 {
                                     if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                                     if (CardEffectCommons.IsPermanentExistsOnBattleArea(selectedPermanent))
                                     {
                                     {
-                                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable1, (permanent) => permanent == selectedPermanent))
+                                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable1, (permanent) => permanent == selectedPermanent, activateClass))
                                         {
                                         {
                                             if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass))
                                             if (!selectedPermanent.TopCard.CanNotBeAffected(activateClass))
                                             {
                                             {

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov