|
|
@@ -825,6 +825,7 @@ public partial class CardEffectFactory
|
|
|
bool optional,
|
|
|
Func<Hashtable, bool> additionalUseCondition = null,
|
|
|
Func<Hashtable, bool> additionalActivateCondition = null,
|
|
|
+ Func<Hashtable, bool> isOptionalFunction = null,
|
|
|
int maxCountPerTurn = -1,
|
|
|
string hashValue = null,
|
|
|
bool whenMoving = false,
|
|
|
@@ -842,51 +843,51 @@ public partial class CardEffectFactory
|
|
|
{
|
|
|
if (whenMoving && timing == EffectTiming.OnMove)
|
|
|
{
|
|
|
- cardEffects.Add(WhenMovingClass(card, effectName, activateCoroutine, effectDescription("When Moving"), optional, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue));
|
|
|
+ cardEffects.Add(WhenMovingClass(card, effectName, activateCoroutine, effectDescription("When Moving"), optional, isOptionalFunction, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue));
|
|
|
}
|
|
|
if (onPlay && timing == EffectTiming.OnEnterFieldAnyone)
|
|
|
{
|
|
|
- cardEffects.Add(OnPlayClass(card, effectName, activateCoroutine, effectDescription("On Play"), optional, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue));
|
|
|
+ cardEffects.Add(OnPlayClass(card, effectName, activateCoroutine, effectDescription("On Play"), optional, isOptionalFunction, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue));
|
|
|
}
|
|
|
if (whenDigivolving && timing == EffectTiming.OnEnterFieldAnyone)
|
|
|
{
|
|
|
- cardEffects.Add(WhenDigivolvingClass(card, effectName, activateCoroutine, effectDescription("When Digivolving"), optional, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue));
|
|
|
+ cardEffects.Add(WhenDigivolvingClass(card, effectName, activateCoroutine, effectDescription("When Digivolving"), optional, isOptionalFunction, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue));
|
|
|
}
|
|
|
if (whenAttacking && timing == EffectTiming.OnAllyAttack)
|
|
|
{
|
|
|
- cardEffects.Add(WhenAttackingClass(card, effectName, activateCoroutine, effectDescription("When Attacking"), optional, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue));
|
|
|
+ cardEffects.Add(WhenAttackingClass(card, effectName, activateCoroutine, effectDescription("When Attacking"), optional, isOptionalFunction, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue));
|
|
|
}
|
|
|
if (onDeletion && timing == EffectTiming.OnDestroyedAnyone)
|
|
|
{
|
|
|
- cardEffects.Add(OnDeletionClass(card, effectName, activateCoroutine, effectDescription("On Deletion"), optional, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue));
|
|
|
+ cardEffects.Add(OnDeletionClass(card, effectName, activateCoroutine, effectDescription("On Deletion"), optional, isOptionalFunction, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue));
|
|
|
}
|
|
|
if (whenLinking && timing == EffectTiming.WhenLinked)
|
|
|
{
|
|
|
- cardEffects.Add(WhenLinkingClass(card, effectName, activateCoroutine, effectDescription("When Linking"), optional, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue));
|
|
|
+ cardEffects.Add(WhenLinkingClass(card, effectName, activateCoroutine, effectDescription("When Linking"), optional, isOptionalFunction, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue));
|
|
|
}
|
|
|
if (endOfAttack && timing == EffectTiming.OnEndAttack)
|
|
|
{
|
|
|
- cardEffects.Add(EndOfAttackClass(card, effectName, activateCoroutine, effectDescription("End of Attack"), optional, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue));
|
|
|
+ cardEffects.Add(EndOfAttackClass(card, effectName, activateCoroutine, effectDescription("End of Attack"), optional, isOptionalFunction, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue));
|
|
|
}
|
|
|
if (endOfYourTurn && timing == EffectTiming.OnEndTurn)
|
|
|
{
|
|
|
- cardEffects.Add(EndOfYourTurnClass(card, effectName, activateCoroutine, effectDescription("End of Your Turn"), optional, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue));
|
|
|
+ cardEffects.Add(EndOfYourTurnClass(card, effectName, activateCoroutine, effectDescription("End of Your Turn"), optional, isOptionalFunction, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue));
|
|
|
}
|
|
|
if (endOfOpponentTurn && timing == EffectTiming.OnEndTurn)
|
|
|
{
|
|
|
- cardEffects.Add(EndOfYourOpponentsTurnClass(card, effectName, activateCoroutine, effectDescription("End of Opponent's Turn"), optional, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue));
|
|
|
+ cardEffects.Add(EndOfYourOpponentsTurnClass(card, effectName, activateCoroutine, effectDescription("End of Opponent's Turn"), optional, isOptionalFunction, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue));
|
|
|
}
|
|
|
if (endOfAllTurns && timing == EffectTiming.OnEndTurn)
|
|
|
{
|
|
|
- cardEffects.Add(EndOfAllTurnsClass(card, effectName, activateCoroutine, effectDescription("End of All Turns"), optional, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue));
|
|
|
+ cardEffects.Add(EndOfAllTurnsClass(card, effectName, activateCoroutine, effectDescription("End of All Turns"), optional, isOptionalFunction, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue));
|
|
|
}
|
|
|
if(startOfYourMainPhase && timing == EffectTiming.OnStartMainPhase)
|
|
|
{
|
|
|
- cardEffects.Add(StartOfYourMainPhaseClass(card, effectName, activateCoroutine, effectDescription("Start of Your Main Phase"), optional, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue));
|
|
|
+ cardEffects.Add(StartOfYourMainPhaseClass(card, effectName, activateCoroutine, effectDescription("Start of Your Main Phase"), optional, isOptionalFunction, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue));
|
|
|
}
|
|
|
if (counter && timing == EffectTiming.OnCounterTiming)
|
|
|
{
|
|
|
- cardEffects.Add(CounterClass(card, effectName, activateCoroutine, effectDescription("Counter"), optional, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue));
|
|
|
+ cardEffects.Add(CounterClass(card, effectName, activateCoroutine, effectDescription("Counter"), optional, isOptionalFunction, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue));
|
|
|
}
|
|
|
|
|
|
return cardEffects;
|
|
|
@@ -903,6 +904,7 @@ public partial class CardEffectFactory
|
|
|
Func<Hashtable, ActivateClass, IEnumerator> activateCoroutine,
|
|
|
string effectDescription,
|
|
|
bool optional,
|
|
|
+ Func<Hashtable, bool> isOptionalFunction = null,
|
|
|
int maxCountPerTurn = -1,
|
|
|
string hashValue = null,
|
|
|
bool isInheritedEffect = false,
|
|
|
@@ -915,6 +917,7 @@ public partial class CardEffectFactory
|
|
|
activateClass.SetUpActivateClass(canActivateCondition, hashtable => activateCoroutine(hashtable, activateClass), maxCountPerTurn, optional, effectDescription);
|
|
|
activateClass.SetHashString(hashValue);
|
|
|
activateClass.SetIsSecurityEffect(isSecurityEffect);
|
|
|
+ activateClass.SetIsOptionalOverride(isOptionalFunction);
|
|
|
return activateClass;
|
|
|
}
|
|
|
|
|
|
@@ -927,13 +930,14 @@ public partial class CardEffectFactory
|
|
|
Func<Hashtable, ActivateClass, IEnumerator> activateCoroutine,
|
|
|
string effectDescription,
|
|
|
bool optional,
|
|
|
+ Func<Hashtable, bool> isOptionalFunction = null,
|
|
|
Func<Hashtable, bool> additionalUseCondition = null,
|
|
|
Func<Hashtable, bool> additionalActivateCondition = null,
|
|
|
int maxCountPerTurn = -1,
|
|
|
string hashValue = null,
|
|
|
bool isInherited = false)
|
|
|
{
|
|
|
- return ActivateClass(card, effectName, CanUseCondition, CanActivateCondition, activateCoroutine, effectDescription, optional, maxCountPerTurn, hashValue, isInherited, false);
|
|
|
+ return ActivateClass(card, effectName, CanUseCondition, CanActivateCondition, activateCoroutine, effectDescription, optional, isOptionalFunction, maxCountPerTurn, hashValue, isInherited, false);
|
|
|
|
|
|
bool PermanentCondition(Permanent permanent)
|
|
|
{
|
|
|
@@ -963,13 +967,14 @@ public partial class CardEffectFactory
|
|
|
Func<Hashtable, ActivateClass, IEnumerator> activateCoroutine,
|
|
|
string effectDescription,
|
|
|
bool optional,
|
|
|
+ Func<Hashtable, bool> isOptionalFunction = null,
|
|
|
Func<Hashtable, bool> additionalUseCondition = null,
|
|
|
Func<Hashtable, bool> additionalActivateCondition = null,
|
|
|
int maxCountPerTurn = -1,
|
|
|
string hashValue = null,
|
|
|
bool isInherited = false)
|
|
|
{
|
|
|
- return ActivateClass(card, effectName, CanUseCondition, CanActivateCondition, activateCoroutine, effectDescription, optional, maxCountPerTurn, hashValue, isInherited, false);
|
|
|
+ return ActivateClass(card, effectName, CanUseCondition, CanActivateCondition, activateCoroutine, effectDescription, optional, isOptionalFunction, maxCountPerTurn, hashValue, isInherited, false);
|
|
|
|
|
|
bool CanUseCondition(Hashtable hashtable)
|
|
|
{
|
|
|
@@ -994,6 +999,7 @@ public partial class CardEffectFactory
|
|
|
Func<Hashtable, ActivateClass, IEnumerator> activateCoroutine,
|
|
|
string effectDescription,
|
|
|
bool optional,
|
|
|
+ Func<Hashtable, bool> isOptionalFunction = null,
|
|
|
Func<Hashtable, bool> additionalUseCondition = null,
|
|
|
Func<Hashtable, bool> additionalActivateCondition = null,
|
|
|
int maxCountPerTurn = -1,
|
|
|
@@ -1001,7 +1007,7 @@ public partial class CardEffectFactory
|
|
|
bool isInherited = false,
|
|
|
bool isLinked = false)
|
|
|
{
|
|
|
- return ActivateClass(card, effectName, CanUseCondition, CanActivateCondition, activateCoroutine, effectDescription, optional, maxCountPerTurn, hashValue, isInherited, isLinked);
|
|
|
+ return ActivateClass(card, effectName, CanUseCondition, CanActivateCondition, activateCoroutine, effectDescription, optional, isOptionalFunction, maxCountPerTurn, hashValue, isInherited, isLinked);
|
|
|
|
|
|
bool CanUseCondition(Hashtable hashtable)
|
|
|
{
|
|
|
@@ -1025,6 +1031,7 @@ public partial class CardEffectFactory
|
|
|
Func<Hashtable, ActivateClass, IEnumerator> activateCoroutine,
|
|
|
string effectDescription,
|
|
|
bool optional,
|
|
|
+ Func<Hashtable, bool> isOptionalFunction = null,
|
|
|
Func<Hashtable, bool> additionalUseCondition = null,
|
|
|
Func<Hashtable, bool> additionalActivateCondition = null,
|
|
|
int maxCountPerTurn = -1,
|
|
|
@@ -1032,7 +1039,7 @@ public partial class CardEffectFactory
|
|
|
bool isInherited = false,
|
|
|
bool isLinked = false)
|
|
|
{
|
|
|
- return ActivateClass(card, effectName, CanUseCondition, CanActivateCondition, activateCoroutine, effectDescription, optional, maxCountPerTurn, hashValue, isInherited, isLinked);
|
|
|
+ return ActivateClass(card, effectName, CanUseCondition, CanActivateCondition, activateCoroutine, effectDescription, optional, isOptionalFunction, maxCountPerTurn, hashValue, isInherited, isLinked);
|
|
|
|
|
|
bool CanUseCondition(Hashtable hashtable)
|
|
|
{
|
|
|
@@ -1057,6 +1064,7 @@ public partial class CardEffectFactory
|
|
|
Func<Hashtable, ActivateClass, IEnumerator> activateCoroutine,
|
|
|
string effectDescription,
|
|
|
bool optional,
|
|
|
+ Func<Hashtable, bool> isOptionalFunction = null,
|
|
|
Func<Hashtable, bool> additionalUseCondition = null,
|
|
|
Func<Hashtable, bool> additionalActivateCondition = null,
|
|
|
int maxCountPerTurn = -1,
|
|
|
@@ -1064,7 +1072,7 @@ public partial class CardEffectFactory
|
|
|
bool isInherited = false,
|
|
|
bool isLinked = false)
|
|
|
{
|
|
|
- return ActivateClass(card, effectName, CanUseCondition, CanActivateCondition, activateCoroutine, effectDescription, optional, maxCountPerTurn, hashValue, isInherited, isLinked);
|
|
|
+ return ActivateClass(card, effectName, CanUseCondition, CanActivateCondition, activateCoroutine, effectDescription, optional, isOptionalFunction, maxCountPerTurn, hashValue, isInherited, isLinked);
|
|
|
|
|
|
bool CanUseCondition(Hashtable hashtable)
|
|
|
{
|
|
|
@@ -1089,6 +1097,7 @@ public partial class CardEffectFactory
|
|
|
Func<Hashtable, ActivateClass, IEnumerator> activateCoroutine,
|
|
|
string effectDescription,
|
|
|
bool optional,
|
|
|
+ Func<Hashtable, bool> isOptionalFunction = null,
|
|
|
Func<Hashtable, bool> additionalUseCondition = null,
|
|
|
Func<Hashtable, bool> additionalActivateCondition = null,
|
|
|
int maxCountPerTurn = -1,
|
|
|
@@ -1097,7 +1106,7 @@ public partial class CardEffectFactory
|
|
|
bool isLinked = false
|
|
|
)
|
|
|
{
|
|
|
- return ActivateClass(card, effectName, CanUseCondition, CanActivateCondition, activateCoroutine, effectDescription, optional, maxCountPerTurn, hashValue, isInherited, isLinked);
|
|
|
+ return ActivateClass(card, effectName, CanUseCondition, CanActivateCondition, activateCoroutine, effectDescription, optional, isOptionalFunction, maxCountPerTurn, hashValue, isInherited, isLinked);
|
|
|
|
|
|
bool CanUseCondition(Hashtable hashtable)
|
|
|
{
|
|
|
@@ -1122,10 +1131,11 @@ public partial class CardEffectFactory
|
|
|
Func<Hashtable, ActivateClass, IEnumerator> activateCoroutine,
|
|
|
string effectDescription,
|
|
|
bool optional,
|
|
|
+ Func<Hashtable, bool> isOptionalFunction = null,
|
|
|
Func<Hashtable, bool> additionalUseCondition = null,
|
|
|
Func<Hashtable, bool> additionalActivateCondition = null)
|
|
|
{
|
|
|
- ActivateClass activateClass = ActivateClass(card, effectName, CanUseCondition, additionalActivateCondition, activateCoroutine, effectDescription, optional, -1, null, false, false);
|
|
|
+ ActivateClass activateClass = ActivateClass(card, effectName, CanUseCondition, additionalActivateCondition, activateCoroutine, effectDescription, optional, isOptionalFunction, -1, null, false, false);
|
|
|
activateClass.SetIsSecurityEffect(true);
|
|
|
return activateClass;
|
|
|
|
|
|
@@ -1145,6 +1155,7 @@ public partial class CardEffectFactory
|
|
|
Func<Hashtable, ActivateClass, IEnumerator> activateCoroutine,
|
|
|
string effectDescription,
|
|
|
bool optional,
|
|
|
+ Func<Hashtable, bool> isOptionalFunction = null,
|
|
|
Func<Hashtable, bool> additionalUseCondition = null,
|
|
|
Func<Hashtable, bool> additionalActivateCondition = null,
|
|
|
int maxCountPerTurn = -1,
|
|
|
@@ -1152,7 +1163,7 @@ public partial class CardEffectFactory
|
|
|
bool isInherited = false,
|
|
|
bool isLinked = false)
|
|
|
{
|
|
|
- return ActivateClass(card, effectName, CanUseCondition, CanActivateCondition, activateCoroutine, effectDescription, optional, maxCountPerTurn, hashValue, isInherited, isLinked);
|
|
|
+ return ActivateClass(card, effectName, CanUseCondition, CanActivateCondition, activateCoroutine, effectDescription, optional, isOptionalFunction, maxCountPerTurn, hashValue, isInherited, isLinked);
|
|
|
|
|
|
bool CanUseCondition(Hashtable hashtable)
|
|
|
{
|
|
|
@@ -1179,6 +1190,7 @@ public partial class CardEffectFactory
|
|
|
Func<Hashtable, ActivateClass, IEnumerator> activateCoroutine,
|
|
|
string effectDescription,
|
|
|
bool optional,
|
|
|
+ Func<Hashtable, bool> isOptionalFunction = null,
|
|
|
Func<Hashtable, bool> additionalUseCondition = null,
|
|
|
Func<Hashtable, bool> additionalActivateCondition = null,
|
|
|
int maxCountPerTurn = -1,
|
|
|
@@ -1186,7 +1198,7 @@ public partial class CardEffectFactory
|
|
|
bool isInherited = false,
|
|
|
bool isLinked = false)
|
|
|
{
|
|
|
- ActivateClass activateClass = ActivateClass(card, effectName, CanUseCondition, CanActivateCondition, activateCoroutine, effectDescription, optional, maxCountPerTurn, hashValue, isInherited, isLinked);
|
|
|
+ ActivateClass activateClass = ActivateClass(card, effectName, CanUseCondition, CanActivateCondition, activateCoroutine, effectDescription, optional, isOptionalFunction, maxCountPerTurn, hashValue, isInherited, isLinked);
|
|
|
activateClass.SetIsCounterEffect(true);
|
|
|
return activateClass;
|
|
|
|
|
|
@@ -1219,6 +1231,7 @@ public partial class CardEffectFactory
|
|
|
Func<Hashtable, ActivateClass, IEnumerator> activateCoroutine,
|
|
|
string effectDescription,
|
|
|
bool optional,
|
|
|
+ Func<Hashtable, bool> isOptionalFunction = null,
|
|
|
Func<Hashtable, bool> additionalUseCondition = null,
|
|
|
Func<Hashtable, bool> additionalActivateCondition = null,
|
|
|
int maxCountPerTurn = -1,
|
|
|
@@ -1228,7 +1241,7 @@ public partial class CardEffectFactory
|
|
|
bool yourTurn = false,
|
|
|
bool opponentTurn = false)
|
|
|
{
|
|
|
- return ActivateClass(card, effectName, CanUseCondition, CanActivateCondition, activateCoroutine, effectDescription, optional, maxCountPerTurn, hashValue, isInherited, isLinked);
|
|
|
+ return ActivateClass(card, effectName, CanUseCondition, CanActivateCondition, activateCoroutine, effectDescription, optional, isOptionalFunction, maxCountPerTurn, hashValue, isInherited, isLinked);
|
|
|
|
|
|
bool CanUseCondition(Hashtable hashtable)
|
|
|
{
|
|
|
@@ -1255,6 +1268,7 @@ public partial class CardEffectFactory
|
|
|
Func<Hashtable, ActivateClass, IEnumerator> activateCoroutine,
|
|
|
string effectDescription,
|
|
|
bool optional,
|
|
|
+ Func<Hashtable, bool> isOptionalFunction = null,
|
|
|
Func<Hashtable, bool> additionalUseCondition = null,
|
|
|
Func<Hashtable, bool> additionalActivateCondition = null,
|
|
|
int maxCountPerTurn = -1,
|
|
|
@@ -1262,7 +1276,7 @@ public partial class CardEffectFactory
|
|
|
bool isInherited = false,
|
|
|
bool isLinked = false)
|
|
|
{
|
|
|
- return TurnTimingClass(card, effectName, activateCoroutine, effectDescription, optional, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue, isInherited, isLinked, true, false);
|
|
|
+ return TurnTimingClass(card, effectName, activateCoroutine, effectDescription, optional, isOptionalFunction, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue, isInherited, isLinked, true, false);
|
|
|
}
|
|
|
|
|
|
public static ActivateClass StartOfYourMainPhaseClass(CardSource card,
|
|
|
@@ -1270,6 +1284,7 @@ public partial class CardEffectFactory
|
|
|
Func<Hashtable, ActivateClass, IEnumerator> activateCoroutine,
|
|
|
string effectDescription,
|
|
|
bool optional,
|
|
|
+ Func<Hashtable, bool> isOptionalFunction = null,
|
|
|
Func<Hashtable, bool> additionalUseCondition = null,
|
|
|
Func<Hashtable, bool> additionalActivateCondition = null,
|
|
|
int maxCountPerTurn = -1,
|
|
|
@@ -1277,7 +1292,7 @@ public partial class CardEffectFactory
|
|
|
bool isInherited = false,
|
|
|
bool isLinked = false)
|
|
|
{
|
|
|
- return TurnTimingClass(card, effectName, activateCoroutine, effectDescription, optional, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue, isInherited, isLinked, true, false);
|
|
|
+ return TurnTimingClass(card, effectName, activateCoroutine, effectDescription, optional, isOptionalFunction, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue, isInherited, isLinked, true, false);
|
|
|
}
|
|
|
|
|
|
public static ActivateClass EndOfYourTurnClass(CardSource card,
|
|
|
@@ -1285,6 +1300,7 @@ public partial class CardEffectFactory
|
|
|
Func<Hashtable, ActivateClass, IEnumerator> activateCoroutine,
|
|
|
string effectDescription,
|
|
|
bool optional,
|
|
|
+ Func<Hashtable, bool> isOptionalFunction = null,
|
|
|
Func<Hashtable, bool> additionalUseCondition = null,
|
|
|
Func<Hashtable, bool> additionalActivateCondition = null,
|
|
|
int maxCountPerTurn = -1,
|
|
|
@@ -1292,7 +1308,7 @@ public partial class CardEffectFactory
|
|
|
bool isInherited = false,
|
|
|
bool isLinked = false)
|
|
|
{
|
|
|
- return TurnTimingClass(card, effectName, activateCoroutine, effectDescription, optional, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue, isInherited, isLinked, true, false);
|
|
|
+ return TurnTimingClass(card, effectName, activateCoroutine, effectDescription, optional, isOptionalFunction, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue, isInherited, isLinked, true, false);
|
|
|
}
|
|
|
|
|
|
public static ActivateClass YourTurnClass(CardSource card,
|
|
|
@@ -1300,6 +1316,7 @@ public partial class CardEffectFactory
|
|
|
Func<Hashtable, ActivateClass, IEnumerator> activateCoroutine,
|
|
|
string effectDescription,
|
|
|
bool optional,
|
|
|
+ Func<Hashtable, bool> isOptionalFunction = null,
|
|
|
Func<Hashtable, bool> additionalUseCondition = null,
|
|
|
Func<Hashtable, bool> additionalActivateCondition = null,
|
|
|
int maxCountPerTurn = -1,
|
|
|
@@ -1307,7 +1324,7 @@ public partial class CardEffectFactory
|
|
|
bool isInherited = false,
|
|
|
bool isLinked = false)
|
|
|
{
|
|
|
- return TurnTimingClass(card, effectName, activateCoroutine, effectDescription, optional, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue, isInherited, isLinked, true, false);
|
|
|
+ return TurnTimingClass(card, effectName, activateCoroutine, effectDescription, optional, isOptionalFunction, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue, isInherited, isLinked, true, false);
|
|
|
}
|
|
|
|
|
|
#endregion
|
|
|
@@ -1319,6 +1336,7 @@ public partial class CardEffectFactory
|
|
|
Func<Hashtable, ActivateClass, IEnumerator> activateCoroutine,
|
|
|
string effectDescription,
|
|
|
bool optional,
|
|
|
+ Func<Hashtable, bool> isOptionalFunction = null,
|
|
|
Func<Hashtable, bool> additionalUseCondition = null,
|
|
|
Func<Hashtable, bool> additionalActivateCondition = null,
|
|
|
int maxCountPerTurn = -1,
|
|
|
@@ -1326,7 +1344,7 @@ public partial class CardEffectFactory
|
|
|
bool isInherited = false,
|
|
|
bool isLinked = false)
|
|
|
{
|
|
|
- return TurnTimingClass(card, effectName, activateCoroutine, effectDescription, optional, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue, isInherited, isLinked, false, true);
|
|
|
+ return TurnTimingClass(card, effectName, activateCoroutine, effectDescription, optional, isOptionalFunction, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue, isInherited, isLinked, false, true);
|
|
|
}
|
|
|
|
|
|
public static ActivateClass StartOfYourOpponentsMainPhaseClass(CardSource card,
|
|
|
@@ -1334,6 +1352,7 @@ public partial class CardEffectFactory
|
|
|
Func<Hashtable, ActivateClass, IEnumerator> activateCoroutine,
|
|
|
string effectDescription,
|
|
|
bool optional,
|
|
|
+ Func<Hashtable, bool> isOptionalFunction = null,
|
|
|
Func<Hashtable, bool> additionalUseCondition = null,
|
|
|
Func<Hashtable, bool> additionalActivateCondition = null,
|
|
|
int maxCountPerTurn = -1,
|
|
|
@@ -1341,7 +1360,7 @@ public partial class CardEffectFactory
|
|
|
bool isInherited = false,
|
|
|
bool isLinked = false)
|
|
|
{
|
|
|
- return TurnTimingClass(card, effectName, activateCoroutine, effectDescription, optional, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue, isInherited, isLinked, false, true);
|
|
|
+ return TurnTimingClass(card, effectName, activateCoroutine, effectDescription, optional, isOptionalFunction, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue, isInherited, isLinked, false, true);
|
|
|
}
|
|
|
|
|
|
public static ActivateClass EndOfYourOpponentsTurnClass(CardSource card,
|
|
|
@@ -1349,6 +1368,7 @@ public partial class CardEffectFactory
|
|
|
Func<Hashtable, ActivateClass, IEnumerator> activateCoroutine,
|
|
|
string effectDescription,
|
|
|
bool optional,
|
|
|
+ Func<Hashtable, bool> isOptionalFunction = null,
|
|
|
Func<Hashtable, bool> additionalUseCondition = null,
|
|
|
Func<Hashtable, bool> additionalActivateCondition = null,
|
|
|
int maxCountPerTurn = -1,
|
|
|
@@ -1356,7 +1376,7 @@ public partial class CardEffectFactory
|
|
|
bool isInherited = false,
|
|
|
bool isLinked = false)
|
|
|
{
|
|
|
- return TurnTimingClass(card, effectName, activateCoroutine, effectDescription, optional, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue, isInherited, isLinked, false, true);
|
|
|
+ return TurnTimingClass(card, effectName, activateCoroutine, effectDescription, optional, isOptionalFunction, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue, isInherited, isLinked, false, true);
|
|
|
}
|
|
|
|
|
|
public static ActivateClass OpponentsTurnClass(CardSource card,
|
|
|
@@ -1364,6 +1384,7 @@ public partial class CardEffectFactory
|
|
|
Func<Hashtable, ActivateClass, IEnumerator> activateCoroutine,
|
|
|
string effectDescription,
|
|
|
bool optional,
|
|
|
+ Func<Hashtable, bool> isOptionalFunction = null,
|
|
|
Func<Hashtable, bool> additionalUseCondition = null,
|
|
|
Func<Hashtable, bool> additionalActivateCondition = null,
|
|
|
int maxCountPerTurn = -1,
|
|
|
@@ -1371,7 +1392,7 @@ public partial class CardEffectFactory
|
|
|
bool isInherited = false,
|
|
|
bool isLinked = false)
|
|
|
{
|
|
|
- return TurnTimingClass(card, effectName, activateCoroutine, effectDescription, optional, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue, isInherited, isLinked, false, true);
|
|
|
+ return TurnTimingClass(card, effectName, activateCoroutine, effectDescription, optional, isOptionalFunction, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue, isInherited, isLinked, false, true);
|
|
|
}
|
|
|
|
|
|
#endregion
|
|
|
@@ -1383,6 +1404,7 @@ public partial class CardEffectFactory
|
|
|
Func<Hashtable, ActivateClass, IEnumerator> activateCoroutine,
|
|
|
string effectDescription,
|
|
|
bool optional,
|
|
|
+ Func<Hashtable, bool> isOptionalFunction = null,
|
|
|
Func<Hashtable, bool> additionalUseCondition = null,
|
|
|
Func<Hashtable, bool> additionalActivateCondition = null,
|
|
|
int maxCountPerTurn = -1,
|
|
|
@@ -1390,7 +1412,7 @@ public partial class CardEffectFactory
|
|
|
bool isInherited = false,
|
|
|
bool isLinked = false)
|
|
|
{
|
|
|
- return TurnTimingClass(card, effectName, activateCoroutine, effectDescription, optional, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue, isInherited, isLinked, true, true);
|
|
|
+ return TurnTimingClass(card, effectName, activateCoroutine, effectDescription, optional, isOptionalFunction, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue, isInherited, isLinked, true, true);
|
|
|
}
|
|
|
|
|
|
public static ActivateClass AllTurnsClass(CardSource card,
|
|
|
@@ -1398,6 +1420,7 @@ public partial class CardEffectFactory
|
|
|
Func<Hashtable, ActivateClass, IEnumerator> activateCoroutine,
|
|
|
string effectDescription,
|
|
|
bool optional,
|
|
|
+ Func<Hashtable, bool> isOptionalFunction = null,
|
|
|
Func<Hashtable, bool> additionalUseCondition = null,
|
|
|
Func<Hashtable, bool> additionalActivateCondition = null,
|
|
|
int maxCountPerTurn = -1,
|
|
|
@@ -1405,7 +1428,7 @@ public partial class CardEffectFactory
|
|
|
bool isInherited = false,
|
|
|
bool isLinked = false)
|
|
|
{
|
|
|
- return TurnTimingClass(card, effectName, activateCoroutine, effectDescription, optional, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue, isInherited, isLinked, true, true);
|
|
|
+ return TurnTimingClass(card, effectName, activateCoroutine, effectDescription, optional, isOptionalFunction, additionalUseCondition, additionalActivateCondition, maxCountPerTurn, hashValue, isInherited, isLinked, true, true);
|
|
|
}
|
|
|
|
|
|
#endregion
|