External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-25 12:49:39 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Toxin Sliver - Fixed not corretly working triggerd ability.

Browse source
This commit is contained in:
Ludwig.Hirth 2017-01-19 16:59:58 +01:00
parent 25e0dfa699
commit a3659826a8
4 changed files with 100 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

55
Mage.Sets/src/mage/cards/q/QuestForTheGemblades.java
View file

@ -28,7 +28,7 @@
package mage.cards.q;
import java.util.UUID;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.common.DealsDamageToACreatureAllTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.RemoveCountersSourceCost;
import mage.abilities.costs.common.SacrificeSourceCost;
@ -37,13 +37,10 @@ import mage.abilities.effects.common.counter.AddCountersTargetEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SetTargetPointer;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.game.Game;
import mage.game.events.DamagedCreatureEvent;
import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType;
import mage.game.permanent.Permanent;
import mage.filter.StaticFilters;
import mage.target.common.TargetCreaturePermanent;
/**
@ -57,7 +54,11 @@ public class QuestForTheGemblades extends CardImpl {
// Whenever a creature you control deals combat damage to a creature, you may put a quest counter on Quest for the Gemblades.
this.addAbility(new QuestForTheGembladesTriggeredAbility());
this.addAbility(new DealsDamageToACreatureAllTriggeredAbility(
new AddCountersSourceEffect(CounterType.QUEST.createInstance()), false,
StaticFilters.FILTER_CONTROLLED_A_CREATURE,
SetTargetPointer.PERMANENT, true));
// Remove a quest counter from Quest for the Gemblades and sacrifice it: Put four +1/+1 counters on target creature.
SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
new AddCountersTargetEffect(CounterType.P1P1.createInstance(4)),
@ -76,43 +77,3 @@ public class QuestForTheGemblades extends CardImpl {
return new QuestForTheGemblades(this);
}
}
class QuestForTheGembladesTriggeredAbility extends TriggeredAbilityImpl {
public QuestForTheGembladesTriggeredAbility() {
super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.QUEST.createInstance()), true);
}
public QuestForTheGembladesTriggeredAbility(final QuestForTheGembladesTriggeredAbility ability) {
super(ability);
}
@Override
public QuestForTheGembladesTriggeredAbility copy() {
return new QuestForTheGembladesTriggeredAbility(this);
}
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == EventType.DAMAGED_CREATURE;
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (((DamagedCreatureEvent) event).isCombatDamage()) {
Permanent permanent = game.getPermanent(event.getSourceId());
if (permanent == null) {
permanent = (Permanent) game.getLastKnownInformation(event.getSourceId(), Zone.BATTLEFIELD);
}
if (permanent != null && permanent.getCardType().contains(CardType.CREATURE) && permanent.getControllerId().equals(this.getControllerId())) {
return true;
}
}
return false;
}
@Override
public String getRule() {
return "Whenever a creature you control deals combat damage to a creature, " + super.getRule();
}
}

61
Mage.Sets/src/mage/cards/t/ToxinSliver.java
View file

@ -29,18 +29,13 @@ package mage.cards.t;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.common.DealsDamageToACreatureTriggeredAbility;
import mage.abilities.effects.Effect;
import mage.abilities.common.DealsDamageToACreatureAllTriggeredAbility;
import mage.abilities.effects.common.DestroyTargetEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType;
import mage.target.targetpointer.FixedTarget;
import mage.constants.SetTargetPointer;
import mage.filter.common.FilterCreaturePermanent;
/**
*
@ -56,7 +51,10 @@ public class ToxinSliver extends CardImpl {
this.toughness = new MageInt(3);
// Whenever a Sliver deals combat damage to a creature, destroy that creature. It can't be regenerated.
this.addAbility(new DealsDamageToACreatureTriggeredAbility(new DestroyTargetEffect(true), true, false, true));
this.addAbility(new DealsDamageToACreatureAllTriggeredAbility(
new DestroyTargetEffect(true), false,
new FilterCreaturePermanent("Sliver","a Sliver"),
SetTargetPointer.PERMANENT, true));
}
@ -69,48 +67,3 @@ public class ToxinSliver extends CardImpl {
return new ToxinSliver(this);
}
}
class DealsDamageTriggeredAbility extends TriggeredAbilityImpl {
private boolean setTargetPointer;
public DealsDamageTriggeredAbility(Effect effect, boolean optional, boolean setTargetPointer) {
super(Zone.BATTLEFIELD, effect, optional);
this.setTargetPointer = setTargetPointer;
}
public DealsDamageTriggeredAbility(final DealsDamageTriggeredAbility ability) {
super(ability);
this.setTargetPointer = ability.setTargetPointer;
}
@Override
public DealsDamageTriggeredAbility copy() {
return new DealsDamageTriggeredAbility(this);
}
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == EventType.DAMAGED_CREATURE;
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (game.getPermanent(event.getSourceId()).hasSubtype("Sliver", game)) {
if (setTargetPointer) {
for (Effect effect : this.getEffects()) {
effect.setTargetPointer(new FixedTarget(game.getControllerId(event.getTargetId())));
effect.setValue("damage", event.getAmount());
}
}
return true;
}
return false;
}
@Override
public String getRule() {
return "Whenever a Sliver deals damage to a creature" + super.getRule();
}
}