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

- Fixed AI using Man-o'-War.

Browse Source
This commit is contained in:
Sloth
2013-03-14 08:24:50 +00:00
parent a5f7855e03
commit 5e687f98b9
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/cardsfolder/m/man_o_war.txt
View File

@@ -4,6 +4,7 @@ Types:Creature Jellyfish
PT:2/2 PT:2/2
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return target creature to its owner's hand. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return target creature to its owner's hand.
SVar:TrigChangeZone:DB$ChangeZone | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand SVar:TrigChangeZone:DB$ChangeZone | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand
SVar:PlayMain1:TRUE
SVar:Picture:http://resources.wizards.com/magic/cards/po/en-us/card4266.jpg SVar:Picture:http://resources.wizards.com/magic/cards/po/en-us/card4266.jpg
Oracle:When Man-o'-War enters the battlefield, return target creature to its owner's hand. Oracle:When Man-o'-War enters the battlefield, return target creature to its owner's hand.
SetInfo:VIS Common SetInfo:VIS Common

4
src/main/java/forge/card/ability/ai/ChangeZoneAi.java
View File

@@ -745,7 +745,7 @@ public class ChangeZoneAi extends SpellAbilityAi {
} }
} }
// Blink permanents with ETB triggers // Blink permanents with ETB triggers
else if (SpellAbilityAi.playReusable(ai, sa)) { else if (!sa.isTrigger() && SpellAbilityAi.playReusable(ai, sa)) {
aiPermanents = CardLists.filter(aiPermanents, new Predicate<Card>() { aiPermanents = CardLists.filter(aiPermanents, new Predicate<Card>() {
@Override @Override
public boolean apply(final Card c) { public boolean apply(final Card c) {
@@ -755,7 +755,7 @@ public class ChangeZoneAi extends SpellAbilityAi {
// counters TODO check good and // counters TODO check good and
// bad counters // bad counters
// checks only if there is a dangerous ETB effect // checks only if there is a dangerous ETB effect
return SpellPermanent.checkETBEffects(c, ai); return !c.equals(sa.getSourceCard()) && SpellPermanent.checkETBEffects(c, ai);
} }
}); });
if (!aiPermanents.isEmpty()) { if (!aiPermanents.isEmpty()) {