Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

[SWS] Fixed Sith Ravager, added missing import to Maintenance Hangar.

Browse source
This commit is contained in:
LevelX2 2016-09-28 00:05:13 +02:00
parent 05f6224f8b
commit 923f4a1bb5
2 changed files with 9 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Mage.Sets/src/mage/sets/starwars/MaintenanceHangar.java
View file

@ -51,6 +51,7 @@ import mage.filter.FilterCard;
import mage.filter.common.FilterCreatureCard;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.players.Player;

27
Mage.Sets/src/mage/sets/starwars/SithRavager.java
View file

@ -29,17 +29,17 @@ package mage.sets.starwars;
import java.util.UUID;
import mage.MageInt;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
import mage.abilities.keyword.HasteAbility;
import mage.abilities.keyword.TrampleAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.PhaseStep;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.DamagedPlayerEvent;
import mage.game.events.GameEvent;
/**
@ -49,7 +49,7 @@ import mage.game.events.GameEvent;
public class SithRavager extends CardImpl {
public SithRavager(UUID ownerId) {
super(ownerId, 122, "Sith Ravager", Rarity.NA/*COMMON*/, new CardType[]{CardType.CREATURE}, "{3}{R}");
super(ownerId, 122, "Sith Ravager", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{R}");
this.expansionSetCode = "SWS";
this.subtype.add("Human");
this.subtype.add("Sith");
@ -87,31 +87,20 @@ public class SithRavager extends CardImpl {
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.DAMAGED_PLAYER
|| event.getType() == GameEvent.EventType.LOST_LIFE;
return event.getType() == GameEvent.EventType.LOST_LIFE;
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
// ON DAMAGE TRIGGER TWICE
if (event.getType() == GameEvent.EventType.LOST_LIFE) {
game.informPlayers("LOST LIFE TRIGGER");
}
if (event.getType() == GameEvent.EventType.DAMAGED_PLAYER) {
game.informPlayers("DAMAGED PLAYER TRIGGER " + ((DamagedPlayerEvent) event).isCombatDamage());
}
if (event.getType() == GameEvent.EventType.DAMAGED_PLAYER) {
return !((DamagedPlayerEvent) event).isCombatDamage() && game.getOpponents(game.getControllerId(sourceId)).contains(event.getPlayerId());
} else if (event.getType() == GameEvent.EventType.LOST_LIFE) {
return game.getOpponents(game.getControllerId(sourceId)).contains(event.getPlayerId());
if (!game.getStep().getType().equals(PhaseStep.COMBAT_DAMAGE)) {
return game.getOpponents(game.getControllerId(getSourceId())).contains(event.getPlayerId());
}
return false;
}
@Override
public String getRule() {
return "<i>Hate</i> &mdash; Whenever an opponent loses life from a source other than combat damage, Sith Ravager gains haste and trample until end of turn";
return "<i>Hate</i> &mdash; Whenever an opponent loses life from a source other than combat damage, {this} gains haste and trample until end of turn.";
}
}