More Changes to Tetsuo Umezawa and Bartel Runeaxe

Additional testing to confirm functionality.
This commit is contained in:
JRHerlehy 2015-02-21 02:41:30 -08:00
parent 41e690c27c
commit d4f558c3da
2 changed files with 16 additions and 11 deletions

View file

@ -92,6 +92,11 @@ class BartelRuneaxeEffect extends ContinuousRuleModifiyingEffectImpl {
return new BartelRuneaxeEffect(this);
}
@Override
public boolean checksEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.TARGET;
}
@Override
public boolean apply(Game game, Ability source) {
return true;
@ -108,15 +113,12 @@ class BartelRuneaxeEffect extends ContinuousRuleModifiyingEffectImpl {
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
if (event.getType() == GameEvent.EventType.TARGET) {
Card targetCard = game.getCard(event.getTargetId());
StackObject stackObject = (StackObject) game.getStack().getStackObject(event.getSourceId());
if (targetCard != null && stackObject != null && event.getTargetId().equals(source.getSourceId())) {
if (stackObject != null && event.getTargetId().equals(source.getSourceId())) {
if (stackObject.getSubtype().contains("Aura")) {
return true;
}
}
}
return false;
}
}

View file

@ -113,6 +113,11 @@ class TetsuoUmezawaEffect extends ContinuousRuleModifiyingEffectImpl {
return new TetsuoUmezawaEffect(this);
}
@Override
public boolean checksEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.TARGET;
}
@Override
public boolean apply(Game game, Ability source) {
return true;
@ -129,15 +134,13 @@ class TetsuoUmezawaEffect extends ContinuousRuleModifiyingEffectImpl {
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
if (event.getType() == GameEvent.EventType.TARGET) {
Card targetCard = game.getCard(event.getTargetId());
//Card targetCard = game.getCard(event.getTargetId());
StackObject stackObject = (StackObject) game.getStack().getStackObject(event.getSourceId());
if (targetCard != null && stackObject != null && event.getTargetId().equals(source.getSourceId())) {
if (/*targetCard != null && */stackObject != null && event.getTargetId().equals(source.getSourceId())) {
if (stackObject.getSubtype().contains("Aura")) {
return true;
}
}
}
return false;
}
}