Code lift and review of old cards.

This commit is contained in:
marcins78
2013-02-14 16:09:51 +00:00
parent 9ca48a3d63
commit 3e637a41af
53 changed files with 61 additions and 61 deletions

View File

@@ -49,7 +49,7 @@ public class Card2_004 extends AbstractAttachable {
new SelfDiscardEffect(self));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(self.getAttachedTo()), 1), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(self.getAttachedTo()), 1)));
return Collections.singletonList(action);
}
return null;

View File

@@ -35,12 +35,12 @@ public class Card2_005 extends AbstractOldEvent {
if (has2Weapons) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(new StrengthModifier(self, Filters.sameCard(dwarf), 4), Phase.SKIRMISH));
new AddUntilEndOfPhaseModifierEffect(new StrengthModifier(self, Filters.sameCard(dwarf), 4)));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(new KeywordModifier(self, Filters.sameCard(dwarf), Keyword.DAMAGE), Phase.SKIRMISH));
new AddUntilEndOfPhaseModifierEffect(new KeywordModifier(self, Filters.sameCard(dwarf), Keyword.DAMAGE)));
} else
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(new StrengthModifier(self, Filters.sameCard(dwarf), 2), Phase.SKIRMISH));
new AddUntilEndOfPhaseModifierEffect(new StrengthModifier(self, Filters.sameCard(dwarf), 2)));
}
});
return action;

View File

@@ -47,7 +47,7 @@ public class Card2_010 extends AbstractAttachableFPPossession {
new SelfDiscardEffect(self));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new ArcheryTotalModifier(self, Side.FREE_PEOPLE, 1), Phase.ARCHERY));
new ArcheryTotalModifier(self, Side.FREE_PEOPLE, 1)));
return Collections.singletonList(action);
}
return null;

View File

@@ -46,12 +46,12 @@ public class Card2_012 extends AbstractPermanent {
action.appendEffect(
new CheckPhaseLimitEffect(action, self, "str", 3, Phase.SKIRMISH,
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(dwarf), 1), Phase.SKIRMISH)));
new StrengthModifier(self, Filters.sameCard(dwarf), 1))));
if (PlayConditions.location(game, Keyword.UNDERGROUND))
action.appendEffect(
new CheckPhaseLimitEffect(action, self, "dmg", 3, Phase.SKIRMISH,
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, Filters.sameCard(dwarf), Keyword.DAMAGE), Phase.SKIRMISH)));
new KeywordModifier(self, Filters.sameCard(dwarf), Keyword.DAMAGE))));
}
});
return Collections.singletonList(action);

View File

@@ -50,7 +50,7 @@ public class Card2_029 extends AbstractAttachableFPPossession {
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(card), -3), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(card), -3)));
}
});

View File

@@ -49,7 +49,7 @@ public class Card2_036 extends AbstractOldEvent {
int bonus = (card.getBlueprint().getSignet() == Signet.ARAGORN) ? 3 : 2;
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(card), bonus), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(card), bonus)));
}
});
return action;

View File

@@ -41,7 +41,7 @@ public class Card2_037 extends AbstractOldEvent {
int bonus = (game.getGameState().isFierceSkirmishes()) ? 4 : 2;
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(card), bonus), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(card), bonus)));
}
});
return action;

View File

@@ -46,7 +46,7 @@ public class Card2_069 extends AbstractOldEvent {
int penalty = (canSpotElf && canSpotDwarf) ? -3 : -1;
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(elfOrDwarf), penalty), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(elfOrDwarf), penalty)));
}
});
return action;

View File

@@ -43,7 +43,7 @@ public class Card3_002 extends AbstractAttachable {
new ExertCharactersEffect(action, self, self.getAttachedTo()));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new PossessionClassSpotModifier(self, PossessionClass.PIPE), Phase.FELLOWSHIP));
new PossessionClassSpotModifier(self, PossessionClass.PIPE)));
return Collections.singletonList(action);
}
return null;

View File

@@ -50,7 +50,7 @@ public class Card3_009 extends AbstractPermanent {
protected void cardSelected(LotroGame game, PhysicalCard minion) {
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(minion), -1), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(minion), -1)));
}
});
}

View File

@@ -78,7 +78,7 @@ public class Card3_019 extends AbstractAttachable {
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(card), -1), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(card), -1)));
}
});
return Collections.singletonList(action);

