diff --git a/.gitattributes b/.gitattributes index c7b54da0aee..e07e9ddeb2b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1241,6 +1241,7 @@ res/cardsfolder/deadfall.txt -text svneol=native#text/plain res/cardsfolder/deadly_grub.txt -text svneol=native#text/plain res/cardsfolder/deadly_insect.txt -text svneol=native#text/plain res/cardsfolder/deadly_recluse.txt -text svneol=native#text/plain +res/cardsfolder/deadshot_minotaur.txt -text svneol=native#text/plain res/cardsfolder/death_baron.txt -text svneol=native#text/plain res/cardsfolder/death_cloud.txt -text svneol=native#text/plain res/cardsfolder/death_cultist.txt -text svneol=native#text/plain @@ -2155,6 +2156,7 @@ res/cardsfolder/goblin_cavaliers.txt -text svneol=native#text/plain res/cardsfolder/goblin_charbelcher.txt -text svneol=native#text/plain res/cardsfolder/goblin_chariot.txt -text svneol=native#text/plain res/cardsfolder/goblin_chieftain.txt -text svneol=native#text/plain +res/cardsfolder/goblin_commando.txt -text svneol=native#text/plain res/cardsfolder/goblin_deathraiders.txt -text svneol=native#text/plain res/cardsfolder/goblin_digging_team.txt -text svneol=native#text/plain res/cardsfolder/goblin_dirigible.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/corrupt_eunuchs.txt b/res/cardsfolder/corrupt_eunuchs.txt index d5a3c918fea..98e569baa42 100644 --- a/res/cardsfolder/corrupt_eunuchs.txt +++ b/res/cardsfolder/corrupt_eunuchs.txt @@ -1,8 +1,10 @@ Name:Corrupt Eunuchs ManaCost:3 R Types:Creature Human Advisor -Text:When Corrupt Eunuchs enters the battlefield, it deals 2 damage to target creature. +Text:no text PT:2/2 +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 2 damage to target creature. +SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Tgt$ TgtC | NumDmg$ 2 SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/corrupt_eunuchs.jpg SetInfo:PTK|Uncommon|http://magiccards.info/scans/en/p3k/106.jpg diff --git a/res/cardsfolder/deadshot_minotaur.txt b/res/cardsfolder/deadshot_minotaur.txt new file mode 100644 index 00000000000..fe8320da3db --- /dev/null +++ b/res/cardsfolder/deadshot_minotaur.txt @@ -0,0 +1,11 @@ +Name:Deadshot Minotaur +ManaCost:3 R G +Types:Creature Minotaur +Text:no text +PT:3/4 +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 3 damage to target creature with flying. +SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Creature.withFlying | NumDmg$ 3 +K:Cycling:RG +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/deadshot_minotaur.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/fire_imp.txt b/res/cardsfolder/fire_imp.txt index 00878183df0..974b7764f2a 100644 --- a/res/cardsfolder/fire_imp.txt +++ b/res/cardsfolder/fire_imp.txt @@ -1,8 +1,10 @@ Name:Fire Imp ManaCost:2 R Types:Creature Imp -Text:When CARDNAME enters the battlefield, it deals 2 damage to target creature. +Text:no text PT:2/1 +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 2 damage to target creature. +SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Tgt$ TgtC | NumDmg$ 2 SVar:Rarity:Uncommon SVar:Picture:http://resources.wizards.com/magic/cards/po/en-us/card4337.jpg SetInfo:POR|Uncommon|http://magiccards.info/scans/en/po/131.jpg diff --git a/res/cardsfolder/flametongue_kavu.txt b/res/cardsfolder/flametongue_kavu.txt index a5f21494eb6..70db0f3f0b4 100644 --- a/res/cardsfolder/flametongue_kavu.txt +++ b/res/cardsfolder/flametongue_kavu.txt @@ -1,8 +1,10 @@ Name:Flametongue Kavu ManaCost:3 R Types:Creature Kavu -Text:When CARDNAME enters the battlefield, it deals 4 damage to target creature. +Text:no text PT:4/2 +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 4 damage to target creature. +SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Tgt$ TgtC | NumDmg$ 4 SVar:Rarity:Uncommon SVar:Picture:http://resources.wizards.com/magic/cards/ps/en-us/card26262.jpg SetInfo:PLS|Uncommon|http://magiccards.info/scans/en/ps/60.jpg diff --git a/res/cardsfolder/goblin_commando.txt b/res/cardsfolder/goblin_commando.txt new file mode 100644 index 00000000000..c37e1c3fa88 --- /dev/null +++ b/res/cardsfolder/goblin_commando.txt @@ -0,0 +1,10 @@ +Name:Goblin Commando +ManaCost:4 R +Types:Creature Goblin +Text:no text +PT:2/2 +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 2 damage to target creature. +SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Tgt$ TgtC | NumDmg$ 2 +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_commando.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/goretusk_firebeast.txt b/res/cardsfolder/goretusk_firebeast.txt index 1ef1621653f..04bb58565da 100644 --- a/res/cardsfolder/goretusk_firebeast.txt +++ b/res/cardsfolder/goretusk_firebeast.txt @@ -1,8 +1,10 @@ Name:Goretusk Firebeast ManaCost:5 R Types:Creature Beast -Text:When CARDNAME enters the battlefield, it deals 4 damage to target player. +Text:no text PT:2/2 +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 4 damage to target player. +SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Tgt$ TgtP | NumDmg$ 4 SVar:Rarity:Common SVar:Picture:http://resources.wizards.com/magic/cards/jud/en-us/card34917.jpg SetInfo:JUD|Common|http://magiccards.info/scans/en/ju/91.jpg diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java index 00c7e1e7a81..70611c3ebf7 100644 --- a/src/forge/CardFactory_Creatures.java +++ b/src/forge/CardFactory_Creatures.java @@ -1513,7 +1513,7 @@ public class CardFactory_Creatures { card.addComesIntoPlayCommand(intoPlay); }//*************** END ************ END ************************** - + /* //*************** START *********** START ************************** else if(cardName.equals("Goretusk Firebeast")) { final SpellAbility ability = new Ability(card, "0") { @@ -1539,7 +1539,7 @@ public class CardFactory_Creatures { }; card.addComesIntoPlayCommand(intoPlay); }//*************** END ************ END ************************** - + */ //*************** START *********** START ************************** else if(cardName.equals("Sylvan Messenger") @@ -1708,7 +1708,7 @@ public class CardFactory_Creatures { card.addComesIntoPlayCommand(intoPlay); }//*************** END ************ END ************************** - + /* //*************** START *********** START ************************** else if(cardName.equals("Flametongue Kavu")) { final CommandReturn getCreature = new CommandReturn() { @@ -1780,6 +1780,7 @@ public class CardFactory_Creatures { } }); }//*************** END ************ END ************************** + */ //*************** START *********** START ************************** else if(cardName.equals("Phylactery Lich") ) { @@ -2157,7 +2158,7 @@ public class CardFactory_Creatures { card.addDestroyCommand(destroy); }//*************** END ************ END ************************** - + /* //*************** START *********** START ************************** else if(cardName.equals("Fire Imp") || cardName.equals("Corrupt Eunuchs")) { final SpellAbility ability = new Ability(card, "0") { @@ -2208,7 +2209,7 @@ public class CardFactory_Creatures { } }); }//*************** END ************ END ************************** - + */ //*************** START *********** START ************************** else if(cardName.equals("Keening Banshee")) {