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

Stop counting phased out cards

Browse Source
This commit is contained in:
tool4EvEr
2021-06-03 06:22:15 +02:00
parent 83dc9b688b
commit c648a8ccbc
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -4662,6 +4662,8 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
getGame().getTriggerHandler().runTrigger(TriggerType.PhaseIn, runParams, false); getGame().getTriggerHandler().runTrigger(TriggerType.PhaseIn, runParams, false);
} }
game.updateLastStateForCard(this);
return true; return true;
} }

5
forge-game/src/main/java/forge/game/card/CardProperty.java
View File

@@ -47,6 +47,11 @@ public class CardProperty {
final Card lki = game.getChangeZoneLKIInfo(card); final Card lki = game.getChangeZoneLKIInfo(card);
final Player controller = lki.getController(); final Player controller = lki.getController();
// CR 702.25b if card is phased out it will not count unless specifically asked for
if (card.isPhasedOut() && !property.contains("phasedOut")) {
return false;
}
// by name can also have color names, so needs to happen before colors. // by name can also have color names, so needs to happen before colors.
if (property.startsWith("named")) { if (property.startsWith("named")) {
String name = TextUtil.fastReplace(property.substring(5), ";", ","); // for some legendary cards String name = TextUtil.fastReplace(property.substring(5), ";", ","); // for some legendary cards

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

@@ -253,6 +253,8 @@ public final class CardUtil {
newCopy.setCounters(Maps.newHashMap(in.getCounters())); newCopy.setCounters(Maps.newHashMap(in.getCounters()));
newCopy.setColor(in.determineColor().getColor()); newCopy.setColor(in.determineColor().getColor());
newCopy.setPhasedOut(in.isPhasedOut());
newCopy.setReceivedDamageFromThisTurn(in.getReceivedDamageFromThisTurn()); newCopy.setReceivedDamageFromThisTurn(in.getReceivedDamageFromThisTurn());
newCopy.setDamageHistory(in.getDamageHistory()); newCopy.setDamageHistory(in.getDamageHistory());
for (Card c : in.getBlockedThisTurn()) { for (Card c : in.getBlockedThisTurn()) {