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

fix Palladia Mors, the Ruiner

Browse Source 
closes #743
This commit is contained in:
Anthony Calosa
2021-01-28 09:16:48 +08:00
parent 135685910f
commit 8352cc0cf6
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -151,6 +151,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
private Map<Card, Integer> dealtDamageToThisTurn = Maps.newTreeMap();
private Map<String, Integer> dealtDamageToPlayerThisTurn = Maps.newTreeMap();
private final Map<Card, Integer> assignedDamageMap = Maps.newTreeMap();
private boolean hasdealtDamagetoAny = false;
private boolean isCommander = false;
private boolean canMoveToCommandZone = false;
@@ -4748,6 +4749,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
currentDamage = dealtDamageToThisTurn.get(c);
}
dealtDamageToThisTurn.put(c, damage+currentDamage);
hasdealtDamagetoAny = true;
}
public final void resetDealtDamageToThisTurn() {
dealtDamageToThisTurn.clear();
@@ -4765,6 +4767,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
currentDamage = dealtDamageToPlayerThisTurn.get(player);
}
dealtDamageToPlayerThisTurn.put(player, damage+currentDamage);
hasdealtDamagetoAny = true;
}
public final void resetDealtDamageToPlayerThisTurn() {
dealtDamageToPlayerThisTurn.clear();
@@ -5437,6 +5440,9 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
return sum;
}
public boolean getHasdealtDamagetoAny() {
return hasdealtDamagetoAny;
}
public boolean hasProtectionFrom(final Card source) {
return hasProtectionFrom(source, false, false);

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

@@ -1213,6 +1213,8 @@ public class CardProperty {
if (card.getTotalDamageDoneBy() == 0) {
return false;
}
} else if (property.startsWith("dealtDamagetoAny")) {
return card.getHasdealtDamagetoAny();
} else if (property.startsWith("attackedThisTurn")) {
if (!card.getDamageHistory().getCreatureAttackedThisTurn()) {
return false;