Merge branch 'develop' into Guard-and-MAchine-Empire

Assets/CardBaseEntity/BT18/Black/Digimon/BT18_060_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:666450b1973e8d7448f37711fb056ffc0574320c2b67be7ec8de5a8813a7e92c
-size 1558
+oid sha256:29523e26bc8011a94c3aa79063c630891cb434d43f808a64f39c5e7e8387a876
+size 1603

Assets/Prefab/GameplayPanel.prefab

@@ -140,7 +140,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: 5e887a426c49a6748a021b8426a3cd53, type: 3}
+  m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -723,7 +723,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &7928374914756538918
 RectTransform:
   m_ObjectHideFlags: 0
@@ -826,8 +826,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 7928374916472540340}
   m_HandleRect: {fileID: 7928374916472540343}
   m_Direction: 2
-  m_Value: 1.0000169
-  m_Size: 0.99596745
+  m_Value: 0.62781835
+  m_Size: 0.84622556
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -1160,6 +1160,7 @@ GameObject:
   - component: {fileID: 7928374914864650544}
   - component: {fileID: 7928374914864650547}
   - component: {fileID: 7928374914864650546}
+  - component: {fileID: 4937676638312405349}
   m_Layer: 5
   m_Name: AutoMaxCardCountButton
   m_TagString: Untagged
@@ -1313,6 +1314,18 @@ MonoBehaviour:
             m_StringArgument: 
             m_BoolArgument: 0
           m_CallState: 2
+--- !u!114 &4937676638312405349
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7928374914864650548}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 24810f441051444c9b85cd5ee64ace1e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &7928374914887564770
 GameObject:
   m_ObjectHideFlags: 0
@@ -1434,7 +1447,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: 3c2172383277d46b697de74b6df875e5, type: 3}
+  m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -2084,6 +2097,7 @@ GameObject:
   - component: {fileID: 7928374915029961593}
   - component: {fileID: 7928374915029961592}
   - component: {fileID: 7928374915029961595}
+  - component: {fileID: 4632474434352980641}
   m_Layer: 5
   m_Name: AutoHatchButton
   m_TagString: Untagged
@@ -2237,6 +2251,18 @@ MonoBehaviour:
             m_StringArgument: 
             m_BoolArgument: 0
           m_CallState: 2
+--- !u!114 &4632474434352980641
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7928374915029961597}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 24810f441051444c9b85cd5ee64ace1e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &7928374915051940583
 GameObject:
   m_ObjectHideFlags: 0
@@ -2600,7 +2626,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: 3c2172383277d46b697de74b6df875e5, type: 3}
+  m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -3211,6 +3237,7 @@ GameObject:
   - component: {fileID: 7928374915203219918}
   - component: {fileID: 7928374915203219921}
   - component: {fileID: 7928374915203219920}
+  - component: {fileID: 4016611680359036842}
   m_Layer: 5
   m_Name: AutoDeckBottomOrderButton
   m_TagString: Untagged
@@ -3364,6 +3391,18 @@ MonoBehaviour:
             m_StringArgument: 
             m_BoolArgument: 0
           m_CallState: 2
+--- !u!114 &4016611680359036842
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7928374915203219922}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 24810f441051444c9b85cd5ee64ace1e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &7928374915215816685
 GameObject:
   m_ObjectHideFlags: 0
@@ -3424,7 +3463,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: 3c2172383277d46b697de74b6df875e5, type: 3}
+  m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -3962,6 +4001,7 @@ GameObject:
   - component: {fileID: 7928374915307089664}
   - component: {fileID: 7928374915307089667}
   - component: {fileID: 7928374915307089666}
+  - component: {fileID: 3357544725572256066}
   m_Layer: 5
   m_Name: AutoDeckTopOrderButton
   m_TagString: Untagged
@@ -4115,6 +4155,18 @@ MonoBehaviour:
             m_StringArgument: 
             m_BoolArgument: 0
           m_CallState: 2
+--- !u!114 &3357544725572256066
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7928374915307089668}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 24810f441051444c9b85cd5ee64ace1e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &7928374915307483080
 GameObject:
   m_ObjectHideFlags: 0
@@ -4251,7 +4303,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: 6b1134f0bc52f8543b71ee696d61d89d, type: 3}
+  m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -4833,6 +4885,7 @@ GameObject:
   - component: {fileID: 7928374915473546153}
   - component: {fileID: 7928374915473546152}
   - component: {fileID: 7928374915473546155}
+  - component: {fileID: 7019467594845130036}
   m_Layer: 5
   m_Name: ReverseOpponentsCardsButton
   m_TagString: Untagged
