From fe29fb1f83611e1b5f4b49ff5e0962c80bfa2493 Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Tue, 15 Mar 2016 01:59:24 +0000
Subject: [PATCH] Fix so NEW distinction reset after each match Fix so NEW
 distinction appears for AEther rewards

---
 .../planarconquest/ConquestCollectionScreen.java   |  3 +--
 .../screens/planarconquest/ConquestDeckEditor.java |  3 ++-
 .../java/forge/planarconquest/ConquestBattle.java  |  1 +
 .../java/forge/planarconquest/ConquestData.java    | 14 +++++++-------
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCollectionScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCollectionScreen.java
index d7e0659e334..2c551dc7dc5 100644
--- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCollectionScreen.java
+++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCollectionScreen.java
@@ -22,9 +22,8 @@ public class ConquestCollectionScreen extends FScreen {
     public ConquestCollectionScreen() {
         super("", ConquestMenu.getMenu());
 
-        ConquestData model = FModel.getConquest().getModel();
         ItemManagerConfig config = ItemManagerConfig.CONQUEST_COLLECTION;
-        lstCollection.setup(config, model.getColOverrides(config));
+        lstCollection.setup(config, ConquestData.getColOverrides(config));
     }
 
     @Override
diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestDeckEditor.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestDeckEditor.java
index e4c61efd20b..4e8cc3a27e4 100644
--- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestDeckEditor.java
+++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestDeckEditor.java
@@ -10,6 +10,7 @@ import forge.itemmanager.ItemColumn;
 import forge.itemmanager.ItemManagerConfig;
 import forge.model.FModel;
 import forge.planarconquest.ConquestCommander;
+import forge.planarconquest.ConquestData;
 import forge.toolbox.FEvent;
 import forge.toolbox.FEvent.FEventHandler;
 
@@ -37,6 +38,6 @@ public class ConquestDeckEditor extends FDeckEditor {
 
     @Override
     protected Map<ColumnDef, ItemColumn> getColOverrides(ItemManagerConfig config) {
-        return FModel.getConquest().getModel().getColOverrides(config);
+        return ConquestData.getColOverrides(config);
     }
 }
diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestBattle.java b/forge-gui/src/main/java/forge/planarconquest/ConquestBattle.java
index 9b1e7cf1716..30ef1e59562 100644
--- a/forge-gui/src/main/java/forge/planarconquest/ConquestBattle.java
+++ b/forge-gui/src/main/java/forge/planarconquest/ConquestBattle.java
@@ -57,6 +57,7 @@ public abstract class ConquestBattle {
             view.getBtnQuit().setText("Quit");
             model.addLoss(this);
         }
+        model.resetNewCards(); //reset new cards after finishing a game
         model.saveData();
     }
 
diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java
index aa1d75a8250..9f581c205b0 100644
--- a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java
+++ b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java
@@ -311,26 +311,26 @@ public final class ConquestData {
         directory.renameTo(new File(ForgeConstants.CONQUEST_SAVE_DIR, name));
     }
 
-    public HashSet<PaperCard> getNewCards() {
-        return newCards;
+    public void resetNewCards() {
+        newCards.clear();
     }
 
-    private final Function<Entry<InventoryItem, Integer>, Comparable<?>> fnNewCompare =
+    private static final Function<Entry<InventoryItem, Integer>, Comparable<?>> fnNewCompare =
             new Function<Entry<InventoryItem, Integer>, Comparable<?>>() {
         @Override
         public Comparable<?> apply(final Entry<InventoryItem, Integer> from) {
-            return newCards.contains(from.getKey()) ? Integer.valueOf(1) : Integer.valueOf(0);
+            return FModel.getConquest().getModel().newCards.contains(from.getKey()) ? Integer.valueOf(1) : Integer.valueOf(0);
         }
     };
-    private final Function<Entry<? extends InventoryItem, Integer>, Object> fnNewGet =
+    private static final Function<Entry<? extends InventoryItem, Integer>, Object> fnNewGet =
             new Function<Entry<? extends InventoryItem, Integer>, Object>() {
         @Override
         public Object apply(final Entry<? extends InventoryItem, Integer> from) {
-            return newCards.contains(from.getKey()) ? "NEW" : "";
+            return FModel.getConquest().getModel().newCards.contains(from.getKey()) ? "NEW" : "";
         }
     };
 
-    public Map<ColumnDef, ItemColumn> getColOverrides(ItemManagerConfig config) {
+    public static Map<ColumnDef, ItemColumn> getColOverrides(ItemManagerConfig config) {
         Map<ColumnDef, ItemColumn> colOverrides = new HashMap<ColumnDef, ItemColumn>();
         ItemColumn.addColOverride(config, colOverrides, ColumnDef.NEW, fnNewCompare, fnNewGet);
         return colOverrides;