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:54:45 +00:00
parent 8317035492
commit 7c7f835900
55 changed files with 68 additions and 70 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/gondor/Card1_102.java
View File

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

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

@@ -45,7 +45,7 @@ public class Card1_114 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);
}

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

@@ -47,7 +47,7 @@ public class Card1_121 extends AbstractOldEvent {
protected void forEachCardExertedCallback(PhysicalCard urukHai) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(urukHai), 3), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(urukHai), 3)));
}
}
);

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

@@ -45,10 +45,10 @@ public class Card1_128 extends AbstractOldEvent {
protected void cardSelected(LotroGame game, PhysicalCard urukHai) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(urukHai), -1), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(urukHai), -1)));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, Filters.sameCard(urukHai), Keyword.DAMAGE), Phase.SKIRMISH));
new KeywordModifier(self, Filters.sameCard(urukHai), Keyword.DAMAGE)));
}
}
);

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

@@ -49,7 +49,7 @@ public class Card1_139 extends AbstractOldEvent {
} else {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(urukHai), 2), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(urukHai), 2)));
}
}
});

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

@@ -52,8 +52,7 @@ public class Card1_145 extends AbstractMinion {
int spotCount = getValidatedResult(result);
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, self, spotCount)
, Phase.SKIRMISH));
new StrengthModifier(self, self, spotCount)));
}
}
));

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

@@ -46,8 +46,7 @@ public class Card1_147 extends AbstractMinion {
protected void cardSelected(LotroGame game, PhysicalCard companion) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new CantBeAssignedAgainstModifier(self, Side.FREE_PEOPLE, Filters.sameCard(companion), self)
, Phase.ASSIGNMENT));
new CantBeAssignedAgainstModifier(self, Side.FREE_PEOPLE, Filters.sameCard(companion), self)));
}
});
return Collections.singletonList(action);

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

@@ -45,7 +45,7 @@ public class Card1_153 extends AbstractMinion {
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, self, null,
new CardPhaseLimitEvaluator(game, self, Phase.SKIRMISH, 3,
new ConstantEvaluator(1))), Phase.SKIRMISH));
new ConstantEvaluator(1)))));
return Collections.singletonList(action);
}

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

@@ -36,7 +36,7 @@ public class Card1_167 extends AbstractOldEvent {
int bonus = Math.min(4, Filters.countActive(game.getGameState(), game.getModifiersQuerying(), Culture.MORIA, Race.ORC, Filters.not(Filters.sameCard(orc))));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(orc), bonus), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(orc), bonus)));
}
}
);

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

@@ -55,7 +55,7 @@ public class Card1_190 extends AbstractAttachable {
new ExertCharactersEffect(action, self, self.getAttachedTo()));
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);
}
return null;

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

@@ -40,7 +40,7 @@ public class Card1_246 extends AbstractOldEvent {
protected void burdensSpotted(int burdensSpotted) {
action.insertEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(skirmish.getFellowshipCharacter()), -burdensSpotted), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(skirmish.getFellowshipCharacter()), -burdensSpotted)));
}
});
}

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

@@ -52,7 +52,7 @@ public class Card1_269 extends AbstractAttachable {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(self.getAttachedTo()), null,
new CardPhaseLimitEvaluator(game, self, Phase.SKIRMISH, 3, new ConstantEvaluator(1))), Phase.SKIRMISH));
new CardPhaseLimitEvaluator(game, self, Phase.SKIRMISH, 3, new ConstantEvaluator(1)))));
return Collections.singletonList(action);
}
return null;

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

@@ -40,7 +40,7 @@ public class Card1_278 extends AbstractPermanent {
protected void cardSelected(LotroGame game, PhysicalCard sauronOrc) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(sauronOrc), 1), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(sauronOrc), 1)));
}
});
return Collections.singletonList(action);

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

@@ -48,7 +48,7 @@ public class Card1_286 extends AbstractAlly {
protected void cardSelected(LotroGame game, PhysicalCard hobbit) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new OverwhelmedByMultiplierModifier(self, Filters.sameCard(hobbit), 3), Phase.SKIRMISH));
new OverwhelmedByMultiplierModifier(self, Filters.sameCard(hobbit), 3)));
}
}
);

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

@@ -47,7 +47,7 @@ public class Card1_293 extends AbstractOldEvent {
protected void forEachCardExertedCallback(PhysicalCard hobbit) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(hobbit), 3), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(hobbit), 3)));
}
});
return action;

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

