diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_moria.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_moria.hjson index 6d7347d3c..83ed58d15 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_moria.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_moria.hjson @@ -380,6 +380,7 @@ type: Killed filter: tentacle cause: wounds + memorize: woundedTentacle } ] effect: { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Dunland.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Dunland.hjson index 456fa843c..7af817d9a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Dunland.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Dunland.hjson @@ -189,97 +189,83 @@ collInfo: V2_5 rarity: _ } - title: No More Shall We Wait + title: Ritual Oath of Enmity unique: false side: Shadow culture: Dunland - twilight: 0 - type: Event - timewords: Shadow + twilight: 7 + type: Artifact + keywords: Support Area effects: [ { - type: event - effect: { - type: Choice - texts: [ - Remove (3) to draw 2 cards - Remove (9) to take control of 2 sites - ] - effects: [ + type: Activated + text: Remove (7) to add a {Dunland} token here. + phase: Shadow + requires: { + type: Or + requires: [ { - type: CostToEffect - requires: { - type: CanSpot - filter: your,minion - } - cost: { - type: RemoveTwilight - amount: 3 - } - effect: [ + type: And + requires: [ { - type: DrawCards - count: 2 + type: Location + filter: RegionNumber(3) + } + { + type: CanSpotTwilight + amount: 25 } ] } - { - type: CostToEffect - requires: { - type: Or - requires: [ - { - type: And - requires: [ - { - type: Location - filter: RegionNumber(3) - } - { - type: CanSpotTwilight - amount: 25 - } - ] - } - { - type: And - requires: [ - { - type: Location - filter: RegionNumber(1-2) - } - { - type: CanSpotTwilight - amount: 18 - } - ] - } - ] - } - cost: { - type: RemoveTwilight - amount: 9 - } - effect: [ + type: And + requires: [ { - type: TakeControlOfSite + type: Location + filter: RegionNumber(1-2) } { - type: TakeControlOfSite - } - { - type: AddModifier - modifier: { - type: SiteControlCount - amount: +2 - } - until: start(regroup) + type: CanSpotTwilight + amount: 18 } ] } ] } + cost: { + type: RemoveTwilight + amount: 7 + } + effect: [ + { + type: AddCultureTokens + culture: dunland + select: self + count: 1 + } + ] + } + { + type: Activated + text: Discard this to take control of 2 sites. + phase: Shadow + requires: { + type: CanSpotCultureTokens + culture: dunland + filter: self + } + effect: [ + { + type: TakeControlOfSite + } + { + type: TakeControlOfSite + } + { + type: Discard + select: self + } + ] } { type: ActivatedInDrawDeck @@ -297,15 +283,17 @@ amount: 18 } ] - effect: { - type: PlayCardFromDrawDeck - select: self - shuffle: true - showAll: true - } + effect: [ + { + type: PlayCardFromDrawDeck + select: self + shuffle: true + showAll: true + } + ] } ] - gametext: Shadow: Spot your minion and remove (3) to draw 2 cards.
Shadow: Spot 18 twilight tokens (or 25 if in region 3) and remove (9) to take control of 2 sites and make the count of sites you control +2 until the regroup phase. If in region 1, this action can be played from your draw deck. + gametext: While you can spot 18 twilight tokens in region 1, this card can be played from your draw deck.
Shadow: Spot 18 twilight tokens (or 25 if in region 3) and remove (7) to add a [dunland] token here.
Shadow: Spot a [dunland] token here to take control of 2 sites. Discard this artifact. lore: "" promotext: "" alts: { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Gandalf.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Gandalf.hjson index 0ec9c8f0a..401f913ec 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Gandalf.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Gandalf.hjson @@ -45,7 +45,7 @@ cost: [ { type: Spot - count: 2 + count: 3 filter: valiant, companion } { @@ -66,7 +66,7 @@ ] } ] - gametext: Each mounted companion gains valiant.
Response: If a minion's special ability is used (except during a skirmish), spot 2 valiant companions and exert Gandalf to prevent that and wound that minion. + gametext: Each mounted companion gains valiant.
Response: If a minion's special ability is used (except during a skirmish), spot 3 valiant companions and exert Gandalf to prevent that and wound that minion. lore: "'No counsel have I to give to those that despair. Yet counsel I could give, and words I could speak to you.'" promotext: "" alts: { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Gollum.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Gollum.hjson index 43f092b5d..159385344 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Gollum.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Gollum.hjson @@ -21,7 +21,7 @@ type: Choice texts: [ Remove (3) to draw 2 cards - Remove (9) to draw 8 cards + Remove (3) to draw 8 cards ] effects: [ { @@ -77,7 +77,7 @@ } cost: { type: RemoveTwilight - amount: 9 + amount: 3 } effect: [ { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Isengard.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Isengard.hjson index 4a786e483..902c8324c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Isengard.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Isengard.hjson @@ -242,13 +242,13 @@ type: Event timewords: Shadow effects: [ - { + { type: event effect: { type: Choice texts: [ Remove (3) to draw 2 cards - Remove (9) to take up to 4 items into hand from your deck + Remove (5) to take up to 4 items into hand from your deck ] effects: [ { @@ -304,7 +304,7 @@ } cost: { type: RemoveTwilight - amount: 9 + amount: 5 } effect: [ { @@ -344,7 +344,7 @@ } } ] - gametext: Shadow: Spot your minion and remove (3) to draw 2 cards.
Shadow: Spot 18 twilight tokens (or 25 if in region 3) and remove (9) to take up to 4 Shadow items into hand from your draw deck. If in region 1, this action can be played from your draw deck. + gametext: Shadow: Spot your minion and remove (3) to draw 2 cards.
Shadow: Spot 18 twilight tokens (or 25 if in region 3) and remove (5) to take up to 4 Shadow items into hand from your draw deck. If in region 1, this action can be played from your draw deck. lore: "" promotext: "" alts: { @@ -463,7 +463,6 @@ trigger: { type: Played filter: self - fromZone: hand } effect: { type: PutCardsFromDiscardIntoHand @@ -471,7 +470,7 @@ } } ] - gametext: Bearer must be a warg-rider .
When you play this possession from hand, you may take an [isengard] skirmish event into hand from your discard pile. + gametext: Bearer must be a warg-rider .
When you play this possession, you may take an [isengard] skirmish event into hand from your discard pile. lore: "'He has taken Orcs into his service, and Wolf-riders, and evil Men...'" promotext: "" alts: { @@ -1133,7 +1132,7 @@ } effect: [ { - type: negateWound + type: PreventWound select: memory(woundedUruk) } { @@ -1157,7 +1156,7 @@ } } ] - gametext: Machine. Each time an Uruk-hai costing X is about to take a wound (except during a skirmish), exert it instead, where X is the number of [isengard] tokens you can spot here.
Maneuver: Exert an Uruk-hai to add an [isengard] token here. + gametext: Machine. Each time an Uruk-hai costing X is about to take a wound (except during a skirmish), prevent that and exert it. X is the number of [isengard] tokens you can spot here.
Maneuver: Exert an Uruk-hai to add an [isengard] token here. lore: "They held their great shields above them like a roof..." promotext: "" alts: { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Moria.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Moria.hjson index 6c5298536..49b4d3f59 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Moria.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Moria.hjson @@ -374,7 +374,7 @@ type: Choice texts: [ Remove (3) to draw 2 cards - Remove (9) to take up to 4 conditions into hand from your deck + Remove (6) to take up to 4 conditions into hand from your deck ] effects: [ { @@ -430,7 +430,7 @@ } cost: { type: RemoveTwilight - amount: 9 + amount: 6 } effect: [ { @@ -470,7 +470,7 @@ } } ] - gametext: Shadow: Spot your minion and remove (3) to draw 2 cards.
Shadow: Spot 18 twilight tokens (or 25 if in region 3) and remove (9) to take up to 4 Shadow conditions into hand from your draw deck. If in region 1, this action can be played from your draw deck. + gametext: Shadow: Spot your minion and remove (3) to draw 2 cards.
Shadow: Spot 18 twilight tokens (or 25 if in region 3) and remove (6) to take up to 4 Shadow conditions into hand from your draw deck. If in region 1, this action can be played from your draw deck. lore: "" promotext: "" alts: { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Raider.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Raider.hjson index 295b64399..1ae5cdb6c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Raider.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Raider.hjson @@ -15,13 +15,13 @@ type: Event timewords: Shadow effects: [ - { + { type: event effect: { type: Choice texts: [ Remove (3) to draw 2 cards - Remove (9) to take up to 4 events into hand from your deck + Remove (4) to take up to 4 events into hand from your deck ] effects: [ { @@ -77,7 +77,7 @@ } cost: { type: RemoveTwilight - amount: 9 + amount: 4 } effect: [ { @@ -117,7 +117,7 @@ } } ] - gametext: Shadow: Spot your minion and remove (3) to draw 2 cards.
Shadow: Spot 18 twilight tokens (or 25 if in region 3) and remove (9) to take up to 4 Shadow events into hand from your draw deck. If in region 1, this action can be played from your draw deck. + gametext: Shadow: Spot your minion and remove (3) to draw 2 cards.\Shadow: Spot 18 twilight tokens (or 25 if in region 3) and remove (4) to take up to 4 Shadow events into hand from your draw deck. If in region 1, this action can be played from your draw deck. lore: "" promotext: "" alts: { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Ringwraith.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Ringwraith.hjson index 7dcc5e6aa..7461d1a73 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Ringwraith.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Ringwraith.hjson @@ -21,7 +21,7 @@ type: Choice texts: [ Remove (3) to draw 2 cards - Remove (9) to add up to 5 threats + Remove (9) to add up to 6 threats ] effects: [ { @@ -82,7 +82,7 @@ effect: [ { type: addThreats - amount: 0-5 + amount: 0-6 } ] } @@ -113,7 +113,7 @@ } } ] - gametext: Shadow: Spot your minion and remove (3) to draw 2 cards.
Shadow: Spot 18 twilight tokens (or 25 if in region 3) and remove (9) to add up to 5 threats. If in region 1, this action can be played from your draw deck. + gametext: Shadow: Spot your minion and remove (3) to draw 2 cards.
Shadow: Spot 18 twilight tokens (or 25 if in region 3) and remove (9) to add up to 6 threats. If in region 1, this action can be played from your draw deck. lore: "" promotext: "" alts: { diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_020_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_020_Tests.java index 37c4a4a08..e836825a8 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_020_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_020_Tests.java @@ -38,38 +38,39 @@ public class Card_V1_020_Tests public void BoromirStatsAndKeywordsAreCorrect() throws DecisionResultInvalidException, CardNotFoundException { /** - * Set: V1 - * Title: *Boromir, Redeemed - * Side: Free Peoples - * Culture: gondor - * Twilight Cost: 3 - * Type: companion - * Subtype: Man - * Strength: 5 - * Vitality: 3 - * Signet: Aragorn - * Game Text: Boromir is strength +2 for each minion he is skirmishing. - * At the start of the assignment phase, you may exert another companion with the Aragorn signet to make Boromir defender +1 until the regroup phase. + * Set: V1 + * Name: Boromir, Redeemed + * Unique: True + * Side: Free Peoples + * Culture: Gondor + * Twilight Cost: 3 + * Type: Companion + * Subtype: Man + * Strength: 5 + * Vitality: 3 + * Resistance: 6 + * Signet: Aragorn + * Game Text: Boromir is strength +2 for each minion he is skirmishing. + * At the start of each assignment phase, make Boromir defender +1 if you can spot an unbound Hobbit or another companion with the Aragorn signet. */ //Pre-game setup GenericCardTestHelper scn = GetScenario(); - PhysicalCardImpl boromir = scn.GetFreepsCard("boromir"); - - assertTrue(boromir.getBlueprint().isUnique()); - assertEquals(Side.FREE_PEOPLE, boromir.getBlueprint().getSide()); - assertEquals(Culture.GONDOR, boromir.getBlueprint().getCulture()); - assertEquals(CardType.COMPANION, boromir.getBlueprint().getCardType()); - assertEquals(Race.MAN, boromir.getBlueprint().getRace()); - //assertTrue(scn.HasKeyword(boromir, Keyword.SUPPORT_AREA)); // test for keywords as needed - assertEquals(3, boromir.getBlueprint().getTwilightCost()); - assertEquals(5, boromir.getBlueprint().getStrength()); - assertEquals(3, boromir.getBlueprint().getVitality()); - //assertEquals(, boromir.getBlueprint().getResistance()); - assertEquals(Signet.ARAGORN, boromir.getBlueprint().getSignet()); - //assertEquals(, boromir.getBlueprint().getSiteNumber()); // Change this to getAllyHomeSiteNumbers for allies + PhysicalCardImpl card = scn.GetFreepsCard("boromir"); + assertEquals("Boromir", card.getBlueprint().getTitle()); + assertEquals("Redeemed", card.getBlueprint().getSubtitle()); + assertTrue(card.getBlueprint().isUnique()); + assertEquals(Side.FREE_PEOPLE, card.getBlueprint().getSide()); + assertEquals(Culture.GONDOR, card.getBlueprint().getCulture()); + assertEquals(CardType.COMPANION, card.getBlueprint().getCardType()); + assertEquals(Race.MAN, card.getBlueprint().getRace()); + assertEquals(3, card.getBlueprint().getTwilightCost()); + assertEquals(5, card.getBlueprint().getStrength()); + assertEquals(3, card.getBlueprint().getVitality()); + assertEquals(6, card.getBlueprint().getResistance()); + assertEquals(Signet.ARAGORN, card.getBlueprint().getSignet()); } @Test diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_005_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_005_Tests.java index 8f063c052..fb0ad5498 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_005_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_005_Tests.java @@ -28,37 +28,39 @@ public class Card_V2_005_Tests } @Test - public void NoMoreShallWeWaitStatsAndKeywordsAreCorrect() throws DecisionResultInvalidException, CardNotFoundException { + public void RitualOathofEnmityStatsAndKeywordsAreCorrect() throws DecisionResultInvalidException, CardNotFoundException { /** * Set: V2 - * Name: No More Shall We Wait + * Name: Ritual Oath of Enmity * Unique: False * Side: Shadow * Culture: Dunland * Twilight Cost: 0 - * Type: Event - * Subtype: Response - * Game Text: At the start of the Shadow phase, spot 25 twilight tokens and remove 10 to take control of 3 sites, then remove this from the game. This event may be played from your draw deck or discard pile. + * Type: Artifact + * Subtype: Support area + * Game Text: While you can spot 18 twilight tokens in region 1, this card can be played from your draw deck. + * Shadow: Spot 18 twilight tokens (or 25 if in region 3) and remove (7) to add a [dunland] token here. + * Shadow: Spot a [dunland] token here to take control of 2 sites. Discard this artifact. */ var scn = GetScenario(); var card = scn.GetFreepsCard("card"); - assertEquals("No More Shall We Wait", card.getBlueprint().getTitle()); + assertEquals("Ritual Oath of Enmity", card.getBlueprint().getTitle()); assertNull(card.getBlueprint().getSubtitle()); assertFalse(card.getBlueprint().isUnique()); assertEquals(Side.SHADOW, card.getBlueprint().getSide()); assertEquals(Culture.DUNLAND, card.getBlueprint().getCulture()); - assertEquals(CardType.EVENT, card.getBlueprint().getCardType()); - assertTrue(scn.hasTimeword(card, Timeword.SHADOW)); + assertEquals(CardType.ARTIFACT, card.getBlueprint().getCardType()); + assertTrue(scn.hasKeyword(card, Keyword.SUPPORT_AREA)); assertEquals(0, card.getBlueprint().getTwilightCost()); } // Uncomment any @Test markers below once this is ready to be used //@Test - public void NoMoreShallWeWaitTest1() throws DecisionResultInvalidException, CardNotFoundException { + public void RitualOathofEnmityTest1() throws DecisionResultInvalidException, CardNotFoundException { //Pre-game setup var scn = GetScenario(); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_008_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_008_Tests.java index afa53e626..a706c664f 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_008_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_008_Tests.java @@ -43,7 +43,7 @@ public class Card_V2_008_Tests * Vitality: 3 * Resistance: 6 * Game Text: Valiant. - * While Haldir bears a ranged weapon, each valiant Elf is strength +1 and does not add to the fellowship archery total. + * While Haldir bears a ranged weapon, each valiant Elf is strength +1 and each valiant Elf does not add to the fellowship archery total. * Each time an [elven] possession is about to be discarded by a card effect, you may exert Haldir to prevent that. */ diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_009_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_009_Tests.java index 4eead5513..a1859f235 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_009_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_009_Tests.java @@ -39,7 +39,7 @@ public class Card_V2_009_Tests * Twilight Cost: 0 * Type: Event * Subtype: Archery - * Game Text: Spot 2 valiant elves to wound a minion (or wound a minion twice if each of those elves bears a ranged weapon). + * Game Text: Spot 2 valiant Elves to wound a minion (or wound a minion twice if each of those elves bears a ranged weapon). */ var scn = GetScenario(); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_015_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_015_Tests.java index c382ba265..4d6f12e46 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_015_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_015_Tests.java @@ -38,8 +38,9 @@ public class Card_V2_015_Tests * Culture: Gollum * Twilight Cost: 0 * Type: Event - * Subtype: Response - * Game Text: At the start of the Shadow phase, spot 25 twilight tokens and remove 10 to draw 8 cards, then remove this from the game. This event may be played from your draw deck or discard pile. + * Subtype: Shadow + * Game Text: Shadow: Spot your minion and remove (3) to draw 2 cards. + * Shadow: Spot 18 twilight tokens (or 25 if in region 3) and remove (3) to draw 8 cards. If in region 1, this action can be played from your draw deck. */ var scn = GetScenario(); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_020_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_020_Tests.java index da00eda7b..f13918ddf 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_020_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_020_Tests.java @@ -43,7 +43,7 @@ public class Card_V2_020_Tests * Vitality: 3 * Site Number: 5 * Game Text: Damage +1. - * The minion is strength+1 for each wound on each character in its skirmish. + * This minion is strength +1 for each wound on each character in its skirmish. * When this minion dies in a skirmish, you may remove 2 [isengard] tokens from a machine to wound a character it was skirmishing. */ diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_022_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_022_Tests.java index 4b4fd6744..503b29af1 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_022_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_022_Tests.java @@ -46,8 +46,9 @@ public class Card_V2_022_Tests * Culture: Isengard * Twilight Cost: 0 * Type: Event - * Subtype: Response - * Game Text: At the start of the Shadow phase, spot 25 twilight tokens and remove 10 to exert each character once (or twice if it costs (4) or more), then remove this from the game. This event may be played from your draw deck or discard pile. + * Subtype: Shadow + * Game Text: Shadow: Spot your minion and remove (3) to draw 2 cards. + * Shadow: Spot 18 twilight tokens (or 25 if in region 3) and remove (5) to take up to 4 Shadow items into hand from your draw deck. If in region 1, this action can be played from your draw deck. */ var scn = GetScenario(); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_024_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_024_Tests.java index e075e68d7..5b402d056 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_024_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_024_Tests.java @@ -41,7 +41,7 @@ public class Card_V2_024_Tests * Subtype: Mount * Strength: 1 * Vitality: 1 - * Game Text: Bearer must be a warg-rider .
When you play this possession from hand, you may take an [isengard] skirmish event into hand from your discard pile. + * Game Text: Bearer must be a warg-rider .
When you play this possession, you may take an [isengard] skirmish event into hand from your discard pile. */ var scn = GetScenario(); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_025_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_025_Tests.java index 2901f80e2..f9aae5c02 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_025_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_025_Tests.java @@ -42,7 +42,7 @@ public class Card_V2_025_Tests * Strength: 7 * Vitality: 3 * Site Number: 4 - * Game Text: When you play this minion, you may play an [isengard] orc from your discard pile; it is strength +1 until the regroup phase. + * Game Text: When you play this minion, you may play an [isengard] Orc from your discard pile; it is strength +1 until the regroup phase. * Regroup: Discard this minion to add two threats. */ diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_035_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_035_Tests.java index 57d61feb6..7e459364c 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_035_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_035_Tests.java @@ -39,9 +39,10 @@ public class Card_V2_035_Tests * Twilight Cost: 1 * Type: Possession * Subtype: Support area - * Game Text: Machine. - * While you can spot X [isengard] tokens here, each time an [isengard] Uruk-hai costing X is about to take a wound, exert it instead. - * Maneuver: Exert an Uruk-hai to add an [isengard] token here. + * Game Text: Machine. Each time an Uruk-hai costing + * X is about to take a wound (except during a skirmish), prevent that and exert it. X is the number of [isengard] tokens you can spot here. + * Maneuver: Exert an Uruk-hai to add an + * [isengard] token here. */ var scn = GetScenario(); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_042_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_042_Tests.java index 4f5235582..cd421656e 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_042_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_042_Tests.java @@ -38,8 +38,9 @@ public class Card_V2_042_Tests * Culture: Moria * Twilight Cost: 0 * Type: Event - * Subtype: Response - * Game Text: At the start of the Shadow phase, spot 25 twilight tokens and remove 10 to take up to 4 Shadow conditions into hand from your draw deck or discard pile, then remove this from the game. This event may be played from your draw deck or discard pile. + * Subtype: Shadow + * Game Text: Shadow: Spot your minion and remove (3) to draw 2 cards. + * Shadow: Spot 18 twilight tokens (or 25 if in region 3) and remove (6) to take up to 4 Shadow conditions into hand from your draw deck. If in region 1, this action can be played from your draw deck. */ var scn = GetScenario(); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_043_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_043_Tests.java index f229a3f96..6f689baa2 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_043_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_043_Tests.java @@ -38,8 +38,9 @@ public class Card_V2_043_Tests * Culture: Raider * Twilight Cost: 0 * Type: Event - * Subtype: Response - * Game Text: At the start of the Shadow phase, spot 25 twilight tokens and remove 10 to make the minion archery total +6 until the regroup phase, then remove this from the game. This event may be played from your draw deck or discard pile. + * Subtype: Shadow + * Game Text: Shadow: Spot your minion and remove (3) to draw 2 cards. + * Shadow: Spot 18 twilight tokens (or 25 if in region 3) and remove (4) to take up to 4 Shadow events into hand from your draw deck. If in region 1, this action can be played from your draw deck. */ var scn = GetScenario(); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_044_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_044_Tests.java index 308013980..9c8335391 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_044_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_044_Tests.java @@ -38,8 +38,9 @@ public class Card_V2_044_Tests * Culture: Wraith * Twilight Cost: 0 * Type: Event - * Subtype: Response - * Game Text: At the start of the Shadow phase, spot 25 twilight tokens and remove 10 to add up to 9 threats, then remove this from the game. This event may be played from your draw deck or discard pile. + * Subtype: Shadow + * Game Text: Shadow: Spot your minion and remove (3) to draw 2 cards. + * Shadow: Spot 18 twilight tokens (or 25 if in region 3) and remove (9) to add up to 6 threats. If in region 1, this action can be played from your draw deck. */ var scn = GetScenario(); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_046_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_046_Tests.java index 94a837e96..61dfa8400 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_046_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_046_Tests.java @@ -39,7 +39,7 @@ public class Card_V2_046_Tests * Twilight Cost: 2 * Type: Event * Subtype: Skirmish - * Game Text: Remove 2 tokens from X [rohan] conditions to make 3 valiant companions strength +X until the regroup phase. + * Game Text: Spot X [rohan] conditions and remove 2 tokens from each to make 3 valiant companions strength +X until the regroup phase. */ var scn = GetScenario(); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_048_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_048_Tests.java index 7e43b5c0f..50a5c8b8c 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_048_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_048_Tests.java @@ -28,11 +28,11 @@ public class Card_V2_048_Tests } @Test - public void FortressofMyFathersStatsAndKeywordsAreCorrect() throws DecisionResultInvalidException, CardNotFoundException { + public void StrongholdofMyFathersStatsAndKeywordsAreCorrect() throws DecisionResultInvalidException, CardNotFoundException { /** * Set: V2 - * Name: Fortress of My Fathers + * Name: Stronghold of My Fathers * Unique: False * Side: Free Peoples * Culture: Rohan @@ -47,7 +47,7 @@ public class Card_V2_048_Tests var card = scn.GetFreepsCard("card"); - assertEquals("Fortress of My Fathers", card.getBlueprint().getTitle()); + assertEquals("Stronghold of My Fathers", card.getBlueprint().getTitle()); assertNull(card.getBlueprint().getSubtitle()); assertFalse(card.getBlueprint().isUnique()); assertEquals(Side.FREE_PEOPLE, card.getBlueprint().getSide()); @@ -60,7 +60,7 @@ public class Card_V2_048_Tests // Uncomment any @Test markers below once this is ready to be used //@Test - public void FortressofMyFathersTest1() throws DecisionResultInvalidException, CardNotFoundException { + public void StrongholdofMyFathersTest1() throws DecisionResultInvalidException, CardNotFoundException { //Pre-game setup var scn = GetScenario(); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_053_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_053_Tests.java index 18d17470f..06d112a2f 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_053_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_053_Tests.java @@ -55,7 +55,7 @@ public class Card_V2_053_Tests * Twilight Cost: 2 * Type: Condition * Subtype: Support area - * Game Text: Maneuver: Spot 3 valiant companions to discard your hand. For each Shadow card discarded, exert a minion. For each Free Peoples card discarded, heal a valiant or [rohan] companion. You may not make any more Maneuver actions. + * Game Text: Maneuver: Spot 3 valiant companions to discard your hand. For each Shadow card discarded, exert a minion. For each Free Peoples card discarded, heal a valiant or [rohan] companion. You cannot make any more Maneuver actions. */ var scn = GetScenario(); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_057_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_057_Tests.java index 6e1b228fa..c1f641420 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_057_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_057_Tests.java @@ -38,8 +38,9 @@ public class Card_V2_057_Tests * Culture: Sauron * Twilight Cost: 0 * Type: Event - * Subtype: Response - * Game Text: At the start of the Shadow phase, spot 25 twilight tokens to play up to 3 minions from your draw deck costing (5) or more, then remove this from the game. This event may be played from your draw deck or discard pile. + * Subtype: Shadow + * Game Text: Shadow: Spot your minion and remove (3) to draw 2 cards. + * Shadow: Spot 18 twilight tokens (or 25 if in region 3) to play up to 2 minions from your draw deck costing (5) or more. If in region 1, this action can be played from your draw deck. */ var scn = GetScenario();