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

invasion_of_fiora_marchesa_resolute_monarch.txt + support

Browse Source
This commit is contained in:
Northmoc
2023-04-15 11:14:14 -04:00
parent 450cefcdf1
commit 562981147f
4 changed files with 47 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/ability/AbilityUtils.java
View File

@@ -3542,6 +3542,10 @@ public class AbilityUtils {
return doXMath(amount, m, source, ctb);
}
if (value.equals("BeenDealtCombatDamageSinceLastTurn")) {
return doXMath(player.hasBeenDealtCombatDamageSinceLastTurn() ? 1 : 0, m, source, ctb);
}
if (value.equals("DungeonsCompleted")) {
return doXMath(player.getCompletedDungeons().size(), m, source, ctb);
}

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

@@ -250,7 +250,11 @@ public class CardDamageHistory {
damagedThisGame.add(target);
hasdealtDamagetoAny = true;
if (isCombat && target instanceof Player) {
damagedThisCombat.add((Player) target);
final Player pTgt = (Player) target;
damagedThisCombat.add(pTgt);
if (pTgt.getLastTurnNr() > 0 && !pTgt.getGame().getPhaseHandler().isPlayerTurn(pTgt)) {
pTgt.setBeenDealtCombatDamageSinceLastTurn(true);
}
}
Pair<Integer, Boolean> dmg = Pair.of(damage, isCombat);
damageDoneThisTurn.add(dmg);

10
forge-game/src/main/java/forge/game/player/Player.java
View File

@@ -197,6 +197,8 @@ public class Player extends GameEntity implements Comparable<Player> {
private List<Player> attackedPlayersLastTurn = new ArrayList<>();
private List<Player> attackedPlayersThisCombat = new ArrayList<>();
private boolean beenDealtCombatDamageSinceLastTurn = false;
private boolean activateLoyaltyAbilityThisTurn = false;
private boolean tappedLandForManaThisTurn = false;
private List<Card> completedDungeons = new ArrayList<>();
@@ -1845,6 +1847,13 @@ public class Player extends GameEntity implements Comparable<Player> {
this.tappedLandForManaThisTurn = tappedLandForManaThisTurn;
}
public final boolean hasBeenDealtCombatDamageSinceLastTurn() {
return beenDealtCombatDamageSinceLastTurn;
}
public final void setBeenDealtCombatDamageSinceLastTurn(final boolean b) {
beenDealtCombatDamageSinceLastTurn = b;
}
public final boolean getActivateLoyaltyAbilityThisTurn() {
return activateLoyaltyAbilityThisTurn;
}
@@ -2447,6 +2456,7 @@ public class Player extends GameEntity implements Comparable<Player> {
// set last turn nr
if (game.getPhaseHandler().isPlayerTurn(this)) {
setBeenDealtCombatDamageSinceLastTurn(false);
setAttackedPlayersMyLastTurn(getAttackedPlayersMyTurn());
clearAttackedMyTurn();
this.lastTurnNr = game.getPhaseHandler().getTurn();