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

Made the maximum of the same card configurable per format

Browse Source
This commit is contained in:
marcin.sciesinski
2019-10-20 18:56:16 -07:00
parent efb8f4de97
commit ae6d854e0f
2 changed files with 31 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/LotroFormatLibrary.java
View File

@@ -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);

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

@@ -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
}
]