From ae6d854e0fad361446728c59b25297025eca0aef Mon Sep 17 00:00:00 2001
From: "marcin.sciesinski" <Marcin.Sciesinski@stash.synchronoss.net>
Date: Sun, 20 Oct 2019 18:56:16 -0700
Subject: [PATCH] Made the maximum of the same card configurable per format

---
 .../game/formats/LotroFormatLibrary.java      |   3 +-
 .../src/main/resources/lotrFormats.json       | 142 ++++--------------
 2 files changed, 31 insertions(+), 114 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 2cd559f50..060141f40 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
@@ -46,9 +46,10 @@ public class LotroFormatLibrary {
                     Boolean winOnControlling5Sites = (Boolean) formatDef.get("winOnControlling5Sites");
                     if (winOnControlling5Sites == null)
                         winOnControlling5Sites = false;
-                    Number maximumSameNameCount = (Number) formatDef.get("maximumSameName");
 
+                    Number maximumSameNameCount = (Number) formatDef.get("maximumSameName");
                     int maximumSameName = (maximumSameNameCount != null) ? maximumSameNameCount.intValue() : 4;
+
                     final DefaultLotroFormat format = new DefaultLotroFormat(adventure, library, name, surveyUrl, block, true, 60, maximumSameName, true,
                             cancelRingBearerSkirmish, hasRuleOfFour, winAtEndOfRegroup, winOnControlling5Sites);
 
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json
index 2e4740f2c..9f61b0725 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json
+++ b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json
@@ -355,128 +355,44 @@
         "code":"limited_hobbit",
         "sites":"HOBBIT",
         "cancelRingBearerSkirmish":true,
-        "maximumSameName": 100,
+        "maximumSameName":100,
         "set":[30, 31],
         "hall":false
     },
     {
-        "name": "Limited",
-        "code": "limited_fotr",
-        "sites": "FELLOWSHIP",
-        "cancelRingBearerSkirmish": true,
-        "maximumSameName": 100,
-        "set": [
-            0,
-            1,
-            2,
-            3,
-            4,
-            5,
-            6,
-            7,
-            8,
-            9,
-            10,
-            11,
-            12,
-            13,
-            14,
-            15,
-            16,
-            17,
-            18,
-            19
-        ],
-        "hall": false
+        "name":"Limited",
+        "code":"limited_fotr",
+        "sites":"FELLOWSHIP",
+        "cancelRingBearerSkirmish":true,
+        "maximumSameName":100,
+        "set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19],
+        "hall":false
     },
     {
-        "name": "Limited",
-        "code": "limited_ttt",
-        "sites": "TWO_TOWERS",
-        "cancelRingBearerSkirmish": true,
-        "maximumSameName": 100,
-        "set": [
-            0,
-            1,
-            2,
-            3,
-            4,
-            5,
-            6,
-            7,
-            8,
-            9,
-            10,
-            11,
-            12,
-            13,
-            14,
-            15,
-            16,
-            17,
-            18,
-            19
-        ],
-        "hall": false
+        "name":"Limited",
+        "code":"limited_ttt",
+        "sites":"TWO_TOWERS",
+        "cancelRingBearerSkirmish":true,
+        "maximumSameName":100,
+        "set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19],
+        "hall":false
     },
     {
-        "name": "Limited",
-        "code": "limited_king",
-        "sites": "KING",
-        "cancelRingBearerSkirmish": true,
-        "maximumSameName": 100,
-        "set": [
-            0,
-            1,
-            2,
-            3,
-            4,
-            5,
-            6,
-            7,
-            8,
-            9,
-            10,
-            11,
-            12,
-            13,
-            14,
-            15,
-            16,
-            17,
-            18,
-            19
-        ],
-        "hall": false
+        "name":"Limited",
+        "code":"limited_king",
+        "sites":"KING",
+        "cancelRingBearerSkirmish":true,
+        "maximumSameName":100,
+        "set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19],
+        "hall":false
     },
     {
-        "name": "Limited",
-        "code": "limited_shadows",
-        "sites": "SHADOWS",
-        "cancelRingBearerSkirmish": false,
-        "maximumSameName": 100,
-        "set": [
-            0,
-            1,
-            2,
-            3,
-            4,
-            5,
-            6,
-            7,
-            8,
-            9,
-            10,
-            11,
-            12,
-            13,
-            14,
-            15,
-            16,
-            17,
-            18,
-            19
-        ],
-        "hall": false
+        "name":"Limited",
+        "code":"limited_shadows",
+        "sites":"SHADOWS",
+        "cancelRingBearerSkirmish":false,
+        "maximumSameName":100,
+        "set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19],
+        "hall":false
     }
 ]