From e050e16e627d845a6b50a4d2517308e7946e8cf1 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Sat, 6 Mar 2021 20:18:37 -0600 Subject: [PATCH 1/2] Incorporating PC Formats on a limited basis for use in the PC March League. --- .../gemp-lotr-async/src/main/web/ban.html | 1 + .../main/web/cards/set51/set01-errata.json | 103 ++++++++++++++++++ .../main/web/cards/set51/set02-errata.json | 50 +++++++++ .../main/web/cards/set51/set03-errata.json | 99 +++++++++++++++++ .../src/main/web/deckBuild.html | 1 + .../gemp-lotr-async/src/main/web/game.html | 1 + .../gemp-lotr-async/src/main/web/hall.html | 1 + .../gemp-lotr-async/src/main/web/index.html | 1 + .../src/main/web/js/gemp-022/PC_Cards.js | 85 +++++++++++++++ .../src/main/web/js/gemp-022/cardFilter.js | 7 ++ .../src/main/web/js/gemp-022/jCards.js | 9 ++ .../src/main/web/leagueAdmin.html | 1 + .../src/main/web/merchant.html | 1 + .../src/main/web/soloDraft.html | 1 + .../src/main/resources/set51-rarity.txt | 16 +++ .../src/main/resources/setConfig.json | 18 +++ .../lotro/game/SortAndFilterCards.java | 4 +- .../src/main/resources/lotrFormats.json | 26 +++++ 18 files changed, 423 insertions(+), 2 deletions(-) create mode 100644 gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set01-errata.json create mode 100644 gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set02-errata.json create mode 100644 gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set03-errata.json create mode 100644 gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js create mode 100644 gemp-lotr/gemp-lotr-cards/src/main/resources/set51-rarity.txt diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/ban.html b/gemp-lotr/gemp-lotr-async/src/main/web/ban.html index 5a5218a9b..f1236e8d6 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/ban.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/ban.html @@ -36,6 +36,7 @@ + diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set01-errata.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set01-errata.json new file mode 100644 index 000000000..a79f3a3c9 --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set01-errata.json @@ -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" + } + } + ] + }, + + + + + + +} \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set02-errata.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set02-errata.json new file mode 100644 index 000000000..60fa17d6c --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set02-errata.json @@ -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" + } + ] + }, + ] + }, + + +} \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set03-errata.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set03-errata.json new file mode 100644 index 000000000..0ef29e212 --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set03-errata.json @@ -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" + } + }, + ] + }, + +} \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html b/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html index 5bb640b4e..27f241342 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html @@ -30,6 +30,7 @@ + diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/game.html b/gemp-lotr/gemp-lotr-async/src/main/web/game.html index 7b4981d5a..b7b3317f7 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/game.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/game.html @@ -30,6 +30,7 @@ + diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/hall.html b/gemp-lotr/gemp-lotr-async/src/main/web/hall.html index 584be9368..9fcd32ae9 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/hall.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/hall.html @@ -29,6 +29,7 @@ + diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/index.html b/gemp-lotr/gemp-lotr-async/src/main/web/index.html index 6f1dc03e6..7b41873c5 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/index.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/index.html @@ -39,6 +39,7 @@ + diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js new file mode 100644 index 000000000..5e2d2fadd --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js @@ -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', +} \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cardFilter.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cardFilter.js index 9ac4955d9..68871f571 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cardFilter.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cardFilter.js @@ -110,6 +110,7 @@ var CardFilter = Class.extend({ + "" + "" + "" + + "" + "" + "" + "" @@ -124,8 +125,13 @@ var CardFilter = Class.extend({ + "" + "" + "" + + "" + + "" + + "" + + "" + "" + "" + + "" + "" + "" + "" @@ -144,6 +150,7 @@ var CardFilter = Class.extend({ + "" + "" + "" + + "" + "" + "" + "" diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/jCards.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/jCards.js index a322019d6..34592b359 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/jCards.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/jCards.js @@ -214,6 +214,9 @@ var Card = Class.extend({ if (img != null) return img; img = hobbit[blueprintId]; + if (img != null) + return img; + img = PCCards[blueprintId]; if (img != null) return img; return null; @@ -228,6 +231,12 @@ var Card = Class.extend({ }, hasErrata: function () { + var separator = this.blueprintId.indexOf("_"); + var setNo = parseInt(this.blueprintId.substr(0, separator)); + + if(setNo >= 50 && setNo <= 69) + return true; + return this.errata; }, diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html b/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html index da0735a07..c0eaf7d95 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html @@ -44,6 +44,7 @@ + diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/merchant.html b/gemp-lotr/gemp-lotr-async/src/main/web/merchant.html index 6d7efd7cd..3e19945fb 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/merchant.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/merchant.html @@ -30,6 +30,7 @@ + diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/soloDraft.html b/gemp-lotr/gemp-lotr-async/src/main/web/soloDraft.html index 6fb0573cc..b0312fca2 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/soloDraft.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/soloDraft.html @@ -30,6 +30,7 @@ + diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set51-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/set51-rarity.txt new file mode 100644 index 000000000..b7c64de13 --- /dev/null +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/set51-rarity.txt @@ -0,0 +1,16 @@ +51R1040 +51R1045 +51R1080 +51U10108 +51R10139 +51R10195 +51U10234 +51C10248 +51C10311 +51R10313 +51U10316 +51R2032 +51R2075 +51R3042 +51R3068 +51U10108 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/setConfig.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/setConfig.json index 03ba11955..efb2eec22 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/setConfig.json +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/setConfig.json @@ -146,5 +146,23 @@ "merchantable": false, "needsLoading": 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 } ] diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/SortAndFilterCards.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/SortAndFilterCards.java index 0f203201d..6a0d33d9d 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/SortAndFilterCards.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/SortAndFilterCards.java @@ -170,7 +170,7 @@ public class SortAndFilterCards { final LotroCardBlueprint blueprint = cardBlueprint.get(blueprintId); if (blueprint.getCardType() == CardType.SITE) { if (blueprint.getSiteBlock() == SitesBlock.FELLOWSHIP) { - if ("fotr_block".contains(set)) { + if ("fotr_block,pc_fotr_block".contains(set)) { return true; } return false; @@ -182,7 +182,7 @@ public class SortAndFilterCards { return false; } 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 false; 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 24d959673..ca29aad5b 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json +++ b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json @@ -6,6 +6,15 @@ "cancelRingBearerSkirmish":true, "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", "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"], "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", "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"], "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", "code":"war_block11", From d7115f13f7e5fdf180daa5249a717789f4f8230e Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Fri, 12 Mar 2021 06:44:39 -0600 Subject: [PATCH 2/2] Fixing rarity file issues with the PC errata sets --- .../src/main/resources/set51-rarity.txt | 18 ++---------------- .../src/main/resources/set52-rarity.txt | 1 + .../src/main/resources/set53-rarity.txt | 2 ++ .../src/main/resources/setConfig.json | 17 +++++++++++++---- 4 files changed, 18 insertions(+), 20 deletions(-) create mode 100644 gemp-lotr/gemp-lotr-cards/src/main/resources/set52-rarity.txt create mode 100644 gemp-lotr/gemp-lotr-cards/src/main/resources/set53-rarity.txt diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set51-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/set51-rarity.txt index b7c64de13..d6e1d6f62 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set51-rarity.txt +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/set51-rarity.txt @@ -1,16 +1,2 @@ -51R1040 -51R1045 -51R1080 -51U10108 -51R10139 -51R10195 -51U10234 -51C10248 -51C10311 -51R10313 -51U10316 -51R2032 -51R2075 -51R3042 -51R3068 -51U10108 +51R40 +51C311 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set52-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/set52-rarity.txt new file mode 100644 index 000000000..e39216b1b --- /dev/null +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/set52-rarity.txt @@ -0,0 +1 @@ +52R32 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set53-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/set53-rarity.txt new file mode 100644 index 000000000..81120397e --- /dev/null +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/set53-rarity.txt @@ -0,0 +1,2 @@ +53R42 +53R68 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/setConfig.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/setConfig.json index efb2eec22..0b11dcced 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/setConfig.json +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/setConfig.json @@ -149,7 +149,7 @@ }, { "setId": "51", - "setName": "PC Errata", + "setName": "PC FotR Errata", "rarityFile": "/set51-rarity.txt", "originalSet": false, "merchantable": false, @@ -157,9 +157,18 @@ "playable": true }, { - "setId": "101", - "setName": "PC FOTR Supplements", - "rarityFile": "/set101-rarity.txt", + "setId": "52", + "setName": "PC MoM Errata", + "rarityFile": "/set52-rarity.txt", + "originalSet": false, + "merchantable": false, + "needsLoading": false, + "playable": true + }, + { + "setId": "53", + "setName": "PC RotEL Errata", + "rarityFile": "/set53-rarity.txt", "originalSet": false, "merchantable": false, "needsLoading": false,