From 371d4c9f857f39b3998872dc2de99c9a3ad52a56 Mon Sep 17 00:00:00 2001 From: Vittorio Alfieri Date: Tue, 12 Oct 2021 16:32:26 +0200 Subject: [PATCH] Fixed and improved the Deck Importer (from MTGO) in Android application. --- CHANGELOG.md | 4 +++- projects/mtg/Android/src/net/wagic/utils/DeckImporter.java | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31c284fc9..b81b288a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,9 @@ ## [master] (https://github.com/WagicProject/wagic/tree/master) ### 12/10/21 -- *Committed:* Added a new menu choice to instantly choose all the possible targets (on battlefield) of an ability during its target selection (e.g. Proliferation ability can target a lot of permanents and players so using that menu choice all the targets will be instantly chosen and then the current player will be able to remove any of them or confirm the entire selection). ([Vitty85](https://github.com/Vitty85)) +- *Committed:* Fixed and improved the Deck Importer (from MTGO) in Android application. ([Vitty85](https://github.com/Vitty85)) + +- *Committed:* Added a new menu choice to instantly choose all the possible targets (on battlefield) of an ability during its target selection (e.g. Proliferation ability can target a lot of permanents and players so using that menu choice all the targets will be instantly chosen and then the current player will be able to remove any of them or confirm the entire selection). https://github.com/WagicProject/wagic/commit/c1f391329564a962907c9179c8b6c9b382c6bafb ([Vitty85](https://github.com/Vitty85)) ### 09/10/21 - *Committed:* Fixed the Proliferation and Damageable target chooser in order to avoid targeting permanents or players without counters and/or with some protections (e.g. hexproof, shroud and similar), fixed a Travis build toolchain error. https://github.com/WagicProject/wagic/commit/4623167b0f608a8322de81b09d96f8642e1b33cd ([Vitty85](https://github.com/Vitty85)) diff --git a/projects/mtg/Android/src/net/wagic/utils/DeckImporter.java b/projects/mtg/Android/src/net/wagic/utils/DeckImporter.java index 4438349cf..612d825db 100644 --- a/projects/mtg/Android/src/net/wagic/utils/DeckImporter.java +++ b/projects/mtg/Android/src/net/wagic/utils/DeckImporter.java @@ -38,9 +38,9 @@ public class DeckImporter line = line.trim(); if (line.equals("")) { line = scanner.nextLine(); + prefix = "#SB:"; // Sideboard started from next card. if (line.equals("")) { - line = scanner.nextLine(); - prefix = "#SB:"; // Sideboard started from next card (we assumed that there are 2 blank lines from main deck and sideboard). + line = scanner.nextLine(); // Sometimes there are 2 blank lines from main deck and sideboard. } } if (!line.equals("")) // don't write out blank lines