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

Fix some bad params in AI combat trigger prediction

Browse Source
This commit is contained in:
tool4EvEr
2022-01-07 23:12:45 +01:00
parent 0e58a54834
commit 8d1049beac
6 changed files with 26 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3473,11 +3473,7 @@ public class AbilityUtils {
}
if (value.contains("DamageToOppsThisTurn")) {
int oppDmg = 0;
for (Player opp : player.getOpponents()) {
oppDmg += opp.getAssignedDamage();
}
return doXMath(oppDmg, m, source, ctb);
return doXMath(player.getOpponentsAssignedDamage(), m, source, ctb);
}
if (value.contains("NonCombatDamageDealtThisTurn")) {

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

@@ -5240,9 +5240,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
} else {
assignedDamageMap.put(sourceCard, assignedDamageMap.get(sourceCard) + assignedDamage0);
}
if (assignedDamage0 > 0) {
view.updateAssignedDamage(this);
}
view.updateAssignedDamage(this);
}
public final void clearAssignedDamage() {
if (assignedDamageMap.isEmpty()) { return; }

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

@@ -141,8 +141,7 @@ public final class CardUtil {
for (Player p : game.getPlayers()) {
res.addAll(p.getZone(to).getCardsAddedLastTurn(from));
}
}
else {
} else {
res.addAll(game.getStackZone().getCardsAddedLastTurn(from));
}
return CardLists.getValidCardsAsList(res, valid, src.getController(), src, ctb);