From 7a0d2bc0e79a72e879020ff41a6765195ebd8ac2 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 18:26:09 +0000 Subject: [PATCH] - Converted Ichor Slick to script. --- res/cardsfolder/ichor_slick.txt | 3 +- res/gui/display_new_layout.xml | 102 +++++++++++++-------------- src/forge/CardFactory_Sorceries.java | 85 ---------------------- 3 files changed, 53 insertions(+), 137 deletions(-) diff --git a/res/cardsfolder/ichor_slick.txt b/res/cardsfolder/ichor_slick.txt index b676cae7171..d15b4211989 100644 --- a/res/cardsfolder/ichor_slick.txt +++ b/res/cardsfolder/ichor_slick.txt @@ -4,7 +4,8 @@ Types:Sorcery Text:no text K:Cycling:2 K:Madness:3 B +A:SP$ Pump | Cost$ 2 B | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -3 | NumDef$ -3 | IsCurse$ True | SpellDescription$ Target creature gets -3/-3 until end of turn. SVar:Rarity:Common -SVar:Picture:http://resources.wizards.com/magic/cards/fut/en-us/card130683.jpg +SVar:Picture:http://www.wizards.com/global/images/magic/general/ichor_slick.jpg SetInfo:FUT|Common|http://magiccards.info/scans/en/fut/68.jpg End \ No newline at end of file diff --git a/res/gui/display_new_layout.xml b/res/gui/display_new_layout.xml index a7c0a96872b..f4ff2cc90fa 100644 --- a/res/gui/display_new_layout.xml +++ b/res/gui/display_new_layout.xml @@ -6,7 +6,7 @@ 0 0 1600 - 1123 + 1114 @@ -16,8 +16,8 @@ 0 0 - 197 - 1123 + 447 + 1114 @@ -27,8 +27,8 @@ 0 0 + 447 197 - 199 @@ -47,8 +47,8 @@ 0 - 199 197 + 447 5 @@ -62,9 +62,9 @@ 0 - 204 - 197 - 280 + 202 + 447 + 278 @@ -83,8 +83,8 @@ 0 - 484 - 197 + 480 + 447 5 @@ -98,9 +98,9 @@ 0 - 489 - 197 - 147 + 485 + 447 + 145 @@ -119,8 +119,8 @@ 0 - 636 - 197 + 630 + 447 5 @@ -134,9 +134,9 @@ 0 - 641 - 197 - 194 + 635 + 447 + 192 @@ -155,8 +155,8 @@ 0 - 835 - 197 + 827 + 447 5 @@ -170,9 +170,9 @@ 0 - 840 - 197 - 283 + 832 + 447 + 282 @@ -202,10 +202,10 @@ - 197 + 447 0 5 - 1123 + 1114 @@ -217,10 +217,10 @@ - 202 + 452 0 - 1083 - 1123 + 833 + 1114 @@ -228,10 +228,10 @@ - 202 + 452 0 - 1083 - 501 + 833 + 497 @@ -249,9 +249,9 @@ - 202 - 501 - 1083 + 452 + 497 + 833 5 @@ -264,10 +264,10 @@ - 202 - 506 - 1083 - 404 + 452 + 502 + 833 + 400 @@ -285,9 +285,9 @@ - 202 - 910 - 1083 + 452 + 902 + 833 5 @@ -300,10 +300,10 @@ - 202 - 915 - 1083 - 208 + 452 + 907 + 833 + 207 @@ -339,7 +339,7 @@ 1285 0 5 - 1123 + 1114 @@ -354,7 +354,7 @@ 1290 0 310 - 1123 + 1114 @@ -365,7 +365,7 @@ 1290 0 310 - 622 + 618 @@ -384,7 +384,7 @@ 1290 - 622 + 618 310 5 @@ -399,9 +399,9 @@ 1290 - 627 + 623 310 - 496 + 491 diff --git a/src/forge/CardFactory_Sorceries.java b/src/forge/CardFactory_Sorceries.java index 51136ee7fdc..234cffe76c0 100644 --- a/src/forge/CardFactory_Sorceries.java +++ b/src/forge/CardFactory_Sorceries.java @@ -1618,91 +1618,6 @@ public class CardFactory_Sorceries { }//*************** END ************ END ************************** - - - //*************** START *********** START ************************** - else if(cardName.equals("Ichor Slick")) { - final SpellAbility spell = new Spell(card) { - private static final long serialVersionUID = -273970706213674570L; - - @Override - public boolean canPlayAI() { - CardList c = CardFactoryUtil.AI_getHumanCreature(3, card, true); - CardListUtil.sortAttack(c); - CardListUtil.sortFlying(c); - - if(c.isEmpty()) return false; - else { - setTargetCard(c.get(0)); - return true; - } - }//canPlayAI() - - @Override - public void resolve() { - final Card[] target = new Card[1]; - final Command untilEOT = new Command() { - private static final long serialVersionUID = -1615047325868708734L; - - public void execute() { - if(AllZone.GameAction.isCardInPlay(target[0])) { - target[0].addTempAttackBoost(3); - target[0].addTempDefenseBoost(3); - } - } - }; - - target[0] = getTargetCard(); - if(AllZone.GameAction.isCardInPlay(target[0]) && CardFactoryUtil.canTarget(card, target[0])) { - target[0].addTempAttackBoost(-3); - target[0].addTempDefenseBoost(-3); - - AllZone.EndOfTurn.addUntil(untilEOT); - } - }//resolve() - };//SpellAbility - - Input target = new Input() { - private static final long serialVersionUID = -7381927922574152604L; - - @Override - public void showMessage() { - AllZone.Display.showMessage("Select target creature for " + card.getName()); - ButtonUtil.enableOnlyCancel(); - } - - @Override - public void selectButtonCancel() { - stop(); - } - - @Override - public void selectCard(Card card, PlayerZone zone) { - if(!CardFactoryUtil.canTarget(spell, card)) { - AllZone.Display.showMessage("Cannot target this card (Shroud? Protection?)."); - } else if(card.isCreature() && zone.is(Constant.Zone.Battlefield)) { - spell.setTargetCard(card); - if(this.isFree()) - { - this.setFree(false); - AllZone.Stack.add(spell); - stop(); - } - else - stopSetNext(new Input_PayManaCost(spell)); - } - } - };//Input - spell.setDescription("Target creature gets -3/-3 until end of turn"); - - card.clearSpellAbility(); - card.addSpellAbility(spell); - - card.setSVar("PlayMain1", "TRUE"); - - spell.setBeforePayMana(target); - }//*************** END ************ END ************************** - //*************** START *********** START ************************** else if(cardName.equals("Commune with Nature")) {