@@ -4986,6 +5039,18 @@ MonoBehaviour:
             m_StringArgument: 
             m_BoolArgument: 0
           m_CallState: 2
+--- !u!114 &7019467594845130036
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7928374915473546157}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 24810f441051444c9b85cd5ee64ace1e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &7928374915475311728
 GameObject:
   m_ObjectHideFlags: 0
@@ -5109,9 +5174,9 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -0.000015258789}
+  m_AnchoredPosition: {x: 0, y: -1011.5901}
   m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 1}
+  m_Pivot: {x: 0, y: 0}
 --- !u!114 &7928374915483523998
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5346,9 +5411,9 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -17, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &7928374915564279513
 CanvasRenderer:
@@ -5741,7 +5806,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: 5e887a426c49a6748a021b8426a3cd53, type: 3}
+  m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -5916,8 +5981,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -53.6}
-  m_SizeDelta: {x: 1854.4, y: 891.59}
+  m_AnchoredPosition: {x: 0, y: -70}
+  m_SizeDelta: {x: 1854.4, y: 908}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7928374915775137450
 CanvasRenderer:
@@ -5964,7 +6029,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7928374915775137454}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
   m_Name: 
@@ -6523,6 +6588,7 @@ GameObject:
   - component: {fileID: 7928374915840589318}
   - component: {fileID: 7928374915840589321}
   - component: {fileID: 7928374915840589320}
+  - component: {fileID: 3718408135101065587}
   m_Layer: 5
   m_Name: AutoMinDigivolutiuonCostButton
   m_TagString: Untagged
@@ -6676,6 +6742,18 @@ MonoBehaviour:
             m_StringArgument: 
             m_BoolArgument: 0
           m_CallState: 2
+--- !u!114 &3718408135101065587
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7928374915840589322}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 24810f441051444c9b85cd5ee64ace1e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &7928374915877382007
 GameObject:
   m_ObjectHideFlags: 0
@@ -6736,7 +6814,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: 5e887a426c49a6748a021b8426a3cd53, type: 3}
+  m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -7127,7 +7205,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &7928374915970859287
 RectTransform:
   m_ObjectHideFlags: 0
@@ -7239,6 +7317,7 @@ GameObject:
   - component: {fileID: 7928374916004630460}
   - component: {fileID: 7928374916004630463}
   - component: {fileID: 7928374916004630462}
+  - component: {fileID: 6508491763816116467}
   m_Layer: 5
   m_Name: AutoEffectOrderButton
   m_TagString: Untagged
@@ -7392,6 +7471,18 @@ MonoBehaviour:
             m_StringArgument: 
             m_BoolArgument: 0
           m_CallState: 2
+--- !u!114 &6508491763816116467
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7928374916004630400}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 24810f441051444c9b85cd5ee64ace1e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &7928374916028117480
 GameObject:
   m_ObjectHideFlags: 0
@@ -7779,7 +7870,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: 3c2172383277d46b697de74b6df875e5, type: 3}
+  m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -8182,6 +8273,7 @@ GameObject:
   - component: {fileID: 7928374916272943215}
   - component: {fileID: 7928374916272943214}
   - component: {fileID: 7928374916272943217}
+  - component: {fileID: 1003559647348142293}
   m_Layer: 5
   m_Name: TurnSuspendedCardsButton
   m_TagString: Untagged
@@ -8335,6 +8427,18 @@ MonoBehaviour:
             m_StringArgument: 
             m_BoolArgument: 0
           m_CallState: 2
+--- !u!114 &1003559647348142293
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7928374916272943219}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 24810f441051444c9b85cd5ee64ace1e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &7928374916288359320
 GameObject:
   m_ObjectHideFlags: 0
@@ -8428,6 +8532,7 @@ GameObject:
   - component: {fileID: 7928374916328845438}
   - component: {fileID: 7928374916328845377}
   - component: {fileID: 7928374916328845376}
+  - component: {fileID: 2319259301301056102}
   m_Layer: 5
   m_Name: SuspendCardRotationIsLeftButton
   m_TagString: Untagged
@@ -8581,6 +8686,18 @@ MonoBehaviour:
             m_StringArgument: 
             m_BoolArgument: 0
           m_CallState: 2
+--- !u!114 &2319259301301056102
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7928374916328845378}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 24810f441051444c9b85cd5ee64ace1e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &7928374916331378629
 GameObject:
   m_ObjectHideFlags: 0
