Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct target filter in Scrap Trawler (#1556) 

* Correct target filter in Scrap Trawler

* Revert "Correct target filter in Scrap Trawler"

This reverts commit e6f2575c3a1903ba1db701bba906d393d98bf237.

* Add cmcLT to MagicCardFilterImpl and Scrap Trawler
master
Ada Joule 2018-04-14 10:48:20 +07:00 committed by Melvin Zhang
parent 2e89cfb7b8
commit baffa65bb5
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/Magarena/scripts/Scrap_Trawler.groovy
View File

@ -10,7 +10,7 @@
return new MagicEvent(
permanent,
new MagicTargetChoice(
card(MagicType.Artifact).cmcLEQ(cmc).from(MagicTargetType.Graveyard),
card(MagicType.Artifact).cmcLT(cmc).from(MagicTargetType.Graveyard),
"target artifact card in your graveyard with converted mana cost less than ${cmc}"
),
this,

9
src/magic/model/target/MagicCardFilterImpl.java
View File

@ -193,6 +193,15 @@ public abstract class MagicCardFilterImpl implements MagicTargetFilter<MagicCard
}
};
}
public MagicCardFilterImpl cmcLT(final int n) {
final MagicCardFilterImpl curr = this;
return new MagicCardFilterImpl() {
@Override
public boolean accept(final MagicSource source,final MagicPlayer player,final MagicCard target) {
return curr.accept(source, player, target) && target.getConvertedCost() < n;
}
};
}
/**
* @param n power limit