From 0eb52e17ba5e760d4d69594f21db232cb532ec37 Mon Sep 17 00:00:00 2001 From: Troy Biesterfeld Date: Fri, 7 May 2021 20:48:23 -0500 Subject: [PATCH 1/3] Update Nerta to only deploy unique wraith minions --- .../src/main/web/cards/errata/set01-errata-playtest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set01-errata-playtest.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set01-errata-playtest.json index 53fc88ad9..bd830e045 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set01-errata-playtest.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set01-errata-playtest.json @@ -225,10 +225,10 @@ }, "effect": { "type": "optional", - "text": "Would you like to play a wraith minion from your discard?", + "text": "Would you like to play a unique wraith minion from your discard?", "effect": { "type": "playCardFromDiscard", - "filter": "choose(culture(wraith),minion)" + "filter": "choose(unique,culture(wraith),minion)" } } } From dae91c32b981d6a6617f73b7003aef0e89fd10df Mon Sep 17 00:00:00 2001 From: Troy Biesterfeld Date: Sat, 15 May 2021 10:24:15 -0500 Subject: [PATCH 2/3] Complete release of Fellowship block X-list errata --- .../cards/errata/set01-errata-playtest.json | 318 ----------------- .../main/web/cards/errata/set01-errata.json | 319 +++++++++++++++++- .../cards/errata/set02-errata-playtest.json | 157 --------- .../main/web/cards/errata/set02-errata.json | 155 +++++++++ .../cards/errata/set03-errata-playtest.json | 200 ----------- .../main/web/cards/errata/set03-errata.json | 198 +++++++++++ .../src/main/resources/lotrFormats.json | 76 ++--- 7 files changed, 705 insertions(+), 718 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set01-errata-playtest.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set01-errata-playtest.json index bd830e045..2c63c0851 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set01-errata-playtest.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set01-errata-playtest.json @@ -1,320 +1,2 @@ { - "71_45": { - "title": "*Galadriel", - "subtitle": "Lady of Light", - "culture": "elven", - "cost": 3, - "type": "ally", - "allyHome": "fellowship,6", - "race": "elf", - "strength": 3, - "vitality": 3, - "effects": [ - { - "type": "trigger", - "trigger": { - "type": "startOfTurn" - }, - "effect": { - "type": "heal", - "filter": "choose(ally,allyHome(fellowship,6))", - "count": "0-3" - } - }, - { - "type": "activated", - "phase": "fellowship", - "cost": { - "type": "exert", - "filter": "self", - "times": 1 - }, - "effect": { - "type": "play", - "filter": "choose(elf)", - "cost": -1 - } - } - ] - }, - "71_80": { - "title": "*Ottar", - "subtitle": "Man of Laketown", - "culture": "gandalf", - "cost": 1, - "type": "ally", - "allyHome": "fellowship,3", - "race": "man", - "strength": 2, - "vitality": 2, - "condition": { - "type": "canSpot", - "filter": "name(Gandalf)" - }, - "effects": { - "type": "activated", - "phase": "fellowship", - "cost": [ - { - "type": "exert", - "filter": "self" - }, - { - "type": "discardFromHand", - "forced": false - } - ], - "effect": { - "type": "drawCards" - } - } - }, - "71_108": { - "title": "*No Stranger to the Shadows", - "culture": "gondor", - "cost": 0, - "type": "condition", - "keyword": [ - "stealth" - ], - "target": "ranger", - "effects": { - "type": "modifier", - "modifier": { - "type": "modifyCost", - "filter": "site", - "amount": -1 - } - } - }, - "71_138": { - "title": "Saruman's Snows", - "culture": "isengard", - "cost": 2, - "type": "condition", - "keyword": [ - "spell", - "weather" - ], - "target": "site", - "effects": [ - { - "type": "extraCost", - "cost": { - "type": "exert", - "filter": "choose(culture(isengard),minion)" - } - }, - { - "type": "modifier", - "modifier": { - "type": "cantPlayPhaseEventsOrPhaseSpecialAbilities", - "condition": [ - { - "type": "location", - "filter": "hasAttached(self)" - }, - { - "type": "canSpot", - "filter": "culture(isengard),minion,inSkirmish" - } - ], - "phase": "skirmish" - } - }, - { - "type": "trigger", - "trigger": { - "type": "endOfTurn" - }, - "effect": { - "type": "discard", - "filter": "self" - } - } - ] - }, - "71_139": { - "title": "Savagery To Match Their Numbers", - "culture": "isengard", - "cost": 0, - "type": "event", - "keyword": "skirmish", - "effects": { - "type": "event", - "effect": { - "type": "choice", - "texts": [ - "Make an Uruk-hai strength +2", - "Make an Uruk-hai strength +3 (and fierce until the regroup phase)" - ], - "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": 3, - "memorize": "chosenUrukHai" - }, - { - "type": "addKeyword", - "filter": "memory(chosenUrukHai)", - "keyword": "fierce", - "until": "start(regroup)" - } - ] - } - ] - } - } - }, - "71_195": { - "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)" - } - } - }, - "71_234": { - "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 a unique wraith minion from your discard?", - "effect": { - "type": "playCardFromDiscard", - "filter": "choose(unique,culture(wraith),minion)" - } - } - } - } - }, - "71_248": { - "title": "Forces of Mordor", - "culture": "sauron", - "cost": 0, - "type": "event", - "keyword": "shadow", - "effects": { - "type": "event", - "cost": { - "type": "exert", - "filter": "choose(culture(sauron),minion)" - }, - "effect": { - "type": "addTwilight", - "amount": { - "type": "forEachYouCanSpot", - "filter": "culture(sauron),orc", - "limit": 3 - } - } - } - }, - - "71_313": { - "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": "revealrandomcardsfromhand", - "hand": "shadowPlayer", - "forced": true, - "memorize": "revealedCards", - "count": 4 - }, - { - "type": "removeTwilight", - "amount": { - "type": "cardPhaseLimit", - "limit": 2, - "amount": { - "type": "forEachMatchingInMemory", - "memory": "revealedCards", - "filter": "orc", - "limit": 2 - } - } - } - ] - } - }, - "71_316": { - "title": "A Talent for Not Being Seen", - "culture": "shire", - "cost": 0, - "type": "condition", - "target": "or(name(Merry),name(Pippin)),not(hasAttached(name(A Talent for Not Being Seen)))", - "keyword": [ - "stealth" - ], - "effects": { - "type": "modifier", - "modifier": { - "type": "modifyCost", - "filter": "site", - "amount": -1 - } - } - } } diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set01-errata.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set01-errata.json index 40f5d02e6..1dd4732a8 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set01-errata.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set01-errata.json @@ -48,7 +48,263 @@ } ] }, - + "51_45": { + "title": "*Galadriel", + "subtitle": "Lady of Light", + "culture": "elven", + "cost": 3, + "type": "ally", + "allyHome": "fellowship,6", + "race": "elf", + "strength": 3, + "vitality": 3, + "effects": [ + { + "type": "trigger", + "trigger": { + "type": "startOfTurn" + }, + "effect": { + "type": "heal", + "filter": "choose(ally,allyHome(fellowship,6))", + "count": "0-3" + } + }, + { + "type": "activated", + "phase": "fellowship", + "cost": { + "type": "exert", + "filter": "self", + "times": 1 + }, + "effect": { + "type": "play", + "filter": "choose(elf)", + "cost": -1 + } + } + ] + }, + "51_80": { + "title": "*Ottar", + "subtitle": "Man of Laketown", + "culture": "gandalf", + "cost": 1, + "type": "ally", + "allyHome": "fellowship,3", + "race": "man", + "strength": 2, + "vitality": 2, + "condition": { + "type": "canSpot", + "filter": "name(Gandalf)" + }, + "effects": { + "type": "activated", + "phase": "fellowship", + "cost": [ + { + "type": "exert", + "filter": "self" + }, + { + "type": "discardFromHand", + "forced": false + } + ], + "effect": { + "type": "drawCards" + } + } + }, + "51_108": { + "title": "*No Stranger to the Shadows", + "culture": "gondor", + "cost": 0, + "type": "condition", + "keyword": [ + "stealth" + ], + "target": "ranger", + "effects": { + "type": "modifier", + "modifier": { + "type": "modifyCost", + "filter": "site", + "amount": -1 + } + } + }, + "51_138": { + "title": "Saruman's Snows", + "culture": "isengard", + "cost": 2, + "type": "condition", + "keyword": [ + "spell", + "weather" + ], + "target": "site", + "effects": [ + { + "type": "extraCost", + "cost": { + "type": "exert", + "filter": "choose(culture(isengard),minion)" + } + }, + { + "type": "modifier", + "modifier": { + "type": "cantPlayPhaseEventsOrPhaseSpecialAbilities", + "condition": [ + { + "type": "location", + "filter": "hasAttached(self)" + }, + { + "type": "canSpot", + "filter": "culture(isengard),minion,inSkirmish" + } + ], + "phase": "skirmish" + } + }, + { + "type": "trigger", + "trigger": { + "type": "endOfTurn" + }, + "effect": { + "type": "discard", + "filter": "self" + } + } + ] + }, + "51_139": { + "title": "Savagery To Match Their Numbers", + "culture": "isengard", + "cost": 0, + "type": "event", + "keyword": "skirmish", + "effects": { + "type": "event", + "effect": { + "type": "choice", + "texts": [ + "Make an Uruk-hai strength +2", + "Make an Uruk-hai strength +3 (and fierce until the regroup phase)" + ], + "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": 3, + "memorize": "chosenUrukHai" + }, + { + "type": "addKeyword", + "filter": "memory(chosenUrukHai)", + "keyword": "fierce", + "until": "start(regroup)" + } + ] + } + ] + } + } + }, + "51_195": { + "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)" + } + } + }, + "51_234": { + "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 a unique wraith minion from your discard?", + "effect": { + "type": "playCardFromDiscard", + "filter": "choose(unique,culture(wraith),minion)" + } + } + } + } + }, + "51_248": { + "title": "Forces of Mordor", + "culture": "sauron", + "cost": 0, + "type": "event", + "keyword": "shadow", + "effects": { + "type": "event", + "cost": { + "type": "exert", + "filter": "choose(culture(sauron),minion)" + }, + "effect": { + "type": "addTwilight", + "amount": { + "type": "forEachYouCanSpot", + "filter": "culture(sauron),orc", + "limit": 3 + } + } + } + }, "51_311": { "title": "*Sam", "subtitle": "Son of Hamfast", @@ -92,5 +348,64 @@ } ] }, - + "51_313": { + "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": "revealrandomcardsfromhand", + "hand": "shadowPlayer", + "forced": true, + "memorize": "revealedCards", + "count": 4 + }, + { + "type": "removeTwilight", + "amount": { + "type": "cardPhaseLimit", + "limit": 2, + "amount": { + "type": "forEachMatchingInMemory", + "memory": "revealedCards", + "filter": "orc", + "limit": 2 + } + } + } + ] + } + }, + "51_316": { + "title": "A Talent for Not Being Seen", + "culture": "shire", + "cost": 0, + "type": "condition", + "target": "or(name(Merry),name(Pippin)),not(hasAttached(name(A Talent for Not Being Seen)))", + "keyword": [ + "stealth" + ], + "effects": { + "type": "modifier", + "modifier": { + "type": "modifyCost", + "filter": "site", + "amount": -1 + } + } + } } diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set02-errata-playtest.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set02-errata-playtest.json index 93de3c299..2c63c0851 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set02-errata-playtest.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set02-errata-playtest.json @@ -1,159 +1,2 @@ { - - "72_75": { - "title": "*Bill Ferny", - "subtitle": "Swarthy Sneering Fellow", - "culture": "wraith", - "cost": 2, - "type": "minion", - "race": "man", - "strength": 4, - "vitality": 1, - "site": 2, - "effects": [ - { - "type": "modifier", - "modifier": { - "type": "removeKeyword", - "filter": "nazgul", - "keyword": "roaming" - } - }, - { - "type": "modifier", - "modifier": { - "type": "cantBeAssignedToSkirmishAgainst", - "condition": { - "type": "canSpot", - "filter": "hobbit" - }, - "minion": "self", - "fpCharacter": "any", - "side": "free people" - } - }, - { - "type": "trigger", - "trigger": { - "type": "condition", - "condition": { - "type": "location", - "filter": "underground" - } - }, - "effect": { - "type": "discard", - "filter": "self" - } - } - ] - }, - "72_101": { - "title": "*Filibert Bolger", - "subtitle": "Wily Rascal", - "culture": "shire", - "cost": 1, - "type": "ally", - "allyHome": "fellowship,1", - "race": "hobbit", - "strength": 1, - "vitality": 2, - "effects": { - "type": "activated", - "phase": "skirmish", - "cost": [ - { - "type": "exert", - "filter": "choose(hobbit,companion,not(ring bearer))", - "times": 2, - "memorize": "exertedHobbit" - } - ], - "effect": { - "type": "cancelSkirmish", - "filter": "memory(exertedHobbit),infierceskirmish" - } - } - }, - "72_108": { - "title": "*O Elbereth! Gilthoniel!", - "culture": "shire", - "cost": 1, - "type": "condition", - "strength": 1, - "keyword": "tale", - "target": "ring bearer", - "effects": { - "type": "activated", - "phase": "skirmish", - "cost": [ - { - "type": "memorize", - "filter": "bearer", - "memory": "bearer" - }, - { - "type": "discard", - "filter": "self" - } - ], - "effect": { - "type": "choice", - "texts": [ - "Make the Ring-bearer strength +4 if skirmishing a Nazgul", - "Take off The One Ring" - ], - "effects": [ - { - "type": "addmodifier", - "modifier": { - "type": "modifyStrength", - "filter": "memory(bearer),inSkirmishAgainst(nazgul)", - - "amount": 4 - }, - - }, - { - "type": "takeOffRing" - } - ] - } - } - }, - "72_121": { - "title": "*Gimli", - "subtitle": "Dwarf of the Mountain-race", - "culture": "dwarven", - "cost": 2, - "type": "companion", - "race": "dwarf", - "strength": 6, - "vitality": 3, - "resistance": 6, - "signet": "frodo", - "keyword": "damage+1", - "effects": [ - { - "type": "modifier", - "modifier": { - "type": "modifyCost", - "filter": "underground,site", - "amount": -1 - } - }, - { - "type": "modifier", - "modifier": { - "type": "modifyStrength", - "amount": 1, - "condition": { - "type": "location", - "filter": "underground" - }, - "filter": "self" - } - } - ] - } } diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set02-errata.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set02-errata.json index bcf7c89b9..637cb009f 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set02-errata.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set02-errata.json @@ -44,5 +44,160 @@ ] } ] + }, + "52_75": { + "title": "*Bill Ferny", + "subtitle": "Swarthy Sneering Fellow", + "culture": "wraith", + "cost": 2, + "type": "minion", + "race": "man", + "strength": 4, + "vitality": 1, + "site": 2, + "effects": [ + { + "type": "modifier", + "modifier": { + "type": "removeKeyword", + "filter": "nazgul", + "keyword": "roaming" + } + }, + { + "type": "modifier", + "modifier": { + "type": "cantBeAssignedToSkirmishAgainst", + "condition": { + "type": "canSpot", + "filter": "hobbit" + }, + "minion": "self", + "fpCharacter": "any", + "side": "free people" + } + }, + { + "type": "trigger", + "trigger": { + "type": "condition", + "condition": { + "type": "location", + "filter": "underground" + } + }, + "effect": { + "type": "discard", + "filter": "self" + } + } + ] + }, + "52_101": { + "title": "*Filibert Bolger", + "subtitle": "Wily Rascal", + "culture": "shire", + "cost": 1, + "type": "ally", + "allyHome": "fellowship,1", + "race": "hobbit", + "strength": 1, + "vitality": 2, + "effects": { + "type": "activated", + "phase": "skirmish", + "cost": [ + { + "type": "exert", + "filter": "choose(hobbit,companion,not(ring bearer))", + "times": 2, + "memorize": "exertedHobbit" + } + ], + "effect": { + "type": "cancelSkirmish", + "filter": "memory(exertedHobbit),infierceskirmish" + } + } + }, + "52_108": { + "title": "*O Elbereth! Gilthoniel!", + "culture": "shire", + "cost": 1, + "type": "condition", + "strength": 1, + "keyword": "tale", + "target": "ring bearer", + "effects": { + "type": "activated", + "phase": "skirmish", + "cost": [ + { + "type": "memorize", + "filter": "bearer", + "memory": "bearer" + }, + { + "type": "discard", + "filter": "self" + } + ], + "effect": { + "type": "choice", + "texts": [ + "Make the Ring-bearer strength +4 if skirmishing a Nazgul", + "Take off The One Ring" + ], + "effects": [ + { + "type": "addmodifier", + "modifier": { + "type": "modifyStrength", + "filter": "memory(bearer),inSkirmishAgainst(nazgul)", + + "amount": 4 + } + }, + { + "type": "takeOffRing" + } + ] + } + } + }, + "52_121": { + "title": "*Gimli", + "subtitle": "Dwarf of the Mountain-race", + "culture": "dwarven", + "cost": 2, + "type": "companion", + "race": "dwarf", + "strength": 6, + "vitality": 3, + "resistance": 6, + "signet": "frodo", + "keyword": "damage+1", + "effects": [ + { + "type": "modifier", + "modifier": { + "type": "modifyCost", + "filter": "underground,site", + "amount": -1 + } + }, + { + "type": "modifier", + "modifier": { + "type": "modifyStrength", + "amount": 1, + "condition": { + "type": "location", + "filter": "underground" + }, + "filter": "self" + } + } + ] } } diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set03-errata-playtest.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set03-errata-playtest.json index e5f38590f..2c63c0851 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set03-errata-playtest.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set03-errata-playtest.json @@ -1,202 +1,2 @@ { - "73_17": { - "title": "*Galadriel", - "subtitle": "Lady of the Golden Wood", - "culture": "elven", - "cost": 3, - "type": "ally", - "allyHome": "fellowship,6", - "race": "elf", - "strength": 3, - "vitality": 3, - "effects": [ - { - "type": "trigger", - "optional": true, - "trigger": { - "type": "startOfTurn" - }, - "effect": { - "type": "heal", - "filter": "choose(another,elf)" - } - }, - { - "type": "activated", - "phase": "fellowship", - "cost": { - "type": "exert", - "filter": "self", - "times": 2 - }, - "effect": { - "type": "playNextSite", - "filter": "forest" - } - } - ] - }, - "73_38": { - "title": "*Aragorn", - "subtitle": "Heir to the White City", - "culture": "Gondor", - "type": "companion", - "race": "Man", - "cost": 4, - "strength": 8, - "vitality": 4, - "resistance": 6, - "signet": "frodo", - "keyword": [ - "Ranger" - ], - "effects": { - "type": "trigger", - "trigger": { - "type": "moves" - }, - "condition": { - "type": "phase", - "phase": "fellowship" - }, - "effect": { - "type": "removeTwilight", - "amount": 1 - } - } - }, - - "73_67": { - "title": "*The Palantir of Orthanc", - "culture": "isengard", - "cost": 0, - "type": "artifact", - "possession": "palantir", - "keyword": "support area", - "condition": { - "type": "canSpot", - "filter": "culture(isengard),minion" - }, - "effects": { - "type": "activated", - "phase": "shadow", - "cost": [ - { - "type": "removeTwilight", - "amount": 2 - } - ], - "condition": { - "type": "canSpot", - "filter": "culture(isengard),minion", - "count": 2, - }, - "effect": [ - { - "type": "revealRandomCardsFromHand", - "forced": true, - "hand": "fp", - "count": 1, - "memorize": "revealedCard" - }, - { - "type": "putCardsFromHandOnTopOfDeck", - "filter": "choose(memory(revealedCard))", - "player": "fp" - } - ] - } - }, - - "73_106": { - "title": "*Bill the Pony", - "culture": "Shire", - "side": "free_people", - "cost": 0, - "type": "possession", - "keyword": [ - "stealth" - ], - "target": "name(Sam)", - "effects": [ - { - "type": "modifier", - "modifier": { - "type": "modifyCost", - "filter": "site", - "amount": -1 - } - }, - { - "type": "trigger", - "trigger": { - "type": "condition", - "condition": { - "type": "location", - "filter": "underground" - } - }, - "effect": { - "type": "discard", - "filter": "self" - } - } - ] - }, - "73_108": { - "title": "Frying Pan", - "culture": "Shire", - "cost": 1, - "type": "possession", - "possession": "hand weapon", - "strength": 1, - "target": "hobbit", - "effects": { - "type": "activated", - "phase": "skirmish", - "cost": { - "type": "exert", - "filter": "bearer" - }, - "effect": { - "type": "wound", - "filter": "choose(orc,inSkirmishAgainst(bearer))" - } - } - }, - "73_113": { - "title": "*The Shire Countryside", - "culture": "shire", - "cost": 1, - "type": "condition", - "keyword": "support area", - "condition": { - "type": "canSpot", - "count": 2, - "filter": "culture(shire),companion" - }, - "effects": { - "type": "trigger", - "optional": true, - "trigger": { - "type": "removesBurden", - "filter": "not(hobbit)" - }, - "condition": { - "type": "perPhaseLimit", - "limit": 1 - }, - "effect": [ - { - "type": "incrementPerPhaseLimit", - "limit": 1 - }, - { - "type": "heal", - "count": "0-2", - "filter": "choose(companion)" - } - ] - } - } } diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set03-errata.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set03-errata.json index 8311cfea5..f637e4c58 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set03-errata.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set03-errata.json @@ -1,4 +1,70 @@ { + "53_17": { + "title": "*Galadriel", + "subtitle": "Lady of the Golden Wood", + "culture": "elven", + "cost": 3, + "type": "ally", + "allyHome": "fellowship,6", + "race": "elf", + "strength": 3, + "vitality": 3, + "effects": [ + { + "type": "trigger", + "optional": true, + "trigger": { + "type": "startOfTurn" + }, + "effect": { + "type": "heal", + "filter": "choose(another,elf)" + } + }, + { + "type": "activated", + "phase": "fellowship", + "cost": { + "type": "exert", + "filter": "self", + "times": 2 + }, + "effect": { + "type": "playNextSite", + "filter": "forest" + } + } + ] + }, + "53_38": { + "title": "*Aragorn", + "subtitle": "Heir to the White City", + "culture": "Gondor", + "type": "companion", + "race": "Man", + "cost": 4, + "strength": 8, + "vitality": 4, + "resistance": 6, + "signet": "frodo", + "keyword": [ + "Ranger" + ], + "effects": { + "type": "trigger", + "trigger": { + "type": "moves" + }, + "condition": { + "type": "phase", + "phase": "fellowship" + }, + "effect": { + "type": "removeTwilight", + "amount": 1 + } + } + }, "53_42": { "side": "free_people", "cost": 0, @@ -111,5 +177,137 @@ } } ] + }, + "53_67": { + "title": "*The Palantir of Orthanc", + "culture": "isengard", + "cost": 0, + "type": "artifact", + "possession": "palantir", + "keyword": "support area", + "condition": { + "type": "canSpot", + "filter": "culture(isengard),minion" + }, + "effects": { + "type": "activated", + "phase": "shadow", + "cost": [ + { + "type": "removeTwilight", + "amount": 2 + } + ], + "condition": { + "type": "canSpot", + "filter": "culture(isengard),minion", + "count": 2, + }, + "effect": [ + { + "type": "revealRandomCardsFromHand", + "forced": true, + "hand": "fp", + "count": 1, + "memorize": "revealedCard" + }, + { + "type": "putCardsFromHandOnTopOfDeck", + "filter": "choose(memory(revealedCard))", + "player": "fp" + } + ] + } + }, + "53_106": { + "title": "*Bill the Pony", + "culture": "Shire", + "side": "free_people", + "cost": 0, + "type": "possession", + "keyword": [ + "stealth" + ], + "target": "name(Sam)", + "effects": [ + { + "type": "modifier", + "modifier": { + "type": "modifyCost", + "filter": "site", + "amount": -1 + } + }, + { + "type": "trigger", + "trigger": { + "type": "condition", + "condition": { + "type": "location", + "filter": "underground" + } + }, + "effect": { + "type": "discard", + "filter": "self" + } + } + ] + }, + "53_108": { + "title": "Frying Pan", + "culture": "Shire", + "cost": 1, + "type": "possession", + "possession": "hand weapon", + "strength": 1, + "target": "hobbit", + "effects": { + "type": "activated", + "phase": "skirmish", + "cost": { + "type": "exert", + "filter": "bearer" + }, + "effect": { + "type": "wound", + "filter": "choose(orc,inSkirmishAgainst(bearer))" + } + } + }, + "53_113": { + "title": "*The Shire Countryside", + "culture": "shire", + "cost": 1, + "type": "condition", + "keyword": "support area", + "condition": { + "type": "canSpot", + "count": 2, + "filter": "culture(shire),companion" + }, + "effects": { + "type": "trigger", + "optional": true, + "trigger": { + "type": "removesBurden", + "filter": "not(hobbit)" + }, + "condition": { + "type": "perPhaseLimit", + "limit": 1 + }, + "effect": [ + { + "type": "incrementPerPhaseLimit", + "limit": 1 + }, + { + "type": "heal", + "count": "0-2", + "filter": "choose(companion)" + } + ] + } } } 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 8537061a2..630a28a47 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json +++ b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json @@ -7,15 +7,43 @@ "set":[1, 2, 3] }, { - "name":"PC-Fellowship", + "name":"Fellowship block (PC)", "code":"pc_fotr_block", "sites":"FELLOWSHIP", "cancelRingBearerSkirmish":true, - "hall":true, - "set":[1, 2, 3, 51, 52, 53, 101], - "banned":["1_40","1_311","2_32","3_42","3_68",] + "set":[1, 2, 3, 51, 52, 53], + "banned":["1_40", "1_45", "1_80", "1_108", "1_138", "1_139", "1_195", "1_234", "1_248", "1_311", "1_313", "1_316", "2_32", "2_75", "2_101", "2_108", "2_121", "3_17", "3_38", "3_42", "3_67", "3_68", "3_106", "3_108", "3_113"] + }, + { + "name":"Movie block", + "code":"movie", + "sites":"KING", + "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":"Movie block (PC)", + "code":"pc_movie", + "sites":"KING", + "set":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 51, 52, 53], + "banned":["1_40", "1_45", "1_80", "1_108", "1_138", "1_139", "1_195", "1_234", "1_248", "1_311", "1_313", "1_316", "2_32", "2_75", "2_101", "2_108", "2_121", "3_17", "3_38", "3_42", "3_67", "3_68", "3_106", "3_108", "3_113", "4_73", "4_192", "4_276", "4_304", "7_49", "7_96", "8_1", "10_2", "10_11", "10_91"] + }, + { + "name":"Expanded", + "code":"expanded", + "sites":"SHADOWS", + "banned":["1_45", "1_138", "1_234", "1_311", "1_313", "1_316", "2_121", "3_17", "3_38", "3_42", "3_67", "3_68", "3_108", "3_113", "4_73", "7_49", "8_1", "10_2", "10_11", "10_91", "11_31", "11_100", "11_132"], + "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":"Expanded (PC)", + "code":"pc_expanded", + "sites":"SHADOWS", + "banned":["1_40", "1_45", "1_80", "1_108", "1_138", "1_139", "1_195", "1_234", "1_248", "1_311", "1_313", "1_316", "2_32", "2_75", "2_101", "2_108", "2_121", "3_17", "3_38", "3_42", "3_67", "3_68", "3_106", "3_108", "3_113", "4_73", "7_49", "8_1", "10_2", "10_11", "10_91", "11_31", "11_100", "11_132"], + "restricted":["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] }, - { "name":"Fellowship block - Set 1", "code":"fotr1_block", @@ -165,22 +193,6 @@ "set":[7, 8], "hall":false }, - { - "name":"Movie block", - "code":"movie", - "sites":"KING", - "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":true, - "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", @@ -247,24 +259,6 @@ "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] }, - { - "name":"Expanded", - "code":"expanded", - "sites":"SHADOWS", - "banned":["1_45", "1_138", "1_234", "1_311", "1_313", "1_316", "2_121", "3_17", "3_38", "3_42", "3_67", "3_68", "3_108", "3_113", "4_73", "7_49", "8_1", "10_2", "10_11", "10_91", "11_31", "11_100", "11_132"], - "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":true, - "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", @@ -443,7 +437,7 @@ "sites":"KING", "hall":true, "playtest":true, - "set":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 51, 52, 53, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 101, 151], + "set":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 51, 52, 53, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80], "banned":["1_40", "1_45", "1_80", "1_108", "1_138", "1_139", "1_195", "1_234", "1_248", "1_311", "1_313", "1_316", "2_32", "2_75", "2_101", "2_108", "2_121", "3_17", "3_38", "3_42", "3_67", "3_68", "3_106", "3_108", "3_113", "4_73", "4_192", "4_276", "4_304", "7_49", "7_96", "8_1", "10_2", "10_11", "10_91"] }, { @@ -452,7 +446,7 @@ "sites":"SHADOWS", "hall":true, "playtest":true, - "set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 51, 52, 53, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 101, 151], + "set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 51, 52, 53, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89], "banned":["1_40", "1_45", "1_80", "1_108", "1_138", "1_139", "1_195", "1_234", "1_248", "1_311", "1_313", "1_316", "2_32", "2_75", "2_101", "2_108", "2_121", "3_17", "3_38", "3_42", "3_67", "3_68", "3_106", "3_108", "3_113", "4_73", "4_192", "4_276", "4_304", "7_49", "7_96", "8_1", "10_2", "10_11", "10_91", "11_31", "11_100", "11_114", "11_132", "13_188", "15_64"] } ] From 40b87e1269e840bc060f0fa299f0217869766e05 Mon Sep 17 00:00:00 2001 From: Troy Biesterfeld Date: Sat, 15 May 2021 10:39:33 -0500 Subject: [PATCH 3/3] Add PC formats to league admin page --- gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html | 3 +++ 1 file changed, 3 insertions(+) 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 c0eaf7d95..c3f2c91ac 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html @@ -235,6 +235,7 @@ Format:
Series duration in days:
Maximum matches in series: