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

Merge pull request #97 from PlayersCouncil/pc-formats

Browse Source 
Incorporating PC Formats on a limited basis for use in the PC March League
This commit is contained in:
Marcin Sciesinski
2021-03-09 04:24:56 -08:00
committed by GitHub
parent 2d48823cfb e050e16e62
commit 9683ccca24
18 changed files with 417 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gemp-lotr/gemp-lotr-async/src/main/web/ban.html
View File

@@ -36,6 +36,7 @@
<script type="text/javascript" src="js/gemp-022/hobbit.js"></script> <script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-022/set40.js"></script> <script type="text/javascript" src="js/gemp-022/set40.js"></script>
<script type="text/javascript" src="js/gemp-022/jCards.js"></script> <script type="text/javascript" src="js/gemp-022/jCards.js"></script>
<script type="text/javascript" src="js/gemp-022/PC_Cards.js"></script>
<script type="text/javascript" src="js/gemp-022/hallUi.js"></script> <script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script> <script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>

103
gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set01-errata.json Normal file
View File

@@ -0,0 +1,103 @@
{
"51_40": {
"title": "*Elrond",
"subtitle": "Lord of Rivendell",
"culture": "elven",
"cost": 4,
"type": "ally",
"allyHome": "fellowship,3",
"race": "elf",
"strength": 8,
"vitality": 4,
"condition": {
"type": "canSpot",
"filter": "or(name(Gandalf),elf)"
},
"effects": [
{
"type": "trigger",
"trigger": {
"type": "startOfTurn"
},
"effect": {
"type": "heal",
"filter": "choose(ally,allyHome(fellowship,3))",
"count": "0-3"
}
},
{
"type": "activated",
"phase": "fellowship",
"cost": {
"type": "exert",
"filter": "self",
"times": {
"type": "condition",
"condition": {
"type": "canSpot",
"count": 2,
"filter": "not(self),culture(elven),ally"
},
"true": 1,
"false": 2
}
},
"effect": {
"type": "drawCards"
}
}
]
},
"51_311": {
"title": "*Sam",
"subtitle": "Son of Hamfast",
"culture": "shire",
"cost": 2,
"type": "companion",
"race": "hobbit",
"strength": 3,
"vitality": 4,
"resistance": 5,
"signet": "aragorn",
"effects": [
{
"type": "activated",
"phase": "fellowship",
"cost": [
{
"type": "exert",
"filter": "self",
"times": 1
},
{
"type": "exert",
"filter": "choose(another,companion)",
"times": 1
}
],
"effect": {
"type": "removeBurdens",
"amount": 1
}
},
{
"type": "trigger",
"optional": true,
"trigger": {
"type": "killed",
"filter": "name(Frodo),ring bearer"
},
"effect": {
"type": "makeSelfRingBearer"
}
}
]
},
}

50
gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set02-errata.json Normal file
View File

@@ -0,0 +1,50 @@
{
"52_32": {
"side": "free_people",
"cost": 0,
"strength": 1,
"culture": "Gondor",
"possession": "Hand Weapon",
"title": "Flaming Brand",
"type": "possession",
"target": "ranger",
"effects": [
{
"type": "extrapossessionclass"
},
{
"type": "activated",
"phase": "skirmish",
"condition": {
"type": "canSpot",
"filter": "bearer,inSkirmishAgainst(Nazgul)",
},
"cost": [
{
"type": "memorize",
"filter": "bearer",
"memory": "bearer"
},
{
"type": "discard",
"filter": "self"
}
],
"effect":[
{
"type": "modifyStrength",
"filter": "memory(bearer)",
"amount": 3
},
{
"type": "addKeyword",
"filter": "memory(bearer)",
"keyword": "damage+1"
}
]
},
]
},
}

99
gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set03-errata.json Normal file
View File

