diff --git a/res/cardsfolder/akuta_born_of_ash.txt b/res/cardsfolder/akuta_born_of_ash.txt index 589e7b7927b..3b3b69c789c 100644 --- a/res/cardsfolder/akuta_born_of_ash.txt +++ b/res/cardsfolder/akuta_born_of_ash.txt @@ -4,7 +4,7 @@ Types:Legendary Creature Spirit Text:no text PT:3/2 K:Haste -T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | IsPresent$ Card | PresentZone$ Hand | PresentPlayer$ Opponent | PresentCompare$ LTX | TriggerZones$ Graveyard | OptionalDecider$ You | Execute$ TrigReturn | TriggerDescription$ At the beginning of your upkeep, if you have more cards in hand than each opponent, you may sacrifice a Swamp. If you do, return CARDNAME from your graveyard to the battlefield. +T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | IsPresent$ Card | PresentZone$ Hand | PresentPlayer$ Opponent | PresentCompare$ LTX | TriggerZones$ Graveyard | Execute$ TrigReturn | TriggerDescription$ At the beginning of your upkeep, if you have more cards in hand than each opponent, you may sacrifice a Swamp. If you do, return CARDNAME from your graveyard to the battlefield. SVar:TrigReturn:AB$ChangeZone | Cost$ Sac<1/Swamp> | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield SVar:X:Count$InYourHand SVar:Rarity:Rare diff --git a/res/cardsfolder/genesis.txt b/res/cardsfolder/genesis.txt index 0f5577d8150..69d8bfbf7c2 100644 --- a/res/cardsfolder/genesis.txt +++ b/res/cardsfolder/genesis.txt @@ -3,7 +3,7 @@ ManaCost:4 G Types:Creature Incarnation Text:no text PT:4/4 -T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Graveyard | OptionalDecider$ You | Execute$ TrigChange | TriggerDescription$ At the beginning of your upkeep, if CARDNAME is in your graveyard, you may pay 2 G. If you do, return target creature card from your graveyard to your hand. +T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Graveyard | Execute$ TrigChange | TriggerDescription$ At the beginning of your upkeep, if CARDNAME is in your graveyard, you may pay 2 G. If you do, return target creature card from your graveyard to your hand. SVar:TrigChange:AB$ChangeZone | Cost$ 2 G | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.YouCtrl SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/genesis.jpg diff --git a/res/cardsfolder/kookus.txt b/res/cardsfolder/kookus.txt index 4d0373278fe..3e98fb2c1cc 100644 --- a/res/cardsfolder/kookus.txt +++ b/res/cardsfolder/kookus.txt @@ -8,7 +8,7 @@ A:AB$Pump | Cost$ R | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until e T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | IsPresent$ Creature.YouCtrl+namedKeeper of Kookus | PresentCompare$ EQ0 | Execute$ TrigNoKeeper | TriggerDescription$ At the beginning of your upkeep, if you don't control a creature named Keeper of Kookus, CARDNAME deals 3 damage to you and attacks this turn if able. SVar:TrigNoKeeper:DB$DealDamage | NumDmg$ 3 | Defined$ You | SubAbility$ SVar=DBMustAttack SVar:DBMustAttack:DB$Pump | KW$ HIDDEN CARDNAME attacks each turn if able. | Defined$ Self | SpellDescription$ CARDNAME attacks this turn if able. -SVar:RemAIDeck:True +SVar:RemRandomDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/kookus.jpg SetInfo:VIS|Rare|http://magiccards.info/scans/en/vi/86.jpg diff --git a/res/cardsfolder/nether_spirit.txt b/res/cardsfolder/nether_spirit.txt index ce0ae8d478b..41f5df361cd 100644 --- a/res/cardsfolder/nether_spirit.txt +++ b/res/cardsfolder/nether_spirit.txt @@ -1,8 +1,10 @@ Name:Nether Spirit ManaCost:1 B B Types:Creature Spirit -Text:At the beginning of your upkeep, if Nether Spirit is the only creature card in your graveyard, you may return Nether Spirit to the battlefield. +Text:no text PT:2/2 +T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Graveyard | IsPresent$ Creature.YouOwn | PresentZone$ Graveyard | PresentCompare$ EQ1 | Execute$ TrigReturn | OptionalDecider$ You | TriggerDescription$ At the beginning of your upkeep, if CARDNAME is the only creature card in your graveyard, you may return CARDNAME to the battlefield. +SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/nether_spirit.jpg SetInfo:MMQ|Rare|http://magiccards.info/scans/en/mm/149.jpg diff --git a/res/cardsfolder/planar_collapse.txt b/res/cardsfolder/planar_collapse.txt index 3b033dde44b..3b6458697c9 100644 --- a/res/cardsfolder/planar_collapse.txt +++ b/res/cardsfolder/planar_collapse.txt @@ -5,6 +5,7 @@ Text:no text T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | IsPresent$ Creature | PresentCompare$ GE4 | Execute$ TrigSac | TriggerDescription$ At the beginning of your upkeep, if there are four or more creatures on the battlefield, sacrifice CARDNAME and destroy all creatures. They can't be regenerated. SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Self | SubAbility$ SVar=DBDestroyAll SVar:DBDestroyAll:DB$DestroyAll | ValidCards$ Creature | NoRegen$ True +SVar:RemRandomDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/planar_collapse.jpg SetInfo:ULG|Rare|http://magiccards.info/scans/en/ul/18.jpg diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index 711c0493f67..0398a4502f6 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -71,7 +71,7 @@ public class GameActionUtil { upkeep_Wolf_Skull_Shaman(); upkeep_Oversold_Cemetery(); - upkeep_Nether_Spirit(); + //upkeep_Nether_Spirit(); upkeep_Vampire_Lacerator(); upkeep_Sleeper_Agent(); upkeep_Pillory_of_the_Sleepless(); @@ -4105,6 +4105,7 @@ public class GameActionUtil { } }//Oversold Cemetery + /* private static void upkeep_Nether_Spirit() { final Player player = AllZone.Phase.getPlayerTurn(); final PlayerZone graveyard = AllZone.getZone(Constant.Zone.Graveyard, player); @@ -4141,6 +4142,7 @@ public class GameActionUtil { } } //if }//nether spirit + */ public static void upkeep_Suspend() { Player player = AllZone.Phase.getPlayerTurn();