From 4c4798a91c6b942d316666d1120c701edc57197b Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Tue, 2 Oct 2012 16:03:16 +0000 Subject: [PATCH] Fixing error. --- .../common/ApplicationConfiguration.java | 3 + .../src/main/resources/lotrFormats.json | 484 +++++++++--------- 2 files changed, 245 insertions(+), 242 deletions(-) diff --git a/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/ApplicationConfiguration.java b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/ApplicationConfiguration.java index 60415a649..0a2de3481 100644 --- a/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/ApplicationConfiguration.java +++ b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/ApplicationConfiguration.java @@ -15,6 +15,9 @@ public class ApplicationConfiguration { Properties props = new Properties(); try { props.load(ApplicationConfiguration.class.getResourceAsStream("/gemp-lotr.properties")); + String gempPropertiesOverride = System.getProperty("gemp-lotr.override"); + if (gempPropertiesOverride != null) + props.load(ApplicationConfiguration.class.getResourceAsStream(gempPropertiesOverride)); _properties = props; } catch (Exception exp) { LOGGER.error("Can't load application configuration", exp); 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 22044da4b..d601188d3 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json +++ b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json @@ -1,243 +1,243 @@ -w[ -{ -"name":"Fellowship block", -"code":"fotr_block", -"sites":"FELLOWSHIP", -"cancelRingBearerSkirmish":true, -"restricted":["1_248"], -"set":[1, 2, 3] -}, -{ -"name":"Fellowship block - Set 1", -"code":"fotr1_block", -"sites":"FELLOWSHIP", -"cancelRingBearerSkirmish":true, -"restricted":["1_248"], -"set":[1], -"hall":false -}, -{ -"name":"Fellowship block - Sets 1-2", -"code":"fotr2_block", -"sites":"FELLOWSHIP", -"cancelRingBearerSkirmish":true, -"restricted":["1_248"], -"set":[1, 2], -"hall":false -}, -{ -"name":"Towers block", -"code":"ttt_block", -"sites":"TWO_TOWERS", -"cancelRingBearerSkirmish":true, -"set":[4, 5, 6] -}, -{ -"name":"Towers block - Set 4", -"code":"ttt1_block", -"sites":"TWO_TOWERS", -"cancelRingBearerSkirmish":true, -"set":[4], -"hall":false -}, -{ -"name":"Towers block - Sets 4-5", -"code":"ttt2_block", -"sites":"TWO_TOWERS", -"cancelRingBearerSkirmish":true, -"set":[4, 5], -"hall":false -}, -{ -"name":"Towers standard", -"code":"towers_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, 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 2-6", -"code":"ts_no_fotr", -"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":[2, 3, 4, 5, 6], -"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", -"sites":"KING", -"cancelRingBearerSkirmish":true, -"restricted":["7_49"], -"set":[7, 8, 10] -}, -{ -"name":"Movie block", -"code":"movie", -"sites":"KING", -"banned":["8_1", "3_38", "3_106", "1_40", "2_32", "1_248", "3_108", "1_45", "7_96", "3_42", "10_2", "10_91", "1_108", "1_80", "3_67", "1_195", "3_68", "1_139", "7_49", "1_313", "1_234"], -"set":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10] -}, -{ -"name":"Movie block - Sets 1-7", -"code":"movie7", -"sites":"KING", -"banned":["8_1", "3_38", "3_106", "1_40", "2_32", "1_248", "3_108", "1_45", "7_96", "3_42", "10_2", "10_91", "1_108", "1_80", "3_67", "1_195", "3_68", "1_139", "7_49", "1_313", "1_234"], -"set":[1, 2, 3, 4, 5, 6, 7], -"hall":false -}, -{ -"name":"Movie block - Sets 1-8", -"code":"movie8", -"sites":"KING", -"banned":["8_1", "3_38", "3_106", "1_40", "2_32", "1_248", "3_108", "1_45", "7_96", "3_42", "10_2", "10_91", "1_108", "1_80", "3_67", "1_195", "3_68", "1_139", "7_49", "1_313", "1_234"], -"set":[1, 2, 3, 4, 5, 6, 7, 8], -"hall":false -}, -{ -"name":"Movie block - Sets 1-9", -"code":"movie9", -"sites":"KING", -"banned":["8_1", "3_38", "3_106", "1_40", "2_32", "1_248", "3_108", "1_45", "7_96", "3_42", "10_2", "10_91", "1_108", "1_80", "3_67", "1_195", "3_68", "1_139", "7_49", "1_313", "1_234"], -"set":[1, 2, 3, 4, 5, 6, 7, 8, 9], -"hall":false -}, -{ -"name":"War of the Ring block", -"code":"war_block", -"sites":"SHADOWS", -"restricted":["11_132", "11_100"], -"set":[11, 12, 13] -}, -{ -"name":"War of the Ring standard", -"code":"war_standard", -"sites":"SHADOWS", -"banned":["4_73", "4_276", "4_304", "7_49", "8_1", "10_2", "10_11", "10_91", "11_31", "11_100", "11_132"], -"set":[4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14] -}, -{ -"name":"Standard", -"code":"standard", -"sites":"SHADOWS", -"banned":["0_1-19", "0_21", "0_22", "0_30-47", "0_62-67", "8_1", "13_188", "11_114", "11_31", "10_11", "15_64", "10_2", "10_91", "11_132", "7_49", "11_100"], -"set":[0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19] -}, -{ -"name":"Open", -"code":"open", -"sites":"SHADOWS", -"restricted":["1_248", "7_49", "10_2", "10_91", "11_100", "11_132"], -"set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19] -}, -{ -"name":"Expanded", -"code":"expanded", -"sites":"SHADOWS", -"banned":["1_45", "1_138", "1_234", "1_311", "1_313", "1_316", "2_121", "3_17", "3_38", "3_42", "3_67", "3_68", "3_108", "3_113", "4_73", "7_49", "8_1", "10_2", "10_11", "10_91", "11_31", "11_100", "11_132"], -"restricted":["1_40", "1_80", "1_108", "1_139", "1_195", "1_248", "2_32", "2_75", "3_106", "4_276", "4_304"], -"set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19] -}, -{ -"name":"Limited", -"code":"limited_fotr", -"sites":"FELLOWSHIP", -"cancelRingBearerSkirmish":true, -"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, -"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, -"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, -"set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19], -"hall":false -}, -{ -"name":"War of the Ring block - Set 11", -"code":"war_block11", -"sites":"SHADOWS", -"restricted":["11_132", "11_100"], -"set":[11], -"hall":false -}, -{ -"name":"War of the Ring block - Sets 11-12", -"code":"war_block12", -"sites":"SHADOWS", -"restricted":["11_132", "11_100"], -"set":[11, 12], -"hall":false -}, -{ -"name":"War of the Ring block - Sets 10-14", -"code":"war_block14", -"sites":"SHADOWS", -"restricted":["11_132", "11_100"], -"set":[10, 11, 12, 13, 14], -"hall":false -}, -{ -"name":"Pre-Shadows Multipath", -"code":"multipath", -"sites":"SPECIAL", -"banned":["1_138", "1_311", "1_316", "1_331", "1_338", "1_355", "1_360", "2_14", "2_75", "3_1", "3_113", "4_73", "4_338", "4_355", "4_357", "7_188", "7_190", "8_20", "10_11", -"8_1", "3_38", "3_106", "1_40", "2_32", "1_248", "3_108", "1_45", "7_96", "3_42", "10_2", "10_91", "1_108", "1_80", "3_67", "1_195", "3_68", "1_139", "7_49", "1_313", "1_234", "7_156"], -"valid":["0_56-60"], -"set":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10] -}, -{ -"name":"Movie block, no GLR (10R11)", -"code":"movie_exp", -"sites":"KING", -"banned":["8_1", "3_38", "3_106", "1_40", "2_32", "1_248", "3_108", "1_45", "10_11", "7_96", "3_42", "10_2", "10_91", "1_108", "1_80", "3_67", "1_195", "3_68", "1_139", "7_49", "1_313", "1_234"], -"set":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10], -"hall":false -} +[ + { + "name":"Fellowship block", + "code":"fotr_block", + "sites":"FELLOWSHIP", + "cancelRingBearerSkirmish":true, + "restricted":["1_248"], + "set":[1, 2, 3] + }, + { + "name":"Fellowship block - Set 1", + "code":"fotr1_block", + "sites":"FELLOWSHIP", + "cancelRingBearerSkirmish":true, + "restricted":["1_248"], + "set":[1], + "hall":false + }, + { + "name":"Fellowship block - Sets 1-2", + "code":"fotr2_block", + "sites":"FELLOWSHIP", + "cancelRingBearerSkirmish":true, + "restricted":["1_248"], + "set":[1, 2], + "hall":false + }, + { + "name":"Towers block", + "code":"ttt_block", + "sites":"TWO_TOWERS", + "cancelRingBearerSkirmish":true, + "set":[4, 5, 6] + }, + { + "name":"Towers block - Set 4", + "code":"ttt1_block", + "sites":"TWO_TOWERS", + "cancelRingBearerSkirmish":true, + "set":[4], + "hall":false + }, + { + "name":"Towers block - Sets 4-5", + "code":"ttt2_block", + "sites":"TWO_TOWERS", + "cancelRingBearerSkirmish":true, + "set":[4, 5], + "hall":false + }, + { + "name":"Towers standard", + "code":"towers_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, 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 2-6", + "code":"ts_no_fotr", + "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":[2, 3, 4, 5, 6], + "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", + "sites":"KING", + "cancelRingBearerSkirmish":true, + "restricted":["7_49"], + "set":[7, 8, 10] + }, + { + "name":"Movie block", + "code":"movie", + "sites":"KING", + "banned":["8_1", "3_38", "3_106", "1_40", "2_32", "1_248", "3_108", "1_45", "7_96", "3_42", "10_2", "10_91", "1_108", "1_80", "3_67", "1_195", "3_68", "1_139", "7_49", "1_313", "1_234"], + "set":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10] + }, + { + "name":"Movie block - Sets 1-7", + "code":"movie7", + "sites":"KING", + "banned":["8_1", "3_38", "3_106", "1_40", "2_32", "1_248", "3_108", "1_45", "7_96", "3_42", "10_2", "10_91", "1_108", "1_80", "3_67", "1_195", "3_68", "1_139", "7_49", "1_313", "1_234"], + "set":[1, 2, 3, 4, 5, 6, 7], + "hall":false + }, + { + "name":"Movie block - Sets 1-8", + "code":"movie8", + "sites":"KING", + "banned":["8_1", "3_38", "3_106", "1_40", "2_32", "1_248", "3_108", "1_45", "7_96", "3_42", "10_2", "10_91", "1_108", "1_80", "3_67", "1_195", "3_68", "1_139", "7_49", "1_313", "1_234"], + "set":[1, 2, 3, 4, 5, 6, 7, 8], + "hall":false + }, + { + "name":"Movie block - Sets 1-9", + "code":"movie9", + "sites":"KING", + "banned":["8_1", "3_38", "3_106", "1_40", "2_32", "1_248", "3_108", "1_45", "7_96", "3_42", "10_2", "10_91", "1_108", "1_80", "3_67", "1_195", "3_68", "1_139", "7_49", "1_313", "1_234"], + "set":[1, 2, 3, 4, 5, 6, 7, 8, 9], + "hall":false + }, + { + "name":"War of the Ring block", + "code":"war_block", + "sites":"SHADOWS", + "restricted":["11_132", "11_100"], + "set":[11, 12, 13] + }, + { + "name":"War of the Ring standard", + "code":"war_standard", + "sites":"SHADOWS", + "banned":["4_73", "4_276", "4_304", "7_49", "8_1", "10_2", "10_11", "10_91", "11_31", "11_100", "11_132"], + "set":[4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14] + }, + { + "name":"Standard", + "code":"standard", + "sites":"SHADOWS", + "banned":["0_1-19", "0_21", "0_22", "0_30-47", "0_62-67", "8_1", "13_188", "11_114", "11_31", "10_11", "15_64", "10_2", "10_91", "11_132", "7_49", "11_100"], + "set":[0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19] + }, + { + "name":"Open", + "code":"open", + "sites":"SHADOWS", + "restricted":["1_248", "7_49", "10_2", "10_91", "11_100", "11_132"], + "set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19] + }, + { + "name":"Expanded", + "code":"expanded", + "sites":"SHADOWS", + "banned":["1_45", "1_138", "1_234", "1_311", "1_313", "1_316", "2_121", "3_17", "3_38", "3_42", "3_67", "3_68", "3_108", "3_113", "4_73", "7_49", "8_1", "10_2", "10_11", "10_91", "11_31", "11_100", "11_132"], + "restricted":["1_40", "1_80", "1_108", "1_139", "1_195", "1_248", "2_32", "2_75", "3_106", "4_276", "4_304"], + "set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19] + }, + { + "name":"Limited", + "code":"limited_fotr", + "sites":"FELLOWSHIP", + "cancelRingBearerSkirmish":true, + "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, + "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, + "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, + "set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19], + "hall":false + }, + { + "name":"War of the Ring block - Set 11", + "code":"war_block11", + "sites":"SHADOWS", + "restricted":["11_132", "11_100"], + "set":[11], + "hall":false + }, + { + "name":"War of the Ring block - Sets 11-12", + "code":"war_block12", + "sites":"SHADOWS", + "restricted":["11_132", "11_100"], + "set":[11, 12], + "hall":false + }, + { + "name":"War of the Ring block - Sets 10-14", + "code":"war_block14", + "sites":"SHADOWS", + "restricted":["11_132", "11_100"], + "set":[10, 11, 12, 13, 14], + "hall":false + }, + { + "name":"Pre-Shadows Multipath", + "code":"multipath", + "sites":"SPECIAL", + "banned":["1_138", "1_311", "1_316", "1_331", "1_338", "1_355", "1_360", "2_14", "2_75", "3_1", "3_113", "4_73", "4_338", "4_355", "4_357", "7_188", "7_190", "8_20", "10_11", + "8_1", "3_38", "3_106", "1_40", "2_32", "1_248", "3_108", "1_45", "7_96", "3_42", "10_2", "10_91", "1_108", "1_80", "3_67", "1_195", "3_68", "1_139", "7_49", "1_313", "1_234", "7_156"], + "valid":["0_56-60"], + "set":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10] + }, + { + "name":"Movie block, no GLR (10R11)", + "code":"movie_exp", + "sites":"KING", + "banned":["8_1", "3_38", "3_106", "1_40", "2_32", "1_248", "3_108", "1_45", "10_11", "7_96", "3_42", "10_2", "10_91", "1_108", "1_80", "3_67", "1_195", "3_68", "1_139", "7_49", "1_313", "1_234"], + "set":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10], + "hall":false + } ] \ No newline at end of file