View File

@@ -54,7 +54,7 @@ public class Card3_020 extends AbstractAlly {
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(card), -1), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(card), -1)));
}
});
return Collections.singletonList(action);

View File

@@ -54,7 +54,7 @@ public class Card3_025 extends AbstractAlly {
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(card), -1), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(card), -1)));
}
});
return Collections.singletonList(action);

View File

@@ -47,7 +47,7 @@ public class Card3_035 extends AbstractPermanent {
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(card), null,
new CardPhaseLimitEvaluator(game, self, Phase.SKIRMISH, 3,
new CountActiveEvaluator(CardType.COMPANION, Signet.GANDALF))), Phase.SKIRMISH));
new CountActiveEvaluator(CardType.COMPANION, Signet.GANDALF)))));
}
});
return Collections.singletonList(action);

View File

@@ -43,7 +43,7 @@ public class Card3_037 extends AbstractPermanent {
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(card), 2), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(card), 2)));
}
});
return Collections.singletonList(action);

View File

@@ -41,7 +41,7 @@ public class Card3_041 extends AbstractPermanent {
new SelfDiscardEffect(self));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new ArcheryTotalModifier(self, Side.FREE_PEOPLE, 2), Phase.ARCHERY));
new ArcheryTotalModifier(self, Side.FREE_PEOPLE, 2)));
return Collections.singletonList(action);
}
return null;

View File

@@ -39,7 +39,7 @@ public class Card3_045 extends AbstractOldEvent {
PlayEventAction action = new PlayEventAction(self);
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new TwilightCostModifier(self, Filters.and(CardType.EVENT, Keyword.MANEUVER), 2), Phase.MANEUVER));
new TwilightCostModifier(self, Filters.and(CardType.EVENT, Keyword.MANEUVER), 2)));
return action;
}
}

View File

@@ -44,10 +44,10 @@ public class Card3_046 extends AbstractOldEvent {
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(card), 3), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(card), 3)));
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, Filters.sameCard(card), Keyword.DAMAGE), Phase.SKIRMISH));
new KeywordModifier(self, Filters.sameCard(card), Keyword.DAMAGE)));
}
});
return action;

View File

@@ -42,7 +42,7 @@ public class Card3_070 extends AbstractOldEvent {
int bonus = (countCards < 3) ? 3 : 2;
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(card), bonus), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(card), bonus)));
}
});
return action;

View File

@@ -45,7 +45,7 @@ public class Card3_078 extends AbstractOldEvent {
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, Filters.sameCard(card), Keyword.DAMAGE), Phase.SKIRMISH));
new KeywordModifier(self, Filters.sameCard(card), Keyword.DAMAGE)));
}
});
return action;

View File

@@ -48,7 +48,7 @@ public class Card3_100 extends AbstractMinion {
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(card), -1), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(card), -1)));
}
});
return Collections.singletonList(action);

View File

@@ -44,7 +44,7 @@ public class Card3_112 extends AbstractOldEvent {
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new RemoveKeywordModifier(self, Filters.sameCard(card), Keyword.DAMAGE), Phase.SKIRMISH));
new RemoveKeywordModifier(self, Filters.sameCard(card), Keyword.DAMAGE)));
}
});
return action;

View File

@@ -43,7 +43,7 @@ public class Card3_082 extends AbstractOldEvent {
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, Filters.sameCard(card), Keyword.DAMAGE), Phase.SKIRMISH));
new KeywordModifier(self, Filters.sameCard(card), Keyword.DAMAGE)));
}
});
return action;

View File

@@ -41,7 +41,7 @@ public class Card4_005 extends AbstractOldEvent {
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(card), bonus), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(card), bonus)));
}
});
return action;

View File

@@ -38,7 +38,7 @@ public class Card4_007 extends AbstractOldEvent {
int bonus = (game.getModifiersQuerying().hasKeyword(game.getGameState(), game.getGameState().getCurrentSite(), Keyword.SANCTUARY)) ? 4 : 2;
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(card), bonus), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(card), bonus)));
}
});
return action;

View File

@@ -38,7 +38,7 @@ public class Card4_008 extends AbstractOldEvent {
int bonus = Filters.countActive(game.getGameState(), game.getModifiersQuerying(), CardType.COMPANION);
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(card), bonus), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(card), bonus)));
}
});
return action;