@@ -0,0 +1,99 @@
{
"53_42": {
"side": "free_people",
"cost": 0,
"culture": "Gondor",
"title": "*Horn of Boromir",
"type": "possession",
"target": "name(Boromir)",
"effects": {
"type": "activated",
"phase": "maneuver",
"cost": [
{
"type": "exert",
"filter": "bearer",
"times": 1
},
{
"type": "exert",
"filter": "choose(ally)",
"memorize": "summonedAlly",
"times": 1
}
],
"effect":[
{
"type": "allyCanParticipateInArcheryFireAndSkirmishes",
"filter": "memory(summonedAlly)",
"until": "start(regroup)"
}
]
}
},
"53_68": {
"side": "shadow",
"site": 4,
"cost": 4,
"race": "Wizard",
"strength": 8,
"culture": "Isengard",
"vitality": 4,
"subtitle": "Keeper of Isengard",
"title": "*Saruman",
"type": "minion",
"effects": [
{
"type": "modifier",
"modifier": {
"type": "cantbeassignedtoskirmish",
"filter": "self"
}
},
{
"type": "modifier",
"modifier": {
"type": "cantTakeWounds",
"filter": "self",
"condition": {
"type": "phase",
"phase": "archery"
}
}
},
{
"type": "activatedTrigger",
"trigger": {
"type": "aboutToTakeWound",
"filter": "uruk-hai"
},
"cost": {
"type": "exert",
"filter": "self",
"times": 1
},
"effect":
{
"type": "preventWound",
"filter": "choose(uruk-hai)"
}
},
{
"type": "activated",
"phase": "maneuver",
"cost": {
"type": "exert",
"filter": "self",
"times": 1
},
"effect": {
"type": "addKeyword",
"filter": "choose(uruk-hai)",
"keyword": "fierce"
}
},
]
},
}

1
gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html
View File

@@ -30,6 +30,7 @@
<script type="text/javascript" src="js/gemp-022/hobbit.js"></script> <script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-022/set40.js"></script> <script type="text/javascript" src="js/gemp-022/set40.js"></script>
<script type="text/javascript" src="js/gemp-022/jCards.js"></script> <script type="text/javascript" src="js/gemp-022/jCards.js"></script>
<script type="text/javascript" src="js/gemp-022/PC_Cards.js"></script>
<script type="text/javascript" src="js/gemp-022/hallUi.js"></script> <script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script> <script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>

1
gemp-lotr/gemp-lotr-async/src/main/web/game.html
View File

@@ -30,6 +30,7 @@
<script type="text/javascript" src="js/gemp-022/hobbit.js"></script> <script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-022/set40.js"></script> <script type="text/javascript" src="js/gemp-022/set40.js"></script>
<script type="text/javascript" src="js/gemp-022/jCards.js"></script> <script type="text/javascript" src="js/gemp-022/jCards.js"></script>
<script type="text/javascript" src="js/gemp-022/PC_Cards.js"></script>
<script type="text/javascript" src="js/gemp-022/hallUi.js"></script> <script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script> <script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>

1
gemp-lotr/gemp-lotr-async/src/main/web/hall.html
View File

@@ -29,6 +29,7 @@
<script type="text/javascript" src="js/gemp-022/jCardGroup.js"></script> <script type="text/javascript" src="js/gemp-022/jCardGroup.js"></script>
<script type="text/javascript" src="js/gemp-022/hobbit.js"></script> <script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-022/set40.js"></script> <script type="text/javascript" src="js/gemp-022/set40.js"></script>
<script type="text/javascript" src="js/gemp-022/PC_Cards.js"></script>
<script type="text/javascript" src="js/gemp-022/jCards.js"></script> <script type="text/javascript" src="js/gemp-022/jCards.js"></script>
<script type="text/javascript" src="js/gemp-022/hallUi.js"></script> <script type="text/javascript" src="js/gemp-022/hallUi.js"></script>

1
gemp-lotr/gemp-lotr-async/src/main/web/index.html
View File

@@ -39,6 +39,7 @@
<script type="text/javascript" src="js/gemp-022/hobbit.js"></script> <script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-022/set40.js"></script> <script type="text/javascript" src="js/gemp-022/set40.js"></script>
<script type="text/javascript" src="js/gemp-022/jCards.js"></script> <script type="text/javascript" src="js/gemp-022/jCards.js"></script>
<script type="text/javascript" src="js/gemp-022/PC_Cards.js"></script>
<script type="text/javascript" src="js/gemp-022/hallUi.js"></script> <script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script> <script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>

85
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js Normal file
View File