@@ -47,7 +47,7 @@ public class Card1_296 extends AbstractOldEvent {
protected void cardSelected(LotroGame game, PhysicalCard hobbit) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(hobbit), 3), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(hobbit), 3)));
}
});
} else {

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

@@ -48,7 +48,7 @@ public class Card1_298 extends AbstractOldEvent {
protected void cardSelected(LotroGame game, PhysicalCard hobbit) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(hobbit), 2), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(hobbit), 2)));
}
});
} else {

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

@@ -50,7 +50,7 @@ public class Card1_302 extends AbstractCompanion {
int merryStrength = game.getModifiersQuerying().getStrength(game.getGameState(), self);
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(anotherCompanion), merryStrength), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(anotherCompanion), merryStrength)));
}
});
return Collections.singletonList(action);

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

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

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

@@ -42,7 +42,7 @@ public class Card1_331 extends AbstractSite {
protected void forEachCardExertedCallback(PhysicalCard character) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, character, 2), Phase.SKIRMISH));
new StrengthModifier(self, character, 2)));
}
});
return Collections.singletonList(action);

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

@@ -86,11 +86,11 @@ public class Card1_363 extends AbstractSite {
else
_action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new PlayersCantPlayPhaseEventsOrPhaseSpecialAbilitiesModifier(null, Phase.SHADOW), Phase.SHADOW));
new PlayersCantPlayPhaseEventsOrPhaseSpecialAbilitiesModifier(null, Phase.SHADOW)));
} else {
_action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new PlayersCantPlayPhaseEventsOrPhaseSpecialAbilitiesModifier(null, Phase.SHADOW), Phase.SHADOW));
new PlayersCantPlayPhaseEventsOrPhaseSpecialAbilitiesModifier(null, Phase.SHADOW)));
}
}
}

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

@@ -36,7 +36,7 @@ public class Card1_204 extends AbstractOldEvent {
int bonus = (game.getGameState().isWearingRing()) ? 5 : 2;
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(nazgul), bonus), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(nazgul), bonus)));
}
});
return action;

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

@@ -42,10 +42,10 @@ public class Card1_210 extends AbstractOldEvent {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(nazgul), (burdens >= 6) ? 3 : 1), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(nazgul), (burdens >= 6) ? 3 : 1)));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, Filters.sameCard(nazgul), Keyword.DAMAGE, (burdens >= 6) ? 2 : 1), Phase.SKIRMISH));
new KeywordModifier(self, Filters.sameCard(nazgul), Keyword.DAMAGE, (burdens >= 6) ? 2 : 1)));
}
});
return action;

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

@@ -37,7 +37,7 @@ public class Card1_213 extends AbstractOldEvent {
boolean notAssigned = Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.ringBearer, Filters.notAssignedToSkirmish);
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(nazgul), notAssigned ? 2 : 3), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(nazgul), notAssigned ? 2 : 3)));
}
});
return action;

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

@@ -68,7 +68,7 @@ public class Card1_224 extends AbstractResponseOldEvent {
RequiredTriggerAction action = new RequiredTriggerAction(self);
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new SpecialFlagModifier(self, ModifierFlag.RING_TEXT_INACTIVE), Phase.SKIRMISH));
new SpecialFlagModifier(self, ModifierFlag.RING_TEXT_INACTIVE)));
return Collections.singletonList(action);
}
return null;

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

@@ -36,7 +36,7 @@ public class Card1_227 extends AbstractOldEvent {
int bonus = (game.getGameState().getBurdens() >= 5) ? 4 : 2;
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(nazgul), bonus), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(nazgul), bonus)));
}
});
return action;

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

@@ -41,7 +41,7 @@ public class Card1_229 extends AbstractMinion {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, self, null,
new CardPhaseLimitEvaluator(game, self, Phase.SKIRMISH, 5, new ConstantEvaluator(1))), Phase.SKIRMISH));
new CardPhaseLimitEvaluator(game, self, Phase.SKIRMISH, 5, new ConstantEvaluator(1)))));
return Collections.singletonList(action);
}
return null;

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

