From b766bbed397666ac325af162b90eb9a96f3d18f9 Mon Sep 17 00:00:00 2001 From: Sloth Date: Sun, 5 Feb 2012 18:59:52 +0000 Subject: [PATCH] - Fixed the keyword "May be played by your opponent". --- res/cardsfolder/f/fiend_of_the_shadows.txt | 2 +- res/cardsfolder/k/knacksaw_clique.txt | 2 +- res/cardsfolder/o/ornate_kanzashi.txt | 2 +- res/cardsfolder/t/thada_adel_acquisitor.txt | 2 +- src/main/java/forge/card/cardfactory/CardFactoryUtil.java | 2 ++ 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/res/cardsfolder/f/fiend_of_the_shadows.txt b/res/cardsfolder/f/fiend_of_the_shadows.txt index 7d635a15c98..15d8af359fc 100644 --- a/res/cardsfolder/f/fiend_of_the_shadows.txt +++ b/res/cardsfolder/f/fiend_of_the_shadows.txt @@ -6,7 +6,7 @@ PT:3/3 K:Flying T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigChangeZone | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player exiles a card from his or her hand. You may play that card for as long as it remains exiled. SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 0 | Origin$ Hand | Destination$ Exile | DefinedPlayer$ TriggeredTarget | Chooser$ Opponent | ChangeType$ Card | ChangeNum$ 1 | RememberChanged$ True | SubAbility$ DBPump -SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ May be played by your Opponent | PumpZone$ Exile | Permanent$ True | SubAbility$ DBCleanup +SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ May be played by your opponent | PumpZone$ Exile | Permanent$ True | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True A:AB$ Regenerate | Cost$ Sac<1/Human> | SpellDescription$ Regenerate CARDNAME. SVar:RemAIDeck:True diff --git a/res/cardsfolder/k/knacksaw_clique.txt b/res/cardsfolder/k/knacksaw_clique.txt index 783ff05b663..2e1c5ca21d5 100644 --- a/res/cardsfolder/k/knacksaw_clique.txt +++ b/res/cardsfolder/k/knacksaw_clique.txt @@ -5,7 +5,7 @@ Text:no text PT:1/4 K:Flying A:AB$ Mill | Cost$ 1 U Q | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | NumCards$ 1 | Destination$ Exile | RememberMilled$ True | SubAbility$ DBPump | SpellDescription$ Target opponent exiles the top card of his or her library. Until end of turn, you may play that card. -SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ May be played by your Opponent | PumpZone$ Exile | SubAbility$ DBCleanup +SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ May be played by your opponent | PumpZone$ Exile | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:RemAIDeck:True SVar:Rarity:Rare diff --git a/res/cardsfolder/o/ornate_kanzashi.txt b/res/cardsfolder/o/ornate_kanzashi.txt index 10aa54ae283..3abe81246ea 100644 --- a/res/cardsfolder/o/ornate_kanzashi.txt +++ b/res/cardsfolder/o/ornate_kanzashi.txt @@ -3,7 +3,7 @@ ManaCost:5 Types:Artifact Text:no text A:AB$ Mill | Cost$ 2 T | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | NumCards$ 1 | Destination$ Exile | RememberMilled$ True | SubAbility$ DBPump | SpellDescription$ Target opponent exiles the top card of his or her library. You may play that card this turn. -SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ May be played by your Opponent | PumpZone$ Exile | SubAbility$ DBCleanup +SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ May be played by your opponent | PumpZone$ Exile | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:RemAIDeck:True SVar:Rarity:Rare diff --git a/res/cardsfolder/t/thada_adel_acquisitor.txt b/res/cardsfolder/t/thada_adel_acquisitor.txt index 8fcf22ab495..c704b1c3b02 100644 --- a/res/cardsfolder/t/thada_adel_acquisitor.txt +++ b/res/cardsfolder/t/thada_adel_acquisitor.txt @@ -6,7 +6,7 @@ PT:2/2 K:Islandwalk T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigChangeZone | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, search that player's library for an artifact card and exile it. Then that player shuffles his or her library. Until end of turn, you may play that card. SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Exile | DefinedPlayer$ TriggeredTarget | Chooser$ You | ChangeType$ Artifact | ChangeNum$ 1 | RememberChanged$ True | SubAbility$ DBPump -SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ May be played by your Opponent | PumpZone$ Exile | SubAbility$ DBCleanup +SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ May be played by your opponent | PumpZone$ Exile | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:RemAIDeck:True SVar:Rarity:Rare diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java index 829ebc7428e..455b6f32c16 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java @@ -2460,6 +2460,7 @@ public class CardFactoryUtil { } if (c.isLand() && (c.hasKeyword("May be played") + || c.hasKeyword("May be played by your opponent") || c.hasKeyword("May be played without paying its mana cost"))) { return true; } @@ -2472,6 +2473,7 @@ public class CardFactoryUtil { if (sa.isSpell() && (c.hasKeyword("May be played") + || c.hasKeyword("May be played by your Opponent") || c.hasKeyword("May be played without paying its mana cost") || (c.hasStartOfKeyword("Flashback") && zone .is(Zone.Graveyard))) && restrictZone.equals(Zone.Hand)) {