ソースを参照

Merge pull request #1044 from DCGO2/hooperk-on-deletion

Fix On Deletion to always care about whether the top card is in trash
x89rt2 3 ヶ月 前
コミット
bd80b63382
100 ファイル変更108 行追加108 行削除
  1. 1 1
      Assets/Scripts/CardEffect/BT1/Blue/BT1_030.cs
  2. 1 1
      Assets/Scripts/CardEffect/BT1/Blue/BT1_035.cs
  3. 1 1
      Assets/Scripts/CardEffect/BT10/Black/BT10_069.cs
  4. 1 1
      Assets/Scripts/CardEffect/BT10/Black/BT10_092.cs
  5. 1 1
      Assets/Scripts/CardEffect/BT10/Blue/BT10_018.cs
  6. 1 1
      Assets/Scripts/CardEffect/BT10/Green/BT10_056.cs
  7. 1 1
      Assets/Scripts/CardEffect/BT10/Purple/BT10_078.cs
  8. 1 1
      Assets/Scripts/CardEffect/BT10/Purple/BT10_080.cs
  9. 1 1
      Assets/Scripts/CardEffect/BT10/Purple/BT10_081.cs
  10. 1 1
      Assets/Scripts/CardEffect/BT10/Purple/BT10_083.cs
  11. 1 1
      Assets/Scripts/CardEffect/BT11/Black/BT11_071.cs
  12. 1 1
      Assets/Scripts/CardEffect/BT11/Black/BT11_072.cs
  13. 1 1
      Assets/Scripts/CardEffect/BT11/Blue/BT11_031.cs
  14. 1 1
      Assets/Scripts/CardEffect/BT11/Purple/BT11_079.cs
  15. 1 1
      Assets/Scripts/CardEffect/BT11/Purple/BT11_082.cs
  16. 1 1
      Assets/Scripts/CardEffect/BT11/Red/BT11_001.cs
  17. 1 1
      Assets/Scripts/CardEffect/BT11/Red/BT11_007.cs
  18. 1 1
      Assets/Scripts/CardEffect/BT11/Red/BT11_011.cs
  19. 1 1
      Assets/Scripts/CardEffect/BT11/Red/BT11_016.cs
  20. 1 1
      Assets/Scripts/CardEffect/BT11/Yellow/BT11_036.cs
  21. 1 1
      Assets/Scripts/CardEffect/BT11/Yellow/BT11_038.cs
  22. 1 1
      Assets/Scripts/CardEffect/BT11/Yellow/BT11_040.cs
  23. 1 1
      Assets/Scripts/CardEffect/BT12/Purple/BT12_006.cs
  24. 2 2
      Assets/Scripts/CardEffect/BT12/Red/BT12_012.cs
  25. 1 1
      Assets/Scripts/CardEffect/BT13/Black/BT13_061.cs
  26. 1 1
      Assets/Scripts/CardEffect/BT13/Black/BT13_062.cs
  27. 1 1
      Assets/Scripts/CardEffect/BT13/Purple/BT13_006.cs
  28. 1 1
      Assets/Scripts/CardEffect/BT13/Purple/BT13_079.cs
  29. 1 1
      Assets/Scripts/CardEffect/BT13/Purple/BT13_082.cs
  30. 1 1
      Assets/Scripts/CardEffect/BT13/Purple/BT13_083.cs
  31. 1 1
      Assets/Scripts/CardEffect/BT13/Purple/BT13_085.cs
  32. 1 1
      Assets/Scripts/CardEffect/BT13/Red/BT13_001.cs
  33. 1 1
      Assets/Scripts/CardEffect/BT13/Red/BT13_010.cs
  34. 1 1
      Assets/Scripts/CardEffect/BT13/Red/BT13_011.cs
  35. 1 1
      Assets/Scripts/CardEffect/BT13/Red/BT13_014.cs
  36. 1 1
      Assets/Scripts/CardEffect/BT13/White/BT13_093.cs
  37. 1 1
      Assets/Scripts/CardEffect/BT13/Yellow/BT13_041.cs
  38. 1 1
      Assets/Scripts/CardEffect/BT14/Black/BT14_063.cs
  39. 1 1
      Assets/Scripts/CardEffect/BT14/Black/BT14_066.cs
  40. 1 1
      Assets/Scripts/CardEffect/BT14/Purple/BT14_075.cs
  41. 1 1
      Assets/Scripts/CardEffect/BT14/Purple/BT14_078.cs
  42. 1 1
      Assets/Scripts/CardEffect/BT14/Yellow/BT14_032.cs
  43. 1 1
      Assets/Scripts/CardEffect/BT14/Yellow/BT14_034.cs
  44. 2 2
      Assets/Scripts/CardEffect/BT14/Yellow/BT14_038.cs
  45. 2 2
      Assets/Scripts/CardEffect/BT14/Yellow/BT14_102.cs
  46. 2 2
      Assets/Scripts/CardEffect/BT15/Black/BT15_057.cs
  47. 1 1
      Assets/Scripts/CardEffect/BT15/Blue/BT15_030.cs
  48. 1 1
      Assets/Scripts/CardEffect/BT15/Green/BT15_044.cs
  49. 1 1
      Assets/Scripts/CardEffect/BT15/Purple/BT15_006.cs
  50. 1 1
      Assets/Scripts/CardEffect/BT15/Purple/BT15_069.cs
  51. 1 1
      Assets/Scripts/CardEffect/BT15/Purple/BT15_073.cs
  52. 1 1
      Assets/Scripts/CardEffect/BT15/Purple/BT15_078.cs
  53. 1 1
      Assets/Scripts/CardEffect/BT15/Purple/BT15_080.cs
  54. 1 1
      Assets/Scripts/CardEffect/BT15/Red/BT15_001.cs
  55. 1 1
      Assets/Scripts/CardEffect/BT15/Red/BT15_016.cs
  56. 1 1
      Assets/Scripts/CardEffect/BT15/Red/BT15_017.cs
  57. 1 1
      Assets/Scripts/CardEffect/BT15/Yellow/BT15_035.cs
  58. 1 1
      Assets/Scripts/CardEffect/BT15/Yellow/BT15_036.cs
  59. 2 2
      Assets/Scripts/CardEffect/BT15/Yellow/BT15_041.cs
  60. 1 1
      Assets/Scripts/CardEffect/BT16/Purple/BT16_006.cs
  61. 1 1
      Assets/Scripts/CardEffect/BT16/Purple/BT16_072.cs
  62. 1 1
      Assets/Scripts/CardEffect/BT16/Purple/BT16_073.cs
  63. 1 1
      Assets/Scripts/CardEffect/BT16/Purple/BT16_089.cs
  64. 1 1
      Assets/Scripts/CardEffect/BT16/Red/BT16_010.cs
  65. 1 1
      Assets/Scripts/CardEffect/BT16/Red/BT16_011.cs
  66. 1 1
      Assets/Scripts/CardEffect/BT16/Red/BT16_015.cs
  67. 1 1
      Assets/Scripts/CardEffect/BT17/Black/BT17_005.cs
  68. 1 1
      Assets/Scripts/CardEffect/BT17/Black/BT17_053.cs
  69. 1 1
      Assets/Scripts/CardEffect/BT17/Green/BT17_042.cs
  70. 1 1
      Assets/Scripts/CardEffect/BT17/Green/BT17_045.cs
  71. 1 1
      Assets/Scripts/CardEffect/BT17/Green/BT17_046.cs
  72. 1 1
      Assets/Scripts/CardEffect/BT17/Green/BT17_048.cs
  73. 1 1
      Assets/Scripts/CardEffect/BT17/Purple/BT17_068.cs
  74. 1 1
      Assets/Scripts/CardEffect/BT17/Red/BT17_009.cs
  75. 2 2
      Assets/Scripts/CardEffect/BT17/White/BT17_102.cs
  76. 1 1
      Assets/Scripts/CardEffect/BT18/Black/BT18_073.cs
  77. 1 1
      Assets/Scripts/CardEffect/BT18/Purple/BT18_006.cs
  78. 1 1
      Assets/Scripts/CardEffect/BT18/Purple/BT18_078.cs
  79. 1 1
      Assets/Scripts/CardEffect/BT18/Red/BT18_015.cs
  80. 1 1
      Assets/Scripts/CardEffect/BT18/Red/BT18_019.cs
  81. 2 2
      Assets/Scripts/CardEffect/BT18/Yellow/BT18_038.cs
  82. 1 1
      Assets/Scripts/CardEffect/BT18/Yellow/BT18_041.cs
  83. 1 1
      Assets/Scripts/CardEffect/BT19/Black/BT19_055.cs
  84. 1 1
      Assets/Scripts/CardEffect/BT19/Black/BT19_061.cs
  85. 2 2
      Assets/Scripts/CardEffect/BT19/Black/BT19_063.cs
  86. 1 1
      Assets/Scripts/CardEffect/BT19/Black/BT19_065.cs
  87. 1 1
      Assets/Scripts/CardEffect/BT19/Blue/BT19_016.cs
  88. 1 1
      Assets/Scripts/CardEffect/BT19/Blue/BT19_020.cs
  89. 1 1
      Assets/Scripts/CardEffect/BT19/Blue/BT19_022.cs
  90. 1 1
      Assets/Scripts/CardEffect/BT19/Blue/BT19_026.cs
  91. 1 1
      Assets/Scripts/CardEffect/BT19/Green/BT19_051.cs
  92. 1 1
      Assets/Scripts/CardEffect/BT19/Green/BT19_095.cs
  93. 1 1
      Assets/Scripts/CardEffect/BT19/Purple/BT19_006.cs
  94. 1 1
      Assets/Scripts/CardEffect/BT19/Purple/BT19_068.cs
  95. 1 1
      Assets/Scripts/CardEffect/BT19/Purple/BT19_069.cs
  96. 1 1
      Assets/Scripts/CardEffect/BT19/Purple/BT19_070.cs
  97. 1 1
      Assets/Scripts/CardEffect/BT19/Purple/BT19_098.cs
  98. 1 1
      Assets/Scripts/CardEffect/BT19/Red/BT19_008.cs
  99. 1 1
      Assets/Scripts/CardEffect/BT19/Red/BT19_012.cs
  100. 1 1
      Assets/Scripts/CardEffect/BT19/Red/BT19_013.cs

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