@@ -0,0 +1,85 @@
var PCCards = {
//fotr supplements
'101_1': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_1.jpg',
'101_2': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_2.jpg',
'101_3': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_3.jpg',
'101_4': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_4.jpg',
'101_5': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_5.jpg',
'101_6': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_6.jpg',
'101_7': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_7.jpg',
'101_8': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_8.jpg',
'101_9': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_9.jpg',
'101_10': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_10.jpg',
'101_11': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_11.jpg',
'101_12': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_12.jpg',
'101_13': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_13.jpg',
'101_14': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_14.jpg',
'101_15': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_15.jpg',
'101_16': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_16.jpg',
'101_17': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_17.jpg',
'101_18': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_18.jpg',
'101_19': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_19.jpg',
'101_20': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_20.jpg',
'101_21': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_21.jpg',
'101_22': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_22.jpg',
'101_23': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_23.jpg',
'101_24': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_24.jpg',
'101_25': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_25.jpg',
'101_26': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_26.jpg',
'101_27': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_27.jpg',
'101_28': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_28.jpg',
'101_29': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_29.jpg',
'101_30': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_30.jpg',
'101_31': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_31.jpg',
'101_32': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_32.jpg',
'101_33': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_33.jpg',
'101_34': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_34.jpg',
'101_35': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_35.jpg',
'101_36': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_36.jpg',
'101_37': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_37.jpg',
'101_38': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_38.jpg',
'101_39': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_39.jpg',
'101_40': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_40.jpg',
'101_41': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_41.jpg',
'101_42': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_42.jpg',
'101_43': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_43.jpg',
'101_44': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_44.jpg',
'101_45': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_45.jpg',
'101_46': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_46.jpg',
'101_47': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/101_47.jpg',
// April 2021 Errata Batch
'51_40': 'https://i.lotrtcgpc.net/errata/FOTR/51_040.jpg',
'51_311': 'https://i.lotrtcgpc.net/errata/FOTR/51_311.jpg',
'52_32': 'https://i.lotrtcgpc.net/errata/FOTR/52_032.jpg',
'53_42': 'https://i.lotrtcgpc.net/errata/FOTR/53_042.jpg',
'53_68': 'https://i.lotrtcgpc.net/errata/FOTR/53_068.jpg',
// May 2021 VPack1
'101_1001': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/v1_001.jpg',
'101_1002': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/v1_002.jpg',
'101_1003': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/v1_003.jpg',
'101_1004': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/v1_004.jpg',
'101_1005': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/v1_005.jpg',
'101_1006': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/v1_006.jpg',
'101_1007': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/v1_007.jpg',
'101_1008': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/v1_008.jpg',
'101_1009': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/v1_009.jpg',
'101_1010': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/v1_010.jpg',
// Future Errata
'51_45': 'https://i.lotrtcgpc.net/errata/FOTR/51_045.jpg',
'51_80': 'https://i.lotrtcgpc.net/errata/FOTR/51_080.jpg',
'51_108': 'https://i.lotrtcgpc.net/errata/FOTR/51_108.jpg',
'51_139': 'https://i.lotrtcgpc.net/errata/FOTR/51_139.jpg',
'51_195': 'https://i.lotrtcgpc.net/errata/FOTR/51_195.jpg',
'51_234': 'https://i.lotrtcgpc.net/errata/FOTR/51_234.jpg',
'51_248': 'https://i.lotrtcgpc.net/errata/FOTR/51_248.jpg',
'51_313': 'https://i.lotrtcgpc.net/errata/FOTR/51_313.jpg',
'51_316': 'https://i.lotrtcgpc.net/errata/FOTR/51_316.jpg',
'52_75': 'https://i.lotrtcgpc.net/errata/FOTR/52_075.jpg',
'52_121': 'https://i.lotrtcgpc.net/errata/FOTR/52_121.jpg',
'53_38': 'https://i.lotrtcgpc.net/errata/FOTR/53_038.jpg',
'53_106': 'https://i.lotrtcgpc.net/errata/FOTR/53_106.jpg',
}

7
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cardFilter.js
View File

