From f23b97e0402fc877e5d66e80db91a0358439514c Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Thu, 10 May 2012 10:07:57 +0000
Subject: [PATCH] New formats for league.

---
 .../src/main/resources/lotrFormats.json       | 27 ++++++++++++++
 .../gempukku/lotro/server/HallResource.java   | 36 +++++++++++++++++++
 .../src/main/webapp/leagueAdmin.html          |  3 ++
 3 files changed, 66 insertions(+)

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 5f806ae2e..b34c79890 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json
+++ b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json
@@ -56,6 +56,33 @@
         "banned": ["1_40","1_45","1_80","1_108","1_139","1_234","1_248","1_313","2_32","2_101","2_108","3_38","3_42","3_68","4_192"],
         "set":[1,2,3,4,5,6]
     },
+    {
+        "name": "Towers standard - Sets 1-4",
+        "code":"ttt_standard",
+        "sites": "TWO_TOWERS",
+        "cancelRingBearerSkirmish": true,
+        "banned": ["1_40","1_45","1_80","1_108","1_139","1_234","1_248","1_313","2_32","2_101","2_108","3_38","3_42","3_68","4_192"],
+        "set":[1,2,3,4],
+        "hall": false
+    },
+    {
+        "name": "Towers standard - Sets 1-5",
+        "code":"bohd_standard",
+        "sites": "TWO_TOWERS",
+        "cancelRingBearerSkirmish": true,
+        "banned": ["1_40","1_45","1_80","1_108","1_139","1_234","1_248","1_313","2_32","2_101","2_108","3_38","3_42","3_68","4_192"],
+        "set":[1,2,3,4,5],
+        "hall": false
+    },
+    {
+        "name": "Towers standard - Sets 1-6,9,14&16",
+        "code":"ts_reflections",
+        "sites": "TWO_TOWERS",
+        "cancelRingBearerSkirmish": false,
+        "banned": ["1_40","1_45","1_80","1_108","1_139","1_234","1_248","1_313","2_32","2_101","2_108","3_38","3_42","3_68","4_192"],
+        "set":[1,2,3,4,5,6,9,14,16],
+        "hall": false
+    },
     {
         "name": "King block",
         "code": "king_block",
diff --git a/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/HallResource.java b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/HallResource.java
index 0a927f77d..1fd8e5a94 100644
--- a/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/HallResource.java
+++ b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/HallResource.java
@@ -74,6 +74,42 @@ public class HallResource extends AbstractResource {
         return result.toString();
     }
 
+    @Path("/format/{format}")
+    @GET
+    @Produces(MediaType.TEXT_HTML)
+    public String getFormat(
+            @PathParam("format") String format,
+            @Context HttpServletResponse response) {
+
+        response.setCharacterEncoding("UTF-8");
+
+        StringBuilder result = new StringBuilder();
+        LotroFormat lotroFormat = _formatLibrary.getFormat(format);
+        result.append("<b>" + lotroFormat.getName() + "</b>");
+        result.append("<ul>");
+        result.append("<li>valid sets: ");
+        for (Integer integer : lotroFormat.getValidSets())
+            result.append(integer + ", ");
+        result.append("</li>");
+        result.append("<li>sites from block: " + lotroFormat.getSiteBlock().getHumanReadable() + "</li>");
+        result.append("<li>Ring-bearer skirmish can be cancelled: " + (lotroFormat.canCancelRingBearerSkirmish() ? "yes" : "no") + "</li>");
+        result.append("<li>X-listed: ");
+        for (String blueprintId : lotroFormat.getBannedCards())
+            result.append(GameUtils.getCardLink(blueprintId, _library.getLotroCardBlueprint(blueprintId)) + ", ");
+        if (lotroFormat.getBannedCards().size() == 0)
+            result.append("none,");
+        result.append("</li>");
+        result.append("<li>R-listed: ");
+        for (String blueprintId : lotroFormat.getRestrictedCards())
+            result.append(GameUtils.getCardLink(blueprintId, _library.getLotroCardBlueprint(blueprintId)) + ", ");
+        if (lotroFormat.getRestrictedCards().size() == 0)
+            result.append("none,");
+        result.append("</li>");
+        result.append("</ul>");
+
+        return result.toString();
+    }
+
     @GET
     @Produces(MediaType.APPLICATION_XML)
     public Document getHall(
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/leagueAdmin.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/leagueAdmin.html
index ec422a833..c601a793b 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/leagueAdmin.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/leagueAdmin.html
@@ -199,6 +199,9 @@
                 <option value="ttt1_block">Towers block - Set 4</option>
                 <option value="ttt2_block">Towers block - Sets 4&5</option>
                 <option value="towers_standard">Towers standard</option>
+                <option value="ttt_standard">Towers standard - Sets 1-4</option>
+                <option value="bohd_standard">Towers standard - Sets 1-5</option>
+                <option value="ts_reflections">Towers standard - Sets 1-6,9,14&16</option>
                 <option value="king_block">King block</option>
                 <option value="movie">Movie block</option>
                 <option value="movie7">Movie block - Sets 1-7</option>