From 1040c813075cab16ad07a7a90420be9b623127cc Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Mon, 31 Oct 2011 13:36:39 +0000 Subject: [PATCH] - "Uruk Spear" now correctly adds +2 strength to bearer. - "Sharku's Warg" now correctly adds +5 strength, rather than just only +4. - "Drawn to It's Power" no longer triggers for allies dying in skirmish, only companions. --- .../gempukku/lotro/cards/set1/wraith/Card1_211.java | 12 ++++++++---- .../lotro/cards/set4/isengard/Card4_196.java | 8 ++++++++ .../lotro/cards/set5/isengard/Card5_059.java | 2 +- .../src/main/webapp/includes/changeLog.html | 5 +++++ 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_211.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_211.java index 4f9bcb902..1e8df42ff 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_211.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_211.java @@ -8,6 +8,7 @@ import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.RequiredTriggerAction; import com.gempukku.lotro.logic.timing.EffectResult; +import com.gempukku.lotro.logic.timing.results.KillResult; import java.util.Collections; import java.util.List; @@ -31,10 +32,13 @@ public class Card1_211 extends AbstractPermanent { if (effectResult.getType() == EffectResult.Type.KILL && game.getGameState().getSkirmish() != null && Filters.filter(game.getGameState().getSkirmish().getShadowCharacters(), game.getGameState(), game.getModifiersQuerying(), Filters.race(Race.NAZGUL)).size() > 0) { - RequiredTriggerAction action = new RequiredTriggerAction(self); - action.appendEffect( - new AddBurdenEffect(self, 1)); - return Collections.singletonList(action); + KillResult killResult = (KillResult) effectResult; + if (Filters.filter(killResult.getKilledCards(), game.getGameState(), game.getModifiersQuerying(), CardType.COMPANION).size() > 0) { + RequiredTriggerAction action = new RequiredTriggerAction(self); + action.appendEffect( + new AddBurdenEffect(self, 1)); + return Collections.singletonList(action); + } } return null; } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_196.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_196.java index c613a732b..d91f783f7 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_196.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/isengard/Card4_196.java @@ -10,6 +10,8 @@ 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.ActivateCardAction; +import com.gempukku.lotro.logic.modifiers.Modifier; +import com.gempukku.lotro.logic.modifiers.StrengthModifier; import com.gempukku.lotro.logic.timing.Action; import java.util.Collections; @@ -29,6 +31,12 @@ public class Card4_196 extends AbstractAttachable { super(Side.SHADOW, CardType.POSSESSION, 1, Culture.ISENGARD, PossessionClass.HAND_WEAPON, "Uruk Spear"); } + @Override + public List getAlwaysOnModifiers(LotroGame game, PhysicalCard self) { + return Collections.singletonList( + new StrengthModifier(self, Filters.hasAttached(self), 2)); + } + @Override protected Filter getValidTargetFilter(String playerId, LotroGame game, PhysicalCard self) { return Filters.race(Race.URUK_HAI); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/isengard/Card5_059.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/isengard/Card5_059.java index 1367bcc83..958cd3eac 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/isengard/Card5_059.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/isengard/Card5_059.java @@ -46,7 +46,7 @@ public class Card5_059 extends AbstractAttachable { public List getAlwaysOnModifiers(LotroGame game, PhysicalCard self) { List modifiers = new LinkedList(); modifiers.add( - new StrengthModifier(self, Filters.hasAttached(self), 4)); + new StrengthModifier(self, Filters.hasAttached(self), 5)); modifiers.add( new VitalityModifier(self, Filters.hasAttached(self), 3)); modifiers.add( diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html index 16abab270..743ccda8d 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html @@ -1,4 +1,9 @@
+31 Oct. 2011
+- "Uruk Spear" now correctly adds +2 strength to bearer.
+- "Sharku's Warg" now correctly adds +5 strength, rather than just only +4.
+- "Drawn to It's Power" no longer triggers for allies dying in skirmish, only companions.
+
 30 Oct. 2011
 - Added two new pseudo card types "Items" (Possessions and Artifacts) and "Characters" (Companions, Allies and Minions).