diff --git a/.gitattributes b/.gitattributes index 5e3789babf0..36b75afc474 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4367,6 +4367,7 @@ res/cardsfolder/vengeful_firebrand.txt -text svneol=native#text/plain res/cardsfolder/vengevine.txt -text svneol=native#text/plain res/cardsfolder/venomous_dragonfly.txt -text svneol=native#text/plain res/cardsfolder/venomous_vines.txt -text svneol=native#text/plain +res/cardsfolder/venomspout_brackus.txt -text svneol=native#text/plain res/cardsfolder/venser_the_sojourner.txt -text svneol=native#text/plain res/cardsfolder/vensers_sliver.txt -text svneol=native#text/plain res/cardsfolder/vent_sentinel.txt -text svneol=native#text/plain @@ -4513,6 +4514,7 @@ res/cardsfolder/war_chariot.txt -text svneol=native#text/plain res/cardsfolder/war_mammoth.txt -text svneol=native#text/plain res/cardsfolder/war_priest_of_thune.txt -text svneol=native#text/plain res/cardsfolder/war_spike_changeling.txt -text svneol=native#text/plain +res/cardsfolder/war_torch_goblin.txt -text svneol=native#text/plain res/cardsfolder/warlords_axe.txt -text svneol=native#text/plain res/cardsfolder/warmth.txt -text svneol=native#text/plain res/cardsfolder/warpath_ghoul.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/femeref_archers.txt b/res/cardsfolder/femeref_archers.txt index 38bec40d821..c1ff9afd71c 100644 --- a/res/cardsfolder/femeref_archers.txt +++ b/res/cardsfolder/femeref_archers.txt @@ -3,6 +3,8 @@ ManaCost:2 G Types:Creature Human Archer Text:no text PT:2/2 +K:abDamageTgtV T:4:Creature.attacking+withFlying:Femeref Archers deals 4 damage to target attacking creature with flying. +SVar:RemAIDeck:True SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/femeref_archers.jpg End diff --git a/res/cardsfolder/lady_caleria.txt b/res/cardsfolder/lady_caleria.txt index 0cfb02781ad..3d0d96feebb 100644 --- a/res/cardsfolder/lady_caleria.txt +++ b/res/cardsfolder/lady_caleria.txt @@ -3,6 +3,8 @@ ManaCost:3 G G W W Types:Legendary Creature Human Archer Text:no text PT:3/6 +K:abDamageTgtV T:3:Creature.attacking,Creature.blocking:Lady Caleria deals 3 damage to target attacking or blocking creature. +SVar:RemAIDeck:True SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/lady_caleria.jpg End diff --git a/res/cardsfolder/nimble_mongoose.txt b/res/cardsfolder/nimble_mongoose.txt index 31e21158e2d..86960e940c7 100644 --- a/res/cardsfolder/nimble_mongoose.txt +++ b/res/cardsfolder/nimble_mongoose.txt @@ -1,9 +1,10 @@ Name:Nimble Mongoose ManaCost:G Types:Creature Mongoose -Text:Threshold - Nimble Mongoose gets +2/+2 as long as seven or more cards are in your graveyard. +Text:no text PT:1/1 K:Shroud +K:stPumpSelf:Creature:2/2:Threshold:Threshold - Nimble Mongoose gets +2/+2 as long as seven or more cards are in your graveyard. SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/nimble_mongoose.jpg End diff --git a/res/cardsfolder/tetsuo_umezawa.txt b/res/cardsfolder/tetsuo_umezawa.txt index 65f3efc2561..22887b1d6cd 100644 --- a/res/cardsfolder/tetsuo_umezawa.txt +++ b/res/cardsfolder/tetsuo_umezawa.txt @@ -4,6 +4,7 @@ Types:Legendary Creature Human Archer Text:no text PT:3/3 K:CARDNAME can't be the target of Aura spells. +K:abDestroyTgtV U B B R T:Creature.tapped,Creature.blocking:Destroy target tapped or blocking creature. SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/tetsuo_umezawa.jpg End diff --git a/res/cardsfolder/tor_wauki.txt b/res/cardsfolder/tor_wauki.txt index f4b0753bce4..2aceac86084 100644 --- a/res/cardsfolder/tor_wauki.txt +++ b/res/cardsfolder/tor_wauki.txt @@ -3,6 +3,8 @@ ManaCost:2 B B R Types:Legendary Creature Human Archer Text:no text PT:3/3 +K:abDamageTgtV T:2:Creature.attacking,Creature.blocking:Tor Wauki deals 2 damage to target attacking or blocking creature. +SVar:RemAIDeck:True SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/tor_wauki.jpg End diff --git a/res/cardsfolder/venomspout_brackus.txt b/res/cardsfolder/venomspout_brackus.txt new file mode 100644 index 00000000000..239345d0bb1 --- /dev/null +++ b/res/cardsfolder/venomspout_brackus.txt @@ -0,0 +1,11 @@ +Name:Venomspout Brackus +ManaCost:6 G +Types:Creature Beast +Text:no text +PT:5/5 +K:abDamageTgtV 1 G T:5:Creature.attacking+withFlying,Creature.blocking+withFlying:Venomspout Brackus deals 5 damage to target attacking or blocking creature with flying. +K:Morph:3 G G +SVar:RemAIDeck:True +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/venomspout_brackus.jpg +End diff --git a/res/cardsfolder/war_torch_goblin.txt b/res/cardsfolder/war_torch_goblin.txt new file mode 100644 index 00000000000..af384fa6339 --- /dev/null +++ b/res/cardsfolder/war_torch_goblin.txt @@ -0,0 +1,10 @@ +Name:War-Torch Goblin +ManaCost:R +Types:Creature Goblin Warrior +Text:no text +PT:1/1 +K:abDamageTgtV Sac<1/CARDNAME>:2:Creature.blocking:War-Torch Goblin deals 2 damage to target blocking creature. +SVar:RemAIDeck:True +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/war_torch_goblin.jpg +End diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java index 8b80783d731..49de3b61bad 100644 --- a/src/forge/CardFactory_Creatures.java +++ b/src/forge/CardFactory_Creatures.java @@ -6370,7 +6370,7 @@ public class CardFactory_Creatures { ability.setBeforePayMana(CardFactoryUtil.input_targetCreature_NoCost_TapAbility_NoTargetSelf(ability)); }//*************** END ************ END ************************** - + /* converted to keyword //*************** START *********** START ************************** else if(cardName.equals("Tetsuo Umezawa")) { //tap ability - no cost - target creature @@ -6428,7 +6428,7 @@ public class CardFactory_Creatures { ability.setBeforePayMana(target); }//*************** END ************ END ************************** - + //*************** START *********** START ************************** else if(cardName.equals("Tor Wauki")) { //tap ability - no cost - target creature @@ -6558,7 +6558,7 @@ public class CardFactory_Creatures { ability.setBeforePayMana(target); }//*************** END ************ END ************************** - + //*************** START *********** START ************************** else if(cardName.equals("Femeref Archers")) { //tap ability - no cost - target creature @@ -6621,7 +6621,7 @@ public class CardFactory_Creatures { ability.setBeforePayMana(target); }//*************** END ************ END ************************** - + */ //*************** START *********** START ************************** else if(cardName.equals("Adarkar Valkyrie")) { diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index 302bd641b58..4bd24bfd7a8 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -14878,6 +14878,7 @@ public class GameActionUtil { }; //Liu_Bei + /* public static Command Nimble_Mongoose = new Command() { private static final long serialVersionUID = -8155356899650795833L; @@ -14918,7 +14919,8 @@ public class GameActionUtil { } }; //Nimble_Mongoose - + */ + public static Command Mystic_Enforcer = new Command() { private static final long serialVersionUID = 4569052031336290843L; @@ -20731,7 +20733,7 @@ public class GameActionUtil { commands.put("Briarberry_Cohort", Briarberry_Cohort); commands.put("Crabapple_Cohort", Crabapple_Cohort); commands.put("Mudbrawler_Cohort", Mudbrawler_Cohort); - commands.put("Nimble_Mongoose", Nimble_Mongoose); + //commands.put("Nimble_Mongoose", Nimble_Mongoose); commands.put("Werebear", Werebear); commands.put("Divinity_of_Pride", Divinity_of_Pride); commands.put("Serra_Ascendant", Serra_Ascendant); diff --git a/src/forge/StaticEffects.java b/src/forge/StaticEffects.java index 7a320ff883f..d3d4235c4b0 100644 --- a/src/forge/StaticEffects.java +++ b/src/forge/StaticEffects.java @@ -102,7 +102,7 @@ public class StaticEffects cardToEffectsList.put("Crabapple Cohort", new String[] {"Crabapple_Cohort"}); cardToEffectsList.put("Mudbrawler Cohort", new String[] {"Mudbrawler_Cohort"}); cardToEffectsList.put("Mystic Enforcer", new String[] {"Mystic_Enforcer"}); - cardToEffectsList.put("Nimble Mongoose", new String[] {"Nimble_Mongoose"}); + //cardToEffectsList.put("Nimble Mongoose", new String[] {"Nimble_Mongoose"}); cardToEffectsList.put("Werebear", new String[] {"Werebear"}); cardToEffectsList.put("Divinity of Pride", new String[] {"Divinity_of_Pride"}); cardToEffectsList.put("Serra Ascendant", new String[] {"Serra_Ascendant"});