From b4ee92ea28ac61d363de7b9f44c41c19014f9975 Mon Sep 17 00:00:00 2001 From: swordshine Date: Wed, 31 Jul 2013 11:18:52 +0000 Subject: [PATCH] - Added Sea Troll - Phenomenon: Reality Shaping --- .gitattributes | 2 ++ res/cardsfolder/r/reality_shaping.txt | 9 +++++++++ res/cardsfolder/s/sea_troll.txt | 14 ++++++++++++++ .../forge/card/ability/ai/ControlExchangeAi.java | 9 ++++++++- 4 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 res/cardsfolder/r/reality_shaping.txt create mode 100644 res/cardsfolder/s/sea_troll.txt diff --git a/.gitattributes b/.gitattributes index 44ba2acb22f..8c4846f1b5e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8787,6 +8787,7 @@ res/cardsfolder/r/ready_willing.txt -text res/cardsfolder/r/reality_acid.txt -text res/cardsfolder/r/reality_anchor.txt svneol=native#text/plain res/cardsfolder/r/reality_ripple.txt -text +res/cardsfolder/r/reality_shaping.txt -text res/cardsfolder/r/reality_spasm.txt svneol=native#text/plain res/cardsfolder/r/reality_strobe.txt svneol=native#text/plain res/cardsfolder/r/realm_razer.txt -text svneol=unset#text/plain @@ -9611,6 +9612,7 @@ res/cardsfolder/s/sea_serpent.txt svneol=native#text/plain res/cardsfolder/s/sea_snidd.txt -text res/cardsfolder/s/sea_spirit.txt svneol=native#text/plain res/cardsfolder/s/sea_sprite.txt svneol=native#text/plain +res/cardsfolder/s/sea_troll.txt -text res/cardsfolder/s/seachrome_coast.txt svneol=native#text/plain res/cardsfolder/s/seacoast_drake.txt -text res/cardsfolder/s/seafarers_quay.txt -text diff --git a/res/cardsfolder/r/reality_shaping.txt b/res/cardsfolder/r/reality_shaping.txt new file mode 100644 index 00000000000..94bff26e8e5 --- /dev/null +++ b/res/cardsfolder/r/reality_shaping.txt @@ -0,0 +1,9 @@ +Name:Reality Shaping +ManaCost:no cost +Types:Phenomenon +T:Mode$ PlaneswalkedTo | ValidCard$ Card.Self | TriggerZones$ Command | Execute$ TrigPutFromHand | TriggerDescription$ When you encounter CARDNAME, starting with you, each player may put a permanent card from his or her hand onto the battlefield. (Then planeswalk away from this phenomenon.) +SVar:TrigPutFromHand:AB$ RepeatEach | Cost$ 0 | RepeatPlayers$ Player | RepeatSubAbility$ DBChangeZone | SubAbility$ PWAway +SVar:DBChangeZone:DB$ ChangeZone | DefinedPlayer$ Player.IsRemembered | Choser$ Player.IsRemembered | ChangeType$ Permanent | ChangeNum$ 1 | Origin$ Hand | Destination$ Battlefield +SVar:PWAway:DB$ Planeswalk | Cost$ 0 +SVar:Picture:http://www.wizards.com/global/images/magic/general/reality_shaping.jpg +Oracle:When you encounter Reality Shaping, starting with you, each player may put a permanent card from his or her hand onto the battlefield. (Then planeswalk away from this phenomenon.) diff --git a/res/cardsfolder/s/sea_troll.txt b/res/cardsfolder/s/sea_troll.txt new file mode 100644 index 00000000000..452d4b77aaa --- /dev/null +++ b/res/cardsfolder/s/sea_troll.txt @@ -0,0 +1,14 @@ +Name:Sea Troll +ManaCost:2 U +Types:Creature Troll +PT:2/1 +T:Mode$ AttackerBlocked | ValidCard$ Card.Self | ValidBlocker$ Creature.Blue | Execute$ TrigRemember | Static$ True +T:Mode$ AttackerBlocked | ValidCard$ Creature.Blue | ValidBlocker$ Card.Self | Execute$ TrigRemember | Static$ True +SVar:TrigRemember:DB$ StoreSVar | SVar$ CheckActivation | Type$ Number | Expression$ 1 +A:AB$ Regenerate | Cost$ U | CheckSVar$ CheckActivation | SpellDescription$ Regenerate CARDNAME. Activate this ability only if CARDNAME blocked or was blocked by a blue creature this turn. +SVar:CheckSVar:Number$0 +T:Mode$ Phase | Phase$ Cleanup | TriggerZones$ Battlefield | Execute$ DBCleanup | Static$ True +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ DBCleanup | Static$ True +SVar:DBCleanup:DB$ StoreSVar | SVar$ CheckActivation | Type$ Number | Expression$ 0 +SVar:Picture:http://www.wizards.com/global/images/magic/general/sea_troll.jpg +Oracle:{U}: Regenerate Sea Troll. Activate this ability only if Sea Troll blocked or was blocked by a blue creature this turn. diff --git a/src/main/java/forge/card/ability/ai/ControlExchangeAi.java b/src/main/java/forge/card/ability/ai/ControlExchangeAi.java index 3834866f27c..135eb86f02a 100644 --- a/src/main/java/forge/card/ability/ai/ControlExchangeAi.java +++ b/src/main/java/forge/card/ability/ai/ControlExchangeAi.java @@ -63,6 +63,13 @@ public class ControlExchangeAi extends SpellAbilityAi { */ @Override protected boolean doTriggerAINoCost(Player aiPlayer, SpellAbility sa, boolean mandatory) { - return false; + if (sa.getTargetRestrictions() == null) { + if (mandatory) { + return true; + } + } else { + return canPlayAI(aiPlayer, sa); + } + return true; } }