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 f658e7974..f948952aa 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 @@ -158,21 +158,70 @@ var PCCards = { '9_53': 'https://i.lotrtcgpc.net/promos/2021/09/PCPROMO_FA_09033.jpg', '10_123':'https://i.lotrtcgpc.net/promos/2021/09/PCPROMO_FA_10123.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', - + // Player's Council VSet1 'A Shadow of the Past' + '151_1': 'https://i.lotrtcgpc.net/sets/vset1/V1_001.jpg', + '151_2': 'https://i.lotrtcgpc.net/sets/vset1/V1_002.jpg', + '151_3': 'https://i.lotrtcgpc.net/sets/vset1/V1_003.jpg', + '151_4': 'https://i.lotrtcgpc.net/sets/vset1/V1_004.jpg', + '151_5': 'https://i.lotrtcgpc.net/sets/vset1/V1_005.jpg', + '151_6': 'https://i.lotrtcgpc.net/sets/vset1/V1_006.jpg', + //'151_7': 'https://i.lotrtcgpc.net/sets/vset1/V1_007.jpg', + //'151_8': 'https://i.lotrtcgpc.net/sets/vset1/V1_008.jpg', + //'151_9': 'https://i.lotrtcgpc.net/sets/vset1/V1_009.jpg', + //'151_10': 'https://i.lotrtcgpc.net/sets/vset1/V1_010.jpg', + //'151_11': 'https://i.lotrtcgpc.net/sets/vset1/V1_011.jpg', + //'151_12': 'https://i.lotrtcgpc.net/sets/vset1/V1_012.jpg', + //'151_13': 'https://i.lotrtcgpc.net/sets/vset1/V1_013.jpg', + //'151_14': 'https://i.lotrtcgpc.net/sets/vset1/V1_014.jpg', + //'151_15': 'https://i.lotrtcgpc.net/sets/vset1/V1_015.jpg', + //'151_16': 'https://i.lotrtcgpc.net/sets/vset1/V1_016.jpg', + //'151_17': 'https://i.lotrtcgpc.net/sets/vset1/V1_017.jpg', + //'151_18': 'https://i.lotrtcgpc.net/sets/vset1/V1_018.jpg', + //'151_19': 'https://i.lotrtcgpc.net/sets/vset1/V1_019.jpg', + //'151_20': 'https://i.lotrtcgpc.net/sets/vset1/V1_020.jpg', + //'151_21': 'https://i.lotrtcgpc.net/sets/vset1/V1_021.jpg', + //'151_22': 'https://i.lotrtcgpc.net/sets/vset1/V1_022.jpg', + //'151_23': 'https://i.lotrtcgpc.net/sets/vset1/V1_023.jpg', + //'151_24': 'https://i.lotrtcgpc.net/sets/vset1/V1_024.jpg', + //'151_25': 'https://i.lotrtcgpc.net/sets/vset1/V1_025.jpg', + //'151_26': 'https://i.lotrtcgpc.net/sets/vset1/V1_026.jpg', + //'151_27': 'https://i.lotrtcgpc.net/sets/vset1/V1_027.jpg', + //'151_28': 'https://i.lotrtcgpc.net/sets/vset1/V1_028.jpg', + //'151_29': 'https://i.lotrtcgpc.net/sets/vset1/V1_029.jpg', + //'151_30': 'https://i.lotrtcgpc.net/sets/vset1/V1_030.jpg', + '151_31': 'https://i.lotrtcgpc.net/sets/vset1/V1_031.jpg', + '151_32': 'https://i.lotrtcgpc.net/sets/vset1/V1_032.jpg', + '151_33': 'https://i.lotrtcgpc.net/sets/vset1/V1_033.jpg', + '151_34': 'https://i.lotrtcgpc.net/sets/vset1/V1_034.jpg', + '151_35': 'https://i.lotrtcgpc.net/sets/vset1/V1_035.jpg', + '151_36': 'https://i.lotrtcgpc.net/sets/vset1/V1_036.jpg', + //'151_37': 'https://i.lotrtcgpc.net/sets/vset1/V1_037.jpg', + //'151_38': 'https://i.lotrtcgpc.net/sets/vset1/V1_038.jpg', + //'151_39': 'https://i.lotrtcgpc.net/sets/vset1/V1_039.jpg', + //'151_40': 'https://i.lotrtcgpc.net/sets/vset1/V1_040.jpg', + //'151_41': 'https://i.lotrtcgpc.net/sets/vset1/V1_041.jpg', + //'151_42': 'https://i.lotrtcgpc.net/sets/vset1/V1_042.jpg', + //'151_43': 'https://i.lotrtcgpc.net/sets/vset1/V1_043.jpg', + //'151_44': 'https://i.lotrtcgpc.net/sets/vset1/V1_044.jpg', + //'151_45': 'https://i.lotrtcgpc.net/sets/vset1/V1_045.jpg', + //'151_46': 'https://i.lotrtcgpc.net/sets/vset1/V1_046.jpg', + //'151_47': 'https://i.lotrtcgpc.net/sets/vset1/V1_047.jpg', + //'151_48': 'https://i.lotrtcgpc.net/sets/vset1/V1_048.jpg', + //'151_49': 'https://i.lotrtcgpc.net/sets/vset1/V1_049.jpg', + //'151_50': 'https://i.lotrtcgpc.net/sets/vset1/V1_050.jpg', + //'151_51': 'https://i.lotrtcgpc.net/sets/vset1/V1_051.jpg', + //'151_52': 'https://i.lotrtcgpc.net/sets/vset1/V1_052.jpg', + //'151_53': 'https://i.lotrtcgpc.net/sets/vset1/V1_053.jpg', + //'151_54': 'https://i.lotrtcgpc.net/sets/vset1/V1_054.jpg', + //'151_55': 'https://i.lotrtcgpc.net/sets/vset1/V1_055.jpg', + //'151_56': 'https://i.lotrtcgpc.net/sets/vset1/V1_056.jpg', + //'151_57': 'https://i.lotrtcgpc.net/sets/vset1/V1_057.jpg', + //'151_58': 'https://i.lotrtcgpc.net/sets/vset1/V1_058.jpg', + //'151_59': 'https://i.lotrtcgpc.net/sets/vset1/V1_059.jpg', + //'151_60': 'https://i.lotrtcgpc.net/sets/vset1/V1_060.jpg', + //'151_61': 'https://i.lotrtcgpc.net/sets/vset1/V1_061.jpg', + //'151_62': 'https://i.lotrtcgpc.net/sets/vset1/V1_062.jpg', + //'151_63': 'https://i.lotrtcgpc.net/sets/vset1/V1_063.jpg', + //'151_64': 'https://i.lotrtcgpc.net/sets/vset1/V1_064.jpg', } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vset1/vpack1/Card_V1_035Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vset1/vpack1/Card_V1_035Tests.java index 71013051b..3db0db100 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vset1/vpack1/Card_V1_035Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vset1/vpack1/Card_V1_035Tests.java @@ -22,8 +22,10 @@ public class Card_V1_035Tests return new GenericCardTestHelper( new HashMap() {{ - put("card", "151_35"); - // put other cards in here as needed for the test case + put("darkness", "151_35"); + put("balrog", "2_51"); + put("whip", "2_74"); + put("spear", "1_182"); }}, GenericCardTestHelper.FellowshipSites, GenericCardTestHelper.FOTRFrodo, @@ -31,10 +33,8 @@ public class Card_V1_035Tests ); } - // Uncomment both @Test markers below once this is ready to be used - - //@Test - public void TheDarknessGrewStatsAndKeywordsAreCorrect() throws DecisionResultInvalidException, CardNotFoundException { + @Test + public void DarknessStatsAndKeywordsAreCorrect() throws DecisionResultInvalidException, CardNotFoundException { /** * Set: V1 @@ -51,31 +51,40 @@ public class Card_V1_035Tests //Pre-game setup GenericCardTestHelper scn = GetScenario(); - PhysicalCardImpl card = scn.GetFreepsCard("card"); + PhysicalCardImpl darkness = scn.GetFreepsCard("darkness"); - assertFalse(card.getBlueprint().isUnique()); - assertTrue(scn.HasKeyword(card, Keyword.SUPPORT_AREA)); // test for keywords as needed - assertEquals(1, card.getBlueprint().getTwilightCost()); - //assertEquals(, card.getBlueprint().getStrength()); - //assertEquals(, card.getBlueprint().getVitality()); - //assertEquals(, card.getBlueprint().getResistance()); - //assertEquals(Signet., card.getBlueprint().getSignet()); - //assertEquals(, card.getBlueprint().getSiteNumber()); // Change this to getAllyHomeSiteNumbers for allies - assertEquals(CardType.CONDITION, card.getBlueprint().getCardType()); - assertEquals(Culture.MORIA, card.getBlueprint().getCulture()); - assertEquals(Side.FREE_PEOPLE, card.getBlueprint().getSide()); + assertFalse(darkness.getBlueprint().isUnique()); + assertTrue(scn.HasKeyword(darkness, Keyword.SUPPORT_AREA)); // test for keywords as needed + assertEquals(1, darkness.getBlueprint().getTwilightCost()); + assertEquals(CardType.CONDITION, darkness.getBlueprint().getCardType()); + assertEquals(Culture.MORIA, darkness.getBlueprint().getCulture()); + assertEquals(Side.FREE_PEOPLE, darkness.getBlueprint().getSide()); } - //@Test + @Test public void TheDarknessGrewTest1() throws DecisionResultInvalidException, CardNotFoundException { //Pre-game setup GenericCardTestHelper scn = GetScenario(); - PhysicalCardImpl card = scn.GetFreepsCard("card"); - scn.FreepsMoveCardToHand(card); + PhysicalCardImpl darkness = scn.GetShadowCard("darkness"); + PhysicalCardImpl balrog = scn.GetShadowCard("balrog"); + PhysicalCardImpl whip = scn.GetShadowCard("whip"); + PhysicalCardImpl spear = scn.GetShadowCard("spear"); + scn.ShadowMoveCardToHand(darkness, balrog, whip, spear); scn.StartGame(); - scn.FreepsPlayCard(card); + scn.SetTwilight(17); + scn.FreepsSkipCurrentPhaseAction(); + + scn.ShadowPlayCard(darkness); + assertTrue(scn.ShadowActionAvailable("Darkness Grew")); + scn.ShadowUseCardAction(darkness); + scn.ShadowChooseCard(whip); + scn.ShadowUseCardAction(darkness); + + scn.ShadowPlayCard(balrog); + + scn.ShadowUseCardAction(darkness); assertEquals(1, scn.GetTwilight()); }