From 0a93f4c4025b309f290dffc427e568f3bf245306 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Mon, 29 Aug 2011 13:39:38 +0000 Subject: [PATCH] Simplifying Modifiers. --- .../lotro/cards/modifiers/AllyOnCurrentSiteModifier.java | 4 ++-- .../lotro/cards/modifiers/CantTakeWoundsModifier.java | 4 ++-- .../com/gempukku/lotro/cards/modifiers/KeywordModifier.java | 4 ++-- .../com/gempukku/lotro/cards/modifiers/MoveLimitModifier.java | 4 ++-- .../java/com/gempukku/lotro/cards/set1/dwarven/Card1_015.java | 4 ++-- .../java/com/gempukku/lotro/cards/set1/dwarven/Card1_021.java | 2 +- .../java/com/gempukku/lotro/cards/set1/dwarven/Card1_027.java | 2 +- .../java/com/gempukku/lotro/cards/set1/elven/Card1_041.java | 2 +- .../java/com/gempukku/lotro/cards/set1/elven/Card1_046.java | 2 +- .../com/gempukku/lotro/cards/set1/isengard/Card1_146.java | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/AllyOnCurrentSiteModifier.java b/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/AllyOnCurrentSiteModifier.java index b85890904..208e52a38 100644 --- a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/AllyOnCurrentSiteModifier.java +++ b/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/AllyOnCurrentSiteModifier.java @@ -7,8 +7,8 @@ import com.gempukku.lotro.logic.modifiers.AbstractModifier; import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; public class AllyOnCurrentSiteModifier extends AbstractModifier { - public AllyOnCurrentSiteModifier(PhysicalCard source, String text, Filter affectFilter) { - super(source, text, affectFilter); + public AllyOnCurrentSiteModifier(PhysicalCard source, Filter affectFilter) { + super(source, "Can participate in archery and skirmishes", affectFilter); } @Override diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/CantTakeWoundsModifier.java b/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/CantTakeWoundsModifier.java index 4b625e6fd..c8e7fdc1b 100644 --- a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/CantTakeWoundsModifier.java +++ b/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/CantTakeWoundsModifier.java @@ -7,8 +7,8 @@ import com.gempukku.lotro.logic.modifiers.AbstractModifier; import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; public class CantTakeWoundsModifier extends AbstractModifier { - public CantTakeWoundsModifier(PhysicalCard source, String text, Filter affectFilter) { - super(source, text, affectFilter); + public CantTakeWoundsModifier(PhysicalCard source, Filter affectFilter) { + super(source, "Can't take wounds", affectFilter); } @Override diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/KeywordModifier.java b/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/KeywordModifier.java index afc826893..923a659c1 100644 --- a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/KeywordModifier.java +++ b/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/KeywordModifier.java @@ -10,8 +10,8 @@ import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; public class KeywordModifier extends AbstractModifier { private Keyword _keyword; - public KeywordModifier(PhysicalCard physicalCard, String text, Filter affectFilter, Keyword keyword) { - super(physicalCard, text, affectFilter); + public KeywordModifier(PhysicalCard physicalCard, Filter affectFilter, Keyword keyword) { + super(physicalCard, "Has " + keyword, affectFilter); _keyword = keyword; } diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/MoveLimitModifier.java b/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/MoveLimitModifier.java index d52e232fe..b9c12f9c6 100644 --- a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/MoveLimitModifier.java +++ b/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/modifiers/MoveLimitModifier.java @@ -8,8 +8,8 @@ import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; public class MoveLimitModifier extends AbstractModifier { private int _moveLimitModifier; - public MoveLimitModifier(PhysicalCard source, String text, int moveLimitModifier) { - super(source, text, null); + public MoveLimitModifier(PhysicalCard source, int moveLimitModifier) { + super(source, "Move limit " + ((moveLimitModifier < 0) ? moveLimitModifier : ("+" + moveLimitModifier)), null); _moveLimitModifier = moveLimitModifier; } diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_015.java b/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_015.java index 4f903c65a..f5e89b21d 100644 --- a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_015.java +++ b/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_015.java @@ -49,7 +49,7 @@ public class Card1_015 extends AbstractAttachableFPPossession { CostToEffectAction action = new CostToEffectAction(self, "Discard Gimli's Helm to prevent all wounds to him"); action.addCost(new DiscardCardFromPlayEffect(self)); action.addEffect(new AddUntilEndOfPhaseModifierEffect( - new CantTakeWoundsModifier(self, "Prevent all wounds to him", Filters.sameCard(self.getAttachedTo())), Phase.SKIRMISH) + new CantTakeWoundsModifier(self, Filters.sameCard(self.getAttachedTo())), Phase.SKIRMISH) ); actions.add(action); } @@ -62,7 +62,7 @@ public class Card1_015 extends AbstractAttachableFPPossession { if (PlayConditions.isWounded(effectResult, self.getAttachedTo())) { CostToEffectAction action = new CostToEffectAction(self, "Apply damage prevention"); action.addEffect(new AddUntilEndOfPhaseModifierEffect( - new CantTakeWoundsModifier(self, "Can't take more than 1 wound during each skirmish phase", Filters.sameCard(self.getAttachedTo())), Phase.SKIRMISH)); + new CantTakeWoundsModifier(self, Filters.sameCard(self.getAttachedTo())), Phase.SKIRMISH)); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_021.java b/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_021.java index 67b881a63..d3702155c 100644 --- a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_021.java +++ b/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_021.java @@ -43,6 +43,6 @@ public class Card1_021 extends AbstractLotroCardBlueprint { @Override public Modifier getAlwaysOnEffect(PhysicalCard self) { - return new KeywordModifier(self, "Each Dwarf is Damage +1", Filters.keyword(Keyword.DWARF), Keyword.DAMAGE); + return new KeywordModifier(self, Filters.keyword(Keyword.DWARF), Keyword.DAMAGE); } } diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_027.java b/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_027.java index 1c46ad9a7..3bdc15cd3 100644 --- a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_027.java +++ b/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_027.java @@ -50,7 +50,7 @@ public class Card1_027 extends AbstractAlly { action.addCost(new ExertCharacterEffect(self)); action.addEffect( new AddUntilStartOfPhaseModifierEffect( - new AllyOnCurrentSiteModifier(self, "Can participate in archery fire and skimishes", Filters.sameCard(self)), Phase.REGROUP)); + new AllyOnCurrentSiteModifier(self, Filters.sameCard(self)), Phase.REGROUP)); } return actions; diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_041.java b/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_041.java index fa41a6791..6cee63fcb 100644 --- a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_041.java +++ b/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_041.java @@ -42,6 +42,6 @@ public class Card1_041 extends AbstractAttachableFPPossession { @Override public Modifier getAlwaysOnEffect(PhysicalCard self) { - return new KeywordModifier(self, "Bearer is an archer", Filters.sameCard(self.getAttachedTo()), Keyword.ARCHER); + return new KeywordModifier(self, Filters.sameCard(self.getAttachedTo()), Keyword.ARCHER); } } diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_046.java b/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_046.java index 4e909d51c..5f413d7ab 100644 --- a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_046.java +++ b/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_046.java @@ -59,7 +59,7 @@ public class Card1_046 extends AbstractLotroCardBlueprint { public List getRequiredWhenActions(LotroGame game, EffectResult effectResult, PhysicalCard self) { if (effectResult.getType() == EffectResult.Type.WHEN_MOVE_FROM) { CostToEffectAction action = new CostToEffectAction(self, "Move limit for this turn is +1"); - action.addEffect(new AddUntilEndOfTurnModifierEffect(new MoveLimitModifier(self, "Move limit for this turn is +1", 1))); + action.addEffect(new AddUntilEndOfTurnModifierEffect(new MoveLimitModifier(self, 1))); return Collections.singletonList(action); } return null; diff --git a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_146.java b/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_146.java index 6ce234a47..07a53cda1 100644 --- a/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_146.java +++ b/gemp-lotr/lotro-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_146.java @@ -44,7 +44,7 @@ public class Card1_146 extends AbstractMinion { && Filters.countActive(lotroGame.getGameState(), lotroGame.getModifiersQuerying(), Filters.type(CardType.COMPANION)) >= 5) { CostToEffectAction action = new CostToEffectAction(self, "Spot 5 companions to make this minion fierce until the regroup phase"); - action.addEffect(new AddUntilStartOfPhaseModifierEffect(new KeywordModifier(self, "Give Fierce until Regroup phase", Filters.sameCard(self), Keyword.FIERCE), Phase.REGROUP)); + action.addEffect(new AddUntilStartOfPhaseModifierEffect(new KeywordModifier(self, Filters.sameCard(self), Keyword.FIERCE), Phase.REGROUP)); actions.add(action); }