From 88588c1a0e71db01a73cd65e6888114523a65674 Mon Sep 17 00:00:00 2001 From: Sloth Date: Sun, 5 Feb 2012 17:05:35 +0000 Subject: [PATCH] - ContinuousAbility now supports "ChosenColor" as SetColor. - Added Shifting Sky by Jeff. --- .gitattributes | 1 + res/cardsfolder/s/shifting_sky.txt | 15 +++++++++++++++ .../staticability/StaticAbilityContinuous.java | 9 +++++++-- 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 res/cardsfolder/s/shifting_sky.txt diff --git a/.gitattributes b/.gitattributes index b81f82d61de..7ca383aadaf 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7680,6 +7680,7 @@ res/cardsfolder/s/shield_wall.txt svneol=native#text/plain res/cardsfolder/s/shielding_plax.txt svneol=native#text/plain res/cardsfolder/s/shieldmates_blessing.txt svneol=native#text/plain res/cardsfolder/s/shields_of_velis_vel.txt -text +res/cardsfolder/s/shifting_sky.txt -text res/cardsfolder/s/shifting_sliver.txt svneol=native#text/plain res/cardsfolder/s/shifting_wall.txt svneol=native#text/plain res/cardsfolder/s/shimian_specter.txt svneol=native#text/plain diff --git a/res/cardsfolder/s/shifting_sky.txt b/res/cardsfolder/s/shifting_sky.txt new file mode 100644 index 00000000000..a43bdbe8e72 --- /dev/null +++ b/res/cardsfolder/s/shifting_sky.txt @@ -0,0 +1,15 @@ +Name:Shifting Sky +ManaCost:2 U +Types:Enchantment +Text:no text +T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ ChooseColor | Static$ True | TriggerDescription$ As CARDNAME enters the battlefield, choose a color. +SVar:ChooseColor:AB$ ChooseColor | Cost$ 0 | Defined$ You +S:Mode$ Continuous| Affected$ Permanent.nonLand | SetColor$ ChosenColor | Description$ All nonland permanents are the chosen color. +SVar:RemAIDeck:True +SVar:RemRandomDeck:True +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/shifting_sky.jpg +SetInfo:8ED|Rare|http://magiccards.info/scans/en/8e/100.jpg +SetInfo:PLS|Uncommon|http://magiccards.info/scans/en/ps/32.jpg +Oracle:As Shifting Sky enters the battlefield, choose a color.\nAll nonland permanents are the chosen color. +End \ No newline at end of file diff --git a/src/main/java/forge/card/staticability/StaticAbilityContinuous.java b/src/main/java/forge/card/staticability/StaticAbilityContinuous.java index 7d362b70d87..c6a12fb44c4 100644 --- a/src/main/java/forge/card/staticability/StaticAbilityContinuous.java +++ b/src/main/java/forge/card/staticability/StaticAbilityContinuous.java @@ -188,8 +188,13 @@ public class StaticAbilityContinuous { } if (params.containsKey("SetColor")) { - addColors = CardUtil.getShortColorsString(new ArrayList(Arrays.asList(params.get("SetColor").split( - " & ")))); + final String colors = params.get("SetColor"); + if (colors.equals("ChosenColor")) { + addColors = CardUtil.getShortColorsString(hostCard.getChosenColor()); + } else { + addColors = CardUtil.getShortColorsString(new ArrayList(Arrays.asList( + colors.split(" & ")))); + } se.setOverwriteColors(true); }