external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Experimental: make getThisTurnEntered and getLastTurnEntered return information based on the latest state of the card instead of on the pristine state of the card. Fixes e.g. the interaction of Flesh Allergy and Awaken. Let me know if this breaks anything.

Browse Source
This commit is contained in:
Agetian
2015-09-25 18:31:26 +00:00
parent 267b15e8b2
commit c4d8edc05a
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
forge-game/src/main/java/forge/game/card/CardUtil.java
View File

@@ -155,7 +155,7 @@ public final class CardUtil {
* @return a CardCollection that matches the given criteria
*/
public static CardCollection getThisTurnEntered(final ZoneType to, final ZoneType from, final String valid, final Card src) {
return getThisTurnEntered(to, from, valid, src, false);
return getThisTurnEntered(to, from, valid, src, true);
}
/**
@@ -193,15 +193,29 @@ public final class CardUtil {
* @return a CardCollection that matches the given criteria
*/
public static CardCollection getLastTurnEntered(final ZoneType to, final ZoneType from, final String valid, final Card src) {
return getLastTurnEntered(to, from, valid, src, true);
}
/**
* getLastTurnEntered.
*
* @param to zone going to
* @param from zone coming from
* @param valid a isValid expression
* @param src a Card object
* @param checkLatestState a boolean, true if the latest state of the card as it left the original zone needs to be checked
* @return a CardCollection that matches the given criteria
*/
public static CardCollection getLastTurnEntered(final ZoneType to, final ZoneType from, final String valid, final Card src, final boolean checkLatestState) {
CardCollection res = new CardCollection();
final Game game = src.getGame();
if (to != ZoneType.Stack) {
for (Player p : game.getPlayers()) {
res.addAll(p.getZone(to).getCardsAddedLastTurn(from));
res.addAll(p.getZone(to).getCardsAddedLastTurn(from, checkLatestState));
}
}
else {
res.addAll(game.getStackZone().getCardsAddedLastTurn(from));
res.addAll(game.getStackZone().getCardsAddedLastTurn(from, checkLatestState));
}
res = CardLists.getValidCards(res, valid, src.getController(), src);
return res;