@@ -42,7 +42,7 @@ public class Card1_238 extends AbstractPermanent {
action.appendCost(new RemoveTwilightEffect(1));
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/set17/men/Card17_045.java
View File

@@ -49,7 +49,7 @@ public class Card17_045 extends AbstractEvent {
new DiscardCardsFromPlayEffect(self, possession));
subAction.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, minion, Keyword.DAMAGE, 1), Phase.SKIRMISH));
new KeywordModifier(self, minion, Keyword.DAMAGE, 1)));
action.appendEffect(
new OptionalEffect(action, playerId, new StackActionEffect(subAction) {
@Override

4
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_024.java
View File

@@ -32,11 +32,11 @@ public class Card20_024 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 (PlayConditions.canSpot(game, 2, Filters.siteControlled(playerId)))
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/set20/dunland/Card20_029.java
View File

@@ -48,7 +48,7 @@ public class Card20_029 extends AbstractEvent {
protected void cardSelected(LotroGame game, final PhysicalCard minion) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, minion, 3), Phase.SKIRMISH));
new StrengthModifier(self, minion, 3)));
action.appendEffect(
new AddUntilEndOfPhaseActionProxyEffect(
new AbstractActionProxy() {

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

@@ -45,10 +45,10 @@ public class Card20_040 extends AbstractEvent {
new ReplaceInSkirmishEffect(gimli, Filters.unboundCompanion));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, gimli, new SpotCondition(gimli, Filters.inSkirmish), 2), Phase.SKIRMISH));
new StrengthModifier(self, gimli, new SpotCondition(gimli, Filters.inSkirmish), 2)));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, gimli, new SpotCondition(gimli, Filters.inSkirmish), Keyword.DAMAGE, 1), Phase.SKIRMISH));
new KeywordModifier(self, gimli, new SpotCondition(gimli, Filters.inSkirmish), Keyword.DAMAGE, 1)));
}
});
return action;

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

@@ -47,7 +47,7 @@ public class Card20_041 extends AbstractEvent {
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new CantTakeMoreThanXWoundsModifier(self, Phase.SKIRMISH, 1, card), Phase.SKIRMISH));
new CantTakeMoreThanXWoundsModifier(self, Phase.SKIRMISH, 1, card)));
}
});
return action;

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

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

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

@@ -32,11 +32,11 @@ public class Card20_059 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 (PlayConditions.canSpot(game, Culture.DWARVEN, CardType.CONDITION, Filters.hasStacked(Filters.any)))
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/set20/dwarven/Card20_060.java
View File

@@ -37,10 +37,10 @@ public class Card20_060 extends AbstractEvent {
protected void forEachCardExertedCallback(PhysicalCard character) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, character, 3), Phase.SKIRMISH));
new StrengthModifier(self, character, 3)));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, character, Keyword.DAMAGE, 1), Phase.SKIRMISH));
new KeywordModifier(self, character, Keyword.DAMAGE, 1)));
}
});
return action;

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

@@ -40,7 +40,7 @@ public class Card20_070 extends AbstractEvent {
protected void discardingCardsCallback(Collection<PhysicalCard> cards) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new ArcheryTotalModifier(self, Side.SHADOW, -cards.size()), Phase.ARCHERY));
new ArcheryTotalModifier(self, Side.SHADOW, -cards.size())));
}
}
);

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

@@ -35,7 +35,7 @@ public class Card20_072 extends AbstractEvent {
int x = Filters.countActive(game.getGameState(), game.getModifiersQuerying(), CardType.COMPANION, Keyword.ARCHER);
action.appendCost(
new AddUntilEndOfPhaseModifierEffect(
new ArcheryTotalModifier(self, Side.FREE_PEOPLE, -x), Phase.ARCHERY));
new ArcheryTotalModifier(self, Side.FREE_PEOPLE, -x)));
action.appendEffect(
new ChooseAndDiscardCardsFromPlayEffect(action, playerId, x, x, CardType.CONDITION, Side.SHADOW));
return action;

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

@@ -47,7 +47,7 @@ public class Card20_078 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;

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

@@ -47,7 +47,7 @@ public class Card20_099 extends AbstractAlly {
new SelfExertEffect(action, 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;

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

@@ -40,7 +40,7 @@ public class Card20_102 extends AbstractEvent {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new ArcheryTotalModifier(self, Side.FREE_PEOPLE, null,
new CountActiveEvaluator(Filters.siteControlledByShadowPlayer(playerId))), Phase.ARCHERY));
new CountActiveEvaluator(Filters.siteControlledByShadowPlayer(playerId)))));
return action;
}
}

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

@@ -32,7 +32,7 @@ public class Card20_106 extends AbstractEvent {
int count = PlayConditions.location(game, Keyword.FOREST)?2:1;
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new ArcheryTotalModifier(self, Side.FREE_PEOPLE, null, count), Phase.ARCHERY));
new ArcheryTotalModifier(self, Side.FREE_PEOPLE, null, count)));
return action;
}
}

6
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gandalf/Card20_151.java
View File

@@ -32,14 +32,14 @@ public class Card20_151 extends AbstractEvent {
if (initiative) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.gandalf, 4), Phase.SKIRMISH));
new StrengthModifier(self, Filters.gandalf, 4)));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, Filters.gandalf, Keyword.DAMAGE, 1), Phase.SKIRMISH));
new KeywordModifier(self, Filters.gandalf, Keyword.DAMAGE, 1)));
} else {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.gandalf, 2), Phase.SKIRMISH));
new StrengthModifier(self, Filters.gandalf, 2)));
}
return action;
}

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