@@ -32,7 +32,7 @@ public class BT1_030 : CEntity_Effect
 
             bool CanActivateCondition(Hashtable hashtable)
             {
-                if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                 {
                     if (card.Owner.CanAddMemory(activateClass))
                     {

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

@@ -31,7 +31,7 @@ public class BT1_035 : CEntity_Effect
 
             bool CanActivateCondition(Hashtable hashtable)
             {
-                if (CardEffectCommons.CanActivateOnDeletion(card))
+                if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                 {
                     if (card.Owner.CanAddMemory(activateClass))
                     {

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

@@ -175,7 +175,7 @@ namespace DCGO.CardEffects.BT10
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {

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

@@ -139,7 +139,7 @@ namespace DCGO.CardEffects.BT10
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.CanAddMemory(activateClass))
                         {

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

@@ -61,7 +61,7 @@ namespace DCGO.CardEffects.BT10
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         {

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

@@ -181,7 +181,7 @@ namespace DCGO.CardEffects.BT10
 
                         bool CanActivateCondition1(Hashtable hashtable)
                         {
-                            if (CardEffectCommons.CanActivateOnDeletion(cardSource))
+                            if (CardEffectCommons.CanActivateOnDeletion(hashtable, cardSource))
                             {
                                 return true;
                             }

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

@@ -80,7 +80,7 @@ namespace DCGO.CardEffects.BT10
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {

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

@@ -229,7 +229,7 @@ namespace DCGO.CardEffects.BT10
 
                             bool CanActivateCondition1(Hashtable hashtable1)
                             {
-                                if (CardEffectCommons.CanActivateOnDeletion(card))
+                                if (CardEffectCommons.CanActivateOnDeletion(hashtable1, card))
                                 {
                                     if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                                     {

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

@@ -103,7 +103,7 @@ namespace DCGO.CardEffects.BT10
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {

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

@@ -175,7 +175,7 @@ namespace DCGO.CardEffects.BT10
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {

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

@@ -506,7 +506,7 @@ namespace DCGO.CardEffects.BT11
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition))
                         {

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

@@ -259,7 +259,7 @@ namespace DCGO.CardEffects.BT11
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.GetBattleAreaPermanents().Count(CanSelectPermanentCondition) >= 1)
                         {

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

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

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

@@ -33,7 +33,7 @@ namespace DCGO.CardEffects.BT11
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.LibraryCards.Count >= 1)
                         {

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

@@ -118,7 +118,7 @@ namespace DCGO.CardEffects.BT11
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {

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

@@ -29,7 +29,7 @@ namespace DCGO.CardEffects.BT11
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.LibraryCards.Count >= 1)
                         {

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

@@ -115,7 +115,7 @@ namespace DCGO.CardEffects.BT11
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.CanAddMemory(activateClass))
                         {

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

@@ -54,7 +54,7 @@ namespace DCGO.CardEffects.BT11
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         {

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

@@ -200,7 +200,7 @@ namespace DCGO.CardEffects.BT11
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         {

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

@@ -83,7 +83,7 @@ namespace DCGO.CardEffects.BT11
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {

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

@@ -49,7 +49,7 @@ namespace DCGO.CardEffects.BT11
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {

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

@@ -48,7 +48,7 @@ namespace DCGO.CardEffects.BT11
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.LibraryCards.Count >= 1)
                         {

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

@@ -29,7 +29,7 @@ namespace DCGO.CardEffects.BT12
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.LibraryCards.Count >= 1)
                         {

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

@@ -67,7 +67,7 @@ namespace DCGO.CardEffects.BT12
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         {
@@ -157,7 +157,7 @@ namespace DCGO.CardEffects.BT12
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         {

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

@@ -38,7 +38,7 @@ namespace DCGO.CardEffects.BT13
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.LibraryCards.Count >= 1)
                         {

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

@@ -192,7 +192,7 @@ namespace DCGO.CardEffects.BT13
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {

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

@@ -46,7 +46,7 @@ namespace DCGO.CardEffects.BT13
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         {

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

@@ -112,7 +112,7 @@ namespace DCGO.CardEffects.BT13
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (!CardEffectCommons.IsByBattle(hashtable))
                         {

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

@@ -35,7 +35,7 @@ namespace DCGO.CardEffects.BT13
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (!CardEffectCommons.IsByBattle(hashtable))
                         {

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

@@ -418,7 +418,7 @@ namespace DCGO.CardEffects.BT13
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.TrashCards.Count(CanSelectCardCondition) >= 2)
                         {

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

@@ -106,7 +106,7 @@ namespace DCGO.CardEffects.BT13
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (!CardEffectCommons.IsByBattle(hashtable))
                         {

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

@@ -43,7 +43,7 @@ namespace DCGO.CardEffects.BT13
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         {

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

@@ -152,7 +152,7 @@ namespace DCGO.CardEffects.BT13
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.LibraryCards.Count >= 1)
                         {

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

@@ -168,7 +168,7 @@ namespace DCGO.CardEffects.BT13
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.LibraryCards.Count >= 1)
                         {

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

@@ -223,7 +223,7 @@ namespace DCGO.CardEffects.BT13
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         {

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

@@ -99,7 +99,7 @@ namespace DCGO.CardEffects.BT13
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.HandCards.Count(CanSelectCardCondition) >= 1)
                         {

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

@@ -57,7 +57,7 @@ namespace DCGO.CardEffects.BT13
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         {

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

@@ -59,7 +59,7 @@ namespace DCGO.CardEffects.BT14
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.LibraryCards.Count >= 1)
                         {

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

@@ -225,7 +225,7 @@ namespace DCGO.CardEffects.BT14
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         {

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

@@ -127,7 +127,7 @@ namespace DCGO.CardEffects.BT14
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.Enemy.HandCards.Count >= 1)
                         {

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

@@ -122,7 +122,7 @@ namespace DCGO.CardEffects.BT14
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card);
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)

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

@@ -140,7 +140,7 @@ namespace DCGO.CardEffects.BT14
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         {

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

@@ -40,7 +40,7 @@ namespace DCGO.CardEffects.BT14
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         {

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

@@ -153,7 +153,7 @@ namespace DCGO.CardEffects.BT14
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.CanAddSecurity(activateClass))
                         {
@@ -198,7 +198,7 @@ namespace DCGO.CardEffects.BT14
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.TrashCards.Some(CanSelectCardCondition))
                         {

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

@@ -212,7 +212,7 @@ namespace DCGO.CardEffects.BT14
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.CanAddSecurity(activateClass))
                         {
@@ -270,7 +270,7 @@ namespace DCGO.CardEffects.BT14
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         {

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

@@ -73,7 +73,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {
@@ -173,7 +173,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {

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

@@ -153,7 +153,7 @@ namespace DCGO.CardEffects.BT15
                 {
                     if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                     {
-                        if (CardEffectCommons.CanActivateOnDeletion(card))
+                        if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                         {
                             return true;
                         }

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

@@ -34,7 +34,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         {

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

@@ -46,7 +46,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         {

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

@@ -28,7 +28,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.Enemy.MemoryForPlayer <= 1)
                         {

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

@@ -90,7 +90,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         return true;
                     }

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

@@ -148,7 +148,7 @@ namespace DCGO.CardEffects.BT15
 
                             bool CanActivateCondition1(Hashtable hashtable)
                             {
-                                if (CardEffectCommons.CanActivateOnDeletion(cardSource))
+                                if (CardEffectCommons.CanActivateOnDeletion(hashtable, cardSource))
                                 {
                                     return true;
                                 }

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

@@ -175,7 +175,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         {

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

@@ -44,7 +44,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition))
                         {

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

@@ -309,7 +309,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         {

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

@@ -116,7 +116,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.Enemy.SecurityCards.Count <= 3)
                         {

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

@@ -210,7 +210,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         {

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

@@ -31,7 +31,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.SecurityCards.Count >= 1)
                         {

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

@@ -105,7 +105,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card);
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card);
                 }
 
                 bool CanUseCondition(Hashtable hashtable)
@@ -173,7 +173,7 @@ namespace DCGO.CardEffects.BT15
 
                 string EffectDiscription()
                 {
-                    return "[End of Opponent's Turn] By deleting this Digimon, you may play 1 [Rosemon] or [Jijimon] from your hand without paying the cost. Then activate the [When Digivolving] effect of the Digimon played by this effect.";
+                    return "[End of Opponent�'s Turn] By deleting this Digimon, you may play 1 [Rosemon] or [Jijimon] from your hand without paying the cost. Then activate the [When Digivolving] effect of the Digimon played by this effect.";
                 }
 
                 bool CanUseCondition(Hashtable hashtable)

+ 1 - 1
Assets/Scripts/CardEffect/BT16/Purple/BT16_006.cs

@@ -31,7 +31,7 @@ namespace DCGO.CardEffects.BT16
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.HandCards.Count >= 1)
                         {

+ 1 - 1
Assets/Scripts/CardEffect/BT16/Purple/BT16_072.cs

@@ -125,7 +125,7 @@ namespace DCGO.CardEffects.BT16
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition))
                         {

+ 1 - 1
Assets/Scripts/CardEffect/BT16/Purple/BT16_073.cs

@@ -139,7 +139,7 @@ namespace DCGO.CardEffects.BT16
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition))
                         {

+ 1 - 1
Assets/Scripts/CardEffect/BT16/Purple/BT16_089.cs

@@ -244,7 +244,7 @@ namespace DCGO.CardEffects.BT16
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.TrashCards.Count >= 1)
                         {

+ 1 - 1
Assets/Scripts/CardEffect/BT16/Red/BT16_010.cs

@@ -166,7 +166,7 @@ namespace DCGO.CardEffects.BT16
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card);
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)

+ 1 - 1
Assets/Scripts/CardEffect/BT16/Red/BT16_011.cs

@@ -320,7 +320,7 @@ namespace DCGO.CardEffects.BT16
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.Enemy.SecurityCards.Count >= 1)
                         {

+ 1 - 1
Assets/Scripts/CardEffect/BT16/Red/BT16_015.cs

@@ -161,7 +161,7 @@ namespace DCGO.CardEffects.BT16
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card);
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)

+ 1 - 1
Assets/Scripts/CardEffect/BT17/Black/BT17_005.cs

@@ -30,7 +30,7 @@ namespace DCGO.CardEffects.BT17
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if(CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if(CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if(CardEffectCommons.CanActivateSelfOnDeletionWithContainingTrait(hashtable, "Unidentified", card))
                             return true;

+ 1 - 1
Assets/Scripts/CardEffect/BT17/Black/BT17_053.cs

@@ -103,7 +103,7 @@ namespace DCGO.CardEffects.BT17
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (CardEffectCommons.CanActivateSelfOnDeletionWithContainingTrait(hashtable, "Unidentified", card))
                         {

+ 1 - 1
Assets/Scripts/CardEffect/BT17/Green/BT17_042.cs

@@ -119,7 +119,7 @@ namespace DCGO.CardEffects.BT17
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card);
+                    return CardEffectCommons.CanActivateOnDeletion( hashtable, card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

+ 1 - 1
Assets/Scripts/CardEffect/BT17/Green/BT17_045.cs

@@ -147,7 +147,7 @@ namespace DCGO.CardEffects.BT17
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card);
+                    return CardEffectCommons.CanActivateOnDeletion( hashtable, card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

+ 1 - 1
Assets/Scripts/CardEffect/BT17/Green/BT17_046.cs

@@ -41,7 +41,7 @@ namespace DCGO.CardEffects.BT17
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if(CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, IsTerriermon))
                         {

+ 1 - 1
Assets/Scripts/CardEffect/BT17/Green/BT17_048.cs

@@ -104,7 +104,7 @@ namespace DCGO.CardEffects.BT17
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if(CardEffectCommons.HasMatchConditionOwnersHand(card, IsLevel6Argomon))
                         {

+ 1 - 1
Assets/Scripts/CardEffect/BT17/Purple/BT17_068.cs

@@ -215,7 +215,7 @@ namespace DCGO.CardEffects.BT17
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card) &&
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card) &&
                            (card.Owner.HandCards.Some(CanSelectCardCondition) ||
                             card.Owner.TrashCards.Some(CanSelectCardCondition));
                 }

+ 1 - 1
Assets/Scripts/CardEffect/BT17/Red/BT17_009.cs

@@ -132,7 +132,7 @@ namespace DCGO.CardEffects.BT17
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.HandCards.Count(CanSelectCardCondition) >= 1)
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT17/White/BT17_102.cs

@@ -177,7 +177,7 @@ namespace DCGO.CardEffects.BT17
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card);
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
@@ -289,7 +289,7 @@ namespace DCGO.CardEffects.BT17
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card);
+                    return CardEffectCommons.CanActivateOnDeletion( hashtable, card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

+ 1 - 1
Assets/Scripts/CardEffect/BT18/Black/BT18_073.cs

@@ -402,7 +402,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card) &&
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card) &&
                            CardEffectCommons.HasMatchConditionPermanent(HasKimeramon) &&
                            CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, HasMachinedramon) &&
                            CardEffectCommons.HasMatchConditionOwnersHand(card, HasMillenniummon);

+ 1 - 1
Assets/Scripts/CardEffect/BT18/Purple/BT18_006.cs

@@ -47,7 +47,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card);
+                    return CardEffectCommons.CanActivateOnDeletion( hashtable, card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

+ 1 - 1
Assets/Scripts/CardEffect/BT18/Purple/BT18_078.cs

@@ -415,7 +415,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card) &&
+                    return CardEffectCommons.CanActivateOnDeletion( hashtable, card) &&
                            CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition);
                 }
 

+ 1 - 1
Assets/Scripts/CardEffect/BT18/Red/BT18_015.cs

@@ -271,7 +271,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card) &&
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card) &&
                            CardEffectCommons.HasMatchConditionPermanent(HasMachinedramon) &&
                            CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, HasKimeramon) &&
                            CardEffectCommons.HasMatchConditionOwnersHand(card, HasMillenniummon);

+ 1 - 1
Assets/Scripts/CardEffect/BT18/Red/BT18_019.cs

@@ -378,7 +378,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardConditionKimeramon) || CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardConditionMachinedramon))
                         {

+ 2 - 2
Assets/Scripts/CardEffect/BT18/Yellow/BT18_038.cs

@@ -146,7 +146,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (card.Owner.HandCards.Count(CanSelectCardCondition) >= 1)
                         {
@@ -220,7 +220,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                     {
                         if (card.Owner.CanAddSecurity(activateClass))
                         {

+ 1 - 1
Assets/Scripts/CardEffect/BT18/Yellow/BT18_041.cs

@@ -356,7 +356,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(card))
+                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
                     {
                         if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         {

+ 1 - 1
Assets/Scripts/CardEffect/BT19/Black/BT19_055.cs

@@ -41,7 +41,7 @@ namespace DCGO.CardEffects.BT19
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card);
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

+ 1 - 1
Assets/Scripts/CardEffect/BT19/Black/BT19_061.cs

@@ -189,7 +189,7 @@ namespace DCGO.CardEffects.BT19
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card) &&
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card) &&
                            CardEffectCommons.HasMatchConditionOwnersPermanent(card, IsOwnTamerCondition) &&
                            (CardEffectCommons.HasMatchConditionOwnersHand(card, HasTraitCondition) ||
                             CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, HasTraitCondition));

+ 2 - 2
Assets/Scripts/CardEffect/BT19/Black/BT19_063.cs

@@ -354,7 +354,7 @@ namespace DCGO.CardEffects.BT19
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card) &&
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card) &&
                            CardEffectCommons.HasMatchConditionPermanent(TamerHasDigimon);
                 }
 
@@ -474,7 +474,7 @@ namespace DCGO.CardEffects.BT19
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card) &&
+                    return CardEffectCommons.CanActivateOnDeletion( hashtable, card) &&
                            CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, HasKnightmonInText);
                 }
 

+ 1 - 1
Assets/Scripts/CardEffect/BT19/Black/BT19_065.cs

@@ -233,7 +233,7 @@ namespace DCGO.CardEffects.BT19
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card) &&
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card) &&
                            CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, IsTargetableDigimon);
                 }
 

+ 1 - 1
Assets/Scripts/CardEffect/BT19/Blue/BT19_016.cs

@@ -151,7 +151,7 @@ namespace DCGO.CardEffects.BT19
                 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card) &&
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card) &&
                            CardEffectCommons.HasMatchConditionOwnersHand(card, HasBlueFlareTraitCondition) &&
                            CardEffectCommons.HasMatchConditionOwnersPermanent(card, IsOwnTamerCondition);
                 }

+ 1 - 1
Assets/Scripts/CardEffect/BT19/Blue/BT19_020.cs

@@ -57,7 +57,7 @@ namespace DCGO.CardEffects.BT19
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card) &&
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card) &&
                            ((CardEffectCommons.HasMatchConditionOwnersHand(card, IsTamerCardCondition) &&
                              card.Owner.GetBattleAreaPermanents().Count(permanent => permanent.IsTamer) <= 1) ||
                             CardEffectCommons.CanActivateSave(hashtable, CanSelectSaveTamerPermanentCondition));

+ 1 - 1
Assets/Scripts/CardEffect/BT19/Blue/BT19_022.cs

@@ -54,7 +54,7 @@ namespace DCGO.CardEffects.BT19
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card) &&
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card) &&
                            (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, HasBlueFlareTraitCondition) ||
                             CardEffectCommons.CanActivateSave(hashtable, CanSelectSaveTamerPermanentCondition));
                 }