@@ -110,6 +110,7 @@ var CardFilter = Class.extend({
+ "<option value='0-32'>All Sets</option>" + "<option value='0-32'>All Sets</option>"
+ "<option value='0-19'>Official Sets</option>" + "<option value='0-19'>Official Sets</option>"
+ "<option value='30-32'>The Hobbit Sets</option>" + "<option value='30-32'>The Hobbit Sets</option>"
+ "<option value='50-69,101-120'>Player's Council Sets</option>"
+ "<option disabled>----------</option>" + "<option disabled>----------</option>"
+ "<option value='fotr_block'>Fellowship Block</option>" + "<option value='fotr_block'>Fellowship Block</option>"
+ "<option value='ttt_block'>Towers Block</option>" + "<option value='ttt_block'>Towers Block</option>"
@@ -124,8 +125,13 @@ var CardFilter = Class.extend({
+ "<option value='hobbit_tsr'> The Hobbit: The Short Rest</option>" + "<option value='hobbit_tsr'> The Hobbit: The Short Rest</option>"
+ "<option value='hobbit_tcb'> The Hobbit: The Clouds Burst</option>" + "<option value='hobbit_tcb'> The Hobbit: The Clouds Burst</option>"
+ "<option disabled>----------</option>" + "<option disabled>----------</option>"
+ "<option value='pc_fotr_block'>PC Fellowship Block</option>"
+ "<option value='pc_movie'>PC Movie Block</option>"
+ "<option value='pc_expanded'>PC Expanded</option>"
+ "<option disabled>----------</option>"
+ "<option value='0'>00 - Promo</option>" + "<option value='0'>00 - Promo</option>"
+ "<option value='1'>01 - The Fellowship of the Ring</option>" + "<option value='1'>01 - The Fellowship of the Ring</option>"
+ "<option value='51'>01E - The Fellowship of the Ring PC Errata</option>"
+ "<option value='2'>02 - Mines of Moria</option>" + "<option value='2'>02 - Mines of Moria</option>"
+ "<option value='3'>03 - Realms of the Elf-lords</option>" + "<option value='3'>03 - Realms of the Elf-lords</option>"
+ "<option value='4'>04 - The Two Towers</option>" + "<option value='4'>04 - The Two Towers</option>"
@@ -144,6 +150,7 @@ var CardFilter = Class.extend({
+ "<option value='17'>17 - Rise of Saruman</option>" + "<option value='17'>17 - Rise of Saruman</option>"
+ "<option value='18'>18 - Treachery & Deceit</option>" + "<option value='18'>18 - Treachery & Deceit</option>"
+ "<option value='19'>19 - Ages End</option>" + "<option value='19'>19 - Ages End</option>"
+ "<option value='101'>1+ - PC Fellowship Supplement</option>"
+ "<option value='30'>30 - The Hobbit: Main Deck</option>" + "<option value='30'>30 - The Hobbit: Main Deck</option>"
+ "<option value='31'>31 - The Hobbit: Expansion 1</option>" + "<option value='31'>31 - The Hobbit: Expansion 1</option>"
+ "<option value='32'>32 - The Hobbit: Expansion 2</option>" + "<option value='32'>32 - The Hobbit: Expansion 2</option>"

3
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/jCards.js
View File

@@ -214,6 +214,9 @@ var Card = Class.extend({
if (img != null) if (img != null)
return img; return img;
img = hobbit[blueprintId]; img = hobbit[blueprintId];
if (img != null)
return img;
img = PCCards[blueprintId];
if (img != null) if (img != null)
return img; return img;
return null; return null;

1
gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html
View File

@@ -44,6 +44,7 @@
<script type="text/javascript" src="js/gemp-022/hobbit.js"></script> <script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-022/set40.js"></script> <script type="text/javascript" src="js/gemp-022/set40.js"></script>
<script type="text/javascript" src="js/gemp-022/jCards.js"></script> <script type="text/javascript" src="js/gemp-022/jCards.js"></script>
<script type="text/javascript" src="js/gemp-022/PC_Cards.js"></script>
<script type="text/javascript" src="js/gemp-022/hallUi.js"></script> <script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script> <script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>

1
gemp-lotr/gemp-lotr-async/src/main/web/merchant.html
View File

@@ -30,6 +30,7 @@
<script type="text/javascript" src="js/gemp-022/hobbit.js"></script> <script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-022/set40.js"></script> <script type="text/javascript" src="js/gemp-022/set40.js"></script>
<script type="text/javascript" src="js/gemp-022/jCards.js"></script> <script type="text/javascript" src="js/gemp-022/jCards.js"></script>
<script type="text/javascript" src="js/gemp-022/PC_Cards.js"></script>
<script type="text/javascript" src="js/gemp-022/hallUi.js"></script> <script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script> <script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>

1
gemp-lotr/gemp-lotr-async/src/main/web/soloDraft.html
View File

@@ -30,6 +30,7 @@
<script type="text/javascript" src="js/gemp-022/hobbit.js"></script> <script type="text/javascript" src="js/gemp-022/hobbit.js"></script>
<script type="text/javascript" src="js/gemp-022/set40.js"></script> <script type="text/javascript" src="js/gemp-022/set40.js"></script>
<script type="text/javascript" src="js/gemp-022/jCards.js"></script> <script type="text/javascript" src="js/gemp-022/jCards.js"></script>
<script type="text/javascript" src="js/gemp-022/PC_Cards.js"></script>
<script type="text/javascript" src="js/gemp-022/hallUi.js"></script> <script type="text/javascript" src="js/gemp-022/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script> <script type="text/javascript" src="js/gemp-022/leagueResultsUi.js"></script>

16
gemp-lotr/gemp-lotr-cards/src/main/resources/set51-rarity.txt Normal file
View File

@@ -0,0 +1,16 @@
51R1040
51R1045
51R1080
51U10108
51R10139
51R10195
51U10234
51C10248
51C10311
51R10313
51U10316
51R2032
51R2075
51R3042
51R3068
51U10108

18
gemp-lotr/gemp-lotr-cards/src/main/resources/setConfig.json
View File

@@ -146,5 +146,23 @@
"merchantable": false, "merchantable": false,
"needsLoading": false, "needsLoading": false,
"playable": false "playable": false
},
{
"setId": "51",
"setName": "PC Errata",
"rarityFile": "/set51-rarity.txt",
"originalSet": false,
"merchantable": false,
"needsLoading": false,
"playable": true
},
{
"setId": "101",
"setName": "PC FOTR Supplements",
"rarityFile": "/set101-rarity.txt",
"originalSet": false,
"merchantable": false,
"needsLoading": false,
"playable": true
} }
] ]

4
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/SortAndFilterCards.java
View File

@@ -170,7 +170,7 @@ public class SortAndFilterCards {
final LotroCardBlueprint blueprint = cardBlueprint.get(blueprintId); final LotroCardBlueprint blueprint = cardBlueprint.get(blueprintId);
if (blueprint.getCardType() == CardType.SITE) { if (blueprint.getCardType() == CardType.SITE) {
if (blueprint.getSiteBlock() == SitesBlock.FELLOWSHIP) { if (blueprint.getSiteBlock() == SitesBlock.FELLOWSHIP) {
if ("fotr_block".contains(set)) { if ("fotr_block,pc_fotr_block".contains(set)) {
return true; return true;
} }
return false; return false;
@@ -182,7 +182,7 @@ public class SortAndFilterCards {
return false; return false;
} }
if (blueprint.getSiteBlock() == SitesBlock.KING) { if (blueprint.getSiteBlock() == SitesBlock.KING) {
if ("king_block,rotk_sta,movie".contains(set)) { if ("king_block,rotk_sta,movie,pc_movie_block".contains(set)) {
return true; return true;
} }
return false; return false;

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

@@ -6,6 +6,15 @@
"cancelRingBearerSkirmish":true, "cancelRingBearerSkirmish":true,
"set":[1, 2, 3] "set":[1, 2, 3]
}, },
{
"name":"PC-Fellowship Block",
"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",]
},
{ {
"name":"Fellowship block - Set 1", "name":"Fellowship block - Set 1",
"code":"fotr1_block", "code":"fotr1_block",
@@ -162,6 +171,14 @@
"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"], "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] "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"],
},
{ {
"name":"Movie block - Sets 1-7", "name":"Movie block - Sets 1-7",
"code":"movie7", "code":"movie7",
@@ -236,6 +253,15 @@
"restricted":["1_40", "1_80", "1_108", "1_139", "1_195", "1_248", "2_32", "2_75", "3_106", "4_276", "4_304"], "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] "set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]
}, },
{
"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]
},
{ {
"name":"War of the Ring block - Set 11", "name":"War of the Ring block - Set 11",
"code":"war_block11", "code":"war_block11",