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

added getNrOfPermanents that takes in a filter

master
melvin 2013-06-22 18:09:21 +08:00
parent df6c537707
commit 1b3a54a480
2 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/magic/model/MagicPlayer.java
View File

@ -377,26 +377,6 @@ public class MagicPlayer implements MagicTarget {
return count;
}
public int getNrOfPermanentsWithType(final MagicType type) {
int count=0;
for (final MagicPermanent permanent : permanents) {
if (permanent.hasType(type)) {
count++;
}
}
return count;
}
public int getNrOfPermanentsWithSubType(final MagicSubType subType) {
int count=0;
for (final MagicPermanent permanent : permanents) {
if (permanent.hasSubType(subType)) {
count++;
}
}
return count;
}
public void setBuilderCost(final MagicBuilderManaCost builderCost) {
this.builderCost=builderCost;
}
@ -440,7 +420,38 @@ public class MagicPlayer implements MagicTarget {
return count;
}
public boolean controlsPermanent(final MagicTargetFilter filter) {
public int getNrOfPermanentsWithType(final MagicType type) {
int count=0;
for (final MagicPermanent permanent : permanents) {
if (permanent.hasType(type)) {
count++;
}
}
return count;
}
public int getNrOfPermanentsWithSubType(final MagicSubType subType) {
int count=0;
for (final MagicPermanent permanent : permanents) {
if (permanent.hasSubType(subType)) {
count++;
}
}
return count;
}
public int getNrOfPermanents(final MagicTargetFilter<MagicPermanent> filter) {
int count = 0;
for (final MagicPermanent permanent : permanents) {
if (filter.accept(currGame, this, permanent)) {
count++;
}
}
return count;
}
public boolean controlsPermanent(final MagicTargetFilter<MagicPermanent> filter) {
for (final MagicPermanent permanent : permanents) {
if (filter.accept(currGame, this, permanent)) {
return true;

2
src/magic/model/target/MagicTargetFilter.java
View File

@ -313,6 +313,8 @@ public interface MagicTargetFilter<T extends MagicTarget> {
MagicPermanentFilterImpl TARGET_BLACK_PERMANENT_YOU_CONTROL = Factory.permanent(MagicColor.Black, Control.You);
MagicPermanentFilterImpl TARGET_BLUE_PERMANENT_YOU_CONTROL = Factory.permanent(MagicColor.Blue, Control.You);
MagicPermanentFilterImpl TARGET_GREEN_PERMANENT_YOU_CONTROL = Factory.permanent(MagicColor.Green, Control.You);
MagicPermanentFilterImpl TARGET_PERMANENT = new MagicPermanentFilterImpl() {