+ 1 - 1
Assets/Scripts/CardEffect/BT19/Blue/BT19_026.cs

@@ -228,7 +228,7 @@ namespace DCGO.CardEffects.BT19
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card) &&
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card) &&
                            (CardEffectCommons.HasMatchConditionPermanent(TamerHasDigimonCondition) ||
                             CardEffectCommons.CanActivateSave(hashtable, CanSelectSaveTamerPermanentCondition));
                 }

+ 1 - 1
Assets/Scripts/CardEffect/BT19/Green/BT19_051.cs

@@ -273,7 +273,7 @@ namespace DCGO.CardEffects.BT19
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card) &&
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card) &&
                            CardEffectCommons.HasMatchConditionOwnersPermanent(card, IsOwnTamerCondition) &&
                            (CardEffectCommons.HasMatchConditionOwnersHand(card, HasTraitCondition) ||
                             CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, HasTraitCondition));

+ 1 - 1
Assets/Scripts/CardEffect/BT19/Green/BT19_095.cs

@@ -59,7 +59,7 @@ namespace DCGO.CardEffects.BT19
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card);
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

+ 1 - 1
Assets/Scripts/CardEffect/BT19/Purple/BT19_006.cs

@@ -38,7 +38,7 @@ namespace DCGO.CardEffects.BT19
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletionInherited(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
                         return CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, PurpleLevelThree);
                     return false;
                 }

