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("" + lotroFormat.getName() + ""); + result.append("