From ef901ca9077080225ca66a77fb6f718f167cd3a2 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Sun, 24 Jan 2021 11:05:22 -0600 Subject: [PATCH] FOTR Errata Added all set 1 errata and a couple set 2 errata. Hooked up the images and rarities. --- .../src/main/web/cards/set21/set1-errata.json | 365 +++++++++++++++++- .../src/main/web/js/gemp-022/set21.js | 107 ++--- .../src/main/resources/set21-rarity.txt | 17 +- 3 files changed, 421 insertions(+), 68 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set21/set1-errata.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set21/set1-errata.json index 3ff9a7799..9b87b5902 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set21/set1-errata.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set21/set1-errata.json @@ -83,7 +83,7 @@ "culture": "gandalf", "cost": 1, "type": "ally", - "allyHome": "fellowship,10", + "allyHome": "fellowship,1", "race": "man", "strength": 2, "vitality": 2, @@ -120,44 +120,375 @@ "culture": "gondor", "cost": 0, "type": "condition", + "keyword": [ + "stealth" + ], "target": "ranger,not(hasAttached(name(No Stranger to the Shadows)))", "effects": { "type": "modifier", "modifier": { - "type": "modifyCost", - "filter": "site", - "amount": -1 + "type": "addKeyword", + "filter": "bearer", + "keyword": "concealed" } } }, - "21_10109": { - "title": "One Whom Men Would Follow", - "culture": "gondor", + + "21_10139": { + "title": "Savagery To Match Their Numbers", + "culture": "isengard", "cost": 0, "type": "event", - "keyword": "maneuver", + "keyword": "skirmish", + "effects": { + "type": "event", + "effect": { + "type": "choice", + "texts": [ + "Make an Uruk-hai strength +2", + "Make an Uruk-hai fierce until the regroup phase, and strength +4 (this skirmish)" + ], + "effects": [ + { + "type": "modifyStrength", + "filter": "choose(uruk-hai)", + "amount": 2 + }, + { + "type": "conditional", + "condition": { + "type": "canSpot", + "count": 5, + "filter": "companion" + }, + "effect": [ + { + "type": "modifyStrength", + "filter": "choose(uruk-hai)", + "amount": 4, + "memorize": "chosenUrukHai" + }, + { + "type": "addKeyword", + "filter": "memory(chosenUrukHai)", + "keyword": "fierce", + "until": "start(regroup)" + } + ] + } + ] + } + } + }, + + "21_10195": { + "title": "*Relics of Moria", + "culture": "moria", + "cost": 1, + "type": "condition", + "keyword": "support area", + "effects": { + "type": "activated", + "phase": "shadow", + "cost": { + "type": "removeTwilight", + "amount": 2 + }, + "effect": { + "type": "playCardFromDiscard", + "removedTwilight": 2, + "filter": "choose(culture(moria),possession)" + } + } + }, + + "21_10234": { + "title": "*Úlairë Nertëa", + "subtitle": "Messenger of Dol Guldur", + "culture": "wraith", + "cost": 4, + "type": "minion", + "race": "nazgul", + "strength": 9, + "vitality": 2, + "site": 3, + "effects": { + "type": "trigger", + "trigger": { + "type": "played", + "filter": "self" + }, + "effect": { + "type": "duplicate", + "amount": { + "type": "forEachYouCanSpot", + "filter": "companion", + "over": 4 + }, + "effect": { + "type": "optional", + "text": "Would you like to play minion from your discard?", + "effect": { + "type": "playCardFromDiscard", + "filter": "choose(nazgul)" + } + } + } + } + }, + + "21_10248": { + "title": "Forces of Mordor", + "culture": "sauron", + "cost": 0, + "type": "event", + "keyword": "shadow", "effects": { "type": "event", "cost": { "type": "exert", - "filter": "choose(name(Aragorn))" + "filter": "choose(culture(sauron),minion)" + }, + "cost": { + "type": "chooseHowManyToSpot", + "filter": "culture(sauron),minion", + "memorize": "spottedCount" + }, + "effect": { + "type": "addTwilight", + "amount": { + "type": "forEachYouCanSpot", + "filter": "culture(sauron),orc", + } + } + } + }, + + "21_10311": { + "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": "spot", + "filter": "name(Frodo)" + }, + { + "type": "exert", + "filter": "self", + "times": 2 + } + ], + + "effect": { + "type": "preventable", + "text": "Would you like to discard a minion from hand (or place a Nazgul from hand on your draw deck) to prevent removing 2 burdens?", + "player": "shadowPlayer", + "cost": [ + { + "type": "putcardsfromhandontopofdeck", + "filter": "choose(nazgul)" + }, + { + "type": "discardFromHand", + "filter": "choose(minion)" + } + ], + "effect": { + "type": "removeBurdens", + "amount": 2 + } + } + }, + { + "type": "trigger", + "optional": true, + "trigger": { + "type": "killed", + "filter": "name(Frodo),ring bearer" + }, + "effect": { + "type": "makeSelfRingBearer" + } + } + ] + }, + + "21_10313": { + "title": "*Sting", + "culture": "shire", + "cost": 1, + "type": "possession", + "possession": "hand weapon", + "strength": 2, + "target": "name(Frodo)", + "effects": { + "type": "activated", + "phase": [ + "fellowship", + "regroup" + ], + "cost": { + "type": "exert", + "filter": "bearer" }, "effect": [ { - "type": "modifyStrength", - "filter": "choose(ally)", - "amount": 2, - "until": "start(regroup)", - "memorize": "exertedAlly" + "type": "revealrandomcardsfromhand", + "hand": "shadowPlayer", + "memorize": "revealedCards", + "amount":3 }, { - "type": "allyCanParticipateInArcheryFireAndSkirmishes", - "filter": "memory(exertedAlly)", - "until": "start(regroup)" + "type": "addKeyword", + "filter": "choose(companion)", + "keyword": "concealed", + "until": "start(regroup)", + "amount": { + "type": "forEachMatchingInMemory", + "memory": "revealedCards", + "filter": "orc", + "limit": 1 + } + } + ] + } + }, + + "21_10316": { + "title": "*A Talent for Not Being Seen", + "culture": "shire", + "cost": 0, + "type": "condition", + "keyword": [ + "stealth", + "support area" + ], + "effects": [ + { + "type": "extraCost", + "cost": { + "type": "exert", + "filter": "choose(hobbit)" + } + }, + { + "type": "modifier", + "modifier": { + "type": "addKeyword", + "filter": "site,choose(companion)", + "keyword": "concealed", + "until": "start(regroup)", + "condition": { + "type": "canSpot", + "count": 2, + "filter": "companion", + }, + } + } + ] + }, + + "21_2032": { + "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", + "filter": "bearer,inSkirmishAgainst(Nazgul)", + "cost": [ + { + "type": "memorize", + "filter": "bearer", + "memory": "bearer" + }, + { + "type": "discard", + "filter": "self" + } + ], + "effects":[ + { + "type": "modifyStrength", + "filter": "bearer", + "amount": 3 + }, + { + "type": "addKeyword", + "filter": "bearer", + "keyword": "damage+1" + } + ] + }, + ] + }, + + "21_2075": { + "title": "*Bill Ferny", + "subtitle": "Swarthy Sneering Fellow", + "culture": "wraith", + "cost": 2, + "type": "minion", + "race": "Man", + "strength": 4, + "vitality": 1, + "site": 2, + "effects": { + "type": "activated", + "phase": "skirmish", + "cost": { + "type": "removeTwilight" + }, + "effects": [ + { + "type": "modifier", + "modifier": { + "type": "removeKeyword", + "filter": "nazgul", + "keyword": "roaming" + } + }, + { + "type": "trigger", + "trigger": { + "type": "condition", + "condition": [ + { + "type": "location", + "filter": "underground" + } + ] + }, + "effect": { + "type": "discard", + "filter": "self" + } } ] } }, + } \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/set21.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/set21.js index 48913b329..457bd55cb 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/set21.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/set21.js @@ -1,49 +1,62 @@ var set21 = { - '21_1': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_1.jpg', - '21_2': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_2.jpg', - '21_3': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_3.jpg', - '21_4': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_4.jpg', - '21_5': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_5.jpg', - '21_6': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_6.jpg', - '21_7': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_7.jpg', - '21_8': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_8.jpg', - '21_9': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_9.jpg', - '21_10': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_10.jpg', - '21_11': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_11.jpg', - '21_12': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_12.jpg', - '21_13': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_13.jpg', - '21_14': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_14.jpg', - '21_15': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_15.jpg', - '21_16': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_16.jpg', - '21_17': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_17.jpg', - '21_18': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_18.jpg', - '21_19': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_19.jpg', - '21_20': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_20.jpg', - '21_21': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_21.jpg', - '21_22': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_22.jpg', - '21_23': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_23.jpg', - '21_24': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_24.jpg', - '21_25': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_25.jpg', - '21_26': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_26.jpg', - '21_27': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_27.jpg', - '21_28': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_28.jpg', - '21_29': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_29.jpg', - '21_30': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_30.jpg', - '21_31': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_31.jpg', - '21_32': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_32.jpg', - '21_33': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_33.jpg', - '21_34': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_34.jpg', - '21_35': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_35.jpg', - '21_36': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_36.jpg', - '21_37': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_37.jpg', - '21_38': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_38.jpg', - '21_39': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_39.jpg', - '21_40': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_40.jpg', - '21_41': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_41.jpg', - '21_42': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_42.jpg', - '21_43': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_43.jpg', - '21_44': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_44.jpg', - '21_45': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_45.jpg', - '21_46': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_46.jpg', - '21_47': 'http://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_47.jpg' + '21_1': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_1.jpg', + '21_2': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_2.jpg', + '21_3': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_3.jpg', + '21_4': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_4.jpg', + '21_5': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_5.jpg', + '21_6': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_6.jpg', + '21_7': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_7.jpg', + '21_8': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_8.jpg', + '21_9': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_9.jpg', + '21_10': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_10.jpg', + '21_11': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_11.jpg', + '21_12': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_12.jpg', + '21_13': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_13.jpg', + '21_14': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_14.jpg', + '21_15': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_15.jpg', + '21_16': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_16.jpg', + '21_17': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_17.jpg', + '21_18': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_18.jpg', + '21_19': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_19.jpg', + '21_20': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_20.jpg', + '21_21': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_21.jpg', + '21_22': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_22.jpg', + '21_23': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_23.jpg', + '21_24': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_24.jpg', + '21_25': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_25.jpg', + '21_26': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_26.jpg', + '21_27': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_27.jpg', + '21_28': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_28.jpg', + '21_29': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_29.jpg', + '21_30': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_30.jpg', + '21_31': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_31.jpg', + '21_32': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_32.jpg', + '21_33': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_33.jpg', + '21_34': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_34.jpg', + '21_35': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_35.jpg', + '21_36': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_36.jpg', + '21_37': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_37.jpg', + '21_38': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_38.jpg', + '21_39': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_39.jpg', + '21_40': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_40.jpg', + '21_41': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_41.jpg', + '21_42': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_42.jpg', + '21_43': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_43.jpg', + '21_44': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_44.jpg', + '21_45': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_45.jpg', + '21_46': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_46.jpg', + '21_47': 'https://i.lotrtcgpc.net/sets/fotr_starters/playtest/21_47.jpg', + "21_1040": 'https://i.lotrtcgpc.net/errata/FOTR/21_40.jpg', + "21_1045": 'https://i.lotrtcgpc.net/errata/FOTR/21_45.jpg', + "21_1080": 'https://i.lotrtcgpc.net/errata/FOTR/21_80.jpg', + "21_10108": 'https://i.lotrtcgpc.net/errata/FOTR/21_108.jpg', + "21_10139": 'https://i.lotrtcgpc.net/errata/FOTR/21_139.jpg', + "21_10195": 'https://i.lotrtcgpc.net/errata/FOTR/21_195.jpg', + "21_10234": 'https://i.lotrtcgpc.net/errata/FOTR/21_234.jpg', + "21_10248": 'https://i.lotrtcgpc.net/errata/FOTR/21_248.jpg', + "21_10311": 'https://i.lotrtcgpc.net/errata/FOTR/21_311.jpg', + "21_10313": 'https://i.lotrtcgpc.net/errata/FOTR/21_313.jpg', + "21_10316": 'https://i.lotrtcgpc.net/errata/FOTR/21_316.jpg', + "21_2032": 'https://i.lotrtcgpc.net/errata/FOTR/22_32.jpg', + "21_2075": 'https://i.lotrtcgpc.net/errata/FOTR/22_75.jpg', } \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set21-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/set21-rarity.txt index 6343ef996..4e3e9a3f5 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set21-rarity.txt +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/set21-rarity.txt @@ -45,7 +45,16 @@ 21S45 21S46 21S47 -21S1040 -21S1045 -21S1080 -21S10108 +21R1040 +21R1045 +21R1080 +21U10108 +21R10139 +21R10195 +21U10234 +21C10248 +21C10311 +21R10313 +21U10316 +21R2032 +21R2075