github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-24 11:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

More Changes to Tetsuo Umezawa and Bartel Runeaxe

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Mage.Sets/src/mage/sets/legends/BartelRuneaxe.java
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;
}
}

17
Mage.Sets/src/mage/sets/legends/TetsuoUmezawa.java
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,13 +134,11 @@ 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());
StackObject stackObject = (StackObject) game.getStack().getStackObject(event.getSourceId());
if (targetCard != null && stackObject != null && event.getTargetId().equals(source.getSourceId())) {
if (stackObject.getSubtype().contains("Aura")) {
return true;
}
//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.getSubtype().contains("Aura")) {
return true;
}
}
return false;