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

Fix so poison counters show up properly

Browse Source
This commit is contained in:
drdev
2015-11-24 19:42:45 +00:00
parent f224cf9b0e
commit 3b81f30e28
6 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-gui-desktop/src/main/java/forge/screens/match/VAssignDamage.java
View File

@@ -39,6 +39,7 @@ import com.google.common.collect.Maps;
import forge.game.GameEntityView;
import forge.game.card.CardView;
import forge.game.card.CounterType;
import forge.game.player.PlayerView;
import forge.gui.SOverlayUtils;
import forge.toolbox.FButton;
@@ -429,7 +430,7 @@ public class VAssignDamage {
if (card == null) {
if (defender instanceof PlayerView) {
final PlayerView p = (PlayerView)defender;
lethalDamage = attackerHasInfect ? matchUI.getGameView().getPoisonCountersToLose() - p.getPoisonCounters() : p.getLife();
lethalDamage = attackerHasInfect ? matchUI.getGameView().getPoisonCountersToLose() - p.getCounters(CounterType.POISON) : p.getLife();
}
else if (defender instanceof CardView) { // planeswalker
final CardView pw = (CardView)defender;

3
forge-gui-desktop/src/main/java/forge/screens/match/views/VField.java
View File

@@ -29,6 +29,7 @@ import javax.swing.border.LineBorder;
import net.miginfocom.swing.MigLayout;
import forge.assets.FSkinProp;
import forge.game.card.CounterType;
import forge.game.player.PlayerView;
import forge.game.zone.ZoneType;
import forge.gui.framework.DragCell;
@@ -238,7 +239,7 @@ public class VField implements IVDoc<CField> {
}
// Update poison counters
final int poison = player.getPoisonCounters();
final int poison = player.getCounters(CounterType.POISON);
if (poison > 0) {
addLblPoison();
lblPoison.setText(String.valueOf(poison));