From cb4936797ecd5f7c7d46c32a04dee53c93f9f69c Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Wed, 2 Nov 2011 16:33:42 +0000 Subject: [PATCH] - "Orc Pillager" now correctly gives -1 for each attached card to the character in skirmish against it, rather than +1 strength to itself for each such card. --- .../evaluator/NegativeEvaluator.java | 19 +++++++++++++++++++ .../lotro/cards/set3/sauron/Card3_096.java | 3 ++- .../src/main/webapp/includes/changeLog.html | 2 ++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/evaluator/NegativeEvaluator.java diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/evaluator/NegativeEvaluator.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/evaluator/NegativeEvaluator.java new file mode 100644 index 000000000..ea3d346e9 --- /dev/null +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/evaluator/NegativeEvaluator.java @@ -0,0 +1,19 @@ +package com.gempukku.lotro.cards.modifiers.evaluator; + +import com.gempukku.lotro.game.PhysicalCard; +import com.gempukku.lotro.game.state.GameState; +import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; +import com.gempukku.lotro.logic.modifiers.evaluator.Evaluator; + +public class NegativeEvaluator implements Evaluator { + private Evaluator _source; + + public NegativeEvaluator(Evaluator source) { + _source = source; + } + + @Override + public int evaluateExpression(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard self) { + return -_source.evaluateExpression(gameState, modifiersQuerying, self); + } +} diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/sauron/Card3_096.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/sauron/Card3_096.java index c0ec0da0a..02fda4811 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/sauron/Card3_096.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/sauron/Card3_096.java @@ -2,6 +2,7 @@ package com.gempukku.lotro.cards.set3.sauron; import com.gempukku.lotro.cards.AbstractMinion; import com.gempukku.lotro.cards.modifiers.evaluator.CountSpottableEvaluator; +import com.gempukku.lotro.cards.modifiers.evaluator.NegativeEvaluator; import com.gempukku.lotro.common.Culture; import com.gempukku.lotro.common.Race; import com.gempukku.lotro.common.Side; @@ -33,6 +34,6 @@ public class Card3_096 extends AbstractMinion { @Override public List getAlwaysOnModifiers(LotroGame game, PhysicalCard self) { return Collections.singletonList( - new StrengthModifier(self, self, null, new CountSpottableEvaluator(Side.FREE_PEOPLE, Filters.attachedTo(Filters.inSkirmishAgainst(self))))); + new StrengthModifier(self, Filters.inSkirmishAgainst(self), null, new NegativeEvaluator(new CountSpottableEvaluator(Side.FREE_PEOPLE, Filters.attachedTo(Filters.inSkirmishAgainst(self)))))); } } 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 107be887e..601d787ae 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 @@ -2,6 +2,8 @@ 2 Nov. 2011 - "O Elbereth! Gilthoniel!" should correctly give the option to cancel a skirmish with Nazgul when used in skirmish against Nazgul. +- "Orc Pillager" now correctly gives -1 for each attached card to the character in skirmish against it, rather than ++1 strength to itself for each such card. 1 Nov. 2011 - Fixed "Theoden" (4P365) to not crash game due to testing if you can attach hides (also a possession, right?) to it.