diff --git a/res/cardsfolder/t/titanias_song.txt b/res/cardsfolder/t/titanias_song.txt index f910b021e0a..bc574ac08b3 100644 --- a/res/cardsfolder/t/titanias_song.txt +++ b/res/cardsfolder/t/titanias_song.txt @@ -2,10 +2,11 @@ Name:Titania's Song ManaCost:3 G Types:Enchantment Text:no text -K:stAnimateAll:Artifact.nonCreature:Count$CardManaCost/Count$CardManaCost:Creature:no colors:Overwrite:No condition:Each noncreature artifact loses its abilities and becomes an artifact creature with power and toughness each equal to its converted mana cost. -T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigEffect | TriggerDescription$ If CARDNAME leaves the battlefield, this effect continues until end of turn. -SVar:TrigEffect:AB$ Effect | Cost$ 0 | Name$ Titania's Song Effect | Keywords$ KWAnimateAll -SVar:KWAnimateAll:stAnimateAll:Artifact.nonCreature:Count$CardManaCost/Count$CardManaCost:Creature:no colors:Overwrite:No condition:Each noncreature artifact loses its abilities and becomes an artifact creature with power and toughness each equal to its converted mana cost. +S:Mode$ Continuous | Affected$ Artifact.nonCreature | SetPower$ AffectedX | SetToughness$ AffectedX | AddType$ Creature | RemoveAllAbilities$ True | Description$ Each noncreature artifact is an artifact creature with power and toughness each equal to its converted mana cost. +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigEffect | Static$ True | TriggerDescription$ If CARDNAME leaves the battlefield, this effect continues until end of turn. +SVar:TrigEffect:AB$ Effect | Cost$ 0 | Name$ Titania's Song Effect | StaticAbilities$ KWAnimateAll | SVars$ AffectedX +SVar:KWAnimateAll:Mode$ Continuous | Affected$ Artifact.nonCreature | SetPower$ AffectedX | SetToughness$ AffectedX | AddType$ Creature | RemoveAllAbilities$ True | Description$ Each noncreature artifact is an artifact creature with power and toughness each equal to its converted mana cost. +SVar:AffectedX:Count$CardManaCost SVar:PlayMain1:TRUE SVar:RemRandomDeck:True SVar:Rarity:Rare diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index 3eb0d277484..c3bc7ec98ee 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -1562,11 +1562,11 @@ public class Card extends GameEntity implements Comparable { if (keyword.get(i).toString().contains("StaticEffect")) { String[] k = keyword.get(i).split(":"); sbLong.append(k[5]).append("\r\n"); - } else if (keyword.get(i).toString().contains("stAnimate")) { + /*} else if (keyword.get(i).toString().contains("stAnimate")) { String[] k = keyword.get(i).split(":", 8); if (!k[7].contains("no text")) { sbLong.append(k[7]).append("\r\n"); - } + }*/ } else if (keyword.get(i).toString().contains("Protection:")) { String[] k = keyword.get(i).split(":"); sbLong.append(k[2]).append("\r\n"); diff --git a/src/main/java/forge/GameAction.java b/src/main/java/forge/GameAction.java index 18c06f72fa7..f7b5c84d87e 100644 --- a/src/main/java/forge/GameAction.java +++ b/src/main/java/forge/GameAction.java @@ -702,7 +702,7 @@ public class GameAction { com.execute(); } - GameActionUtil.stAnimate.execute(); + //GameActionUtil.stAnimate.execute(); CardList list = AllZoneUtil.getCardsInPlay(); Card c; diff --git a/src/main/java/forge/GameActionUtil.java b/src/main/java/forge/GameActionUtil.java index 2683d417575..56eed644377 100644 --- a/src/main/java/forge/GameActionUtil.java +++ b/src/main/java/forge/GameActionUtil.java @@ -17,7 +17,6 @@ import forge.gui.input.Input_PayManaCost_Ability; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import javax.swing.JOptionPane; @@ -2529,7 +2528,7 @@ public final class GameActionUtil { } /** Constant stAnimate. */ - public static Command stAnimate = new Command() { + //public static Command stAnimate = new Command() { /** stAnimate * Syntax:[ k[0] stAnimate[All][Self][Enchanted] : k[1] AnimateValid : * k[2] P/T/Keyword : k[3] extra types : k[4] extra colors : @@ -2537,7 +2536,7 @@ public final class GameActionUtil { * */ - private static final long serialVersionUID = -1404133561787349004L; + /*private static final long serialVersionUID = -1404133561787349004L; // storage stores the source card and the cards it gave its bonus to, to know what to remove private ArrayList storage = new ArrayList(); @@ -2827,7 +2826,7 @@ public final class GameActionUtil { return affected; } //end getAffectedCards() - }; + };*/ /**