ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing erroneous format overwrite

Browse Source
This commit is contained in:
Christian 'ketura' McCarty
2021-03-23 11:34:05 -05:00
parent 5ecbd4df9c
commit 0eca5808a4
1 changed files with 17 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json
View File

@@ -1,11 +1,4 @@
[
{
"name": "Debug",
"code":"debug_hall",
"sites": "SPECIAL",
"maximumSameName":100,
"set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 51, 52, 53, 101]
},
{
"name":"Fellowship block",
"code":"fotr_block",
@@ -18,6 +11,7 @@
"code":"pc_fotr_block",
"sites":"FELLOWSHIP",
"cancelRingBearerSkirmish":true,
"hall":false,
"set":[1, 2, 3, 51, 52, 53, 101],
"banned":["1_40","1_311","2_32","3_42","3_68",]
},
@@ -68,8 +62,7 @@
"code":"ttt_block",
"sites":"TWO_TOWERS",
"cancelRingBearerSkirmish":true,
"set":[4, 5, 6],
"hall":false
"set":[4, 5, 6]
},
{
"name":"Towers block - Set 4",
@@ -93,16 +86,14 @@
"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],
"hall":false
"set":[1, 2, 3, 4, 5, 6]
},
{
"name": "Anything goes",
"code":"rev_tow_sta",
"sites": "SPECIAL",
"cancelRingBearerSkirmish":true,
"set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 21],
"hall":false
"set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]
},
{
"name":"Towers standard - Sets 1-4",
@@ -146,8 +137,7 @@
"sites":"KING",
"cancelRingBearerSkirmish":true,
"banned":["1_40", "1_45","1_80", "1_108", "1_139", "1_195", "1_234", "1_248", "1_313", "2_32", "2_101", "2_108", "3_38", "3_42", "3_67", "3_68", "3_106", "3_108"],
"set":[1, 2, 3, 4, 5, 6, 7],
"hall":false
"set":[1, 2, 3, 4, 5, 6, 7]
},
{
"name":"King block",
@@ -155,8 +145,7 @@
"sites":"KING",
"cancelRingBearerSkirmish":true,
"restricted":["7_49"],
"set":[7, 8, 10],
"hall":false
"set":[7, 8, 10]
},
{
"name":"King block - Set 7",
@@ -180,13 +169,14 @@
"name":"Movie block",
"code":"movie",
"sites":"KING",
"banned":["1_40", "1_45", "1_80", "1_108", "1_139", "1_195", "1_234", "1_248", "1_313", "2_32", "3_106", "3_108", "3_38", "3_42", "3_67", "3_68", "7_49", "7_96", "8_1", "10_2", "10_91"],
"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":"PC-Movie",
"code":"pc_movie",
"sites":"KING",
"hall":false,
"set":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 51, 52, 53, 101],
"banned":["1_40","1_311","2_32","3_42","3_68", "1_45", "1_80", "1_108", "1_139", "1_195", "1_234", "1_248", "1_313", "3_106", "3_108", "3_38", "3_67", "7_49", "7_96", "8_1", "10_2", "10_91"],
},
@@ -228,39 +218,34 @@
"code":"war_block",
"sites":"SHADOWS",
"restricted":["11_132", "11_100"],
"set":[11, 12, 13],
"hall":false
"set":[11, 12, 13]
},
{
"name":"Hunter block",
"code":"hunter_block",
"sites":"SHADOWS",
"set":[15, 17, 18],
"hall":false
"set":[15, 17, 18]
},
{
"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],
"hall":false
"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],
"hall":false
"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],
"hall":false
"set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]
},
{
"name":"Expanded",
@@ -274,6 +259,7 @@
"name":"PC-Expanded",
"code":"pc_expanded",
"sites":"SHADOWS",
"hall":false,
"banned":["1_40","1_311","2_32","3_42","3_68","1_45", "1_138", "1_234", "1_313", "1_316", "2_121", "3_17", "3_38", "3_67", "3_108", "3_113", "4_73", "7_49", "8_1", "10_2", "10_11", "10_91", "11_31", "11_100", "11_132"],
"restricted":["1_80", "1_108", "1_139", "1_195", "1_248", "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, 51, 52, 53, 101]
@@ -310,8 +296,7 @@
"banned":["1_138", "1_311", "1_316", "1_331", "1_338", "1_354", "1_355", "1_360", "2_14", "2_75", "3_1", "3_113", "4_73", "4_338", "4_355", "4_357", "7_190", "8_20", "10_11",
"8_1", "8_3", "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],
"hall":false
"set":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
},
{
"name":"Movie block, no GLR (10R11)",
@@ -345,7 +330,7 @@
"limit3":[],
"set":[30, 31],
"restrictedName":["Gandalf", "Bilbo"],
"hall":false
"hall":true
},
{
"name": "Hobbit: The Clouds Burst",
@@ -357,7 +342,7 @@
"limit3": [],
"set": [30, 32],
"restrictedName": ["Gandalf", "Bilbo"],
"hall":false
"hall": true
},
{
"name": "Hobbit: Fire and Water",