diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_dwarven_playtest.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_dwarven_playtest.json new file mode 100644 index 000000000..c62440e17 --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_dwarven_playtest.json @@ -0,0 +1,183 @@ +{ + "151_1": { + "title": "*Hospitality of the Dwarves", + "culture": "dwarven", + "cost": 1, + "type": "condition", + "keyword": [ + "support area" + ], + "effects": [ + { + "type": "extraCost", + "cost": { + "type": "exert", + "filter": "choose(dwarf)" + } + }, + { + "type": "trigger", + "trigger": { + "type": "played", + "filter": "orc", + "memorize": "playedOrc" + }, + "effect": { + "type": "discardTopCardsFromDeck", + "forced": true, + "deck": "ownerFromMemory(playedOrc)" + } + } + ] + }, + + "151_2": { + "title": "*Deepest Delvings", + "culture": "dwarven", + "cost": 1, + "type": "condition", + "keyword": [ + "support area" + ], + "effects": [ + { + "type": "extraCost", + "cost": { + "type": "exert", + "filter": "choose(dwarf)" + } + }, + { + "type": "trigger", + "trigger": { + "type": "played", + "filter": "orc", + "memorize": "playedOrc" + }, + "effect": { + "type": "discardTopCardsFromDeck", + "forced": true, + "deck": "ownerFromMemory(playedOrc)" + } + } + ] + }, + + "151_3": { + "title": "*Gimli", + "subtitle": "Vengeful Naugrim", + "culture": "dwarven", + "cost": 2, + "type": "companion", + "race": "dwarf", + "strength": 6, + "vitality": 3, + "resistance": 6, + "signet": "aragorn", + "keyword": "damage+1", + "effects": { + "type": "activated", + "phase": "fellowship", + "condition": { + "type": "twilightPoolLessThan", + "amount": 2 + }, + "cost": { + "type": "addTwilight", + "amount": 2 + }, + "effect": { + "type": "putCardsFromHandOnBottomOfDeck" + } + } + }, + + "151_4": { + "title": "I Name You Elf-friend", + "culture": "dwarven", + "cost": 1, + "type": "event", + "keyword": "maneuver", + "effects": { + "type": "event", + "cost": { + "type": "exert", + "filter": "choose(dwarf)", + "memorize": "exertedDwarf" + }, + "effect": [ + { + "type": "modifyStrength", + "filter": "memory(exertedDwarf)", + "amount": 3 + }, + { + "type": "addKeyword", + "filter": "memory(exertedDwarf)", + "keyword": "damage+1" + } + ] + } + }, + + "151_5": { + "title": "One Dwarf in Moria", + "culture": "dwarven", + "cost": 1, + "type": "event", + "keyword": "maneuver", + "effects": { + "type": "event", + "cost": { + "type": "exert", + "filter": "choose(dwarf)", + "memorize": "exertedDwarf" + }, + "effect": [ + { + "type": "modifyStrength", + "filter": "memory(exertedDwarf)", + "amount": 3 + }, + { + "type": "addKeyword", + "filter": "memory(exertedDwarf)", + "keyword": "damage+1" + } + ] + } + }, + + "151_6": { + "title": "*So Bold and So Courteous", + "culture": "dwarven", + "cost": 0, + "type": "condition", + "keyword": [ + "support area" + ], + "effects": [ + { + "type": "extraCost", + "cost": { + "type": "exert", + "filter": "choose(dwarf)" + } + }, + { + "type": "trigger", + "trigger": { + "type": "played", + "filter": "orc", + "memorize": "playedOrc" + }, + "effect": { + "type": "discardTopCardsFromDeck", + "forced": true, + "deck": "ownerFromMemory(playedOrc)" + } + } + ] + }, + +} \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_moria_playtest.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_moria_playtest.json new file mode 100644 index 000000000..8c1ecd7df --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_moria_playtest.json @@ -0,0 +1,189 @@ +{ + + + "151_46": { + "title": "Guided by One Purpose", + "culture": "moria", + "cost": 0, + "type": "condition", + "keyword": "support area", + "effects": [ + { + "type": "trigger", + "trigger": { + "type": "played", + "filter": "your,culture(moria),weapon" + }, + "effect": { + "type": "addTwilight" + } + }, + { + "type": "activatedTrigger", + "trigger": { + "type": "aboutToTakeWound", + "filter": "culture(moria),orc" + }, + "cost": { + "type": "discard", + "filter": "self" + }, + "effect": { + "type": "preventWound", + "filter": "choose(culture(moria),orc)" + } + } + ] + }, + + "151_47": { + "title": "*Terror at Its Coming", + "culture": "moria", + "cost": 0, + "type": "condition", + "keyword": "support area", + "effects": [ + { + "type": "trigger", + "trigger": { + "type": "played", + "filter": "your,culture(moria),weapon" + }, + "effect": { + "type": "addTwilight" + } + }, + { + "type": "activatedTrigger", + "trigger": { + "type": "aboutToTakeWound", + "filter": "culture(moria),orc" + }, + "cost": { + "type": "discard", + "filter": "self" + }, + "effect": { + "type": "preventWound", + "filter": "choose(culture(moria),orc)" + } + } + ] + }, + + "151_48": { + "title": "Thrashing Tentacle", + "culture": "moria", + "cost": 1, + "type": "minion", + "race": "creature", + "strength": 5, + "vitality": 2, + "site": 4, + "effects": { + "type": "modifier", + "modifier": { + "type": "addKeyword", + "filter": "self,inSkirmish", + "keyword": "damage+2", + "condition": { + "type": "canSpot", + "filter": "another,culture(moria),orc,inSkirmish" + } + } + } + }, + + "151_49": { + "title": "Out of Dark Waters", + "culture": "moria", + "cost": 0, + "type": "condition", + "keyword": "support area", + "effects": [ + { + "type": "trigger", + "trigger": { + "type": "played", + "filter": "your,culture(moria),weapon" + }, + "effect": { + "type": "addTwilight" + } + }, + { + "type": "activatedTrigger", + "trigger": { + "type": "aboutToTakeWound", + "filter": "culture(moria),orc" + }, + "cost": { + "type": "discard", + "filter": "self" + }, + "effect": { + "type": "preventWound", + "filter": "choose(culture(moria),orc)" + } + } + ] + }, + + "151_50": { + "title": "The Darkness Grew", + "culture": "moria", + "cost": 1, + "type": "condition", + "keyword": "support area", + "effects": [ + { + "type": "trigger", + "trigger": { + "type": "played", + "filter": "your,culture(moria),weapon" + }, + "effect": { + "type": "addTwilight" + } + }, + { + "type": "activatedTrigger", + "trigger": { + "type": "aboutToTakeWound", + "filter": "culture(moria),orc" + }, + "cost": { + "type": "discard", + "filter": "self" + }, + "effect": { + "type": "preventWound", + "filter": "choose(culture(moria),orc)" + } + } + ] + }, + + "151_51": { + "title": "Vile Tentacle", + "culture": "moria", + "cost": 3, + "type": "minion", + "race": "creature", + "strength": 7, + "vitality": 2, + "site": 4, + "effects": { + "type": "modifier", + "modifier": { + "type": "addKeyword", + "filter": "self,inSkirmish", + "keyword": "damage+2", + "condition": { + "type": "canSpot", + "filter": "another,culture(moria),orc,inSkirmish" + } + } + } + }, +} \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_sites_playtest.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_sites_playtest.json new file mode 100644 index 000000000..ce39e0709 --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_sites_playtest.json @@ -0,0 +1,44 @@ +{ + "151_93": { + "title": "Rivendell Gateway", + "type": "site", + "site": 3, + "block": "fellowship", + "cost": 0, + "direction": "left", + "effects": { + "type": "activated", + "phase": "fellowship", + "cost": { + "type": "exert", + "filter": "choose(hobbit)" + }, + "effect": { + "type": "playCardFromDrawDeck", + "filter": "choose(name(The Gaffer))" + } + } + }, + + "151_94": { + "title": "Moria Crossroads", + "type": "site", + "site": 4, + "block": "fellowship", + "cost": 2, + "direction": "left", + "effects": { + "type": "activated", + "phase": "fellowship", + "cost": { + "type": "exert", + "filter": "choose(hobbit)" + }, + "effect": { + "type": "playCardFromDrawDeck", + "filter": "choose(name(The Gaffer))" + } + } + }, + +} \ No newline at end of file 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 index cf5557907..3c1c65a57 100644 --- 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 @@ -93,63 +93,81 @@ var PCCards = { '53_108': 'https://i.lotrtcgpc.net/errata/xlist/53_108.jpg', '53_113': 'https://i.lotrtcgpc.net/errata/xlist/53_113.jpg', - '54_73': 'https://i.lotrtcgpc.net/errata/xlist/54_073.jpg', - '54_192': 'https://i.lotrtcgpc.net/errata/xlist/54_192.jpg', - '54_276': 'https://i.lotrtcgpc.net/errata/xlist/54_276.jpg', - '54_304': 'https://i.lotrtcgpc.net/errata/xlist/54_304.jpg', + '54_73': 'https://i.lotrtcgpc.net/errata/xlist/54_073.jpg', + '54_192': 'https://i.lotrtcgpc.net/errata/xlist/54_192.jpg', + '54_276': 'https://i.lotrtcgpc.net/errata/xlist/54_276.jpg', + '54_304': 'https://i.lotrtcgpc.net/errata/xlist/54_304.jpg', - '57_49': 'https://i.lotrtcgpc.net/errata/xlist/57_049.jpg', - '57_96': 'https://i.lotrtcgpc.net/errata/xlist/57_096.jpg', + '57_49': 'https://i.lotrtcgpc.net/errata/xlist/57_049.jpg', + '57_96': 'https://i.lotrtcgpc.net/errata/xlist/57_096.jpg', - '58_1': 'https://i.lotrtcgpc.net/errata/xlist/58_001.jpg', + '58_1': 'https://i.lotrtcgpc.net/errata/xlist/58_001.jpg', - '60_2': 'https://i.lotrtcgpc.net/errata/xlist/60_002.jpg', - '60_11': 'https://i.lotrtcgpc.net/errata/xlist/60_011.jpg', - '60_91': 'https://i.lotrtcgpc.net/errata/xlist/60_091.jpg', + '60_2': 'https://i.lotrtcgpc.net/errata/xlist/60_002.jpg', + '60_11': 'https://i.lotrtcgpc.net/errata/xlist/60_011.jpg', + '60_91': 'https://i.lotrtcgpc.net/errata/xlist/60_091.jpg', - '61_100': 'https://i.lotrtcgpc.net/errata/xlist/61_100.jpg', - '61_114': 'https://i.lotrtcgpc.net/errata/xlist/61_114.jpg', - '61_132': 'https://i.lotrtcgpc.net/errata/xlist/61_132.jpg', - '61_31': 'https://i.lotrtcgpc.net/errata/xlist/61_031.jpg', + '61_100': 'https://i.lotrtcgpc.net/errata/xlist/61_100.jpg', + '61_114': 'https://i.lotrtcgpc.net/errata/xlist/61_114.jpg', + '61_132': 'https://i.lotrtcgpc.net/errata/xlist/61_132.jpg', + '61_31': 'https://i.lotrtcgpc.net/errata/xlist/61_031.jpg', - '63_188': 'https://i.lotrtcgpc.net/errata/xlist/63_188.jpg', + '63_188': 'https://i.lotrtcgpc.net/errata/xlist/63_188.jpg', - '65_64': 'https://i.lotrtcgpc.net/errata/xlist/65_064.jpg', + '65_64': 'https://i.lotrtcgpc.net/errata/xlist/65_064.jpg', // Future Errata - '71_7': 'https://i.lotrtcgpc.net/errata/balancing/71_007.jpg', - '71_11': 'https://i.lotrtcgpc.net/errata/balancing/71_011.jpg', - '71_12': 'https://i.lotrtcgpc.net/errata/balancing/71_012.jpg', - '71_53': 'https://i.lotrtcgpc.net/errata/balancing/71_053.jpg', - '71_55': 'https://i.lotrtcgpc.net/errata/balancing/71_055.jpg', - '71_254': 'https://i.lotrtcgpc.net/errata/balancing/71_254.jpg', - '71_282': 'https://i.lotrtcgpc.net/errata/balancing/71_282.jpg', - '72_1': 'https://i.lotrtcgpc.net/errata/balancing/72_001.jpg', - '72_6': 'https://i.lotrtcgpc.net/errata/balancing/72_006.jpg', - '72_7': 'https://i.lotrtcgpc.net/errata/balancing/72_007.jpg', - '72_12': 'https://i.lotrtcgpc.net/errata/balancing/72_012.jpg', - '72_55': 'https://i.lotrtcgpc.net/errata/balancing/72_055.jpg', - '73_54': 'https://i.lotrtcgpc.net/errata/balancing/73_054.jpg', - '73_120': 'https://i.lotrtcgpc.net/errata/balancing/73_120.jpg', - '74_46': 'https://i.lotrtcgpc.net/errata/balancing/74_046.jpg', - '77_359': 'https://i.lotrtcgpc.net/errata/balancing/77_359.jpg', - '78_24': 'https://i.lotrtcgpc.net/errata/balancing/78_024.jpg', - '78_44': 'https://i.lotrtcgpc.net/errata/balancing/78_044.jpg', - '78_51': 'https://i.lotrtcgpc.net/errata/balancing/78_051.jpg', - '78_57': 'https://i.lotrtcgpc.net/errata/balancing/78_057.jpg', - '78_59': 'https://i.lotrtcgpc.net/errata/balancing/78_059.jpg', - '78_103': 'https://i.lotrtcgpc.net/errata/balancing/78_103.jpg', - '78_107': 'https://i.lotrtcgpc.net/errata/balancing/78_107.jpg', - '79_12': 'https://i.lotrtcgpc.net/errata/balancing/79_012.jpg', - '79_14': 'https://i.lotrtcgpc.net/errata/balancing/79_014.jpg', - '80_8': 'https://i.lotrtcgpc.net/errata/balancing/80_008.jpg', - '80_11': 'https://i.lotrtcgpc.net/errata/balancing/80_011.jpg', - '80_17': 'https://i.lotrtcgpc.net/errata/balancing/80_017.jpg', - '80_32': 'https://i.lotrtcgpc.net/errata/balancing/80_032.jpg', + '71_7': 'https://i.lotrtcgpc.net/errata/balancing/71_007.jpg', + '71_11': 'https://i.lotrtcgpc.net/errata/balancing/71_011.jpg', + '71_12': 'https://i.lotrtcgpc.net/errata/balancing/71_012.jpg', + '71_53': 'https://i.lotrtcgpc.net/errata/balancing/71_053.jpg', + '71_55': 'https://i.lotrtcgpc.net/errata/balancing/71_055.jpg', + '71_254': 'https://i.lotrtcgpc.net/errata/balancing/71_254.jpg', + '71_282': 'https://i.lotrtcgpc.net/errata/balancing/71_282.jpg', + '72_1': 'https://i.lotrtcgpc.net/errata/balancing/72_001.jpg', + '72_6': 'https://i.lotrtcgpc.net/errata/balancing/72_006.jpg', + '72_7': 'https://i.lotrtcgpc.net/errata/balancing/72_007.jpg', + '72_12': 'https://i.lotrtcgpc.net/errata/balancing/72_012.jpg', + '72_55': 'https://i.lotrtcgpc.net/errata/balancing/72_055.jpg', + '73_54': 'https://i.lotrtcgpc.net/errata/balancing/73_054.jpg', + '73_120': 'https://i.lotrtcgpc.net/errata/balancing/73_120.jpg', + '74_46': 'https://i.lotrtcgpc.net/errata/balancing/74_046.jpg', + '77_359': 'https://i.lotrtcgpc.net/errata/balancing/77_359.jpg', + '78_24': 'https://i.lotrtcgpc.net/errata/balancing/78_024.jpg', + '78_44': 'https://i.lotrtcgpc.net/errata/balancing/78_044.jpg', + '78_51': 'https://i.lotrtcgpc.net/errata/balancing/78_051.jpg', + '78_57': 'https://i.lotrtcgpc.net/errata/balancing/78_057.jpg', + '78_59': 'https://i.lotrtcgpc.net/errata/balancing/78_059.jpg', + '78_103': 'https://i.lotrtcgpc.net/errata/balancing/78_103.jpg', + '78_107': 'https://i.lotrtcgpc.net/errata/balancing/78_107.jpg', + '79_12': 'https://i.lotrtcgpc.net/errata/balancing/79_012.jpg', + '79_14': 'https://i.lotrtcgpc.net/errata/balancing/79_014.jpg', + '80_8': 'https://i.lotrtcgpc.net/errata/balancing/80_008.jpg', + '80_11': 'https://i.lotrtcgpc.net/errata/balancing/80_011.jpg', + '80_17': 'https://i.lotrtcgpc.net/errata/balancing/80_017.jpg', + '80_32': 'https://i.lotrtcgpc.net/errata/balancing/80_032.jpg', /// Player's Council League Promos // April 2021 '11_267': 'https://i.lotrtcgpc.net/promos/2021/04/PCPROMO_FA_11054.jpg', '11_268': 'https://i.lotrtcgpc.net/promos/2021/04/PCPROMO_FA_11226.jpg', + + // Player's Council FOTR+ + '151_1': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/V1_001.jpg', + '151_2': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/V1_002.jpg', + '151_3': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/V1_003.jpg', + '151_4': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/V1_004.jpg', + '151_5': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/V1_005.jpg', + '151_6': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/V1_006.jpg', + '151_46': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/V1_046.jpg', + '151_47': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/V1_047.jpg', + '151_48': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/V1_048.jpg', + '151_49': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/V1_049.jpg', + '151_50': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/V1_050.jpg', + '151_51': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/V1_051.jpg', + '151_93': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/V1_093.jpg', + '151_94': 'https://i.lotrtcgpc.net/sets/vset1/vpack1/V1_094.jpg', + + } 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 784afeaa1..5374af894 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 @@ -168,9 +168,13 @@ var CardFilter = Class.extend({ + "" + "" + "" + + "" + + "" + "" + "" + "" + + + ""); this.nameInput = $(""); this.sortSelect = $("