diff --git a/res/cardsfolder/gwafa_hazid_profiteer.txt b/res/cardsfolder/gwafa_hazid_profiteer.txt index 962d29d78cd..65bc4681a12 100644 --- a/res/cardsfolder/gwafa_hazid_profiteer.txt +++ b/res/cardsfolder/gwafa_hazid_profiteer.txt @@ -1,8 +1,11 @@ Name:Gwafa Hazid, Profiteer ManaCost:1 W U Types:Legendary Creature Human Rogue -Text:Creatures with bribery counters on them can't attack or block. +Text:no text +#Creatures with bribery counters on them can't attack or block. PT:2/2 +A:AB$PutCounter|Cost$W U T|ValidTgts$Creature.YouDontCtrl|TgtPrompt$Select target creature you don't control.|CounterType$BRIBERY|CounterNum$1|SpellDescription$Put a bribery counter on target creature you don't control. Its controller draws a card.|SubAbility$ TgtCtrlrDraw/1 +K:stPumpAll:Creature.countersGE1BRIBERY:0/0/HIDDEN CARDNAME can't attack or block.:No Condition:Creatures with bribery counters on them can't attack or block. SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/gwafa_hazid_profiteer.jpg SetInfo:CFX|Rare|http://magiccards.info/scans/en/cfx/110.jpg diff --git a/src/forge/AbilityFactory_Counters.java b/src/forge/AbilityFactory_Counters.java index 6c067e3595c..0cc6286d59c 100644 --- a/src/forge/AbilityFactory_Counters.java +++ b/src/forge/AbilityFactory_Counters.java @@ -373,7 +373,7 @@ public class AbilityFactory_Counters { abSub.resolve(); } else - CardFactoryUtil.doDrawBack(DrawBack, counterAmount, card.getController(), card.getController().getOpponent(), card.getController(), card, null, sa); + CardFactoryUtil.doDrawBack(DrawBack, counterAmount, card.getController(), card.getController().getOpponent(), card.getController(), card, tgtCards.get(0), sa); } } diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java index 517c0ace7dc..b06006313ba 100644 --- a/src/forge/CardFactory_Creatures.java +++ b/src/forge/CardFactory_Creatures.java @@ -16354,7 +16354,7 @@ public class CardFactory_Creatures { } //*************** END ************ END ************************** - + /* //*************** START *********** START ************************** else if(cardName.equals("Gwafa Hazid, Profiteer")) { final Ability_Tap ability = new Ability_Tap(card, "W U") { @@ -16421,6 +16421,7 @@ public class CardFactory_Creatures { }); }//*************** END ************ END ************************** + */ //*************** START *********** START ************************** diff --git a/src/forge/CombatUtil.java b/src/forge/CombatUtil.java index 8eb74298d3d..c44c1543519 100644 --- a/src/forge/CombatUtil.java +++ b/src/forge/CombatUtil.java @@ -38,9 +38,9 @@ public class CombatUtil { if(blocker.getKeyword().contains("CARDNAME can't block.") || blocker.getKeyword().contains("CARDNAME can't attack or block.")) return false; - + /* if (blocker.getCounters(Counters.BRIBERY) > 0 && AllZoneUtil.isCardInPlay("Gwafa Hazid, Profiteer")) - return false; + return false; */ CardList kulrath = AllZoneUtil.getCardsInPlay("Kulrath Knight"); if (kulrath.size() > 0) @@ -426,8 +426,9 @@ public class CombatUtil { return false; } + /* if (c.getCounters(Counters.BRIBERY) > 0 && AllZoneUtil.isCardInPlay("Gwafa Hazid, Profiteer")) - return false; + return false; */ if (AllZoneUtil.isCardInPlay("Ensnaring Bridge")) { int limit = Integer.MAX_VALUE;