From f72ddf5582e8243e8830ce4f0d312e5c5ba722d4 Mon Sep 17 00:00:00 2001
From: "marcin.sciesinski" <Marcin.Sciesinski@stash.synchronoss.net>
Date: Wed, 16 May 2018 11:57:53 -0700
Subject: [PATCH 01/14] Starting collection is given immediately

---
 .../lotro/league/SoloDraftLeagueData.java     | 25 ++++---------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SoloDraftLeagueData.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SoloDraftLeagueData.java
index 447e88d0c..52fbb4a2f 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SoloDraftLeagueData.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SoloDraftLeagueData.java
@@ -64,12 +64,11 @@ public class SoloDraftLeagueData implements LeagueData {
     public CardCollection joinLeague(CollectionsManager collectionsManager, Player player, int currentTime) {
         MutableCardCollection startingCollection = new DefaultCardCollection();
         long seed = getSeed(player);
-        if (currentTime >= _serie.getStart()) {
-            CardCollection leagueProduct = _draft.initializeNewCollection(seed);
 
-            for (Map.Entry<String, CardCollection.Item> serieCollectionItem : leagueProduct.getAll().entrySet())
-                startingCollection.addItem(serieCollectionItem.getKey(), serieCollectionItem.getValue().getCount());
-        }
+        CardCollection leagueProduct = _draft.initializeNewCollection(seed);
+
+        for (Map.Entry<String, CardCollection.Item> serieCollectionItem : leagueProduct.getAll().entrySet())
+            startingCollection.addItem(serieCollectionItem.getKey(), serieCollectionItem.getValue().getCount());
 
         startingCollection.setExtraInformation(createExtraInformation(seed));
         collectionsManager.addPlayerCollection(false, "Sealed league product", player, _collectionType, startingCollection);
@@ -88,23 +87,9 @@ public class SoloDraftLeagueData implements LeagueData {
     public int process(CollectionsManager collectionsManager, List<PlayerStanding> leagueStandings, int oldStatus, int currentTime) {
         int status = oldStatus;
 
-        if (status == 0) {
-            if (currentTime >= _serie.getStart()) {
-                Map<Player, CardCollection> map = collectionsManager.getPlayersCollection(_collectionType.getCode());
-                for (Map.Entry<Player, CardCollection> playerCardCollectionEntry : map.entrySet()) {
-
-                    Player player = playerCardCollectionEntry.getKey();
-                    CardCollection leagueProduct = _draft.initializeNewCollection(getSeed(player));
-
-                    collectionsManager.addItemsToPlayerCollection(false, "New sealed league product", player, _collectionType, leagueProduct.getAll().values());
-                }
-                status = 1;
-            }
-        }
-
         int maxGamesTotal = _serie.getMaxMatches();
 
-        if (status == 1) {
+        if (status == 0) {
             if (currentTime > DateUtils.offsetDate(_serie.getEnd(), 1)) {
                 for (PlayerStanding leagueStanding : leagueStandings) {
                     CardCollection leaguePrize = _leaguePrizes.getPrizeForLeague(leagueStanding.getStanding(), leagueStandings.size(), leagueStanding.getGamesPlayed(), maxGamesTotal, _collectionType);

From 2f59b0a1813ba9566f8d24cb343305b4445d6bb4 Mon Sep 17 00:00:00 2001
From: "marcin.sciesinski" <Marcin.Sciesinski@stash.synchronoss.net>
Date: Thu, 17 May 2018 12:18:59 -0700
Subject: [PATCH 02/14] User can now select what kind of foiling they want to
 see

---
 .../gemp-lotr-async/src/main/web/ban.html     | 44 +++++++++---------
 .../src/main/web/deckBuild.html               | 44 +++++++++---------
 .../src/main/web/deckBuild2.html              | 22 ++++-----
 .../gemp-lotr-async/src/main/web/game.html    | 44 +++++++++---------
 .../gemp-lotr-async/src/main/web/hall.html    | 44 +++++++++---------
 .../gemp-lotr-async/src/main/web/index.html   | 44 +++++++++---------
 gemp-lotr/gemp-lotr-async/src/main/web/js.inc | 40 ++++++++--------
 .../CardInformationDialog.js                  |  0
 .../js/{gemp-020 => gemp-021}/DeckPanel.js    |  0
 .../js/{gemp-020 => gemp-021}/cardFilter.js   |  0
 .../js/{gemp-020 => gemp-021}/cardFilter2.js  |  0
 .../web/js/{gemp-020 => gemp-021}/chat.js     |  0
 .../web/js/{gemp-020 => gemp-021}/common.js   |  0
 .../web/js/{gemp-020 => gemp-021}/commonUi.js |  0
 .../{gemp-020 => gemp-021}/communication.js   |  0
 .../{gemp-020 => gemp-021}/deckBuildingUi.js  |  0
 .../{gemp-020 => gemp-021}/deckBuildingUi2.js |  0
 .../{gemp-020 => gemp-021}/deliveryService.js |  0
 .../{gemp-020 => gemp-021}/gameAnimations.js  |  0
 .../{gemp-020 => gemp-021}/gameHistoryUi.js   |  0
 .../web/js/{gemp-020 => gemp-021}/gameUi.js   | 15 ++++++
 .../web/js/{gemp-020 => gemp-021}/hallUi.js   |  0
 .../web/js/{gemp-020 => gemp-021}/hobbit.js   |  0
 .../js/{gemp-020 => gemp-021}/inheritance.js  |  0
 .../js/{gemp-020 => gemp-021}/jCardGroup.js   |  0
 .../web/js/{gemp-020 => gemp-021}/jCards.js   | 15 ++++--
 .../{gemp-020 => gemp-021}/leagueResultsUi.js |  0
 .../web/js/{gemp-020 => gemp-021}/logging.js  |  0
 .../js/{gemp-020 => gemp-021}/merchantUi.js   |  0
 .../{gemp-020 => gemp-021}/playerStatsUi.js   |  0
 .../web/js/{gemp-020 => gemp-021}/set20.js    |  0
 .../js/{gemp-020 => gemp-021}/soloDraftUi.js  |  0
 .../web/js/{gemp-020 => gemp-021}/statsUi.js  |  0
 .../tournamentResultsUi.js                    |  0
 .../src/main/web/leagueAdmin.html             | 44 +++++++++---------
 .../src/main/web/merchant.html                | 44 +++++++++---------
 .../src/main/web/soloDraft.html               | 46 +++++++++----------
 37 files changed, 235 insertions(+), 211 deletions(-)
 rename gemp-lotr/gemp-lotr-async/src/main/web/js/{gemp-020 => gemp-021}/CardInformationDialog.js (100%)
 rename gemp-lotr/gemp-lotr-async/src/main/web/js/{gemp-020 => gemp-021}/DeckPanel.js (100%)
 rename gemp-lotr/gemp-lotr-async/src/main/web/js/{gemp-020 => gemp-021}/cardFilter.js (100%)
 rename gemp-lotr/gemp-lotr-async/src/main/web/js/{gemp-020 => gemp-021}/cardFilter2.js (100%)
 rename gemp-lotr/gemp-lotr-async/src/main/web/js/{gemp-020 => gemp-021}/chat.js (100%)
 rename gemp-lotr/gemp-lotr-async/src/main/web/js/{gemp-020 => gemp-021}/common.js (100%)
 rename gemp-lotr/gemp-lotr-async/src/main/web/js/{gemp-020 => gemp-021}/commonUi.js (100%)
 rename gemp-lotr/gemp-lotr-async/src/main/web/js/{gemp-020 => gemp-021}/communication.js (100%)
 rename gemp-lotr/gemp-lotr-async/src/main/web/js/{gemp-020 => gemp-021}/deckBuildingUi.js (100%)
 rename gemp-lotr/gemp-lotr-async/src/main/web/js/{gemp-020 => gemp-021}/deckBuildingUi2.js (100%)
 rename gemp-lotr/gemp-lotr-async/src/main/web/js/{gemp-020 => gemp-021}/deliveryService.js (100%)
 rename gemp-lotr/gemp-lotr-async/src/main/web/js/{gemp-020 => gemp-021}/gameAnimations.js (100%)
 rename gemp-lotr/gemp-lotr-async/src/main/web/js/{gemp-020 => gemp-021}/gameHistoryUi.js (100%)
 rename gemp-lotr/gemp-lotr-async/src/main/web/js/{gemp-020 => gemp-021}/gameUi.js (99%)
 rename gemp-lotr/gemp-lotr-async/src/main/web/js/{gemp-020 => gemp-021}/hallUi.js (100%)
 rename gemp-lotr/gemp-lotr-async/src/main/web/js/{gemp-020 => gemp-021}/hobbit.js (100%)
 rename gemp-lotr/gemp-lotr-async/src/main/web/js/{gemp-020 => gemp-021}/inheritance.js (100%)
 rename gemp-lotr/gemp-lotr-async/src/main/web/js/{gemp-020 => gemp-021}/jCardGroup.js (100%)
 rename gemp-lotr/gemp-lotr-async/src/main/web/js/{gemp-020 => gemp-021}/jCards.js (97%)
 rename gemp-lotr/gemp-lotr-async/src/main/web/js/{gemp-020 => gemp-021}/leagueResultsUi.js (100%)
 rename gemp-lotr/gemp-lotr-async/src/main/web/js/{gemp-020 => gemp-021}/logging.js (100%)
 rename gemp-lotr/gemp-lotr-async/src/main/web/js/{gemp-020 => gemp-021}/merchantUi.js (100%)
 rename gemp-lotr/gemp-lotr-async/src/main/web/js/{gemp-020 => gemp-021}/playerStatsUi.js (100%)
 rename gemp-lotr/gemp-lotr-async/src/main/web/js/{gemp-020 => gemp-021}/set20.js (100%)
 rename gemp-lotr/gemp-lotr-async/src/main/web/js/{gemp-020 => gemp-021}/soloDraftUi.js (100%)
 rename gemp-lotr/gemp-lotr-async/src/main/web/js/{gemp-020 => gemp-021}/statsUi.js (100%)
 rename gemp-lotr/gemp-lotr-async/src/main/web/js/{gemp-020 => gemp-021}/tournamentResultsUi.js (100%)

diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/ban.html b/gemp-lotr/gemp-lotr-async/src/main/web/ban.html
index 156ec1bba..53954d4f6 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/ban.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/ban.html
@@ -23,30 +23,30 @@
     <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
     <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
 
-    <script type="text/javascript" src="js/gemp-020/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-020/common.js"></script>
-    <script type="text/javascript" src="js/gemp-020/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-020/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-020/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-020/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-020/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/cardFilter.js"></script>
+    <script type="text/javascript" src="js/gemp-021/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-021/common.js"></script>
+    <script type="text/javascript" src="js/gemp-021/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-021/chat.js"></script>
+    <script type="text/javascript" src="js/gemp-021/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-021/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-021/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/cardFilter.js"></script>
 
-    <script type="text/javascript" src="js/gemp-020/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-020/set20.js"></script>
-    <script type="text/javascript" src="js/gemp-020/hobbit.js"></script>
-    <script type="text/javascript" src="js/gemp-020/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-021/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-021/set20.js"></script>
+    <script type="text/javascript" src="js/gemp-021/hobbit.js"></script>
+    <script type="text/javascript" src="js/gemp-021/jCards.js"></script>
 
-    <script type="text/javascript" src="js/gemp-020/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-020/merchantUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/hallUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/leagueResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/tournamentResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/statsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/playerStatsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/gameHistoryUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/deckBuildingUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/gameUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/gameAnimations.js"></script>
+    <script type="text/javascript" src="js/gemp-021/merchantUi.js"></script>
 
     <script type="text/javascript">
         function submitFormToAddress(url, formElem, success, error) {
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html b/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html
index 1403d75c3..e0a9a8118 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html
@@ -17,30 +17,30 @@
     <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
     <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
 
-    <script type="text/javascript" src="js/gemp-020/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-020/common.js"></script>
-    <script type="text/javascript" src="js/gemp-020/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-020/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-020/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-020/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-020/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/cardFilter.js"></script>
+    <script type="text/javascript" src="js/gemp-021/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-021/common.js"></script>
+    <script type="text/javascript" src="js/gemp-021/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-021/chat.js"></script>
+    <script type="text/javascript" src="js/gemp-021/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-021/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-021/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/cardFilter.js"></script>
 
-    <script type="text/javascript" src="js/gemp-020/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-020/set20.js"></script>
-    <script type="text/javascript" src="js/gemp-020/hobbit.js"></script>
-    <script type="text/javascript" src="js/gemp-020/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-021/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-021/set20.js"></script>
+    <script type="text/javascript" src="js/gemp-021/hobbit.js"></script>
+    <script type="text/javascript" src="js/gemp-021/jCards.js"></script>
 
-    <script type="text/javascript" src="js/gemp-020/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-020/merchantUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/hallUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/leagueResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/tournamentResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/statsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/playerStatsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/gameHistoryUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/deckBuildingUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/gameUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/gameAnimations.js"></script>
+    <script type="text/javascript" src="js/gemp-021/merchantUi.js"></script>
 
     <script type="text/javascript">
 
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild2.html b/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild2.html
index 25c788e72..ffe4b0cef 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild2.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild2.html
@@ -58,8 +58,8 @@
     <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
     <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
 
-    <script type="text/javascript" src="js/gemp-020/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-020/common.js"></script>
+    <script type="text/javascript" src="js/gemp-021/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-021/common.js"></script>
 
     <script type="text/javascript" src="/generic-tcg/js/CardContainer.js"></script>
     <script type="text/javascript" src="/generic-tcg/js/CardGroup.js"></script>
@@ -67,15 +67,15 @@
     <script type="text/javascript" src="/generic-tcg/js/AttachedCardsLayoutCardGroup.js"></script>
     <script type="text/javascript" src="/generic-tcg/js/jquery/jquery-sizes.js"></script>
 
-    <script type="text/javascript" src="js/gemp-020/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-020/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-020/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/set20.js"></script>
-    <script type="text/javascript" src="js/gemp-020/jCards.js"></script>
-    <script type="text/javascript" src="js/gemp-020/cardFilter2.js"></script>
-    <script type="text/javascript" src="js/gemp-020/DeckPanel.js"></script>
-    <script type="text/javascript" src="js/gemp-020/CardInformationDialog.js"></script>
-    <script type="text/javascript" src="js/gemp-020/deckBuildingUi2.js"></script>
+    <script type="text/javascript" src="js/gemp-021/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-021/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-021/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/set20.js"></script>
+    <script type="text/javascript" src="js/gemp-021/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-021/cardFilter2.js"></script>
+    <script type="text/javascript" src="js/gemp-021/DeckPanel.js"></script>
+    <script type="text/javascript" src="js/gemp-021/CardInformationDialog.js"></script>
+    <script type="text/javascript" src="js/gemp-021/deckBuildingUi2.js"></script>
 
     <script type="text/javascript">
 
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/game.html b/gemp-lotr/gemp-lotr-async/src/main/web/game.html
index 0b4e7ed21..0797231e5 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/game.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/game.html
@@ -17,30 +17,30 @@
     <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
     <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
 
-    <script type="text/javascript" src="js/gemp-020/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-020/common.js"></script>
-    <script type="text/javascript" src="js/gemp-020/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-020/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-020/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-020/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-020/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/cardFilter.js"></script>
+    <script type="text/javascript" src="js/gemp-021/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-021/common.js"></script>
+    <script type="text/javascript" src="js/gemp-021/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-021/chat.js"></script>
+    <script type="text/javascript" src="js/gemp-021/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-021/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-021/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/cardFilter.js"></script>
 
-    <script type="text/javascript" src="js/gemp-020/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-020/set20.js"></script>
-    <script type="text/javascript" src="js/gemp-020/hobbit.js"></script>
-    <script type="text/javascript" src="js/gemp-020/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-021/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-021/set20.js"></script>
+    <script type="text/javascript" src="js/gemp-021/hobbit.js"></script>
+    <script type="text/javascript" src="js/gemp-021/jCards.js"></script>
 
-    <script type="text/javascript" src="js/gemp-020/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-020/merchantUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/hallUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/leagueResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/tournamentResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/statsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/playerStatsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/gameHistoryUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/deckBuildingUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/gameUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/gameAnimations.js"></script>
+    <script type="text/javascript" src="js/gemp-021/merchantUi.js"></script>
 
 
 <script type="text/javascript">
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/hall.html b/gemp-lotr/gemp-lotr-async/src/main/web/hall.html
index 6e245c1fc..4d22ba712 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/hall.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/hall.html
@@ -17,30 +17,30 @@
     <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
     <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
 
-    <script type="text/javascript" src="js/gemp-020/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-020/common.js"></script>
-    <script type="text/javascript" src="js/gemp-020/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-020/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-020/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-020/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-020/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/cardFilter.js"></script>
+    <script type="text/javascript" src="js/gemp-021/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-021/common.js"></script>
+    <script type="text/javascript" src="js/gemp-021/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-021/chat.js"></script>
+    <script type="text/javascript" src="js/gemp-021/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-021/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-021/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/cardFilter.js"></script>
 
-    <script type="text/javascript" src="js/gemp-020/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-020/set20.js"></script>
-    <script type="text/javascript" src="js/gemp-020/hobbit.js"></script>
-    <script type="text/javascript" src="js/gemp-020/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-021/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-021/set20.js"></script>
+    <script type="text/javascript" src="js/gemp-021/hobbit.js"></script>
+    <script type="text/javascript" src="js/gemp-021/jCards.js"></script>
 
-    <script type="text/javascript" src="js/gemp-020/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-020/merchantUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/hallUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/leagueResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/tournamentResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/statsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/playerStatsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/gameHistoryUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/deckBuildingUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/gameUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/gameAnimations.js"></script>
+    <script type="text/javascript" src="js/gemp-021/merchantUi.js"></script>
 
 <script type="text/javascript">
     var chat;
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/index.html b/gemp-lotr/gemp-lotr-async/src/main/web/index.html
index fc347d3ec..7df0b7d04 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/index.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/index.html
@@ -26,30 +26,30 @@
     <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
     <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
 
-    <script type="text/javascript" src="js/gemp-020/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-020/common.js"></script>
-    <script type="text/javascript" src="js/gemp-020/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-020/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-020/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-020/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-020/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/cardFilter.js"></script>
+    <script type="text/javascript" src="js/gemp-021/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-021/common.js"></script>
+    <script type="text/javascript" src="js/gemp-021/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-021/chat.js"></script>
+    <script type="text/javascript" src="js/gemp-021/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-021/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-021/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/cardFilter.js"></script>
 
-    <script type="text/javascript" src="js/gemp-020/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-020/set20.js"></script>
-    <script type="text/javascript" src="js/gemp-020/hobbit.js"></script>
-    <script type="text/javascript" src="js/gemp-020/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-021/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-021/set20.js"></script>
+    <script type="text/javascript" src="js/gemp-021/hobbit.js"></script>
+    <script type="text/javascript" src="js/gemp-021/jCards.js"></script>
 
-    <script type="text/javascript" src="js/gemp-020/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-020/merchantUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/hallUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/leagueResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/tournamentResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/statsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/playerStatsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/gameHistoryUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/deckBuildingUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/gameUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/gameAnimations.js"></script>
+    <script type="text/javascript" src="js/gemp-021/merchantUi.js"></script>
 
     <script type="text/javascript">
         jQuery.fn.center = function () {
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js.inc b/gemp-lotr/gemp-lotr-async/src/main/web/js.inc
index f78a58b11..c098514c2 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js.inc
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js.inc
@@ -9,25 +9,25 @@
 <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
 <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
 
-<script type="text/javascript" src="js/gemp-020/inheritance.js"></script>
-<script type="text/javascript" src="js/gemp-020/common.js"></script>
-<script type="text/javascript" src="js/gemp-020/logging.js"></script>
-<script type="text/javascript" src="js/gemp-020/chat.js"></script>
-<script type="text/javascript" src="js/gemp-020/communication.js"></script>
-<script type="text/javascript" src="js/gemp-020/deliveryService.js"></script>
-<script type="text/javascript" src="js/gemp-020/commonUi.js"></script>
-<script type="text/javascript" src="js/gemp-020/cardFilter.js"></script>
+<script type="text/javascript" src="js/gemp-021/inheritance.js"></script>
+<script type="text/javascript" src="js/gemp-021/common.js"></script>
+<script type="text/javascript" src="js/gemp-021/logging.js"></script>
+<script type="text/javascript" src="js/gemp-021/chat.js"></script>
+<script type="text/javascript" src="js/gemp-021/communication.js"></script>
+<script type="text/javascript" src="js/gemp-021/deliveryService.js"></script>
+<script type="text/javascript" src="js/gemp-021/commonUi.js"></script>
+<script type="text/javascript" src="js/gemp-021/cardFilter.js"></script>
 
-<script type="text/javascript" src="js/gemp-020/jCardGroup.js"></script>
-<script type="text/javascript" src="js/gemp-020/jCards.js"></script>
+<script type="text/javascript" src="js/gemp-021/jCardGroup.js"></script>
+<script type="text/javascript" src="js/gemp-021/jCards.js"></script>
 
-<script type="text/javascript" src="js/gemp-020/hallUi.js"></script>
-<script type="text/javascript" src="js/gemp-020/leagueResultsUi.js"></script>
-<script type="text/javascript" src="js/gemp-020/tournamentResultsUi.js"></script>
-<script type="text/javascript" src="js/gemp-020/statsUi.js"></script>
-<script type="text/javascript" src="js/gemp-020/playerStatsUi.js"></script>
-<script type="text/javascript" src="js/gemp-020/gameHistoryUi.js"></script>
-<script type="text/javascript" src="js/gemp-020/deckBuildingUi.js"></script>
-<script type="text/javascript" src="js/gemp-020/gameUi.js"></script>
-<script type="text/javascript" src="js/gemp-020/gameAnimations.js"></script>
-<script type="text/javascript" src="js/gemp-020/merchantUi.js"></script>
+<script type="text/javascript" src="js/gemp-021/hallUi.js"></script>
+<script type="text/javascript" src="js/gemp-021/leagueResultsUi.js"></script>
+<script type="text/javascript" src="js/gemp-021/tournamentResultsUi.js"></script>
+<script type="text/javascript" src="js/gemp-021/statsUi.js"></script>
+<script type="text/javascript" src="js/gemp-021/playerStatsUi.js"></script>
+<script type="text/javascript" src="js/gemp-021/gameHistoryUi.js"></script>
+<script type="text/javascript" src="js/gemp-021/deckBuildingUi.js"></script>
+<script type="text/javascript" src="js/gemp-021/gameUi.js"></script>
+<script type="text/javascript" src="js/gemp-021/gameAnimations.js"></script>
+<script type="text/javascript" src="js/gemp-021/merchantUi.js"></script>
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/CardInformationDialog.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/CardInformationDialog.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/CardInformationDialog.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/CardInformationDialog.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/DeckPanel.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/DeckPanel.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/DeckPanel.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/DeckPanel.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/cardFilter.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/cardFilter.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/cardFilter.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/cardFilter.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/cardFilter2.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/cardFilter2.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/cardFilter2.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/cardFilter2.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/chat.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/chat.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/chat.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/chat.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/common.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/common.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/common.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/common.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/commonUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/commonUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/commonUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/commonUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/communication.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/communication.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/communication.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/communication.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/deckBuildingUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/deckBuildingUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/deckBuildingUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/deckBuildingUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/deckBuildingUi2.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/deckBuildingUi2.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/deckBuildingUi2.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/deckBuildingUi2.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/deliveryService.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/deliveryService.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/deliveryService.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/deliveryService.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/gameAnimations.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/gameAnimations.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/gameAnimations.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/gameAnimations.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/gameHistoryUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/gameHistoryUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/gameHistoryUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/gameHistoryUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/gameUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/gameUi.js
similarity index 99%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/gameUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/gameUi.js
index 9749afaad..8394e20bf 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/gameUi.js
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/gameUi.js
@@ -56,6 +56,7 @@ var GempLotrGameUI = Class.extend({
     communication:null,
     channelNumber:null,
 
+    settingsFoilPresentation:false,
     settingsAutoPass:false,
     settingsAutoAccept:false,
     settingsAlwaysDropDown:false,
@@ -397,6 +398,20 @@ var GempLotrGameUI = Class.extend({
 
         this.chatBoxDiv = $("#chatBox");
 
+        $("#settingsBox").append("<input id='foilPresentation' type='checkbox' value='selected' /><label for='foilPresentation'>Use animated foiling</label><br />");
+
+        var foilPresentation = $.cookie("foilPresentation");
+        if (foilPresentation == "true" || foilPresentation == null) {
+            $("#foilPresentation").prop("checked", true);
+            this.settingsFoilPresentation = true;
+        }
+
+        $("#foilPresentation").bind("change", function () {
+            var selected = $("#foilPresentation").prop("checked");
+            that.settingsFoilPresentation = selected;
+            $.cookie("foilPresentation", "" + selected, { expires:365 });
+        });
+
         $("#settingsBox").append("<input id='autoAccept' type='checkbox' value='selected' /><label for='autoAccept'>Auto-accept after selecting action or card</label><br />");
 
         var autoAccept = $.cookie("autoAccept");
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/hallUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/hallUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/hallUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/hallUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/hobbit.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/hobbit.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/hobbit.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/hobbit.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/inheritance.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/inheritance.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/inheritance.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/inheritance.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/jCardGroup.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/jCardGroup.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/jCardGroup.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/jCardGroup.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/jCards.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/jCards.js
similarity index 97%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/jCards.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/jCards.js
index cd7e470e5..6039d2703 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/jCards.js
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/jCards.js
@@ -418,7 +418,7 @@ function createCardDiv(image, text, foil, tokens, noBorder, errata) {
     }
 
     if (foil) {
-        var foilDiv = $("<div class='foilOverlay'><img src='/gemp-lotr/images/foil.gif' width='100%' height='100%'></div>");
+        var foilDiv = $("<div class='foilOverlay'><img src='/gemp-lotr/images/"+getFoilImg()+"' width='100%' height='100%'></div>");
         cardDiv.append(foilDiv);
     }
 
@@ -434,6 +434,15 @@ function createCardDiv(image, text, foil, tokens, noBorder, errata) {
     return cardDiv;
 }
 
+function getFoilImg() {
+    var foilPresentation = $.cookie("foilPresentation");
+    if (foilPresentation == "true" || foilPresentation == null) {
+        return "foil.gif";
+    } else {
+        return "holo.jpg";
+    }
+}
+
 function createFullCardDiv(image, foil, horizontal, noBorder) {
     if (horizontal) {
         var cardDiv = $("<div style='position: relative;width:497px;height:357px;'></div>");
@@ -448,7 +457,7 @@ function createFullCardDiv(image, foil, horizontal, noBorder) {
         }
 
         if (foil) {
-            var foilDiv = $("<div class='foilOverlay' style='position:absolute;width:497px;height:357px'><img src='/gemp-lotr/images/foil.gif' width='100%' height='100%'></div>");
+            var foilDiv = $("<div class='foilOverlay' style='position:absolute;width:497px;height:357px'><img src='/gemp-lotr/images/"+getFoilImg()+"' width='100%' height='100%'></div>");
             cardDiv.append(foilDiv);
         }
     } else {
@@ -464,7 +473,7 @@ function createFullCardDiv(image, foil, horizontal, noBorder) {
         }
 
         if (foil) {
-            var foilDiv = $("<div class='foilOverlay' style='position:absolute;width:357px;height:497px'><img src='/gemp-lotr/images/foil.gif' width='100%' height='100%'></div>");
+            var foilDiv = $("<div class='foilOverlay' style='position:absolute;width:357px;height:497px'><img src='/gemp-lotr/images/"+getFoilImg()+"' width='100%' height='100%'></div>");
             cardDiv.append(foilDiv);
         }
     }
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/leagueResultsUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/leagueResultsUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/leagueResultsUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/leagueResultsUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/logging.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/logging.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/logging.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/logging.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/merchantUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/merchantUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/merchantUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/merchantUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/playerStatsUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/playerStatsUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/playerStatsUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/playerStatsUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/set20.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/set20.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/set20.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/set20.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/soloDraftUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/soloDraftUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/soloDraftUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/soloDraftUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/statsUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/statsUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/statsUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/statsUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/tournamentResultsUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/tournamentResultsUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-020/tournamentResultsUi.js
rename to gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/tournamentResultsUi.js
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html b/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html
index d3836f1a1..e91b285f9 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html
@@ -31,30 +31,30 @@
     <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
     <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
 
-    <script type="text/javascript" src="js/gemp-020/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-020/common.js"></script>
-    <script type="text/javascript" src="js/gemp-020/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-020/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-020/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-020/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-020/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/cardFilter.js"></script>
+    <script type="text/javascript" src="js/gemp-021/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-021/common.js"></script>
+    <script type="text/javascript" src="js/gemp-021/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-021/chat.js"></script>
+    <script type="text/javascript" src="js/gemp-021/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-021/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-021/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/cardFilter.js"></script>
 
-    <script type="text/javascript" src="js/gemp-020/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-020/set20.js"></script>
-    <script type="text/javascript" src="js/gemp-020/hobbit.js"></script>
-    <script type="text/javascript" src="js/gemp-020/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-021/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-021/set20.js"></script>
+    <script type="text/javascript" src="js/gemp-021/hobbit.js"></script>
+    <script type="text/javascript" src="js/gemp-021/jCards.js"></script>
 
-    <script type="text/javascript" src="js/gemp-020/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-020/merchantUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/hallUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/leagueResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/tournamentResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/statsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/playerStatsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/gameHistoryUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/deckBuildingUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/gameUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/gameAnimations.js"></script>
+    <script type="text/javascript" src="js/gemp-021/merchantUi.js"></script>
 
     <script type="text/javascript">
         function submitFormToAddress(url, formElem, success, error) {
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/merchant.html b/gemp-lotr/gemp-lotr-async/src/main/web/merchant.html
index 83fc130eb..67eb1d46e 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/merchant.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/merchant.html
@@ -17,30 +17,30 @@
     <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
     <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
 
-    <script type="text/javascript" src="js/gemp-020/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-020/common.js"></script>
-    <script type="text/javascript" src="js/gemp-020/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-020/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-020/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-020/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-020/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/cardFilter.js"></script>
+    <script type="text/javascript" src="js/gemp-021/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-021/common.js"></script>
+    <script type="text/javascript" src="js/gemp-021/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-021/chat.js"></script>
+    <script type="text/javascript" src="js/gemp-021/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-021/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-021/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/cardFilter.js"></script>
 
-    <script type="text/javascript" src="js/gemp-020/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-020/set20.js"></script>
-    <script type="text/javascript" src="js/gemp-020/hobbit.js"></script>
-    <script type="text/javascript" src="js/gemp-020/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-021/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-021/set20.js"></script>
+    <script type="text/javascript" src="js/gemp-021/hobbit.js"></script>
+    <script type="text/javascript" src="js/gemp-021/jCards.js"></script>
 
-    <script type="text/javascript" src="js/gemp-020/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-020/merchantUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/hallUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/leagueResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/tournamentResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/statsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/playerStatsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/gameHistoryUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/deckBuildingUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/gameUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/gameAnimations.js"></script>
+    <script type="text/javascript" src="js/gemp-021/merchantUi.js"></script>
 
     <script type="text/javascript">
 
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/soloDraft.html b/gemp-lotr/gemp-lotr-async/src/main/web/soloDraft.html
index 7636f0fbc..c73122bac 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/soloDraft.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/soloDraft.html
@@ -17,31 +17,31 @@
     <script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
     <script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
 
-    <script type="text/javascript" src="js/gemp-020/inheritance.js"></script>
-    <script type="text/javascript" src="js/gemp-020/common.js"></script>
-    <script type="text/javascript" src="js/gemp-020/logging.js"></script>
-    <script type="text/javascript" src="js/gemp-020/chat.js"></script>
-    <script type="text/javascript" src="js/gemp-020/communication.js"></script>
-    <script type="text/javascript" src="js/gemp-020/deliveryService.js"></script>
-    <script type="text/javascript" src="js/gemp-020/commonUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/cardFilter.js"></script>
+    <script type="text/javascript" src="js/gemp-021/inheritance.js"></script>
+    <script type="text/javascript" src="js/gemp-021/common.js"></script>
+    <script type="text/javascript" src="js/gemp-021/logging.js"></script>
+    <script type="text/javascript" src="js/gemp-021/chat.js"></script>
+    <script type="text/javascript" src="js/gemp-021/communication.js"></script>
+    <script type="text/javascript" src="js/gemp-021/deliveryService.js"></script>
+    <script type="text/javascript" src="js/gemp-021/commonUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/cardFilter.js"></script>
 
-    <script type="text/javascript" src="js/gemp-020/jCardGroup.js"></script>
-    <script type="text/javascript" src="js/gemp-020/set20.js"></script>
-    <script type="text/javascript" src="js/gemp-020/hobbit.js"></script>
-    <script type="text/javascript" src="js/gemp-020/jCards.js"></script>
+    <script type="text/javascript" src="js/gemp-021/jCardGroup.js"></script>
+    <script type="text/javascript" src="js/gemp-021/set20.js"></script>
+    <script type="text/javascript" src="js/gemp-021/hobbit.js"></script>
+    <script type="text/javascript" src="js/gemp-021/jCards.js"></script>
 
-    <script type="text/javascript" src="js/gemp-020/hallUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/leagueResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/tournamentResultsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/statsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/playerStatsUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/gameHistoryUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/deckBuildingUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/gameUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/gameAnimations.js"></script>
-    <script type="text/javascript" src="js/gemp-020/merchantUi.js"></script>
-    <script type="text/javascript" src="js/gemp-020/soloDraftUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/hallUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/leagueResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/tournamentResultsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/statsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/playerStatsUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/gameHistoryUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/deckBuildingUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/gameUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/gameAnimations.js"></script>
+    <script type="text/javascript" src="js/gemp-021/merchantUi.js"></script>
+    <script type="text/javascript" src="js/gemp-021/soloDraftUi.js"></script>
 
     <script type="text/javascript">
 

From 0e25bb683726e5faa2afe8147f1b83325766ae8a Mon Sep 17 00:00:00 2001
From: "marcin.sciesinski" <Marcin.Sciesinski@stash.synchronoss.net>
Date: Thu, 17 May 2018 17:00:00 -0700
Subject: [PATCH 03/14] Refactoring

---
 .../com/gempukku/lotro/game/formats/LotroFormatLibrary.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/LotroFormatLibrary.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/LotroFormatLibrary.java
index 0434e1b93..cdbf2471d 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/LotroFormatLibrary.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/LotroFormatLibrary.java
@@ -99,9 +99,7 @@ public class LotroFormatLibrary {
                     _allFormats.put(formatCode, format);
 
                     Boolean hallFormat = (Boolean) formatDef.get("hall");
-                    if (hallFormat == null)
-                        hallFormat = true;
-                    if (hallFormat)
+                    if (hallFormat == null || hallFormat)
                         _hallFormats.put(formatCode, format);
                 }
             } catch (ParseException exp) {

From 5f72f0155f5191d2123a25d95981d8d4a5d4d843 Mon Sep 17 00:00:00 2001
From: "marcin.sciesinski" <Marcin.Sciesinski@stash.synchronoss.net>
Date: Mon, 21 May 2018 10:17:31 -0700
Subject: [PATCH 04/14] When an event is played, it triggers initiative lost,
 even if the card effect puts it back into hand.

---
 .../com/gempukku/lotro/cards/effects/PlayEventEffect.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PlayEventEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PlayEventEffect.java
index 73c34957a..2e16638fa 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PlayEventEffect.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/PlayEventEffect.java
@@ -7,6 +7,8 @@ import com.gempukku.lotro.game.PhysicalCard;
 import com.gempukku.lotro.game.state.LotroGame;
 import com.gempukku.lotro.logic.effects.PlayCardEffect;
 
+import java.util.Collections;
+
 public class PlayEventEffect extends PlayCardEffect {
     private PhysicalCard _cardPlayed;
     private PlayEventResult _playEventResult;
@@ -23,6 +25,12 @@ public class PlayEventEffect extends PlayCardEffect {
 
     @Override
     protected FullEffectResult playEffectReturningResult(LotroGame game) {
+        if (_cardPlayed.getZone() == Zone.VOID_FROM_HAND) {
+            // At this point, card should change initiative if played
+            game.getGameState().removeCardsFromZone(_cardPlayed.getOwner(), Collections.singleton(_cardPlayed));
+            game.getGameState().addCardToZone(game, _cardPlayed, Zone.VOID);
+        }
+
         game.getActionsEnvironment().emitEffectResult(_playEventResult);
         return new FullEffectResult(true);
     }

From 2c14d118c63eb42cd447df18ffe99850b60fd1b4 Mon Sep 17 00:00:00 2001
From: PhallenCassidy <leoplurodyn@gmail.com>
Date: Sat, 2 Jun 2018 19:47:21 -0400
Subject: [PATCH 05/14] Fix to 12R9 "Loud and Strong"

No longer usable while in hand
---
 .../com/gempukku/lotro/cards/set12/dwarven/Card12_009.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/dwarven/Card12_009.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/dwarven/Card12_009.java
index 8f1954a94..88c3f9f8d 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/dwarven/Card12_009.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/dwarven/Card12_009.java
@@ -32,7 +32,8 @@ public class Card12_009 extends AbstractPermanent {
 
     @Override
     protected List<? extends Action> getExtraPhaseActions(String playerId, LotroGame game, final PhysicalCard self) {
-        if (PlayConditions.canDiscardFromHand(game, playerId, 1, Culture.DWARVEN)
+        if (PlayConditions.canUseFPCardDuringPhase(game, Phase.SKIRMISH, self)
+                && PlayConditions.canDiscardFromHand(game, playerId, 1, Culture.DWARVEN)
                 && PlayConditions.canSpot(game, CardType.MINION, Filters.inSkirmishAgainst(Race.DWARF))) {
             final ActivateCardAction action = new ActivateCardAction(self);
             action.appendCost(

From cf83cce1ba9d5e80709413ba44abf4c04e2681a4 Mon Sep 17 00:00:00 2001
From: PhallenCassidy <leoplurodyn@gmail.com>
Date: Sat, 2 Jun 2018 19:52:38 -0400
Subject: [PATCH 06/14] Fix to 18C91 "Orkish Sneak"

Assignment ability now works as intended
---
 .../lotro/cards/set18/orc/Card18_091.java     | 47 +++++++++++--------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/orc/Card18_091.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/orc/Card18_091.java
index 4adbe9d22..53c104d14 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/orc/Card18_091.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/orc/Card18_091.java
@@ -16,7 +16,9 @@ import com.gempukku.lotro.game.PhysicalCard;
 import com.gempukku.lotro.game.state.LotroGame;
 import com.gempukku.lotro.logic.GameUtils;
 import com.gempukku.lotro.logic.actions.ActivateCardAction;
+import com.gempukku.lotro.logic.decisions.YesNoDecision;
 import com.gempukku.lotro.logic.effects.DiscardCardsFromPlayEffect;
+import com.gempukku.lotro.logic.effects.PlayoutDecisionEffect;
 import com.gempukku.lotro.logic.effects.StackActionEffect;
 import com.gempukku.lotro.logic.timing.Action;
 import com.gempukku.lotro.logic.timing.Effect;
@@ -50,27 +52,32 @@ public class Card18_091 extends AbstractMinion {
             action.appendEffect(
                     new ChooseAndAssignCharacterToMinionEffect(action, playerId, self, Filters.ringBearer, Filters.not(Culture.SHIRE)));
 
-            String fpPlayer = game.getGameState().getCurrentPlayerId();
-            List<Effect> possibleCosts = new LinkedList<Effect>();
-            possibleCosts.add(
-                    new AddBurdenEffect(fpPlayer, self, 1));
-            possibleCosts.add(
-                    new ChooseAndExertCharactersEffect(action, fpPlayer, 1, 1, 2, Filters.ringBearer));
-            SubCostToEffectAction subAction = new SubCostToEffectAction(action);
-            action.appendCost(
-                    new ChoiceEffect(subAction, fpPlayer, possibleCosts));
+            final String fpPlayer = game.getGameState().getCurrentPlayerId();
+
             action.appendEffect(
-                    new DiscardCardsFromPlayEffect(playerId, self, self));
-            action.appendEffect(
-                    new OptionalEffect(action, game.getGameState().getCurrentPlayerId(),
-                            new StackActionEffect(subAction) {
-                                @Override
-                                public String getText(LotroGame game) {
-                                    return "Add burden or exert the Ring-bearer twice to discard " + GameUtils.getFullName(self);
-                                }
-                            }));
+                    new PlayoutDecisionEffect(fpPlayer,
+                    new YesNoDecision("Do you want to add burden or exert the Ring-bearer twice to discard " + GameUtils.getFullName(self) + "?") {
+                @Override
+                protected void yes() {
+                    List<Effect> possibleCosts = new LinkedList<Effect>();
+                    possibleCosts.add(
+                            new AddBurdenEffect(fpPlayer, self, 1));
+                    possibleCosts.add(
+                            new ChooseAndExertCharactersEffect(action, fpPlayer, 1, 1, 2, Filters.ringBearer) {
+                        @Override
+                        public String getText(LotroGame game) {
+                            return "Exert the Ring-bearer twice";
+                        }
+                    });
+                    SubCostToEffectAction subAction = new SubCostToEffectAction(action);
+                    action.appendCost(
+                            new ChoiceEffect(subAction, fpPlayer, possibleCosts));
+                    action.appendEffect(
+                            new DiscardCardsFromPlayEffect(playerId, self, self));
+                }
+            }));
             return Collections.singletonList(action);
-        }
-        return null;
+        };
+    return null;
     }
 }

From e65ddc6eb2e18ab3fc2a3887d6512cf555517a9f Mon Sep 17 00:00:00 2001
From: PhallenCassidy <leoplurodyn@gmail.com>
Date: Sat, 2 Jun 2018 20:27:15 -0400
Subject: [PATCH 07/14] Check allies have same home site to allow transfers

Courtesy of Tbiesty!
---
 .../com/gempukku/lotro/filters/Filters.java   | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java
index 72314325b..a7db5ca36 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java
@@ -689,6 +689,27 @@ public class Filters {
                 }
             });
 
+    public static Filter allyWithSameHome(final PhysicalCard card) {
+        return Filters.and(
+                CardType.ALLY,
+                new Filter() {
+                    @Override
+                    public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {
+                        LotroCardBlueprint blueprint = card.getBlueprint();
+                        if (blueprint.getCardType() == CardType.ALLY) {
+                            Block homeBlock = blueprint.getAllyHomeSiteBlock();
+                            int[] homeSites = blueprint.getAllyHomeSiteNumbers();
+                            for (int homeSite : homeSites) {
+                                if (physicalCard.getBlueprint().isAllyAtHome(homeSite, homeBlock)) {
+                                    return true;
+                                }
+                            }
+                        }
+                        return false;
+                    }
+                });
+    }
+
     public static final Filter currentSite = new Filter() {
         @Override
         public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {

From aac35ec60614f8b843c53e8ddd0db9aa508f14a6 Mon Sep 17 00:00:00 2001
From: PhallenCassidy <leoplurodyn@gmail.com>
Date: Sat, 2 Jun 2018 20:27:17 -0400
Subject: [PATCH 08/14] Check allies have same home site to allow transfers

Courtesy of Tbiesty!
---
 .../lotro/cards/AbstractLotroCardBlueprint.java        | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractLotroCardBlueprint.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractLotroCardBlueprint.java
index 3d19d70c8..255b9d9e3 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractLotroCardBlueprint.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractLotroCardBlueprint.java
@@ -148,6 +148,16 @@ public abstract class AbstractLotroCardBlueprint implements LotroCardBlueprint {
         throw new UnsupportedOperationException("This method should not be called on this card");
     }
 
+    @Override
+    public int[] getAllyHomeSiteNumbers() {
+        throw new UnsupportedOperationException("This method should not be called on this card");
+    }
+
+    @Override
+    public Block getAllyHomeSiteBlock() {
+        throw new UnsupportedOperationException("This method should not be called on this card");
+    }
+
     @Override
     public boolean isAllyAtHome(int siteNumber, Block siteBlock) {
         throw new UnsupportedOperationException("This method should not be called on this card");

From 1c447dc2120a3f6df52478ce0d0b2a50e963cb48 Mon Sep 17 00:00:00 2001
From: PhallenCassidy <leoplurodyn@gmail.com>
Date: Sat, 2 Jun 2018 20:27:18 -0400
Subject: [PATCH 09/14] Check allies have same home site to allow transfers

Courtesy of Tbiesty!
---
 .../lotro/cards/AbstractAttachableFPPossession.java       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachableFPPossession.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachableFPPossession.java
index a17cb527d..a1e7ad095 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachableFPPossession.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachableFPPossession.java
@@ -44,7 +44,8 @@ public abstract class AbstractAttachableFPPossession extends AbstractAttachable
 
             Filter validTransferFilter;
 
-            LotroCardBlueprint attachedTo = self.getAttachedTo().getBlueprint();
+            PhysicalCard attachedToCard = self.getAttachedTo();
+            LotroCardBlueprint attachedTo = attachedToCard.getBlueprint();
             if (attachedTo.getCardType() == CardType.COMPANION) {
                 validTransferFilter = Filters.and(validTargetFilter,
                         Filters.or(
@@ -54,11 +55,10 @@ public abstract class AbstractAttachableFPPossession extends AbstractAttachable
                 validTransferFilter = Filters.and(validTargetFilter,
                         Filters.or(
                                 CardType.COMPANION,
-                                Filters.allyAtHome));
+                                Filters.allyWithSameHome(attachedToCard)));
             } else {
                 validTransferFilter = Filters.and(validTargetFilter,
-                        CardType.ALLY, Filters.allyAtHome
-                );
+                        Filters.allyWithSameHome(attachedToCard));
             }
 
             validTransferFilter = Filters.and(validTransferFilter,

From ce3e7be41d97760bcf07f6a21b7c004c7a1cdf62 Mon Sep 17 00:00:00 2001
From: PhallenCassidy <leoplurodyn@gmail.com>
Date: Sat, 2 Jun 2018 20:27:19 -0400
Subject: [PATCH 10/14] Check allies have same home site to allow transfers

Courtesy of Tbiesty!
---
 .../java/com/gempukku/lotro/cards/AbstractAlly.java    | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAlly.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAlly.java
index f96103ef3..3838f2e8a 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAlly.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAlly.java
@@ -71,6 +71,16 @@ public class AbstractAlly extends AbstractPermanent {
         return null;
     }
 
+    @Override
+    public int[] getAllyHomeSiteNumbers() {
+        return _siteNumbers;
+    }
+
+    @Override
+    public Block getAllyHomeSiteBlock() {
+        return _siteBlock;
+    }
+
     @Override
     public final boolean isAllyAtHome(int siteNumber, Block block) {
         if (block != _siteBlock)

From 58a0314a55c4171cb437ddfb8b328ac98879d53b Mon Sep 17 00:00:00 2001
From: PhallenCassidy <leoplurodyn@gmail.com>
Date: Sat, 2 Jun 2018 20:27:46 -0400
Subject: [PATCH 11/14] Check allies have same home site to allow transfers

Courtesy of Tbiesty!
---
 .../main/java/com/gempukku/lotro/game/LotroCardBlueprint.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprint.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprint.java
index 2a335654b..7db40485a 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprint.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprint.java
@@ -46,6 +46,10 @@ public interface LotroCardBlueprint {
 
     public int getResistance();
 
+    public int[] getAllyHomeSiteNumbers();
+
+    public Block getAllyHomeSiteBlock();
+
     public boolean isAllyAtHome(int siteNumber, Block siteBlock);
 
     public List<? extends Modifier> getAlwaysOnModifiers(LotroGame game, PhysicalCard self);

From 0a302ddb7eacf0cd1221a773108558aa0317507e Mon Sep 17 00:00:00 2001
From: PhallenCassidy <leoplurodyn@gmail.com>
Date: Sat, 2 Jun 2018 20:42:21 -0400
Subject: [PATCH 12/14] Update changeLog.html

---
 .../gemp-lotr-async/src/main/web/includes/changeLog.html | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html
index 5aebf9516..259bc5b2e 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html
@@ -1,4 +1,13 @@
 <pre style="font-size:80%">
+<b>Most recent update</b>
+- Added Draft for Fellowship block, The Two Towers block, and The Hobbit
+- Added prize support for Draft games
+- Users can now select what kind of foiling they want to see under the "Settings" tab in-game
+- The Free Peoples will now properly lose initiative when playing events
+- Allies with different home sites can no longer transfer possessions to one another
+- "Loud and Strong" can no longer be used while in hand
+- "Orkish Sneak" assignment ability now works as intended
+
 <b>18 Apr. 2018</b>
 - Draft play is now available!
 - The Deckbuilder now filters out sites which are not legal for the selected format.

From a1550bf3f7a7905fdcf9973f770c9617b84775a5 Mon Sep 17 00:00:00 2001
From: "marcin.sciesinski" <Marcin.Sciesinski@stash.synchronoss.net>
Date: Thu, 21 Jun 2018 00:01:11 -0700
Subject: [PATCH 13/14] By default Mtg card price update is disabled

---
 .../src/main/java/com/gempukku/lotro/builder/ServerBuilder.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/builder/ServerBuilder.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/builder/ServerBuilder.java
index a9b4baeac..b155cf1c0 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/builder/ServerBuilder.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/builder/ServerBuilder.java
@@ -152,7 +152,7 @@ public class ServerBuilder {
 
     private static boolean isMtgEnabled() {
         String mtgEnabled = ApplicationConfiguration.getProperty("mtg.enabled");
-        return mtgEnabled == null || mtgEnabled.equals("true");
+        return mtgEnabled != null && mtgEnabled.equals("true");
     }
 
     public static void destroyObjects(Map<Type, Object> objectMap) {

From c8f33f298baf1f6f2d67a66271cca93e1e2c3dbe Mon Sep 17 00:00:00 2001
From: "marcin.sciesinski" <Marcin.Sciesinski@stash.synchronoss.net>
Date: Tue, 26 Jun 2018 02:03:37 -0700
Subject: [PATCH 14/14] Ensure there is no duplicate sets downloaded.

---
 .../mtg/provider/mtggoldfish/MtgGoldfishProvider.java  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/mtg/provider/mtggoldfish/MtgGoldfishProvider.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/mtg/provider/mtggoldfish/MtgGoldfishProvider.java
index 9e4aa54f4..5a4314df4 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/mtg/provider/mtggoldfish/MtgGoldfishProvider.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/mtg/provider/mtggoldfish/MtgGoldfishProvider.java
@@ -150,7 +150,7 @@ public class MtgGoldfishProvider implements MtgDataProvider {
         String link = "http://www.mtggoldfish.com/index/" + mtgCardSet.getUrlPostfix();
         Document doc = Jsoup.parse(new URL(link), TIMEOUT);
         boolean isInPaper = (doc.select("#priceHistoryTabs [href=#tab-paper]").size() > 0);
-        if (isInPaper) {
+        if (isInPaper && !containsLinkSet(result, link)) {
             List<CardData> allCards = new LinkedList<CardData>();
 
             Elements cardElements = doc.select(".index-price-table-paper tbody tr");
@@ -169,6 +169,14 @@ public class MtgGoldfishProvider implements MtgDataProvider {
         }
     }
 
+    private boolean containsLinkSet(List<SetCardData> result, String link) {
+        for (SetCardData setCardData : result) {
+            if (setCardData.getSetLink().equals(link))
+                return true;
+        }
+        return false;
+    }
+
     private int getSleepTime() {
         Random rnd = new Random();
         return SLEEP_MINIMUM + rnd.nextInt(SLEEP_MAXIMUM - SLEEP_MINIMUM);