diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java index c4c39bbf4..adf217c6e 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/HallRequestHandler.java @@ -255,7 +255,7 @@ public class HallRequestHandler extends LotroServerRequestHandler implements Uri } if (!lotroFormat.getErrataCardMap().isEmpty()) { result.append("
  • Errata: "); - appendCards(result, new ArrayList<>(lotroFormat.getErrataCardMap().values())); + appendCards(result, new ArrayList<>(new LinkedHashSet<>(lotroFormat.getErrataCardMap().values()))); result.append("
  • "); } if (lotroFormat.getValidCards().size() > 0) { diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set10-errata-playtest.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set10-errata-playtest.json index e2faf9c19..8129a28f9 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set10-errata-playtest.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/errata/set10-errata-playtest.json @@ -33,6 +33,45 @@ } } }, + "80_11": { + "title": "*Galadriel", + "subtitle": "Lady Redeemed", + "culture": "elven", + "cost": 3, + "type": "companion", + "race": "elf", + "strength": 3, + "vitality": 3, + "resistance": 6, + "effects": [ + { + "type": "modifyOwnCost", + "condition": { + "type": "phase", + "phase": "play starting fellowship" + }, + "amount": -3 + }, + { + "type": "trigger", + "optional": true, + "trigger": { + "type": "startOfPhase", + "phase": "regroup" + }, + "cost": { + "type": "discardFromHand", + "count": 1, + "forced": false, + "filter": "choose(culture(elven),skirmish,event)" + }, + "effect": { + "type": "discard", + "filter": "choose(side(shadow),or(condition,possession))" + } + } + ] + }, "80_17": { "title": "Out of the High Airs", "cost": 3, 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 f50f441f5..cf5557907 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 @@ -117,34 +117,35 @@ var PCCards = { '65_64': 'https://i.lotrtcgpc.net/errata/xlist/65_064.jpg', // Future Errata - '71_7': 'https://i.lotrtcgpc.net/errata/xlist/71_007.jpg', - '71_11': 'https://i.lotrtcgpc.net/errata/xlist/71_011.jpg', - '71_12': 'https://i.lotrtcgpc.net/errata/xlist/71_012.jpg', - '71_53': 'https://i.lotrtcgpc.net/errata/xlist/71_053.jpg', - '71_55': 'https://i.lotrtcgpc.net/errata/xlist/71_055.jpg', - '71_254': 'https://i.lotrtcgpc.net/errata/xlist/71_254.jpg', - '71_282': 'https://i.lotrtcgpc.net/errata/xlist/71_282.jpg', - '72_1': 'https://i.lotrtcgpc.net/errata/xlist/72_001.jpg', - '72_6': 'https://i.lotrtcgpc.net/errata/xlist/72_006.jpg', - '72_7': 'https://i.lotrtcgpc.net/errata/xlist/72_007.jpg', - '72_12': 'https://i.lotrtcgpc.net/errata/xlist/72_012.jpg', - '72_55': 'https://i.lotrtcgpc.net/errata/xlist/72_055.jpg', - '73_54': 'https://i.lotrtcgpc.net/errata/xlist/73_054.jpg', - '73_120': 'https://i.lotrtcgpc.net/errata/xlist/73_120.jpg', - '74_46': 'https://i.lotrtcgpc.net/errata/xlist/74_046.jpg', - '77_359': 'https://i.lotrtcgpc.net/errata/xlist/77_359.jpg', - '78_24': 'https://i.lotrtcgpc.net/errata/xlist/78_024.jpg', - '78_44': 'https://i.lotrtcgpc.net/errata/xlist/78_044.jpg', - '78_51': 'https://i.lotrtcgpc.net/errata/xlist/78_051.jpg', - '78_57': 'https://i.lotrtcgpc.net/errata/xlist/78_057.jpg', - '78_59': 'https://i.lotrtcgpc.net/errata/xlist/78_059.jpg', - '78_103': 'https://i.lotrtcgpc.net/errata/xlist/78_103.jpg', - '78_107': 'https://i.lotrtcgpc.net/errata/xlist/78_107.jpg', - '79_12': 'https://i.lotrtcgpc.net/errata/xlist/79_012.jpg', - '79_14': 'https://i.lotrtcgpc.net/errata/xlist/79_014.jpg', - '80_8': 'https://i.lotrtcgpc.net/errata/xlist/80_008.jpg', - '80_17': 'https://i.lotrtcgpc.net/errata/xlist/80_017.jpg', - '80_32': 'https://i.lotrtcgpc.net/errata/xlist/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 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 c53da30cb..b9af859ff 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json +++ b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json @@ -462,7 +462,7 @@ "3_108":"53_108", "3_113":"53_113", "3_120":"73_120", "4_46":"74_46", "4_73":"54_73", "4_192":"54_192", "4_276":"54_276", "4_304":"54_304", "7_49":"57_49", "7_96":"57_96", "7_359":"77_359", "8_1":"58_1", "8_24":"78_24", "8_44":"78_44", "8_51":"78_51", "8_57":"78_57", "8_59":"78_59", "8_103":"78_103", "8_107":"78_107", "9_12":"79_12", "9_14":"79_14", - "10_2":"60_2", "10_8":"80_8", "10_11":"60_11", "10_17":"80_17", "10_32":"80_32", "10_91":"60_91"} + "10_2":"60_2", "10_8":"80_8", "10_11":"80_11", "60_11":"80_11", "10_17":"80_17", "10_32":"80_32", "10_91":"60_91"} }, { "name":"PLAYTEST - Expanded (PC)", @@ -479,7 +479,7 @@ "3_108":"53_108", "3_113":"53_113", "3_120":"73_120", "4_46":"74_46", "4_73":"54_73", "4_192":"54_192", "4_276":"54_276", "4_304":"54_304", "7_49":"57_49", "7_96":"57_96", "7_359":"77_359", "8_1":"58_1", "8_24":"78_24", "8_44":"78_44", "8_51":"78_51", "8_57":"78_57", "8_59":"78_59", "8_103":"78_103", "8_107":"78_107", "9_12":"79_12", "9_14":"79_14", - "10_2":"60_2", "10_8":"80_8", "10_11":"60_11", "10_17":"80_17", "10_32":"80_32", "10_91":"60_91", + "10_2":"60_2", "10_8":"80_8", "10_11":"80_11", "60_11":"80_11", "10_17":"80_17", "10_32":"80_32", "10_91":"60_91", "11_31":"61_31", "11_100":"61_100", "11_114":"61_114", "11_132":"61_132", "13_188":"63_188", "15_64":"65_64"} } ]