diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/isengard/Card40_139.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/isengard/Card40_139.java index a8420093b..2b8435247 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/isengard/Card40_139.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/isengard/Card40_139.java @@ -34,6 +34,11 @@ public class Card40_139 extends AbstractAttachable { return Race.URUK_HAI; } + @Override + public int getStrength() { + return 2; + } + @Override public List getInPlayModifiers(LotroGame game, PhysicalCard self) { CantTakeWoundsModifier modifier = new CantTakeWoundsModifier(self, diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/moria/Card40_158.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/moria/Card40_158.java index 2d19b3847..195eb51c7 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/moria/Card40_158.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/moria/Card40_158.java @@ -8,7 +8,6 @@ import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.cardtype.AbstractAttachable; import com.gempukku.lotro.logic.modifiers.KeywordModifier; import com.gempukku.lotro.logic.modifiers.Modifier; -import com.gempukku.lotro.logic.modifiers.StrengthModifier; import java.util.LinkedList; import java.util.List; @@ -34,10 +33,14 @@ public class Card40_158 extends AbstractAttachable { return Filters.name("Cave Troll of Moria"); } + @Override + public int getStrength() { + return 3; + } + @Override public List getInPlayModifiers(LotroGame game, PhysicalCard self) { List modifiers = new LinkedList(); - modifiers.add(new StrengthModifier(self, Filters.hasAttached(self), 3)); modifiers.add(new KeywordModifier(self, Filters.hasAttached(self), Keyword.DAMAGE)); return modifiers; } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/moria/Card40_171.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/moria/Card40_171.java index c21fc15ce..eb713c214 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/moria/Card40_171.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/moria/Card40_171.java @@ -1,14 +1,14 @@ package com.gempukku.lotro.cards.set40.moria; -import com.gempukku.lotro.logic.cardtype.AbstractAttachable; -import com.gempukku.lotro.logic.timing.TriggerConditions; import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.OptionalTriggerAction; +import com.gempukku.lotro.logic.cardtype.AbstractAttachable; import com.gempukku.lotro.logic.effects.DrawCardsEffect; import com.gempukku.lotro.logic.timing.EffectResult; +import com.gempukku.lotro.logic.timing.TriggerConditions; import java.util.Collections; import java.util.List; @@ -44,4 +44,9 @@ public class Card40_171 extends AbstractAttachable { } return null; } + + @Override + public int getStrength() { + return 2; + } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/wraith/Card40_190.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/wraith/Card40_190.java index afb2e985f..587331a3f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/wraith/Card40_190.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/wraith/Card40_190.java @@ -9,7 +9,6 @@ import com.gempukku.lotro.logic.cardtype.AbstractAttachable; import com.gempukku.lotro.logic.effects.*; import com.gempukku.lotro.logic.modifiers.ExtraPossessionClassModifier; import com.gempukku.lotro.logic.modifiers.Modifier; -import com.gempukku.lotro.logic.modifiers.StrengthModifier; import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.PlayConditions; @@ -35,8 +34,12 @@ public class Card40_190 extends AbstractAttachable { @Override public List getInPlayModifiers(LotroGame game, PhysicalCard self) { return Arrays.asList( - new ExtraPossessionClassModifier(self, self), - new StrengthModifier(self, Filters.hasAttached(self), 1)); + new ExtraPossessionClassModifier(self, self)); + } + + @Override + public int getStrength() { + return 1; } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/wraith/Card40_192.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/wraith/Card40_192.java index dcab11e03..d8b6cfca2 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/wraith/Card40_192.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/wraith/Card40_192.java @@ -8,7 +8,6 @@ import com.gempukku.lotro.logic.cardtype.AbstractAttachable; import com.gempukku.lotro.logic.modifiers.KeywordModifier; import com.gempukku.lotro.logic.modifiers.Modifier; import com.gempukku.lotro.logic.modifiers.SpotBurdensCondition; -import com.gempukku.lotro.logic.modifiers.StrengthModifier; import java.util.LinkedList; import java.util.List; @@ -33,11 +32,14 @@ public class Card40_192 extends AbstractAttachable { return Race.NAZGUL; } + @Override + public int getStrength() { + return 2; + } + @Override public List getInPlayModifiers(LotroGame game, PhysicalCard self) { List modifiers = new LinkedList(); - modifiers.add( - new StrengthModifier(self, Filters.hasAttached(self), 2)); modifiers.add( new KeywordModifier(self, Filters.hasAttached(self), new SpotBurdensCondition(3), Keyword.DAMAGE, 1)); return modifiers; diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/wraith/Card40_195.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/wraith/Card40_195.java index 92711cff1..a42bc6556 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/wraith/Card40_195.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/wraith/Card40_195.java @@ -9,11 +9,9 @@ import com.gempukku.lotro.logic.cardtype.AbstractAttachable; import com.gempukku.lotro.logic.effects.choose.ChooseAndDiscardCardsFromPlayEffect; import com.gempukku.lotro.logic.modifiers.KeywordModifier; import com.gempukku.lotro.logic.modifiers.Modifier; -import com.gempukku.lotro.logic.modifiers.StrengthModifier; import com.gempukku.lotro.logic.timing.EffectResult; import com.gempukku.lotro.logic.timing.TriggerConditions; -import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -41,9 +39,13 @@ public class Card40_195 extends AbstractAttachable { @Override public List getInPlayModifiers(LotroGame game, PhysicalCard self) { - StrengthModifier strength = new StrengthModifier(self, Filters.hasAttached(self), 3); - KeywordModifier damage = new KeywordModifier(self, Filters.and(Filters.hasAttached(self), Filters.witchKing), Keyword.DAMAGE, 1); - return Arrays.asList(strength, damage); + return Collections.singletonList( + new KeywordModifier(self, Filters.and(Filters.hasAttached(self), Filters.witchKing), Keyword.DAMAGE, 1)); + } + + @Override + public int getStrength() { + return 3; } @Override