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

Merge branch 'master' of https://git.cardforge.org/core-developers/forge into ui-card-translation

Browse Source
This commit is contained in:
Peter
2019-08-06 08:46:45 +02:00
parent 3e2c9ad162 413de957a8
commit 720a3966c1
21 changed files with 55 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -437,7 +437,7 @@ public class VAssignDamage {
}
else if (defender instanceof CardView) { // planeswalker
final CardView pw = (CardView)defender;
lethalDamage = pw.getCurrentState().getLoyalty();
lethalDamage = Integer.valueOf(pw.getCurrentState().getLoyalty());
}
}
else {

4
forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java
View File

@@ -706,7 +706,7 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl
String sPt = "";
if (state.isCreature() && state.isPlaneswalker()) {
sPt = state.getPower() + "/" + state.getToughness() +
" (" + String.valueOf(state.getLoyalty()) + ")";
" (" + state.getLoyalty() + ")";
}
else if (state.isCreature()) {
sPt = state.getPower() + "/" + state.getToughness();
@@ -715,7 +715,7 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl
sPt = "[" + state.getPower() + "/" + state.getToughness() + "]";
}
else if (state.isPlaneswalker()) {
sPt = String.valueOf(state.getLoyalty());
sPt = state.getLoyalty();
}
ptText.setText(sPt);
}