@@ -8949,8 +9066,8 @@ RectTransform:
   m_Father: {fileID: 7928374915229516443}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0.0040325522}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -9484,7 +9601,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: 3c2172383277d46b697de74b6df875e5, type: 3}
+  m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -9601,7 +9718,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: 6b1134f0bc52f8543b71ee696d61d89d, type: 3}
+  m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -9824,6 +9941,7 @@ GameObject:
   - component: {fileID: 7928374916660100987}
   - component: {fileID: 7928374916660100986}
   - component: {fileID: 7928374916660100989}
+  - component: {fileID: 3974715734184600402}
   m_Layer: 5
   m_Name: ShowCutInAnimationButton
   m_TagString: Untagged
@@ -9977,6 +10095,18 @@ MonoBehaviour:
             m_StringArgument: 
             m_BoolArgument: 0
           m_CallState: 2
+--- !u!114 &3974715734184600402
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7928374916660100991}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 24810f441051444c9b85cd5ee64ace1e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &7928374916702200026
 GameObject:
   m_ObjectHideFlags: 0
@@ -10066,6 +10196,7 @@ GameObject:
   - component: {fileID: 7928374916729832105}
   - component: {fileID: 7928374916729832104}
   - component: {fileID: 7928374916729832107}
+  - component: {fileID: 5460304762472086679}
   m_Layer: 5
   m_Name: CheckEndSelectButton
   m_TagString: Untagged
@@ -10219,6 +10350,18 @@ MonoBehaviour:
             m_StringArgument: 
             m_BoolArgument: 0
           m_CallState: 2
+--- !u!114 &5460304762472086679
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7928374916729832109}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 24810f441051444c9b85cd5ee64ace1e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &7928374916758334288
 GameObject:
   m_ObjectHideFlags: 0
@@ -10384,6 +10527,7 @@ GameObject:
   - component: {fileID: 7669067546430629117}
   - component: {fileID: 5982150575648531567}
   - component: {fileID: 7826128636079055205}
+  - component: {fileID: 5321595054649498675}
   m_Layer: 5
   m_Name: BanlistButton
   m_TagString: Untagged
@@ -10537,3 +10681,15 @@ MonoBehaviour:
             m_StringArgument: 
             m_BoolArgument: 0
           m_CallState: 2
+--- !u!114 &5321595054649498675
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8310052256679860245}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 24810f441051444c9b85cd5ee64ace1e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 

Assets/Scripts/CardEffect/BT1/Blue/BT1_030.cs

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

Assets/Scripts/CardEffect/BT1/Blue/BT1_035.cs

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

Assets/Scripts/CardEffect/BT1/Green/BT1_113.cs

@@ -20,7 +20,7 @@ public class BT1_113 : CEntity_Effect
 
             string EffectDiscription()
             {
-                return "[Main] Until the end of your opponent's next turn�C1 of your opponent's Digimon can't attack or block.";
+                return "[Main] Until the end of your opponent's next turn, of your opponent's Digimon can't attack or block.";
             }
 
             bool CanSelectPermanentCondition(Permanent permanent)

Assets/Scripts/CardEffect/BT1/Yellow/BT1_049.cs

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

Assets/Scripts/CardEffect/BT1/Yellow/BT1_054.cs

@@ -20,7 +20,7 @@ public class BT1_054 : CEntity_Effect
 
             string EffectDiscription()
             {
-                return "[When Attacking] If you have 3 or more memory�C of your opponent's Digimon gets -2000 DP for the turn.";
+                return "[When Attacking] If you have 3 or more memory, 1 of your opponent's Digimon gets -2000 DP for the turn.";
             }
 
             bool CanSelectPermanentCondition(Permanent permanent)

Assets/Scripts/CardEffect/BT10/Black/BT10_069.cs

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

Assets/Scripts/CardEffect/BT10/Black/BT10_092.cs

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

Assets/Scripts/CardEffect/BT10/Blue/BT10_018.cs

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

Assets/Scripts/CardEffect/BT10/Green/BT10_056.cs

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

Assets/Scripts/CardEffect/BT10/Purple/BT10_078.cs

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

Assets/Scripts/CardEffect/BT10/Purple/BT10_080.cs

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

Assets/Scripts/CardEffect/BT10/Purple/BT10_081.cs

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

Assets/Scripts/CardEffect/BT10/Purple/BT10_083.cs

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

Assets/Scripts/CardEffect/BT11/Black/BT11_005.cs

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

Assets/Scripts/CardEffect/BT11/Black/BT11_071.cs

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

Assets/Scripts/CardEffect/BT11/Black/BT11_072.cs

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

