external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
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;
}

2
forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java
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;
}

2
forge-ai/src/main/java/forge/ai/ability/DestroyAi.java
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;
}

2
forge-ai/src/main/java/forge/ai/ability/PumpAi.java
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;
}

1
forge-gui/res/cardsfolder/x/xenagos_god_of_revels.txt
View File

@@ -8,6 +8,7 @@ SVar:X:Count$DevotionDual.R.G
T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of combat on your turn, another target creature you control gains haste and gets +X/+X until end of turn, where X is that creature's power.
SVar:TrigPump:AB$ Pump | Cost$ 0 | ValidTgts$ Creature.Other+YouCtrl | TgtPrompt$ Select another target creature you control | NumAtt$ +Y | NumDef$ +Y | KW$ Haste | References$ Y
SVar:Y:Targeted$CardPower
SVar:PlayMain1:TRUE
SVar:BuffedBy:Permanent.Red,Permanent.Green
SVar:Picture:http://www.wizards.com/global/images/magic/general/xenagos_god_of_revels.jpg
Oracle:Indestructible\nAs long as your devotion to red and green is less than seven, Xenagos isn't a creature.\nAt the beginning of combat on your turn, another target creature you control gains haste and gets +X/+X until end of turn, where X is that creature's power.