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

Merge branch 'sengir' into 'master'

Browse Source 
CMR: Sengir, the Dark Baron + Curse of Vengeance

Closes #1334, #50, and #1545

See merge request core-developers/forge!3391
This commit is contained in:
Michael Kamensky
2020-11-30 04:41:58 +00:00
parent 248940fd3d c8bbc8b95e
commit 4682b6aee7
4 changed files with 41 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -609,9 +609,15 @@ public class CardFactoryUtil {
if (value.contains("LifeGainedThisTurn")) {
return doXMath(player.getLifeGainedThisTurn(), m, source);
}
if (value.contains("LifeGainedByTeamThisTurn")) {
return doXMath(player.getLifeGainedByTeamThisTurn(), m, source);
}
if (value.contains("LifeStartedThisTurnWith")) {
return doXMath(player.getLifeStartedThisTurnWith(), m, source);
}
if (value.contains("PoisonCounters")) {
return doXMath(player.getPoisonCounters(), m, source);
}

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

@@ -82,6 +82,7 @@ public class Player extends GameEntity implements Comparable<Player> {
private int life = 20;
private int startingLife = 20;
private int lifeStartedThisTurnWith = startingLife;
private final Map<Card, Integer> assignedDamage = Maps.newHashMap();
private final Map<Card, Integer> assignedCombatDamage = Maps.newHashMap();
private int spellsCastThisTurn = 0;
@@ -1660,6 +1661,13 @@ public class Player extends GameEntity implements Comparable<Player> {
numCardsInHandStartedThisTurnWith = num;
}
public int getLifeStartedThisTurnWith() {
return lifeStartedThisTurnWith;
}
public void setLifeStartedThisTurnWith(int l) {
lifeStartedThisTurnWith = l;
}
public void addNoteForName(String notedFor, String noted) {
if (!notes.containsKey(notedFor)) {
notes.put(notedFor, new FCollection<>());
@@ -2166,10 +2174,6 @@ public class Player extends GameEntity implements Comparable<Player> {
@Override
public final boolean isValid(final String restriction, final Player sourceController, final Card source, SpellAbility spellAbility) {
// if the current player has already lost the game, he can't be a valid target
if (hasLost()) {
return false;
}
final String[] incR = restriction.split("\\.", 2);
@@ -3265,6 +3269,7 @@ public class Player extends GameEntity implements Comparable<Player> {
lifeGainedThisTurn = 0;
lifeGainedTimesThisTurn = 0;
lifeGainedByTeamThisTurn = 0;
setLifeStartedThisTurnWith(getLife());
setLibrarySearched(0);
setNumManaConversion(0);