From 31495e7d63a7449234eabc36cc9874795cf4bd35 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Sun, 11 Jun 2023 17:12:53 +0800 Subject: [PATCH 1/2] update Regular Cube --- forge-gui/res/cube/Regular Cube.dck | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-gui/res/cube/Regular Cube.dck b/forge-gui/res/cube/Regular Cube.dck index c22fe98a432..e8f7c2d0f5e 100644 --- a/forge-gui/res/cube/Regular Cube.dck +++ b/forge-gui/res/cube/Regular Cube.dck @@ -193,7 +193,7 @@ name=Regular Cube 1 Blood Aspirant|THB 1 Dark-Dweller Oracle|M19 1 Dire Fleet Daredevil|RIX -1 Dreadhorde Arcanist|PWAR +1 Dreadhorde Arcanist|WAR 1 Earthshaker Khenra|HOU 1 Electrostatic Infantry|DMU 1 Embereth Shieldbreaker|ELD @@ -375,7 +375,7 @@ name=Regular Cube 1 Myr Retriever|CM2 1 Myr Sire|CM2 1 Perilous Myr|A25 -1 Steel Overseer|PM20 +1 Steel Overseer|M20 1 Bloodline Pretender|KHM 1 Filigree Familiar|GNT 1 Pilgrim's Eye|GNT From b5d1b37ba02de8476c319f06b062f0afea5a1e70 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Tue, 13 Jun 2023 01:48:00 +0800 Subject: [PATCH 2/2] update winlose --- .../match/winlose/AdventureWinLose.java | 1 + .../screens/match/winlose/ViewWinLose.java | 54 +++++++++---------- .../adventure/Shandalar/maps/tileset/main.tsx | 40 -------------- 3 files changed, 28 insertions(+), 67 deletions(-) diff --git a/forge-gui-mobile/src/forge/screens/match/winlose/AdventureWinLose.java b/forge-gui-mobile/src/forge/screens/match/winlose/AdventureWinLose.java index 2bec535fd4f..6f84ccd7a7b 100644 --- a/forge-gui-mobile/src/forge/screens/match/winlose/AdventureWinLose.java +++ b/forge-gui-mobile/src/forge/screens/match/winlose/AdventureWinLose.java @@ -24,6 +24,7 @@ public class AdventureWinLose extends ControlWinLose { } v.getBtnRestart().setVisible(false); v.getBtnRestart().setEnabled(false); + v.getLabelShowBattlefield().setVisible(false); //v.getBtnQuit().setText(Forge.getLocalizer().getMessage("lblBackToAdventure")); Forge.setCursor(null, "0"); } diff --git a/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java b/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java index e199128ab32..4a2a0d16286 100644 --- a/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java +++ b/forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java @@ -64,6 +64,33 @@ public class ViewWinLose extends FOverlay implements IWinLoseView { btnQuit.setFont(btnContinue.getFont()); btnContinue.setEnabled(!game0.isMatchOver()); + lblLog = add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblGameLog")).align(Align.center).font(FSkinFont.get(18)).build()); + txtLog = add(new FTextArea(true, StringUtils.join(game.getGameLog().getLogEntries(null), "\r\n").replace("[COMPUTER]", "[AI]")) { + @Override + public boolean tap(float x, float y, int count) { + if (txtLog.getMaxScrollTop() > 0) { + FMagnifyView.show(txtLog, txtLog.getText(), txtLog.getTextColor(), ViewWinLose.this.getBackColor(), txtLog.getFont(), true); + } + return true; + } + }); + txtLog.setFont(FSkinFont.get(12)); + + btnCopyLog = add(new FLabel.ButtonBuilder().text(Forge.getLocalizer().getMessage("btnCopyToClipboard")).selectable().command(new FEventHandler() { + @Override + public void handleEvent(FEvent e) { + Forge.getClipboard().setContents(txtLog.getText()); + } + }).build()); + + btnShowBattlefield = add(new FLabel.ButtonBuilder().text(Forge.getLocalizer().getMessage("lblShowBattlefield")).font(FSkinFont.get(12)).selectable().command(new FEventHandler() { + @Override + public void handleEvent(FEvent e) { + hide(); + } + }).build()); + lblTitle.setText(composeTitle(game0)); + // Control of the win/lose is handled differently for various game // modes. ControlWinLose control = null; @@ -101,33 +128,6 @@ public class ViewWinLose extends FOverlay implements IWinLoseView { control = new ControlWinLose(this, game0); } - lblLog = add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblGameLog")).align(Align.center).font(FSkinFont.get(18)).build()); - txtLog = add(new FTextArea(true, StringUtils.join(game.getGameLog().getLogEntries(null), "\r\n").replace("[COMPUTER]", "[AI]")) { - @Override - public boolean tap(float x, float y, int count) { - if (txtLog.getMaxScrollTop() > 0) { - FMagnifyView.show(txtLog, txtLog.getText(), txtLog.getTextColor(), ViewWinLose.this.getBackColor(), txtLog.getFont(), true); - } - return true; - } - }); - txtLog.setFont(FSkinFont.get(12)); - - btnCopyLog = add(new FLabel.ButtonBuilder().text(Forge.getLocalizer().getMessage("btnCopyToClipboard")).selectable().command(new FEventHandler() { - @Override - public void handleEvent(FEvent e) { - Forge.getClipboard().setContents(txtLog.getText()); - } - }).build()); - - btnShowBattlefield = add(new FLabel.ButtonBuilder().text(Forge.getLocalizer().getMessage("lblShowBattlefield")).font(FSkinFont.get(12)).selectable().command(new FEventHandler() { - @Override - public void handleEvent(FEvent e) { - hide(); - } - }).build()); - lblTitle.setText(composeTitle(game0)); - showGameOutcomeSummary(); showPlayerScores(); control.showRewards(); diff --git a/forge-gui/res/adventure/Shandalar/maps/tileset/main.tsx b/forge-gui/res/adventure/Shandalar/maps/tileset/main.tsx index e7101b7e8d9..76584c9af14 100644 --- a/forge-gui/res/adventure/Shandalar/maps/tileset/main.tsx +++ b/forge-gui/res/adventure/Shandalar/maps/tileset/main.tsx @@ -4865,14 +4865,6 @@ - - - - - - - - @@ -10508,30 +10500,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -10633,14 +10601,6 @@ - - - - - - - -