From e081e66a1378c333b96da04a23f3d3fc4eaf0c8c Mon Sep 17 00:00:00 2001
From: Sol <zenchristo@gmail.com>
Date: Mon, 8 Jul 2013 00:15:54 +0000
Subject: [PATCH] - Only reset quest new cards at the beginning of the match,
 not the end of each game

---
 src/main/java/forge/game/Match.java             | 11 +++++++++--
 src/main/java/forge/gui/match/QuestWinLose.java |  3 +--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/forge/game/Match.java b/src/main/java/forge/game/Match.java
index 49a009fc4ab..541bfbe78cd 100644
--- a/src/main/java/forge/game/Match.java
+++ b/src/main/java/forge/game/Match.java
@@ -12,6 +12,7 @@ import forge.game.event.GameEventAnteCardsSelected;
 import forge.game.player.LobbyPlayer;
 import forge.game.player.Player;
 import forge.properties.ForgePreferences.FPref;
+import forge.quest.QuestController;
 
 /**
  * TODO: Write javadoc for this type.
@@ -82,8 +83,14 @@ public class Match {
 
         currentGame = new Game(players, gameType, this);
 
-        if ( getGameType() == GameType.Quest)
-            currentGame.subscribeToEvents(Singletons.getModel().getQuest()); // this one listens to player's mulligans ATM
+        if ( getGameType() == GameType.Quest) {
+            QuestController qc = Singletons.getModel().getQuest();
+            // Reset new list when the Match round starts, not when each game starts
+            if (this.getPlayedGames().isEmpty()) {
+                qc.getCards().resetNewList();
+            }
+            currentGame.subscribeToEvents(qc); // this one listens to player's mulligans ATM
+        }
 
         Singletons.getControl().attachToGame(currentGame);
 
diff --git a/src/main/java/forge/gui/match/QuestWinLose.java b/src/main/java/forge/gui/match/QuestWinLose.java
index d830550c7e7..de08b563d10 100644
--- a/src/main/java/forge/gui/match/QuestWinLose.java
+++ b/src/main/java/forge/gui/match/QuestWinLose.java
@@ -125,7 +125,6 @@ public class QuestWinLose extends ControlWinLose {
     @Override
     public final boolean populateCustomPanel() {
         this.getView().getBtnRestart().setVisible(false);
-        qData.getCards().resetNewList();
         QuestController qc = Singletons.getModel().getQuest();
 
         LobbyPlayer questPlayer = Singletons.getControl().getLobby().getQuestPlayer();
@@ -159,7 +158,7 @@ public class QuestWinLose extends ControlWinLose {
         }
 
         if (!match.isMatchOver()) {
-            this.getView().getBtnQuit().setText("Quit (15 Credits)");
+            this.getView().getBtnQuit().setText("Quit (-15 Credits)");
             return isAnte;
         } else {
             this.getView().getBtnContinue().setVisible(false);