From b83a95d55dad1c1826a82e3bda2ad73af37a319d Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Sun, 7 Dec 2014 07:36:31 +0000
Subject: [PATCH] Fix message for choosing booster or card

---
 .../planarconquest/ConquestController.java    | 11 +++++----
 .../main/java/forge/quest/BoosterUtils.java   | 23 +++++++++++++++++++
 .../forge/quest/QuestWinLoseController.java   | 21 +----------------
 3 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestController.java b/forge-gui/src/main/java/forge/planarconquest/ConquestController.java
index f9b3bf8f158..9c9890104c9 100644
--- a/forge-gui/src/main/java/forge/planarconquest/ConquestController.java
+++ b/forge-gui/src/main/java/forge/planarconquest/ConquestController.java
@@ -46,6 +46,7 @@ import forge.planarconquest.ConquestPlaneData.RegionData;
 import forge.planarconquest.ConquestPreferences.CQPref;
 import forge.player.GamePlayerUtil;
 import forge.properties.ForgePreferences.FPref;
+import forge.quest.BoosterUtils;
 import forge.util.Aggregates;
 import forge.util.Lang;
 import forge.util.gui.SGuiChoose;
@@ -266,10 +267,11 @@ public class ConquestController {
                 public void run() {
                     awardWinStreakBonus(view);
 
-                    if (SOptionPane.showConfirmDialog("Choose one \u2014\n\n" +
-                            "\u2022 Booster: open a random booster pack with at least one new card\n\n" +
-                            "\u2022 Card: choose a card from your opponent's deck",
-                            "Spoils of Victory", "Booster", "Card")) {
+                    String[] options = {"Booster", "Card"};
+                    if (SOptionPane.showOptionDialog("Choose one \u2014\n\n" +
+                            "\u2022 Open a random booster pack\n" +
+                            "\u2022 Choose a card from your opponent's deck",
+                            "Spoils of Victory", null, options) == 0) {
                         awardBooster(view);
                     }
                     else {
@@ -288,6 +290,7 @@ public class ConquestController {
                                 }
                             }
                         }
+                        BoosterUtils.sort(cards);
                         PaperCard card = SGuiChoose.one("Choose a card from your opponent's deck", cards);
                         model.getCollection().add(card);
                     }
diff --git a/forge-gui/src/main/java/forge/quest/BoosterUtils.java b/forge-gui/src/main/java/forge/quest/BoosterUtils.java
index 93f97f619ca..793bd73d6b0 100644
--- a/forge-gui/src/main/java/forge/quest/BoosterUtils.java
+++ b/forge-gui/src/main/java/forge/quest/BoosterUtils.java
@@ -36,6 +36,7 @@ import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 // The BoosterPack generates cards for the Card Pool in Quest Mode
@@ -332,4 +333,26 @@ public final class BoosterUtils {
 
         return rewards;
     }
+
+    public static void sort(List<PaperCard> cards) {
+        //sort cards alphabetically so colors appear together and rares appear on top
+        Collections.sort(cards, new Comparator<PaperCard>() {
+            @Override
+            public int compare(PaperCard c1, PaperCard c2) {
+                return c1.getName().compareTo(c2.getName());
+            }
+        });
+        Collections.sort(cards, new Comparator<PaperCard>() {
+            @Override
+            public int compare(PaperCard c1, PaperCard c2) {
+                return c1.getRules().getColor().compareTo(c2.getRules().getColor());
+            }
+        });
+        Collections.sort(cards, new Comparator<PaperCard>() {
+            @Override
+            public int compare(PaperCard c1, PaperCard c2) {
+                return c2.getRarity().compareTo(c1.getRarity());
+            }
+        });
+    }
 }
diff --git a/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java b/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java
index 9481d12e483..9a3d959fae4 100644
--- a/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java
+++ b/forge-gui/src/main/java/forge/quest/QuestWinLoseController.java
@@ -30,7 +30,6 @@ import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Map.Entry;
 
@@ -552,25 +551,7 @@ public class QuestWinLoseController {
         }
 
         if (cardsWon != null) {
-            //sort cards alphabetically so colors appear together and rares appear on top
-            Collections.sort(cardsWon, new Comparator<PaperCard>() {
-                @Override
-                public int compare(PaperCard c1, PaperCard c2) {
-                    return c1.getName().compareTo(c2.getName());
-                }
-            });
-            Collections.sort(cardsWon, new Comparator<PaperCard>() {
-                @Override
-                public int compare(PaperCard c1, PaperCard c2) {
-                    return c1.getRules().getColor().compareTo(c2.getRules().getColor());
-                }
-            });
-            Collections.sort(cardsWon, new Comparator<PaperCard>() {
-                @Override
-                public int compare(PaperCard c1, PaperCard c2) {
-                    return c2.getRarity().compareTo(c1.getRarity());
-                }
-            });
+            BoosterUtils.sort(cardsWon);
             view.showCards(title, cardsWon);
         }
     }