@@ -37,7 +37,7 @@ public class Card20_153 extends AbstractEvent {
PlayEventAction action = new PlayEventAction(self);
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new SidePlayerCantPlayPhaseEventsOrSpecialAbilitiesModifier(self, Side.SHADOW, Phase.SKIRMISH), Phase.SKIRMISH));
new SidePlayerCantPlayPhaseEventsOrSpecialAbilitiesModifier(self, Side.SHADOW, Phase.SKIRMISH)));
return action;
}
}

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

@@ -50,7 +50,7 @@ public class Card20_176 extends AbstractCompanion {
new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Race.DWARF));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, self, Keyword.DAMAGE, 1), Phase.SKIRMISH));
new KeywordModifier(self, self, Keyword.DAMAGE, 1)));
return Collections.singletonList(action);
}
if (PlayConditions.canUseFPCardDuringPhase(game, Phase.REGROUP, self)

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

@@ -32,10 +32,10 @@ public class Card20_187 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;

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

@@ -51,7 +51,7 @@ public class Card20_192 extends AbstractAttachableFPPossession {
new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Filters.name("Faramir")));
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;

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

@@ -33,11 +33,11 @@ public class Card20_207 extends AbstractEvent {
game.getGameState(), game.getModifiersQuerying(), ranger);
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, ranger, matches?3:2), Phase.SKIRMISH));
new StrengthModifier(self, ranger, matches?3:2)));
if (matches)
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, ranger, Keyword.DAMAGE, 1), Phase.SKIRMISH));
new KeywordModifier(self, ranger, Keyword.DAMAGE, 1)));
}
});
return action;

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/isengard/Card20_215.java
View File

@@ -47,7 +47,7 @@ public class Card20_215 extends AbstractMinion {
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/set20/rohan/Card20_322.java
View File

@@ -33,7 +33,7 @@ public class Card20_322 extends AbstractEvent {
if (Filters.and(Filters.inSkirmishAgainst(CardType.MINION, Filters.wounded)).accepts(game.getGameState(), game.getModifiersQuerying(), selectedCharacter))
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, selectedCharacter, Keyword.DAMAGE, 1), Phase.SKIRMISH));
new KeywordModifier(self, selectedCharacter, Keyword.DAMAGE, 1)));
}
});
return action;

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/sauron/Card20_380.java
View File

@@ -31,7 +31,7 @@ public class Card20_380 extends AbstractEvent {
if (!PlayConditions.canSpotFPCultures(game, 2, playerId))
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, selectedCharacter, Keyword.DAMAGE, 1), Phase.SKIRMISH));
new KeywordModifier(self, selectedCharacter, Keyword.DAMAGE, 1)));
}
});
return action;

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

@@ -51,7 +51,7 @@ public class Card20_399 extends AbstractAttachableFPPossession {
new ChooseAndExertCharactersEffect(action, playerId, 1, 1, 2, Filters.hasAttached(self)));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new OverwhelmedByMultiplierModifier(self, self.getAttachedTo(), 3), Phase.SKIRMISH));
new OverwhelmedByMultiplierModifier(self, self.getAttachedTo(), 3)));
return Collections.singletonList(action);
}
return null;

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/site/Card20_425.java
View File

@@ -40,7 +40,7 @@ public class Card20_425 extends AbstractSite {
protected void forEachCardExertedCallback(PhysicalCard character) {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, character, 2), Phase.SKIRMISH));
new StrengthModifier(self, character, 2)));
}
});
return Collections.singletonList(action);

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/site/Card20_437.java
View File

@@ -41,7 +41,7 @@ public class Card20_437 extends AbstractSite {
new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Filters.owner(playerId), Race.GOBLIN));
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;

4
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/wraith/Card20_288.java
View File

@@ -40,10 +40,10 @@ public class Card20_288 extends AbstractEvent {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new StrengthModifier(self, Filters.sameCard(nazgul), (burdens >= 6) ? 3 : 1), Phase.SKIRMISH));
new StrengthModifier(self, Filters.sameCard(nazgul), (burdens >= 6) ? 3 : 1)));
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new KeywordModifier(self, Filters.sameCard(nazgul), Keyword.DAMAGE, (burdens >= 6) ? 2 : 1), Phase.SKIRMISH));
new KeywordModifier(self, Filters.sameCard(nazgul), Keyword.DAMAGE, (burdens >= 6) ? 2 : 1)));
}
});
return action;