ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code lift and review of old cards.

Browse Source
This commit is contained in:
marcins78
2013-02-14 15:45:28 +00:00
parent 67bfa63b88
commit 8317035492
54 changed files with 78 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_004.java
View File

@@ -39,10 +39,10 @@ public class Card1_004 extends AbstractOldEvent {
protected void forEachCardExertedCallback(PhysicalCard dwarf) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, dwarf, 3), Phase.SKIRMISH));
new StrengthModifier(self, dwarf, 3)));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, dwarf, Keyword.DAMAGE), Phase.SKIRMISH));
new KeywordModifier(self, dwarf, Keyword.DAMAGE)));
}
}
);

4
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_005.java
View File

@@ -37,10 +37,10 @@ public class Card1_005 extends AbstractOldEvent {
protected void cardSelected(LotroGame game, PhysicalCard dwarf) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, dwarf, 2), Phase.SKIRMISH));
new StrengthModifier(self, dwarf, 2)));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, dwarf, Keyword.DAMAGE), Phase.SKIRMISH));
new KeywordModifier(self, dwarf, Keyword.DAMAGE)));
}
}
);

4
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_029.java
View File

@@ -51,7 +51,9 @@ public class Card1_029 extends AbstractOldEvent {
new ChooseActiveCardEffect(self, playerId, "Choose an Elf", Race.ELF) {
@Override
protected void cardSelected(LotroGame game, final PhysicalCard elf) {
action.appendEffect(new AddUntilEndOfPhaseModifierEffect(new StrengthModifier(self, Filters.sameCard(elf), 1), Phase.SKIRMISH));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(elf), 1)));
action.appendEffect(
new AddUntilEndOfPhaseActionProxyEffect(
new AbstractActionProxy() {

5
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_038.java
View File

@@ -36,8 +36,9 @@ public class Card1_038 extends AbstractOldEvent {
@Override
public PlayEventAction getPlayCardAction(String playerId, LotroGame game, PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) {
PlayEventAction action = new PlayEventAction(self);
action.appendEffect(new AddUntilEndOfPhaseModifierEffect(
new ArcheryTotalModifier(self, Side.FREE_PEOPLE, 1), Phase.ARCHERY));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new ArcheryTotalModifier(self, Side.FREE_PEOPLE, 1)));
return action;
}

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_047.java
View File

@@ -72,8 +72,7 @@ public class Card1_047 extends AbstractAttachableFPPossession {
new ChoiceEffect(action, playerId, possibleCosts));
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);
}

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_050.java
View File

@@ -40,7 +40,7 @@ public class Card1_050 extends AbstractCompanion {
action.appendCost(new SelfExertEffect(action, self));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new DoesNotAddToArcheryTotalModifier(self, self), Phase.ARCHERY));
new DoesNotAddToArcheryTotalModifier(self, self)));
action.appendEffect(
new ChooseAndWoundCharactersEffect(action, playerId, 1, 1, CardType.MINION));

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_052.java
View File

@@ -38,7 +38,7 @@ public class Card1_052 extends AbstractOldEvent {
PlayEventAction action = new PlayEventAction(self);
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new ArcheryTotalModifier(self, Side.SHADOW, -1), Phase.ARCHERY));
new ArcheryTotalModifier(self, Side.SHADOW, -1)));
return action;
}

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_062.java
View File

@@ -45,7 +45,7 @@ public class Card1_062 extends AbstractAttachable {
action.appendCost(new ExertCharactersEffect(action, self, self.getAttachedTo()));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new ArcheryTotalModifier(self, Side.FREE_PEOPLE, 1), Phase.ARCHERY));
new ArcheryTotalModifier(self, Side.FREE_PEOPLE, 1)));
return Collections.singletonList(action);
}

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_066.java
View File

@@ -44,7 +44,7 @@ public class Card1_066 extends AbstractAttachable {
action.appendCost(new SelfDiscardEffect(self));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(self.getAttachedTo()), 2), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(self.getAttachedTo()), 2)));
return Collections.singletonList(action);
}

15
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_078.java
View File

