github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 19:19:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1875 from drmDev/master

Browse source 
Stinkdrinker bandit bug fix and test
This commit is contained in:
Derek M 2016-04-14 16:03:52 -04:00
commit 30a2d41450
2 changed files with 77 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Mage.Sets/src/mage/sets/morningtide/StinkdrinkerBandit.java
View file

@ -30,25 +30,34 @@ package mage.sets.morningtide;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.continuous.BoostTargetEffect;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.continuous.BoostSourceEffect;
import mage.abilities.effects.common.continuous.GainAbilityAllEffect;
import mage.abilities.keyword.ProwlAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.game.Game;
import mage.game.combat.CombatGroup;
import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType;
import mage.game.permanent.Permanent;
import mage.target.targetpointer.FixedTarget;
/**
*
* @author BursegSardaukar
*/
public class StinkdrinkerBandit extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Rogue");
static {
filter.add(new SubtypePredicate("Rogue"));
}
public StinkdrinkerBandit(UUID ownerId) {
super(ownerId, 80, "Stinkdrinker Bandit", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{B}");
@ -62,8 +71,10 @@ public class StinkdrinkerBandit extends CardImpl {
// Prowl {1}, {B} (You may cast this for its prowl cost if you dealt combat damage to a player this turn with a Goblin or Rogue.)
this.addAbility(new ProwlAbility(this, "{1}{B}"));
// Whenever a Rogue you control attacks and isn't blocked, it gets +2/+1 until end of turn.
this.addAbility(new StinkdrinkerBanditTriggeredAbility());
// Whenever a Rogue you control attacks and isn't blocked, it gets +2/+1 until end of turn.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(
new StinkdrinkerBanditTriggeredAbility(), Duration.WhileOnBattlefield,
filter, "Whenever a Rogue you control attacks and isn't blocked, it gets +2/+1 until end of turn")));
}
public StinkdrinkerBandit(final StinkdrinkerBandit card) {
@ -79,7 +90,7 @@ public class StinkdrinkerBandit extends CardImpl {
class StinkdrinkerBanditTriggeredAbility extends TriggeredAbilityImpl {
public StinkdrinkerBanditTriggeredAbility() {
super(Zone.BATTLEFIELD, new BoostTargetEffect(2, 1, Duration.EndOfTurn));
super(Zone.BATTLEFIELD, new BoostSourceEffect(2, 1, Duration.EndOfTurn));
}
public StinkdrinkerBanditTriggeredAbility(final StinkdrinkerBanditTriggeredAbility ability) {
@ -93,17 +104,18 @@ class StinkdrinkerBanditTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType().equals(EventType.UNBLOCKED_ATTACKER);
return event.getType().equals(EventType.DECLARED_BLOCKERS);
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
Permanent attackingCreature = game.getPermanent(event.getTargetId());
if (attackingCreature != null && attackingCreature.hasSubtype("Rogue")) {
for (Effect effect : getEffects()) {
effect.setTargetPointer(new FixedTarget(event.getTargetId()));
Permanent sourcePermanent = game.getPermanent(getSourceId());
if (sourcePermanent.isAttacking()) {
for (CombatGroup combatGroup: game.getCombat().getGroups()) {
if (combatGroup.getBlockers().isEmpty() && combatGroup.getAttackers().contains(getSourceId())) {
return true;
}
}
return true;
}
return false;
}

53
Mage.Tests/src/test/java/org/mage/test/cards/single/StinkdrinkerBanditTest.java Normal file
View file

@ -0,0 +1,53 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package org.mage.test.cards.single;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
/**
*
* @author escplan9 (Derek Monturo - dmontur1 at gmail dot com)
*/
public class StinkdrinkerBanditTest extends CardTestPlayerBase {
/**
* Reported bug: Stinkdrinker Bandit is incorrectly giving the +2/+1 bonus even to Rogues that do get blocked.
*/
@Test
public void unblockedRoguesTest() {
addCard(Zone.BATTLEFIELD, playerA, "Agent of Horizons"); // 3/2 rogue
addCard(Zone.BATTLEFIELD, playerA, "Amphin Cutthroat"); // 2/4 rogue
addCard(Zone.BATTLEFIELD, playerA, "Bronze Sable"); // 2/1
// Whenever a Rogue you control attacks and isn't blocked, it gets +2/+1 until end of turn.
addCard(Zone.BATTLEFIELD, playerA, "Stinkdrinker Bandit"); // 2/1 rogue
addCard(Zone.BATTLEFIELD, playerB, "Wall of Omens"); // 0/4
attack(1, playerA, "Agent of Horizons");
attack(1, playerA, "Amphin Cutthroat");
attack(1, playerA, "Stinkdrinker Bandit");
attack(1, playerA, "Bronze Sable");
block(1, playerB, "Wall of Omens", "Stinkdrinker Bandit");
setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
execute();
assertPowerToughness(playerA, "Stinkdrinker Bandit", 2, 1); // blocked, so stays 2/1
assertPowerToughness(playerA, "Agent of Horizons", 5, 3); // 3/2 + 2/1
assertPowerToughness(playerA, "Amphin Cutthroat", 4, 5); // 2/4 + 2/1
assertPowerToughness(playerA, "Bronze Sable", 2, 1);
assertPermanentCount(playerB, "Wall of Omens", 1);
assertPowerToughness(playerB, "Wall of Omens", 0, 4);
assertLife(playerA, 20);
assertLife(playerB, 9); // Agent pumped to 5, Amphin pumped to 4, Sable stays at 2 power (11 damage)
}
}