View File

@@ -57,7 +57,7 @@ public class Card4_028 extends AbstractPermanent {
new AddUntilEndOfPhaseModifierEffect(
new CancelStrengthBonusTargetModifier(self,
Filters.and(Filters.character, Filters.inSkirmishAgainst(dunlandMan)),
CardType.POSSESSION), Phase.SKIRMISH));
CardType.POSSESSION)));
}
});
return Collections.singletonList(action);

View File

@@ -45,7 +45,7 @@ public class Card4_030 extends AbstractAttachable {
new SelfDiscardEffect(self));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new SpecialFlagModifier(self, ModifierFlag.HAS_TO_MOVE_IF_POSSIBLE), Phase.REGROUP));
new SpecialFlagModifier(self, ModifierFlag.HAS_TO_MOVE_IF_POSSIBLE)));
return Collections.singletonList(action);
}
return null;

View File

@@ -80,7 +80,7 @@ public class Card4_033 extends AbstractMinion {
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(card), 2), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(card), 2)));
}
});
return Collections.singletonList(action);

View File

@@ -75,7 +75,7 @@ public class Card4_041 extends AbstractAttachableFPPossession {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.gimli, 1), Phase.SKIRMISH));
new StrengthModifier(self, Filters.gimli, 1)));
return Collections.singletonList(action);
}
return null;

View File

@@ -38,7 +38,7 @@ public class Card4_042 extends AbstractOldEvent {
int bonus = game.getModifiersQuerying().hasKeyword(game.getGameState(), game.getGameState().getCurrentSite(), Keyword.BATTLEGROUND) ? 4 : 2;
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(card), bonus), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(card), bonus)));
}
});
return action;

View File

@@ -48,7 +48,7 @@ public class Card4_049 extends AbstractCompanion {
int bonus = (companion.getBlueprint().getName().equals("Legolas")) ? 2 : 1;
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(companion), bonus), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(companion), bonus)));
}
});
return Collections.singletonList(action);

View File

@@ -44,7 +44,7 @@ public class Card4_050 extends AbstractPermanent {
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, Filters.sameCard(card), Keyword.DAMAGE), Phase.SKIRMISH));
new KeywordModifier(self, Filters.sameCard(card), Keyword.DAMAGE)));
}
});
return Collections.singletonList(action);

View File

@@ -39,11 +39,11 @@ public class Card4_051 extends AbstractOldEvent {
boolean spotsLegolas = Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.legolas);
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(card), spotsLegolas ? 3 : 2), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(card), spotsLegolas ? 3 : 2)));
if (spotsLegolas)
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, Filters.sameCard(card), Keyword.DAMAGE), Phase.SKIRMISH));
new KeywordModifier(self, Filters.sameCard(card), Keyword.DAMAGE)));
}
});
return action;

View File

@@ -57,7 +57,7 @@ public class Card4_057 extends AbstractPermanent {
int bonus = Math.min(3, game.getGameState().getTokenCount(self, Token.DWARVEN));
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(card), bonus), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(card), bonus)));
}
});
action.appendEffect(

View File

@@ -48,7 +48,7 @@ public class Card4_059 extends AbstractOldEvent {
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(card), -counter.get()), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(card), -counter.get())));
}
});
return action;

View File

@@ -71,7 +71,7 @@ public class Card4_064 extends AbstractAttachableFPPossession {
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(card), -1), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(card), -1)));
}
});

View File

@@ -38,7 +38,7 @@ public class Card4_066 extends AbstractOldEvent {
int wounds = game.getGameState().getWounds(card);
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(card), -2 * wounds), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(card), -2 * wounds)));
}
});
return action;

View File

@@ -52,7 +52,7 @@ public class Card4_068 extends AbstractCompanion {
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(card), -2), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(card), -2)));
}
});
return Collections.singletonList(action);

View File

@@ -49,7 +49,7 @@ public class Card4_070 extends AbstractOldEvent {
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(card), -3), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(card), -3)));
}
});
}

View File

@@ -53,7 +53,7 @@ public class Card4_074 extends AbstractCompanion {
protected void cardSelected(LotroGame game, PhysicalCard minion) {
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(minion), bonus), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(minion), bonus)));
}
});
}

View File