@@ -2,7 +2,8 @@ package com.gempukku.lotro.cards.set1.gandalf;
import com.gempukku.lotro.cards.AbstractOldEvent;
import com.gempukku.lotro.cards.actions.PlayEventAction;
import com.gempukku.lotro.cards.effects.AddUntilEndOfPhaseModifierEffect;
import com.gempukku.lotro.cards.effects.SnapshotAndApplyStrengthModifierUntilEndOfCurrentPhaseEffect;
import com.gempukku.lotro.cards.modifiers.evaluator.ConditionEvaluator;
import com.gempukku.lotro.common.Culture;
import com.gempukku.lotro.common.Keyword;
import com.gempukku.lotro.common.Phase;
@@ -10,7 +11,7 @@ import com.gempukku.lotro.common.Side;
import com.gempukku.lotro.filters.Filters;
import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.modifiers.StrengthModifier;
import com.gempukku.lotro.logic.modifiers.SpotBurdensCondition;
/**
* Set: The Fellowship of the Ring
@@ -29,13 +30,9 @@ public class Card1_078 extends AbstractOldEvent {
@Override
public PlayEventAction getPlayCardAction(String playerId, LotroGame game, PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) {
PlayEventAction action = new PlayEventAction(self);
int bonus = (game.getGameState().getBurdens() <= 4) ? 4 : 2;
final PhysicalCard gandalf = Filters.findFirstActive(game.getGameState(), game.getModifiersQuerying(), Filters.gandalf);
if (gandalf != null) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(gandalf), bonus), Phase.SKIRMISH));
}
action.appendEffect(
new SnapshotAndApplyStrengthModifierUntilEndOfCurrentPhaseEffect(
self, new ConditionEvaluator(4, 2, new SpotBurdensCondition(5)), Filters.gandalf));
return action;
}

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_090.java
View File

@@ -51,7 +51,7 @@ public class Card1_090 extends AbstractAttachableFPPossession {
action.appendCost(new ExertCharactersEffect(action, self, self.getAttachedTo()));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new DoesNotAddToArcheryTotalModifier(self, Filters.sameCard(self.getAttachedTo())), Phase.ARCHERY));
new DoesNotAddToArcheryTotalModifier(self, Filters.sameCard(self.getAttachedTo()))));
action.appendEffect(
new ChooseAndWoundCharactersEffect(action, playerId, 1, 1, CardType.MINION));
return Collections.singletonList(action);

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_093.java
View File

@@ -46,7 +46,7 @@ public class Card1_093 extends AbstractOldEvent {
filter = Filters.aragorn;
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, filter, 3), Phase.SKIRMISH));
new StrengthModifier(self, filter, 3)));
}
}
);

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set14/elven/Card14_004.java
View File

@@ -39,7 +39,7 @@ public class Card14_004 extends AbstractCompanion {
RequiredTriggerAction action = new RequiredTriggerAction(self);
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, Filters.and(Filters.owner(self.getOwner()), CardType.COMPANION), Keyword.ARCHER), Phase.ARCHERY));
new KeywordModifier(self, Filters.and(Filters.owner(self.getOwner()), CardType.COMPANION), Keyword.ARCHER)));
return Collections.singletonList(action);
}
return null;

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/dwarven/Card15_006.java
View File

@@ -61,7 +61,7 @@ public class Card15_006 extends AbstractCompanion {
new ChooseAndRemoveCultureTokensFromCardEffect(self, playerId, Token.DWARVEN, 1, Filters.any));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, self, 2), Phase.SKIRMISH));
new StrengthModifier(self, self, 2)));
return Collections.singletonList(action);
}
return null;

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/dwarven/Card15_007.java
View File

@@ -51,7 +51,7 @@ public class Card15_007 extends AbstractAttachableFPPossession {
new ChooseAndRemoveCultureTokensFromCardEffect(self, playerId, Token.DWARVEN, 1, Filters.any));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, self.getAttachedTo(), 1), Phase.SKIRMISH));
new StrengthModifier(self, self.getAttachedTo(), 1)));
return Collections.singletonList(action);
}
return null;

6
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/dwarven/Card15_008.java
View File

@@ -36,14 +36,14 @@ public class Card15_008 extends AbstractEvent {
if (count > 0) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, card, count), Phase.SKIRMISH));
new StrengthModifier(self, card, count)));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, card, Keyword.DAMAGE, count), Phase.SKIRMISH));
new KeywordModifier(self, card, Keyword.DAMAGE, count)));
} else {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, card, 2), Phase.SKIRMISH));
new StrengthModifier(self, card, 2)));
}
}
});

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/dwarven/Card15_009.java
View File

@@ -58,7 +58,7 @@ public class Card15_009 extends AbstractAttachableFPPossession {
new ChooseAndDiscardCardsFromHandEffect(action, playerId, false, 1, Culture.DWARVEN));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, self.getAttachedTo(), Keyword.DAMAGE, 1), Phase.SKIRMISH));
new KeywordModifier(self, self.getAttachedTo(), Keyword.DAMAGE, 1)));
return Collections.singletonList(action);
}
return null;

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/elven/Card15_019.java
View File

@@ -46,7 +46,7 @@ public class Card15_019 extends AbstractCompanion {
new AddUntilEndOfPhaseModifierEffect(
new ArcheryTotalModifier(self, Side.FREE_PEOPLE, null,
new CardPhaseLimitEvaluator(game, self, Phase.ARCHERY, 3,
new CountActiveEvaluator(CardType.MINION, Keyword.HUNTER))), Phase.ARCHERY));
new CountActiveEvaluator(CardType.MINION, Keyword.HUNTER)))));
return Collections.singletonList(action);
}
return null;

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/elven/Card15_020.java
View File

@@ -36,7 +36,7 @@ public class Card15_020 extends AbstractEvent {
PlayEventAction action = new PlayEventAction(self);
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new ArcheryTotalModifier(self, Side.SHADOW, -3), Phase.ARCHERY));
new ArcheryTotalModifier(self, Side.SHADOW, -3)));
return action;
}
}

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/elven/Card15_021.java
View File

@@ -45,7 +45,7 @@ public class Card15_021 extends AbstractEvent {
});
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new ArcheryTotalModifier(self, Side.FREE_PEOPLE, count), Phase.ARCHERY));
new ArcheryTotalModifier(self, Side.FREE_PEOPLE, count)));
return action;
}
}

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gollum/Card15_043.java
View File

@@ -42,7 +42,7 @@ public class Card15_043 extends AbstractMinion {
RequiredTriggerAction action = new RequiredTriggerAction(self);
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, self, rbStr), Phase.SKIRMISH));
new StrengthModifier(self, self, rbStr)));
return Collections.singletonList(action);
}
return null;

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gollum/Card15_048.java
View File

@@ -45,7 +45,7 @@ public class Card15_048 extends AbstractEvent {
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new OverwhelmedByMultiplierModifier(self, card, 3), Phase.SKIRMISH));
new OverwhelmedByMultiplierModifier(self, card, 3)));
}
});
return action;

4
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gollum/Card15_049.java
View File

@@ -60,10 +60,10 @@ public class Card15_049 extends AbstractCompanion {
new ChooseAndExertCharactersEffect(action, playerId, 2, 2, 1, Race.HOBBIT, Keyword.RING_BOUND));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, self, 1), Phase.SKIRMISH));
new StrengthModifier(self, self, 1)));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new OverwhelmedByMultiplierModifier(self, self, 3), Phase.SKIRMISH));
new OverwhelmedByMultiplierModifier(self, self, 3)));
return Collections.singletonList(action);
}
return null;

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gondor/Card15_061.java
View File

@@ -78,7 +78,7 @@ public class Card15_061 extends AbstractCompanion {
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new MinionSiteNumberModifier(self, card, null, 2), Phase.SKIRMISH));
new MinionSiteNumberModifier(self, card, null, 2)));
}
});
return Collections.singletonList(action);

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/gondor/Card15_068.java
View File

@@ -79,7 +79,7 @@ public class Card15_068 extends AbstractAttachableFPPossession {
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new MinionSiteNumberModifier(self, card, null, 2), Phase.SKIRMISH));
new MinionSiteNumberModifier(self, card, null, 2)));
}
});
return Collections.singletonList(action);

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/orc/Card15_111.java
View File

@@ -53,7 +53,7 @@ public class Card15_111 extends AbstractMinion {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, self, twilightCost), Phase.SKIRMISH));
new StrengthModifier(self, self, twilightCost)));
}
}
});

4
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_121.java
View File

@@ -33,11 +33,11 @@ public class Card15_121 extends AbstractEvent {
boolean isHunter = game.getModifiersQuerying().hasKeyword(game.getGameState(), card, Keyword.HUNTER);
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, card, isHunter ? 3 : 2), Phase.SKIRMISH));
new StrengthModifier(self, card, isHunter ? 3 : 2)));
if (isHunter)
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, card, Keyword.DAMAGE, 1), Phase.SKIRMISH));
new KeywordModifier(self, card, Keyword.DAMAGE, 1)));
}
});
return action;

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/rohan/Card15_123.java
View File

@@ -52,7 +52,7 @@ public class Card15_123 extends AbstractCompanion {
new ChooseAndDiscardCardsFromHandEffect(action, playerId, false, 1, Culture.ROHAN));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, self, 2), Phase.SKIRMISH));
new StrengthModifier(self, self, 2)));
return Collections.singletonList(action);
}
return null;

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/shire/Card15_149.java
View File

@@ -47,7 +47,7 @@ public class Card15_149 extends AbstractCompanion {
new AddThreatsEffect(playerId, self, 1));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, self, 2), Phase.SKIRMISH));
new StrengthModifier(self, self, 2)));
return Collections.singletonList(action);
}
return null;

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/shire/Card15_151.java
View File

@@ -48,7 +48,7 @@ public class Card15_151 extends AbstractCompanion {
new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Filters.ringBearer));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, self, 2), Phase.SKIRMISH));
new StrengthModifier(self, self, 2)));
return Collections.singletonList(action);
}
return null;

4
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/uruk_hai/Card15_179.java
View File

@@ -32,11 +32,11 @@ public class Card15_179 extends AbstractEvent {
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, card, 2), Phase.SKIRMISH));
new StrengthModifier(self, card, 2)));
if (game.getModifiersQuerying().hasKeyword(game.getGameState(), card, Keyword.HUNTER))
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, card, Keyword.DAMAGE, 1), Phase.SKIRMISH));
new KeywordModifier(self, card, Keyword.DAMAGE, 1)));
}
});
return action;

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/men/Card17_045.java
View File

@@ -43,7 +43,7 @@ public class Card17_045 extends AbstractEvent {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, minion, null,
Filters.filter(game.getGameState().getStackedCards(possession), game.getGameState(), game.getModifiersQuerying(), CardType.MINION).size()), Phase.SKIRMISH));
Filters.filter(game.getGameState().getStackedCards(possession), game.getGameState(), game.getModifiersQuerying(), CardType.MINION).size())));
SubCostToEffectAction subAction = new SubCostToEffectAction(action);
subAction.appendCost(
new DiscardCardsFromPlayEffect(self, possession));

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/rohan/Card17_103.java
View File

@@ -52,7 +52,7 @@ public class Card17_103 extends AbstractEvent {
protected void cardSelected(LotroGame game, final PhysicalCard card) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.frodo, 5), Phase.SKIRMISH));
new StrengthModifier(self, Filters.frodo, 5)));
action.appendEffect(
new AddUntilEndOfPhaseActionProxyEffect(
new AbstractActionProxy() {

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/shire/Card17_111.java
View File

@@ -50,7 +50,7 @@ public class Card17_111 extends AbstractPermanent {
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new OverwhelmedByMultiplierModifier(self, card, 3), Phase.SKIRMISH));
new OverwhelmedByMultiplierModifier(self, card, 3)));
}
});
return Collections.singletonList(action);

8
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/uruk_hai/Card17_114.java
View File

@@ -45,7 +45,7 @@ public class Card17_114 extends AbstractEvent {
List<Effect> possibleEffects = new LinkedList<Effect>();
possibleEffects.add(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, urukHai, 2), Phase.SKIRMISH) {
new StrengthModifier(self, urukHai, 2)) {
@Override
public String getText(LotroGame game) {
return "Make that Uruk-hai strength +2";
@@ -54,7 +54,7 @@ public class Card17_114 extends AbstractEvent {
if (PlayConditions.canSpot(game, Filters.siteControlled(playerId)))
possibleEffects.add(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, urukHai, 3), Phase.SKIRMISH) {
new StrengthModifier(self, urukHai, 3)) {
@Override
public String getText(LotroGame game) {
return "Make that Uruk-hai strength +3";
@@ -68,10 +68,10 @@ public class Card17_114 extends AbstractEvent {
new LiberateASiteEffect(self));
subAction.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, urukHai, 2), Phase.SKIRMISH));
new StrengthModifier(self, urukHai, 2)));
subAction.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, urukHai, Keyword.DAMAGE, 1), Phase.SKIRMISH));
new KeywordModifier(self, urukHai, Keyword.DAMAGE, 1)));
action.appendEffect(
new OptionalEffect(action, playerId,

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/uruk_hai/Card17_121.java
View File

@@ -43,7 +43,7 @@ public class Card17_121 extends AbstractMinion {
if (count > 0)
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new ArcheryTotalModifier(self, Side.SHADOW, null, count), Phase.ARCHERY));
new ArcheryTotalModifier(self, Side.SHADOW, null, count)));
return Collections.singletonList(action);
}
return null;

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/uruk_hai/Card17_138.java
View File

@@ -59,7 +59,7 @@ public class Card17_138 extends AbstractPermanent {
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, card, Keyword.DAMAGE, 1), Phase.SKIRMISH));
new KeywordModifier(self, card, Keyword.DAMAGE, 1)));
}
});
return Collections.singletonList(action);

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/dwarven/Card18_002.java
View File

@@ -61,7 +61,7 @@ public class Card18_002 extends AbstractPermanent {
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, card, Keyword.HUNTER, 1), Phase.SKIRMISH));
new KeywordModifier(self, card, Keyword.HUNTER, 1)));
}
});
return Collections.singletonList(action);

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gandalf/Card18_019.java
View File

@@ -39,7 +39,7 @@ public class Card18_019 extends AbstractEvent {
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new CancelStrengthBonusTargetModifier(self, card, CardType.POSSESSION), Phase.SKIRMISH));
new CancelStrengthBonusTargetModifier(self, card, CardType.POSSESSION)));
}
});
return action;

4
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_042.java
View File

@@ -61,10 +61,10 @@ public class Card18_042 extends AbstractCompanion {
protected void forEachCardExertedCallback(PhysicalCard character) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, character, 1), Phase.SKIRMISH));
new StrengthModifier(self, character, 1)));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, character, Keyword.DAMAGE, 1), Phase.SKIRMISH));
new KeywordModifier(self, character, Keyword.DAMAGE, 1)));
}
});
return Collections.singletonList(action);

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_045.java
View File

@@ -44,7 +44,7 @@ public class Card18_045 extends AbstractAttachableFPPossession {
new ChooseAndDiscardCardsFromHandEffect(action, playerId, false, 2, Culture.GONDOR));
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;

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_051.java
View File

@@ -41,7 +41,7 @@ public class Card18_051 extends AbstractEvent {
protected void forEachCardExertedCallback(PhysicalCard character) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, character, 3), Phase.SKIRMISH));
new StrengthModifier(self, character, 3)));
}
});
return action;

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/gondor/Card18_059.java
View File

@@ -45,7 +45,7 @@ public class Card18_059 extends AbstractCompanion {
protected void forEachCardExertedCallback(PhysicalCard character) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, character, 3), Phase.SKIRMISH));
new StrengthModifier(self, character, 3)));
}
});
return Collections.singletonList(action);

4
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/orc/Card18_079.java
View File

@@ -36,13 +36,13 @@ public class Card18_079 extends AbstractEvent {
PlayEventAction action = new PlayEventAction(self);
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new ArcheryTotalModifier(self, Side.SHADOW, 2), Phase.ARCHERY));
new ArcheryTotalModifier(self, Side.SHADOW, 2)));
final int count = Filters.countActive(game.getGameState(), game.getModifiersQuerying(), CardType.FOLLOWER);
if (count > 0)
action.appendEffect(
new OptionalEffect(action, playerId,
new AddUntilEndOfPhaseModifierEffect(
new ArcheryTotalModifier(self, Side.SHADOW, count * 2), Phase.ARCHERY) {
new ArcheryTotalModifier(self, Side.SHADOW, count * 2)) {
@Override
public String getText(LotroGame game) {
return "Add additional " + (count * 2) + " to the minion archery total";

4
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_094.java
View File

@@ -59,10 +59,10 @@ public class Card18_094 extends AbstractPermanent {
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, card, 1), Phase.SKIRMISH));
new StrengthModifier(self, card, 1)));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, card, Keyword.DAMAGE, 1), Phase.SKIRMISH));
new KeywordModifier(self, card, Keyword.DAMAGE, 1)));
}
});
return Collections.singletonList(action);

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_096.java
View File

@@ -56,7 +56,7 @@ public class Card18_096 extends AbstractAttachableFPPossession {
new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, CardType.FOLLOWER));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, self.getAttachedTo(), null, new CardMatchesEvaluator(4, 5, Filters.name("Erkenbrand"))), Phase.SKIRMISH));
new StrengthModifier(self, self.getAttachedTo(), null, new CardMatchesEvaluator(4, 5, Filters.name("Erkenbrand")))));
return Collections.singletonList(action);
}
return null;

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_100.java
View File

@@ -46,7 +46,7 @@ public class Card18_100 extends AbstractAttachableFPPossession {
new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, CardType.FOLLOWER));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, self.getAttachedTo(), 4), Phase.SKIRMISH));
new StrengthModifier(self, self.getAttachedTo(), 4)));
if (PlayConditions.canSpot(game, Filters.name("Gamling"), Filters.hasAttached(self))) {
action.appendEffect(
new OptionalEffect(action, playerId,

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/rohan/Card18_102.java
View File

@@ -48,7 +48,7 @@ public class Card18_102 extends AbstractPermanent {
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, card, 2), Phase.SKIRMISH));
new StrengthModifier(self, card, 2)));
}
});
action.appendCost(

4
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/uruk_hai/Card18_117.java
View File

@@ -32,10 +32,10 @@ public class Card18_117 extends AbstractEvent {
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, card, 2), Phase.SKIRMISH));
new StrengthModifier(self, card, 2)));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, card, Keyword.DAMAGE, 1), Phase.SKIRMISH));
new KeywordModifier(self, card, Keyword.DAMAGE, 1)));
}
});
return action;

4
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set18/uruk_hai/Card18_130.java
View File

@@ -43,10 +43,10 @@ public class Card18_130 extends AbstractMinion {
new RemoveTwilightEffect(2));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, self, 1), Phase.SKIRMISH));
new StrengthModifier(self, self, 1)));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, self, Keyword.DAMAGE, 1), Phase.SKIRMISH));
new KeywordModifier(self, self, Keyword.DAMAGE, 1)));
return Collections.singletonList(action);
}
return null;

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/Card19_001.java
View File

@@ -66,7 +66,7 @@ public class Card19_001 extends AbstractAttachable {
new AddBurdenEffect(self.getOwner(), self, 1));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, self.getAttachedTo(), 3), Phase.SKIRMISH));
new StrengthModifier(self, self.getAttachedTo(), 3)));
return Collections.singletonList(action);
}
return null;

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/elven/Card19_007.java
View File

@@ -44,7 +44,7 @@ public class Card19_007 extends AbstractCompanion {
new ChooseAndWoundCharactersEffect(action, playerId, 1, 1, CardType.MINION));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new DoesNotAddToArcheryTotalModifier(self, self), Phase.ARCHERY));
new DoesNotAddToArcheryTotalModifier(self, self)));
return Collections.singletonList(action);
}
return null;

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/gollum/Card19_011.java
View File

@@ -76,7 +76,7 @@ public class Card19_011 extends AbstractCompanion {
new ChooseAndExertCharactersEffect(action, playerId, 1, 1, CardType.COMPANION, Keyword.RING_BOUND));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, self, 2), Phase.SKIRMISH));
new StrengthModifier(self, self, 2)));
return Collections.singletonList(action);
}
return null;

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set19/wraith/Card19_040.java
View File

@@ -46,7 +46,7 @@ public class Card19_040 extends AbstractMinion {
for (PhysicalCard physicalCard : cardsBeingDiscarded) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, self, null, PlayConditions.canSpot(game, Filters.name(physicalCard.getBlueprint().getName())) ? 2 : 1), Phase.SKIRMISH));
new StrengthModifier(self, self, null, PlayConditions.canSpot(game, Filters.name(physicalCard.getBlueprint().getName())) ? 2 : 1)));
}
}
});