Assets/Scripts/CardEffect/BT11/Black/BT11_106.cs

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

Assets/Scripts/CardEffect/BT11/Blue/BT11_031.cs

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

Assets/Scripts/CardEffect/BT11/Purple/BT11_079.cs

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

Assets/Scripts/CardEffect/BT11/Purple/BT11_082.cs

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

Assets/Scripts/CardEffect/BT11/Red/BT11_001.cs

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

Assets/Scripts/CardEffect/BT11/Red/BT11_007.cs

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

Assets/Scripts/CardEffect/BT11/Red/BT11_011.cs

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

Assets/Scripts/CardEffect/BT11/Red/BT11_016.cs

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

Assets/Scripts/CardEffect/BT11/Yellow/BT11_036.cs

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

Assets/Scripts/CardEffect/BT11/Yellow/BT11_038.cs

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

Assets/Scripts/CardEffect/BT11/Yellow/BT11_040.cs

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

Assets/Scripts/CardEffect/BT12/Black/BT12_063.cs

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

Assets/Scripts/CardEffect/BT12/Black/BT12_064.cs

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

Assets/Scripts/CardEffect/BT12/Black/BT12_071.cs

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

Assets/Scripts/CardEffect/BT12/Blue/BT12_032.cs

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

Assets/Scripts/CardEffect/BT12/Green/BT12_051.cs

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

Assets/Scripts/CardEffect/BT12/Green/BT12_054.cs

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

Assets/Scripts/CardEffect/BT12/Green/BT12_056.cs

@@ -29,7 +29,7 @@ namespace DCGO.CardEffects.BT12
 
                 string EffectDiscription()
                 {
-                    return "[When Digivolving] Suspend 1 of your opponent�f Digimon. Then, you may attack your opponent's Digimon with this Digimon.";
+                    return "[When Digivolving] Suspend 1 of your opponent's Digimon. Then, you may attack your opponent's Digimon with this Digimon.";
                 }
 
                 bool CanSelectPermanentCondition(Permanent permanent)

Assets/Scripts/CardEffect/BT12/Green/BT12_105.cs

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

Assets/Scripts/CardEffect/BT12/Purple/BT12_006.cs

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

Assets/Scripts/CardEffect/BT12/Purple/BT12_077.cs

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

Assets/Scripts/CardEffect/BT12/Purple/BT12_084.cs

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

Assets/Scripts/CardEffect/BT12/Purple/BT12_085.cs

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

Assets/Scripts/CardEffect/BT12/Red/BT12_011.cs

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

Assets/Scripts/CardEffect/BT12/Red/BT12_012.cs

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

Assets/Scripts/CardEffect/BT12/Red/BT12_015.cs

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

Assets/Scripts/CardEffect/BT12/Red/BT12_017.cs

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

Assets/Scripts/CardEffect/BT12/Yellow/BT12_037.cs

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

Assets/Scripts/CardEffect/BT12/Yellow/BT12_041.cs

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

Assets/Scripts/CardEffect/BT12/Yellow/BT12_042.cs

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

Assets/Scripts/CardEffect/BT13/Black/BT13_061.cs

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

Assets/Scripts/CardEffect/BT13/Black/BT13_062.cs

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

Assets/Scripts/CardEffect/BT13/Black/BT13_064.cs

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

Assets/Scripts/CardEffect/BT13/Black/BT13_065.cs

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

Assets/Scripts/CardEffect/BT13/Black/BT13_068.cs

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

Assets/Scripts/CardEffect/BT13/Black/BT13_070.cs

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

Assets/Scripts/CardEffect/BT13/Black/BT13_073.cs

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

Assets/Scripts/CardEffect/BT13/Black/BT13_076.cs

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

Assets/Scripts/CardEffect/BT13/Purple/BT13_006.cs

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

Assets/Scripts/CardEffect/BT13/Purple/BT13_078.cs

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

Assets/Scripts/CardEffect/BT13/Purple/BT13_079.cs

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

Assets/Scripts/CardEffect/BT13/Purple/BT13_080.cs

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

Assets/Scripts/CardEffect/BT13/Purple/BT13_081.cs

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

Assets/Scripts/CardEffect/BT13/Purple/BT13_082.cs

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

Assets/Scripts/CardEffect/BT13/Purple/BT13_083.cs

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

Assets/Scripts/CardEffect/BT13/Purple/BT13_085.cs

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

Assets/Scripts/CardEffect/BT13/Purple/BT13_086.cs

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

Assets/Scripts/CardEffect/BT13/Purple/BT13_089.cs

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

Assets/Scripts/CardEffect/BT13/Purple/BT13_091.cs