+ 1 - 1
Assets/Scripts/CardEffect/BT19/Purple/BT19_068.cs

@@ -180,7 +180,7 @@ namespace DCGO.CardEffects.BT19
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card);
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)

+ 1 - 1
Assets/Scripts/CardEffect/BT19/Purple/BT19_069.cs

@@ -226,7 +226,7 @@ namespace DCGO.CardEffects.BT19
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card) &&
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card) &&
                            card.Owner.HandCards.Count >= 1;
                 }
 

+ 1 - 1
Assets/Scripts/CardEffect/BT19/Purple/BT19_070.cs

@@ -416,7 +416,7 @@ namespace DCGO.CardEffects.BT19
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card) &&
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card) &&
                            CardEffectCommons.HasMatchConditionPermanent(CanSelectOwnerPermanentCondition);
                 }
 

+ 1 - 1
Assets/Scripts/CardEffect/BT19/Purple/BT19_098.cs

@@ -61,7 +61,7 @@ namespace DCGO.CardEffects.BT19
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card) &&
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card) &&
                            CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, IsPlayableDevice);
                 }
 

+ 1 - 1
Assets/Scripts/CardEffect/BT19/Red/BT19_008.cs

@@ -180,7 +180,7 @@ namespace DCGO.CardEffects.BT19
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card);
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card);
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)

+ 1 - 1
Assets/Scripts/CardEffect/BT19/Red/BT19_012.cs

@@ -277,7 +277,7 @@ namespace DCGO.CardEffects.BT19
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card) &&
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card) &&
                            CardEffectCommons.HasMatchConditionOwnersPermanent(card, IsOwnTamerCondition) &&
                            (CardEffectCommons.HasMatchConditionOwnersHand(card, HasTraitCondition) ||
                             CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, HasTraitCondition));

+ 1 - 1
Assets/Scripts/CardEffect/BT19/Red/BT19_013.cs

@@ -166,7 +166,7 @@ namespace DCGO.CardEffects.BT19
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanActivateOnDeletion(card) &&
+                    return CardEffectCommons.CanActivateOnDeletion(hashtable, card) &&
                            CardEffectCommons.HasMatchConditionPermanent(TamerHasDigimonCondition);
                 }
 

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません