github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-11 19:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed a count in Battlefield, changed loops to streams

Browse source
This commit is contained in:
ingmargoudt 2017-03-06 12:25:14 +01:00
parent 26fc9161d4
commit 90c6a69335
2 changed files with 48 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Mage/src/main/java/mage/abilities/condition/common/OpponentLostLifeCondition.java
View file

@ -28,6 +28,7 @@
package mage.abilities.condition.common;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.condition.Condition;
import mage.abilities.condition.IntCompareCondition;
@ -50,7 +51,7 @@ public class OpponentLostLifeCondition extends IntCompareCondition {
int maxLostLive = 0;
PlayerLostLifeWatcher watcher = (PlayerLostLifeWatcher) game.getState().getWatchers().get("PlayerLostLifeWatcher");
if (watcher != null) {
for (UUID opponentId: game.getOpponents(source.getControllerId())) {
for (UUID opponentId : game.getOpponents(source.getControllerId())) {
int lostLive = watcher.getLiveLost(opponentId);
if (lostLive > maxLostLive) {
maxLostLive = lostLive;
@ -63,9 +64,9 @@ public class OpponentLostLifeCondition extends IntCompareCondition {
@Override
public String toString() {
StringBuilder sb = new StringBuilder("if an opponent lost ");
switch(type) {
switch (type) {
case GreaterThan:
sb.append(value+1).append(" or more life this turn ");
sb.append(value + 1).append(" or more life this turn ");
break;
case Equal:
sb.append(value).append(" life this turn ");

105
Mage/src/main/java/mage/game/permanent/Battlefield.java
View file

@ -134,7 +134,7 @@ public class Battlefield implements Serializable {
return field.values()
.stream()
.filter(permanent -> filter.match(permanent, game)
&& permanent.isPhasedIn()).count() == num;
&& permanent.isPhasedIn()).count() >= num;
}
@ -150,16 +150,13 @@ public class Battlefield implements Serializable {
* @return boolean
*/
public boolean contains(FilterPermanent filter, UUID controllerId, int num, Game game) {
int count = 0;
for (Permanent permanent : field.values()) {
if (permanent.getControllerId().equals(controllerId) && filter.match(permanent, game) && permanent.isPhasedIn()) {
count++;
if (num == count) {
return true;
}
}
}
return false;
return field.values()
.stream()
.filter(permanent -> permanent.getControllerId().equals(controllerId)
&& filter.match(permanent, game)
&& permanent.isPhasedIn())
.count() >= num;
}
/**
@ -174,24 +171,19 @@ public class Battlefield implements Serializable {
* @return boolean
*/
public boolean contains(FilterPermanent filter, UUID sourcePlayerId, Game game, int num) {
int count = 0;
if (game.getRangeOfInfluence() == RangeOfInfluence.ALL) {
return field.values().stream()
.filter(permanent -> filter.match(permanent, null, sourcePlayerId, game)
&& permanent.isPhasedIn()).count() == num;
&& permanent.isPhasedIn()).count() >= num;
} else {
Set<UUID> range = game.getPlayer(sourcePlayerId).getInRange();
for (Permanent permanent : field.values()) {
if (range.contains(permanent.getControllerId()) && filter.match(permanent, null, sourcePlayerId, game) && permanent.isPhasedIn()) {
count++;
if (num == count) {
return true;
}
}
}
return field.values().stream()
.filter(permanent -> range.contains(permanent.getControllerId())
&& filter.match(permanent, null, sourcePlayerId, game)
&& permanent.isPhasedIn())
.count() >= num;
}
return false;
}
public void addPermanent(Permanent permanent) {
@ -262,7 +254,10 @@ public class Battlefield implements Serializable {
* @see Permanent
*/
public List<Permanent> getAllActivePermanents(CardType type) {
return field.values().stream().filter(perm -> perm.isPhasedIn() && perm.getCardType().contains(type)).collect(Collectors.toList());
return field.values()
.stream()
.filter(perm -> perm.isPhasedIn() && perm.getCardType().contains(type))
.collect(Collectors.toList());
}
/**
@ -275,13 +270,10 @@ public class Battlefield implements Serializable {
* @see Permanent
*/
public List<Permanent> getAllActivePermanents(FilterPermanent filter, Game game) {
List<Permanent> active = new ArrayList<>();
for (Permanent perm : field.values()) {
if (perm.isPhasedIn() && filter.match(perm, game)) {
active.add(perm);
}
}
return active;
return field.values()
.stream()
.filter(perm -> perm.isPhasedIn() && filter.match(perm, game))
.collect(Collectors.toList());
}
/**
@ -295,13 +287,10 @@ public class Battlefield implements Serializable {
* @see Permanent
*/
public List<Permanent> getAllActivePermanents(FilterPermanent filter, UUID controllerId, Game game) {
List<Permanent> active = new ArrayList<>();
for (Permanent perm : field.values()) {
if (perm.isPhasedIn() && perm.getControllerId().equals(controllerId) && filter.match(perm, game)) {
active.add(perm);
}
}
return active;
return field.values()
.stream()
.filter(perm -> perm.isPhasedIn() && perm.getControllerId().equals(controllerId) && filter.match(perm, game))
.collect(Collectors.toList());
}
/**
@ -332,18 +321,16 @@ public class Battlefield implements Serializable {
public List<Permanent> getActivePermanents(FilterPermanent filter, UUID sourcePlayerId, UUID sourceId, Game game) {
List<Permanent> active = new ArrayList<>();
if (game.getRangeOfInfluence() == RangeOfInfluence.ALL) {
for (Permanent perm : field.values()) {
if (perm.isPhasedIn() && filter.match(perm, sourceId, sourcePlayerId, game)) {
active.add(perm);
}
}
active = field.values()
.stream()
.filter(perm -> perm.isPhasedIn() && filter.match(perm, sourceId, sourcePlayerId, game))
.collect(Collectors.toList());
} else {
Set<UUID> range = game.getPlayer(sourcePlayerId).getInRange();
for (Permanent perm : field.values()) {
if (perm.isPhasedIn() && range.contains(perm.getControllerId()) && filter.match(perm, sourceId, sourcePlayerId, game)) {
active.add(perm);
}
}
active = field.values()
.stream()
.filter(perm -> perm.isPhasedIn() && range.contains(perm.getControllerId())
&& filter.match(perm, sourceId, sourcePlayerId, game)).collect(Collectors.toList());
}
return active;
}
@ -372,23 +359,19 @@ public class Battlefield implements Serializable {
}
public List<Permanent> getPhasedIn(UUID controllerId) {
List<Permanent> phasedIn = new ArrayList<>();
for (Permanent perm : field.values()) {
if (perm.getAbilities().containsKey(PhasingAbility.getInstance().getId()) && perm.isPhasedIn() && perm.getControllerId().equals(controllerId)) {
phasedIn.add(perm);
}
}
return phasedIn;
return field.values()
.stream()
.filter(perm -> perm.getAbilities().containsKey(PhasingAbility.getInstance().getId())
&& perm.isPhasedIn() &&
perm.getControllerId().equals(controllerId))
.collect(Collectors.toList());
}
public List<Permanent> getPhasedOut(UUID controllerId) {
List<Permanent> phasedOut = new ArrayList<>();
for (Permanent perm : field.values()) {
if (!perm.isPhasedIn() && perm.getControllerId().equals(controllerId)) {
phasedOut.add(perm);
}
}
return phasedOut;
return field.values()
.stream()
.filter(perm -> !perm.isPhasedIn() && perm.getControllerId().equals(controllerId))
.collect(Collectors.toList());
}
public void resetPermanentsControl() {