From 2f6b6cbd471ce1d2d437ec64f17cdc75e190779b Mon Sep 17 00:00:00 2001 From: friarsol Date: Sun, 16 Apr 2023 23:06:36 -0400 Subject: [PATCH] Mobile battle deck editor additions --- .../src/forge/assets/FSkinImage.java | 1 + .../src/forge/card/CardImageRenderer.java | 4 +++- .../src/forge/card/CardRenderer.java | 2 ++ .../itemmanager/filters/CardTypeFilter.java | 1 + .../forge/screens/match/TargetingOverlay.java | 2 +- .../match/views/VAssignCombatDamage.java | 20 ++++++++----------- .../forge/screens/match/views/VReveal.java | 2 ++ 7 files changed, 18 insertions(+), 14 deletions(-) diff --git a/forge-gui-mobile/src/forge/assets/FSkinImage.java b/forge-gui-mobile/src/forge/assets/FSkinImage.java index 786b8e62f8e..81901cca2e6 100644 --- a/forge-gui-mobile/src/forge/assets/FSkinImage.java +++ b/forge-gui-mobile/src/forge/assets/FSkinImage.java @@ -326,6 +326,7 @@ public enum FSkinImage implements FImage { PLANESWALKER (FSkinProp.IMG_PLANESWALKER, SourceFile.MANAICONS), PACK (FSkinProp.IMG_PACK, SourceFile.ICONS), SORCERY (FSkinProp.IMG_SORCERY, SourceFile.MANAICONS), + BATTLE (FSkinProp.IMG_BATTLE, SourceFile.MANAICONS), COMMANDER (FSkinProp.IMG_COMMANDER, SourceFile.ICONS), //Buttons diff --git a/forge-gui-mobile/src/forge/card/CardImageRenderer.java b/forge-gui-mobile/src/forge/card/CardImageRenderer.java index 867e076619c..e55dd3f79a7 100644 --- a/forge-gui-mobile/src/forge/card/CardImageRenderer.java +++ b/forge-gui-mobile/src/forge/card/CardImageRenderer.java @@ -150,7 +150,7 @@ public class CardImageRenderer { float ptBoxHeight = 0; float textBoxHeight = h - headerHeight - artHeight - typeBoxHeight - outerBorderThickness - artInset; - if (state.isCreature() || state.isPlaneswalker() || state.getType().hasSubtype("Vehicle")) { + if (state.isCreature() || state.isPlaneswalker() || state.getType().hasSubtype("Vehicle") || state.isBattle()) { ptBoxHeight = 2 * PT_FONT.getCapHeight(); } //space for artist @@ -721,6 +721,8 @@ public class CardImageRenderer { pieces.add("/"); pieces.add(String.valueOf(state.getToughness())); pieces.add("]"); + } else if (state.isBattle()) { + pieces.add(String.valueOf(state.getDefense())); } else { return; } diff --git a/forge-gui-mobile/src/forge/card/CardRenderer.java b/forge-gui-mobile/src/forge/card/CardRenderer.java index 9a57dc1f4d5..9387ef759fe 100644 --- a/forge-gui-mobile/src/forge/card/CardRenderer.java +++ b/forge-gui-mobile/src/forge/card/CardRenderer.java @@ -533,6 +533,8 @@ public class CardRenderer { type += " (" + loyalty + ")"; } else if (card.getCurrentState().getType().hasSubtype("Vehicle")) { type += String.format(" [%s / %s]", power, toughness); + } else if (card.getCurrentState().isBattle()) { + type += " (" + card.getCurrentState().getDefense() + ")"; } g.drawText(type, typeFont, foreColor, x, y, availableTypeWidth, lineHeight, false, Align.left, true); } diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/CardTypeFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/CardTypeFilter.java index 167beaaeb2a..e27218dcd8b 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/CardTypeFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/CardTypeFilter.java @@ -34,6 +34,7 @@ public class CardTypeFilter extends StatTypeFilter { addToggleButton(widget, StatTypes.PLANESWALKER); addToggleButton(widget, StatTypes.INSTANT); addToggleButton(widget, StatTypes.SORCERY); + addToggleButton(widget, StatTypes.BATTLE); } @Override diff --git a/forge-gui-mobile/src/forge/screens/match/TargetingOverlay.java b/forge-gui-mobile/src/forge/screens/match/TargetingOverlay.java index 365697fe63d..f1b799143f8 100644 --- a/forge-gui-mobile/src/forge/screens/match/TargetingOverlay.java +++ b/forge-gui-mobile/src/forge/screens/match/TargetingOverlay.java @@ -89,7 +89,7 @@ public class TargetingOverlay { } if (null != combat) { final GameEntityView defender = combat.getDefender(c); - // if c is attacking a planeswalker + // if c is attacking a planeswalker or battle if (defender instanceof CardView) { drawArrow(g, endpoints.get(defender.getId()), endpoints.get(c.getId()), ArcConnection.FoesAttacking); } diff --git a/forge-gui-mobile/src/forge/screens/match/views/VAssignCombatDamage.java b/forge-gui-mobile/src/forge/screens/match/views/VAssignCombatDamage.java index 806d66e948c..70e2dd8a717 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VAssignCombatDamage.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VAssignCombatDamage.java @@ -88,14 +88,6 @@ public class VAssignCombatDamage extends FDialog { throw new RuntimeException("Asking to assign damage to object which is not present in defenders list"); } - /** Constructor. - * - * @param attacker0 {@link forge.game.card.Card} - * @param blockers List<{@link forge.game.card.Card}> - * @param damage0 int - * @param defender GameEntity that's bein attacked - * @param overrideOrder override combatant order - */ public VAssignCombatDamage(final CardView attacker, final List blockers, final int damage0, final GameEntityView defender0, boolean overrideOrder, boolean maySkip, final WaitCallback> waitCallback) { super(Forge.getLocalizer().getMessage("lbLAssignDamageDealtBy").replace("%s",CardTranslation.getTranslatedName(attacker.getName())) , 3); @@ -420,8 +412,6 @@ public class VAssignCombatDamage extends FDialog { return totalDamageToAssign - spent; } - /** Updates labels and other UI elements. - * @param index index of the last assigned damage*/ private void updateLabels() { int damageLeft = totalDamageToAssign; boolean allHaveLethal = true; @@ -469,13 +459,19 @@ public class VAssignCombatDamage extends FDialog { } else if (defender instanceof CardView) { // planeswalker CardView pw = (CardView)defender; - lethalDamage = Integer.valueOf(pw.getCurrentState().getLoyalty()); + if (((CardView) defender).getCurrentState().isPlaneswalker()) { + lethalDamage = Integer.parseInt(pw.getCurrentState().getLoyalty()); + } else { + lethalDamage = Integer.parseInt(pw.getCurrentState().getDefense()); + } } } else { lethalDamage = Math.max(0, source.getLethalDamage()); if (source.getCurrentState().getType().isPlaneswalker()) { - lethalDamage = Integer.valueOf(source.getCurrentState().getLoyalty()); + lethalDamage = Integer.parseInt(source.getCurrentState().getLoyalty()); + } else if (source.getCurrentState().getType().isBattle()) { + lethalDamage = Integer.parseInt(source.getCurrentState().getDefense()); } else if (attackerHasDeathtouch) { lethalDamage = Math.min(lethalDamage, 1); } diff --git a/forge-gui-mobile/src/forge/screens/match/views/VReveal.java b/forge-gui-mobile/src/forge/screens/match/views/VReveal.java index ae8eee12c92..ae0a15d99ca 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VReveal.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VReveal.java @@ -176,6 +176,8 @@ public class VReveal extends FDropDown { type += " (" + paperCard.getRules().getPower() + " / " + paperCard.getRules().getToughness() + ")"; } else if (paperCard.getRules().getType().isPlaneswalker()) { type += " (" + paperCard.getRules().getInitialLoyalty() + ")"; + } else if (paperCard.getRules().getType().isBattle()) { + type += " (" + paperCard.getRules().getDefense() + ")"; } else if (paperCard.getRules().getType().hasSubtype("Vehicle")) { type += String.format(" [%s / %s]", paperCard.getRules().getPower(), paperCard.getRules().getToughness()); }