diff --git a/.gitattributes b/.gitattributes index 3c8ae8ae038..ffff8c6ce5d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -366,6 +366,7 @@ res/cardsfolder/aven_augur.txt -text svneol=native#text/plain res/cardsfolder/aven_brigadier.txt -text svneol=native#text/plain res/cardsfolder/aven_cloudchaser.txt -text svneol=native#text/plain res/cardsfolder/aven_envoy.txt -text svneol=native#text/plain +res/cardsfolder/aven_farseer.txt -text svneol=native#text/plain res/cardsfolder/aven_fateshaper.txt -text svneol=native#text/plain res/cardsfolder/aven_fisher.txt -text svneol=native#text/plain res/cardsfolder/aven_flock.txt -text svneol=native#text/plain @@ -2259,6 +2260,7 @@ res/cardsfolder/godless_shrine.txt -text svneol=native#text/plain res/cardsfolder/gods_eye_gate_to_the_reikai.txt -text svneol=native#text/plain res/cardsfolder/godsire.txt -text svneol=native#text/plain res/cardsfolder/godtoucher.txt -text svneol=native#text/plain +res/cardsfolder/godtracker_of_jund.txt -text svneol=native#text/plain res/cardsfolder/gold_myr.txt -text svneol=native#text/plain res/cardsfolder/golden_bear.txt -text svneol=native#text/plain res/cardsfolder/golden_urn.txt -text svneol=native#text/plain @@ -2400,6 +2402,7 @@ res/cardsfolder/hallowed_fountain.txt -text svneol=native#text/plain res/cardsfolder/hallowed_ground.txt -text svneol=native#text/plain res/cardsfolder/halo_hunter.txt -text svneol=native#text/plain res/cardsfolder/halt_order.txt -text svneol=native#text/plain +res/cardsfolder/hamletback_goliath.txt -text svneol=native#text/plain res/cardsfolder/hammer_mage.txt -text svneol=native#text/plain res/cardsfolder/hammer_of_bogardan.txt -text svneol=native#text/plain res/cardsfolder/hammerfist_giant.txt -text svneol=native#text/plain @@ -3002,6 +3005,7 @@ res/cardsfolder/kuldotha_forgemaster.txt -text svneol=native#text/plain res/cardsfolder/kuldotha_phoenix.txt -text svneol=native#text/plain res/cardsfolder/kuldotha_rebirth.txt -text svneol=native#text/plain res/cardsfolder/kulrath_knight.txt -text svneol=native#text/plain +res/cardsfolder/kurgadon.txt -text svneol=native#text/plain res/cardsfolder/kuros_taken.txt -text svneol=native#text/plain res/cardsfolder/kyren_glider.txt -text svneol=native#text/plain res/cardsfolder/kyren_negotiations.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/aven_farseer.txt b/res/cardsfolder/aven_farseer.txt new file mode 100644 index 00000000000..dfbb2e004b1 --- /dev/null +++ b/res/cardsfolder/aven_farseer.txt @@ -0,0 +1,11 @@ +Name:Aven Farseer +ManaCost:1 W +Types:Creature Bird Soldier +Text:no text +PT:1/1 +K:Flying +T:Mode$ TurnFaceUp | ValidCard$ Permanent | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever a permanent is turned face up, put a +1/+1 counter on CARDNAME. +SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/aven_farseer.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/dauthi_ghoul.txt b/res/cardsfolder/dauthi_ghoul.txt index 76979c0364b..b1be9550d33 100644 --- a/res/cardsfolder/dauthi_ghoul.txt +++ b/res/cardsfolder/dauthi_ghoul.txt @@ -3,8 +3,9 @@ ManaCost:1 B Types:Creature Dauthi Zombie Text:no text PT:1/1 -K:Whenever a creature with shadow is put into a graveyard from the battlefield, put a +1/+1 counter on Dauthi Ghoul. K:Shadow +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.withShadow | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature with shadow is put into a graveyard from the battlefield, put a +1/+1 counter on CARDNAME. +SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/dauthi_ghoul.jpg SetInfo:TMP|Uncommon|http://magiccards.info/scans/en/tp/15.jpg diff --git a/res/cardsfolder/godtracker_of_jund.txt b/res/cardsfolder/godtracker_of_jund.txt new file mode 100644 index 00000000000..89dc6cc7c07 --- /dev/null +++ b/res/cardsfolder/godtracker_of_jund.txt @@ -0,0 +1,10 @@ +Name:Godtracker of Jund +ManaCost:1 R G +Types:Creature Elf Shaman +Text:no text +PT:2/2 +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.powerGE5+Other+YouCtrl | Optional$ True | TriggerZones$ Battlefield | Execute$ TrigChange | TriggerDescription$ Whenever a creature with power 5 or greater enters the battlefield under your control, you may put a +1/+1 counter on Godtracker of Jund. +SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/godtracker_of_jund.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/hamletback_goliath.txt b/res/cardsfolder/hamletback_goliath.txt new file mode 100644 index 00000000000..71506f0cedc --- /dev/null +++ b/res/cardsfolder/hamletback_goliath.txt @@ -0,0 +1,11 @@ +Name:Hamletback Goliath +ManaCost:6 R +Types:Creature Giant Warrior +Text:no text +PT:6/6 +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Other | TriggerZones$ Battlefield | Optional$ True | Execute$ TrigPutCounter | TriggerDescription$ Whenever another creature enters the battlefield, you may put X +1/+1 counters on CARDNAME, where X is that creature's power. +SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ X +SVar:X:Triggered$CardPower +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/hamletback_goliath.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/kavu_monarch.txt b/res/cardsfolder/kavu_monarch.txt index 03c929e37d9..6d31a19da50 100644 --- a/res/cardsfolder/kavu_monarch.txt +++ b/res/cardsfolder/kavu_monarch.txt @@ -4,7 +4,7 @@ Types:Creature Kavu Text:no text PT:3/3 K:stPumpAll:Creature.Kavu:0/0/Trample:No Condition:Kavu creatures have trample. -T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Kavu.Other+YouCtrl | TriggerZones$ Battlefield | Execute$TrigPutCounter | TriggerDescription$ Whenever another Kavu enters the battlefield, put a +1/+1 counter on CARDNAME. +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Kavu.Other | TriggerZones$ Battlefield | Execute$TrigPutCounter | TriggerDescription$ Whenever another Kavu enters the battlefield, put a +1/+1 counter on CARDNAME. SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 SVar:PlayMain1:TRUE SVar:BuffedBy:Kavu diff --git a/res/cardsfolder/kurgadon.txt b/res/cardsfolder/kurgadon.txt new file mode 100644 index 00000000000..80c27ae203e --- /dev/null +++ b/res/cardsfolder/kurgadon.txt @@ -0,0 +1,10 @@ +Name:Kurgadon +ManaCost:4 G +Types:Creature Beast +Text:no text +PT:3/3 +T:Mode$ SpellCast | ValidCard$ Creature.cmcGE6+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you cast a creature spell with converted mana cost 6 or more, put three +1/+1 counters on CARDNAME. +SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 3 +SVar:Rarity:Uncommon +SVar:Picture:http://www.wizards.com/global/images/magic/general/kurgadon.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/mold_adder.txt b/res/cardsfolder/mold_adder.txt index 6ceaeb1aac7..30f7334af72 100644 --- a/res/cardsfolder/mold_adder.txt +++ b/res/cardsfolder/mold_adder.txt @@ -1,8 +1,10 @@ Name:Mold Adder ManaCost:G Types:Creature Fungus Snake -Text:Whenever an opponent casts a blue or black spell, you may put a +1/+1 counter on Mold Adder. +Text:no text PT:1/1 +T:Mode$ SpellCast | ValidCard$ Card.Blue+YouDontCtrl,Card.Black+YouDontCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever an opponent casts a blue or black spell, you may put a +1/+1 counter on CARDNAME. +SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/mold_adder.jpg SetInfo:M10|Uncommon|http://magiccards.info/scans/en/m10/194.jpg diff --git a/src/forge/AbilityFactory_CounterMagic.java b/src/forge/AbilityFactory_CounterMagic.java index 2fe740b8b5b..4091b50b4ec 100644 --- a/src/forge/AbilityFactory_CounterMagic.java +++ b/src/forge/AbilityFactory_CounterMagic.java @@ -36,9 +36,7 @@ public class AbilityFactory_CounterMagic { public AbilityFactory_CounterMagic(AbilityFactory newAF) { af = newAF; params = af.getMapParams(); - if (params.containsKey("Type")) { - targetType = params.get("Type"); - } + targetType = params.containsKey("Type") ? params.get("Type") : "Spell"; destination = params.containsKey("Destination") ? params.get("Destination") : "Graveyard"; if(params.containsKey("CounterValid")) { splitTargetingRestrictions = params.get("CounterValid").split(","); @@ -69,7 +67,7 @@ public class AbilityFactory_CounterMagic { public boolean canPlay() { // super takes care of AdditionalCosts //important to keep super.canPlay() first due to targeting hack in counterCanPlay - return super.canPlay() && counterCanPlay(af, this); + return super.canPlay() && counterCanPlay(af, this); } @Override diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index f0f8b20d871..35c9b0afc61 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -519,7 +519,7 @@ public class GameActionUtil { playCard_Primordial_Sage(c); playCard_Quirion_Dryad(c); //playCard_Enchantress_Draw(c); - playCard_Mold_Adder(c); + //playCard_Mold_Adder(c); playCard_Fable_of_Wolf_and_Owl(c); playCard_Kor_Firewalker(c); playCard_Curse_of_Wizardry(c); @@ -2730,7 +2730,8 @@ public class GameActionUtil { } }//Quirion - + + /* public static void playCard_Mold_Adder(Card c) { Player opponent = c.getController().getOpponent(); @@ -2764,7 +2765,7 @@ public class GameActionUtil { } } - }//Quirion + }//Quirion*/ public static void playCard_Fable_of_Wolf_and_Owl(Card c) { final Player controller = c.getController(); @@ -4531,8 +4532,6 @@ public class GameActionUtil { //if (AllZone.GameAction.isCardInPlay(c)){ if(c.getName().equals("Goblin Sharpshooter")) destroyCreature_Goblin_Sharpshooter(c, destroyed); else if(c.getName().equals("Dingus Staff")) destroyCreature_Dingus_Staff(c, destroyed); - else if(c.getName().equals("Dauthi Ghoul") && destroyed.getKeyword().contains("Shadow")) destroyCreature_Dauthi_Ghoul( - c, destroyed); else if(c.getName().equals("Prowess of the Fair") && destroyed.isType("Elf") && !destroyed.isToken() && !c.equals(destroyed) && destroyed.getController().equals(c.getController())) destroyCreature_Prowess_of_the_Fair(c, @@ -4570,7 +4569,8 @@ public class GameActionUtil { AllZone.Stack.add(ability); } - + + /* private static void destroyCreature_Dauthi_Ghoul(Card c, Card destroyed) { final Card crd = c; Ability ability = new Ability(c, "0") { @@ -4581,7 +4581,7 @@ public class GameActionUtil { }; if(AllZone.GameAction.isCardInPlay(c)) ability.setStackDescription("Dauthi Ghoul - gets a +1/+1 counter."); AllZone.Stack.add(ability); - } + }*/ private static void destroyCreature_Prowess_of_the_Fair(Card c, Card destroyed) { final Card crd = c;