@@ -240,7 +240,7 @@ namespace DCGO.CardEffects.BT13
 
                 string EffectDiscription()
                 {
-                    return "[End of Opponent�f Turn] If this Digimon is [Belphemon: Sleep Mode], trash the top card of this Digimon. ";
+                    return "[End of Opponent's Turn] If this Digimon is [Belphemon: Sleep Mode], trash the top card of this Digimon. ";
                 }
 
                 bool CanUseCondition(Hashtable hashtable)

Assets/Scripts/CardEffect/BT13/Red/BT13_001.cs

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

Assets/Scripts/CardEffect/BT13/Red/BT13_010.cs

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

Assets/Scripts/CardEffect/BT13/Red/BT13_011.cs

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

Assets/Scripts/CardEffect/BT13/Red/BT13_014.cs

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

Assets/Scripts/CardEffect/BT13/Red/BT13_015.cs

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

Assets/Scripts/CardEffect/BT13/Red/BT13_094.cs

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

Assets/Scripts/CardEffect/BT13/White/BT13_093.cs

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

Assets/Scripts/CardEffect/BT13/Yellow/BT13_035.cs

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

Assets/Scripts/CardEffect/BT13/Yellow/BT13_039.cs

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

Assets/Scripts/CardEffect/BT13/Yellow/BT13_041.cs

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

Assets/Scripts/CardEffect/BT13/Yellow/BT13_042.cs

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

Assets/Scripts/CardEffect/BT14/Black/BT14_063.cs

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

Assets/Scripts/CardEffect/BT14/Black/BT14_064.cs

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

Assets/Scripts/CardEffect/BT14/Black/BT14_066.cs

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

Assets/Scripts/CardEffect/BT14/Blue/BT14_030.cs

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

Assets/Scripts/CardEffect/BT14/Purple/BT14_075.cs

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

Assets/Scripts/CardEffect/BT14/Purple/BT14_076.cs

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

Assets/Scripts/CardEffect/BT14/Purple/BT14_078.cs

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

Assets/Scripts/CardEffect/BT14/Yellow/BT14_032.cs

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

Assets/Scripts/CardEffect/BT14/Yellow/BT14_034.cs

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

Assets/Scripts/CardEffect/BT14/Yellow/BT14_038.cs

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

Assets/Scripts/CardEffect/BT14/Yellow/BT14_102.cs

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

Assets/Scripts/CardEffect/BT15/Black/BT15_057.cs

@@ -61,7 +61,7 @@ namespace DCGO.CardEffects.BT15
 
                 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)
                         {
@@ -73,7 +73,7 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion(hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateDeletion))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {
@@ -168,12 +168,12 @@ namespace DCGO.CardEffects.BT15
 
                 bool CanUseOnDeletion(Hashtable hashtable)
                 {
-                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    return CardEffectCommons.CanTriggerOnDeletion(hashtable, card, activateDeletion);
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.CanActivateOnDeletion( hashtable, card))
+                    if (CardEffectCommons.CanActivateOnDeletion(card, activateDeletion))
                     {
                         if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {

Assets/Scripts/CardEffect/BT15/Blue/BT15_030.cs

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

Assets/Scripts/CardEffect/BT15/Green/BT15_044.cs

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

Assets/Scripts/CardEffect/BT15/Green/BT15_095.cs

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

Assets/Scripts/CardEffect/BT15/Purple/BT15_006.cs

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

Assets/Scripts/CardEffect/BT15/Purple/BT15_068.cs

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

Assets/Scripts/CardEffect/BT15/Purple/BT15_069.cs

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

Assets/Scripts/CardEffect/BT15/Purple/BT15_073.cs

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

Assets/Scripts/CardEffect/BT15/Purple/BT15_078.cs

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

Assets/Scripts/CardEffect/BT15/Purple/BT15_080.cs

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

Assets/Scripts/CardEffect/BT15/Purple/BT15_098.cs

@@ -153,7 +153,7 @@ namespace DCGO.CardEffects.BT15
 
                 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)
@@ -172,7 +172,7 @@ namespace DCGO.CardEffects.BT15
                 {
                     if (CardEffectCommons.CanDeclareOptionDelayEffect(card))
                     {
-                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, PermanentCondition))
+                        if (CardEffectCommons.CanTriggerOnPermanentDeleted(hashtable, PermanentCondition, activateClass))
                         {
                             return true;
                         }
@@ -273,4 +273,4 @@ namespace DCGO.CardEffects.BT15
             return cardEffects;
         }
     }
-}
+}