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

Merge pull request #8 from Northmoc/snc_grisly

Browse Source 
SNC: Grisly Sigil and support
This commit is contained in:
Agetian
2022-04-12 11:51:16 +03:00
committed by GitHub
parent 3475c63c8e d6ab215aea
commit 984385bb9d
4 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5493,6 +5493,8 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
source.getDamageHistory().registerDamage(this, damageIn);
if (isCombat) {
source.getDamageHistory().registerCombatDamage(this, damageIn);
} else {
getDamageHistory().setHasBeenDealtNonCombatDamageThisTurn(true);
}
// Run triggers
@@ -6140,6 +6142,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
getDamageHistory().setCreatureAttackedLastTurnOf(turn, getDamageHistory().getCreatureAttackedThisTurn());
getDamageHistory().setCreatureAttackedThisTurn(false);
getDamageHistory().setCreatureAttacksThisTurn(0);
getDamageHistory().setHasBeenDealtNonCombatDamageThisTurn(false);
clearBlockedByThisTurn();
clearBlockedThisTurn();
resetMayPlayTurn();

25
forge-game/src/main/java/forge/game/card/CardDamageHistory.java
View File

@@ -20,6 +20,7 @@ public class CardDamageHistory {
private boolean creatureAttackedThisCombat = false;
private boolean creatureBlockedThisCombat = false;
private boolean creatureGotBlockedThisCombat = false;
private boolean receivedNonCombatDamageThisTurn = false;
private int attacksThisTurn = 0;
private final List<Player> creatureAttackedLastTurnOf = Lists.newArrayList();
@@ -247,6 +248,30 @@ public class CardDamageHistory {
public final boolean getCreatureGotBlockedThisCombat() {
return this.creatureGotBlockedThisCombat;
}
/**
* <p>
* Getter for the field <code>receivedNonCombatDamageThisTurn</code>.
* </p>
*
* @return a boolean.
*/
public boolean hasBeenDealtNonCombatDamageThisTurn() {
return this.receivedNonCombatDamageThisTurn;
}
/**
* <p>
* Setter for the field <code>receivedNonCombatDamageThisTurn</code>.
* </p>
*
* @param b
* a boolean.
*/
public void setHasBeenDealtNonCombatDamageThisTurn(boolean b) {
this.receivedNonCombatDamageThisTurn = b;
}
public final Map<GameEntity, Integer> getThisCombatDamaged() {
return damagedThisCombat;
}

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

@@ -1173,6 +1173,10 @@ public class CardProperty {
if (card.getReceivedDamageFromPlayerThisTurn().isEmpty()) {
return false;
}
} else if (property.equals("wasDealtNonCombatDamageThisTurn")) {
if (!card.getDamageHistory().hasBeenDealtNonCombatDamageThisTurn()) {
return false;
}
} else if (property.startsWith("dealtDamageThisTurn")) {
if (card.getTotalDamageDoneBy() == 0) {
return false;