@@ -57,7 +57,7 @@ public class Card4_082 extends AbstractPermanent {
int bonus = Math.max(-3, -game.getGameState().getTokenCount(self, Token.ELVEN));
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(card), bonus), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(card), bonus)));
action.appendEffect(
new SelfDiscardEffect(self));
}

View File

@@ -34,7 +34,7 @@ public class Card4_083 extends AbstractOldEvent {
int bonus = (PlayConditions.canSpot(game, 3, CardType.COMPANION, Race.ELF)) ? 3 : 2;
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(card), bonus), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(card), bonus)));
}
});
return action;

View File

@@ -34,7 +34,7 @@ public class Card4_087 extends AbstractOldEvent {
int bonus = againstWoundedMinion ? 3 : 2;
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(card), bonus), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(card), bonus)));
}
});
return action;

View File

@@ -40,7 +40,7 @@ public class Card4_105 extends AbstractOldEvent {
int bonus = Math.min(5, twilightTokens);
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.gandalf, bonus), Phase.SKIRMISH));
new StrengthModifier(self, Filters.gandalf, bonus)));
}
});
return action;

View File

@@ -57,7 +57,7 @@ public class Card4_111 extends AbstractAttachable {
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(card), 1), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(card), 1)));
}
});
return Collections.singletonList(action);

View File

@@ -58,7 +58,7 @@ public class Card4_124 extends AbstractPermanent {
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(card), 2), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(card), 2)));
}
});
}

View File

@@ -53,7 +53,7 @@ public class Card4_128 extends AbstractOldEvent {
protected void cardSelected(final LotroGame game, final PhysicalCard minion) {
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new MinionSiteNumberModifier(self, Filters.sameCard(minion), null, 2), Phase.SKIRMISH));
new MinionSiteNumberModifier(self, Filters.sameCard(minion), null, 2)));
action.appendEffect(
new AddUntilEndOfPhaseActionProxyEffect(
new AbstractActionProxy() {

View File

@@ -40,11 +40,11 @@ public class Card4_135 extends AbstractOldEvent {
int bonus = isAgainstRoaming ? 3 : 2;
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(card), bonus), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(card), bonus)));
if (isAgainstRoaming)
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, Filters.sameCard(card), Keyword.DAMAGE), Phase.SKIRMISH));
new KeywordModifier(self, Filters.sameCard(card), Keyword.DAMAGE)));
}
});
return action;

View File

@@ -45,10 +45,10 @@ public class Card4_145 extends AbstractOldEvent {
new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Culture.ISENGARD, Keyword.ARCHER));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new ArcheryTotalModifier(self, Side.FREE_PEOPLE, -1), Phase.ARCHERY));
new ArcheryTotalModifier(self, Side.FREE_PEOPLE, -1)));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new ArcheryTotalModifier(self, Side.SHADOW, 1), Phase.ARCHERY));
new ArcheryTotalModifier(self, Side.SHADOW, 1)));
return action;
}
}

View File

@@ -35,10 +35,10 @@ public class Card4_146 extends AbstractPermanent {
ActivateCardAction action = new ActivateCardAction(self);
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new AllyParticipatesInArcheryFireModifier(self, CardType.ALLY), Phase.ARCHERY));
new AllyParticipatesInArcheryFireModifier(self, CardType.ALLY)));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new CantTakeWoundsModifier(self, CardType.COMPANION), Phase.ARCHERY));
new CantTakeWoundsModifier(self, CardType.COMPANION)));
return Collections.singletonList(action);
}
return null;

View File

@@ -37,7 +37,7 @@ public class Card4_149 extends AbstractOldEvent {
int deadPileSize = game.getGameState().getDeadPile(game.getGameState().getCurrentPlayerId()).size();
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new ArcheryTotalModifier(self, Side.SHADOW, deadPileSize), Phase.ARCHERY));
new ArcheryTotalModifier(self, Side.SHADOW, deadPileSize)));
return action;
}

View File

@@ -49,7 +49,7 @@ public class Card4_150 extends AbstractMinion {
new ChooseAndWoundCharactersEffect(action, game.getGameState().getCurrentPlayerId(), 1, 1, Filters.unboundCompanion));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new DoesNotAddToArcheryTotalModifier(self, self), Phase.ARCHERY));
new DoesNotAddToArcheryTotalModifier(self, self)));
return Collections.singletonList(action);
}
return null;