- Changed useRemovalNow() condition from isSpell() to !isTrigger. Added "PlayMain1" to Xenagod to make use of pre-combat trigger.

This commit is contained in:
excessum
2014-06-07 11:06:49 +00:00
parent 29f7c7741f
commit 345cacade9
5 changed files with 5 additions and 4 deletions

View File

@@ -912,7 +912,7 @@ public class ChangeZoneAi extends SpellAbilityAi {
choice = mostExpensive;
}
//option to hold removal instead only applies for single targeted removal
if (sa.isSpell() && tgt.getMaxTargets(source, sa) == 1) {
if (!sa.isTrigger() && tgt.getMaxTargets(source, sa) == 1) {
if (!ComputerUtilCard.useRemovalNow(sa, choice, 0, destination)) {
return false;
}

View File

@@ -360,7 +360,7 @@ public class DamageDealAi extends DamageAiBase {
final Card c = this.dealDamageChooseTgtC(ai, sa, dmg, noPrevention, enemy, mandatory);
if (c != null) {
//option to hold removal instead only applies for single targeted removal
if (sa.isSpell() && tgt.getMaxTargets(sa.getHostCard(), sa) == 1 && !divided) {
if (!sa.isTrigger() && tgt.getMaxTargets(sa.getHostCard(), sa) == 1 && !divided) {
if (!ComputerUtilCard.useRemovalNow(sa, c, dmg, ZoneType.Graveyard)) {
return false;
}

View File

@@ -157,7 +157,7 @@ public class DestroyAi extends SpellAbilityAi {
choice = ComputerUtilCard.getMostExpensivePermanentAI(list, sa, true);
}
//option to hold removal instead only applies for single targeted removal
if (sa.isSpell() && abTgt.getMaxTargets(sa.getHostCard(), sa) == 1) {
if (!sa.isTrigger() && abTgt.getMaxTargets(sa.getHostCard(), sa) == 1) {
if (!ComputerUtilCard.useRemovalNow(sa, choice, 0, ZoneType.Graveyard)) {
return false;
}

View File

@@ -339,7 +339,7 @@ public class PumpAi extends PumpAiBase {
t = ComputerUtilCard.getBestAI(list);
//option to hold removal instead only applies for single targeted removal
if (sa.isSpell() && tgt.getMaxTargets(source, sa) == 1 && sa.isCurse()) {
if (!sa.isTrigger() && tgt.getMaxTargets(source, sa) == 1 && sa.isCurse()) {
if (!ComputerUtilCard.useRemovalNow(sa, t, -defense, ZoneType.Graveyard)) {
return false;
}