diff --git a/res/cardsfolder/brutal_nightstalker.txt b/res/cardsfolder/brutal_nightstalker.txt index 48de2ecc0e6..7b73f95d26c 100644 --- a/res/cardsfolder/brutal_nightstalker.txt +++ b/res/cardsfolder/brutal_nightstalker.txt @@ -4,7 +4,7 @@ Types:Creature Nightstalker Text:no text PT:3/2 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Optional$ True | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters the battlefield, you may have target opponent discard a card. -SVar:TrigDiscard:AB$Discard | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Select a player | NumCards$ 1 | Mode$ TgtChoose +SVar:TrigDiscard:AB$Discard | Cost$ 0 | ValidTgts$ Opponent | TgtPrompt$ Select a opponent | NumCards$ 1 | Mode$ TgtChoose SVar:Rarity:Uncommon SVar:Picture:http://serv2.tcgimages.eu/img/cards/Portal_Second_Age/brutal_nightstalker.jpg SetInfo:PO2|Uncommon|http://magiccards.info/scans/en/po2/4.jpg diff --git a/res/cardsfolder/corrupt_court_official.txt b/res/cardsfolder/corrupt_court_official.txt index 6e6417f95f8..d83776e9761 100644 --- a/res/cardsfolder/corrupt_court_official.txt +++ b/res/cardsfolder/corrupt_court_official.txt @@ -1,8 +1,10 @@ Name:Corrupt Court Official ManaCost:1 B Types:Creature Human Advisor -Text:When Corrupt Court Official enters the battlefield, target opponent discards a card. +Text:no text PT:1/1 +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters the battlefield, target opponent discards a card. +SVar:TrigDiscard:AB$Discard | Cost$ 0 | ValidTgts$ Opponent | TgtPrompt$ Select a opponent | NumCards$ 1 | Mode$ TgtChoose SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/corrupt_court_official.jpg SetInfo:PTK|Uncommon|http://magiccards.info/scans/en/p3k/71.jpg diff --git a/res/cardsfolder/dakmor_ghoul.txt b/res/cardsfolder/dakmor_ghoul.txt index da5229a948b..45ef045940e 100644 --- a/res/cardsfolder/dakmor_ghoul.txt +++ b/res/cardsfolder/dakmor_ghoul.txt @@ -1,8 +1,11 @@ Name:Dakmor Ghoul ManaCost:2 B B Types:Creature Zombie -Text:When Dakmor Ghoul enters the battlefield, target opponent loses 2 life and you gain 2 life. +Text:no text PT:2/2 +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDrain | TriggerDescription$ When CARDNAME enters the battlefield, target opponent loses 2 life and you gain 2 life. +SVar:TrigDrain:AB$LoseLife | Cost$ 0 | ValidTgts$ Opponent | LifeAmount$ 2 | SubAbility$SVar=DBGainLife +SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 2 SVar:Rarity:Uncommon SVar:Picture:http://serv3.tcgimages.eu/img/cards/Starter_1999/dakmor_ghoul.jpg SetInfo:S99|Uncommon|http://magiccards.info/scans/en/st/70.jpg diff --git a/res/cardsfolder/highway_robber.txt b/res/cardsfolder/highway_robber.txt index 26b11a70e7d..f97578b8ea9 100644 --- a/res/cardsfolder/highway_robber.txt +++ b/res/cardsfolder/highway_robber.txt @@ -1,8 +1,11 @@ Name:Highway Robber ManaCost:2 B B Types:Creature Human Mercenary -Text:When CARDNAME enters the battlefield, target opponent loses 2 life and you gain 2 life. +Text:no text PT:2/2 +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDrain | TriggerDescription$ When CARDNAME enters the battlefield, target opponent loses 2 life and you gain 2 life. +SVar:TrigDrain:AB$LoseLife | Cost$ 0 | ValidTgts$ Opponent | LifeAmount$ 2 | SubAbility$ SVar=DBGainLife +SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 2 SVar:Rarity:Common SVar:Picture:http://resources.wizards.com/magic/cards/9ed/en-us/card84505.jpg SetInfo:MMQ|Common|http://magiccards.info/scans/en/mm/139.jpg diff --git a/res/cardsfolder/ravenous_rats.txt b/res/cardsfolder/ravenous_rats.txt index 371dbc30367..43141408206 100644 --- a/res/cardsfolder/ravenous_rats.txt +++ b/res/cardsfolder/ravenous_rats.txt @@ -1,8 +1,10 @@ Name:Ravenous Rats ManaCost:1 B Types:Creature Rat -Text:When CARDNAME enters the battlefield, target opponent discards a card. +Text:no text PT:1/1 +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters the battlefield, target opponent discards a card. +SVar:TrigDiscard:AB$Discard | Cost$ 0 | ValidTgts$ Opponent | TgtPrompt$ Select a opponent | NumCards$ 1 | Mode$ TgtChoose SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/ravenous_rats.jpg SetInfo:8ED|Common|http://magiccards.info/scans/en/8e/158.jpg diff --git a/res/cardsfolder/subversion.txt b/res/cardsfolder/subversion.txt index 15beee60710..8f8d5973ca6 100644 --- a/res/cardsfolder/subversion.txt +++ b/res/cardsfolder/subversion.txt @@ -4,7 +4,7 @@ Types:Enchantment Text:no text T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ At the beginning of your upkeep, each opponent loses 1 life. You gain life equal to the life lost this way. SVar:TrigDrain:AB$LoseLife | Cost$ 0 | Defined$ Opponent | LifeAmount$ 1 | SubAbility$SVar=DBGainLife -SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount 1 +SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 1 SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/subversion.jpg SetInfo:ULG|Rare|http://magiccards.info/scans/en/ul/68.jpg diff --git a/res/cardsfolder/thief_of_hope.txt b/res/cardsfolder/thief_of_hope.txt index 680348acf0a..2d1392e73a1 100644 --- a/res/cardsfolder/thief_of_hope.txt +++ b/res/cardsfolder/thief_of_hope.txt @@ -1,8 +1,11 @@ Name:Thief of Hope ManaCost:2 B Types:Creature Spirit -Text:Whenever you cast a Spirit or Arcane spell, target opponent loses 1 life and you gain 1 life. +Text:no text PT:2/2 +T:Mode$ SpellCast | ValidCard$ Spirit.YouCtrl,Arcane.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, target opponent loses 1 life and you gain 1 life. +SVar:TrigDrain:AB$LoseLife | Cost$ 0 | ValidTgts$ Opponent | LifeAmount$ 1 | SubAbility$SVar=DBGainLife +SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 1 K:Soulshift:2 SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/thief_of_hope.jpg diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java index be6d934705c..b436501b59c 100644 --- a/src/forge/CardFactory_Creatures.java +++ b/src/forge/CardFactory_Creatures.java @@ -1265,7 +1265,7 @@ public class CardFactory_Creatures { card.addSpellAbility(ability); }//*************** END ************ END ************************** - + /* //*************** START *********** START ************************** else if(cardName.equals("Highway Robber") || cardName.equals("Dakmor Ghoul")) { final SpellAbility ability = new Ability(card, "0") { @@ -1293,7 +1293,7 @@ public class CardFactory_Creatures { }; card.addComesIntoPlayCommand(intoPlay); }//*************** END ************ END ************************** - + */ //*************** START *********** START ************************** else if(cardName.equals("Drekavac")) { @@ -5031,7 +5031,7 @@ public class CardFactory_Creatures { ability.setBeforePayMana(new Input_PayManaCost(ability)); }//*************** END ************ END ************************** - + /* //*************** START *********** START ************************** else if(cardName.equals("Ravenous Rats") || cardName.equals("Corrupt Court Official")) { final Ability ability = new Ability(card, "0") { @@ -5060,10 +5060,9 @@ public class CardFactory_Creatures { }//else }//execute() };//Command - card.addComesIntoPlayCommand(intoPlay); - + card.addComesIntoPlayCommand(intoPlay); }//*************** END ************ END ************************** - + */ //*************** START *********** START ************************** else if(cardName.equals("Rhys the Redeemed")) { diff --git a/src/forge/CombatUtil.java b/src/forge/CombatUtil.java index 3e5ee3fc16f..19b615c5896 100644 --- a/src/forge/CombatUtil.java +++ b/src/forge/CombatUtil.java @@ -2265,9 +2265,9 @@ public class CombatUtil { if (a.getName().equals("Slith Strider") && !a.getCreatureGotBlockedThisCombat()) { Player player = a.getController(); player.drawCard(); - } else if(a.getName().equals("Corrupt Official") && !a.getCreatureGotBlockedThisCombat()) { + /*} else if(a.getName().equals("Corrupt Official") && !a.getCreatureGotBlockedThisCombat()) { Player opp = b.getController(); - opp.discardRandom(a.getSpellAbility()[0]); + opp.discardRandom(a.getSpellAbility()[0]);*/ } else if (a.getName().equals("Robber Fly") && !a.getCreatureGotBlockedThisCombat()) { Player opp = b.getController(); PlayerZone hand = AllZone.getZone(Constant.Zone.Hand, opp); diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index e63819d4afb..ead333af9a1 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -473,7 +473,7 @@ public class GameActionUtil { playCard_Vengevine(c); playCard_Demigod_of_Revenge(c); playCard_Halcyon_Glaze(c); - playCard_Thief_of_Hope(c); + //playCard_Thief_of_Hope(c); playCard_Infernal_Kirin(c); playCard_Cloudhoof_Kirin(c); playCard_Battlegate_Mimic(c); @@ -988,7 +988,8 @@ public class GameActionUtil { } }//Halcyon Glaze - + + /* public static void playCard_Thief_of_Hope(Card c) { final Player controller = c.getController(); @@ -1032,8 +1033,7 @@ public class GameActionUtil { } }//if } - - }//Thief of Hope + }//Thief of Hope*/ public static void playCard_Infernal_Kirin(Card c) { final Player controller = c.getController();