From d35667d6706cc5046de24166bfc7521843be0baf Mon Sep 17 00:00:00 2001 From: "marcin.sciesinski" Date: Wed, 4 Sep 2019 19:01:57 -0700 Subject: [PATCH] Fixing bug with checking resistance --- .../field/effect/filter/FilterFactory.java | 2 +- .../com/gempukku/lotro/at/NewCardsAtTest.java | 43 +++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/filter/FilterFactory.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/filter/FilterFactory.java index e1fd99eb2..98d4c1b4f 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/filter/FilterFactory.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/filter/FilterFactory.java @@ -123,7 +123,7 @@ public class FilterFactory { parameterFilters.put("resistanceLessThan", (parameter, environment) -> { int amount = Integer.parseInt(parameter); - return (actionContext) -> Filters.maxResistance(amount + 1); + return (actionContext) -> Filters.maxResistance(amount - 1); }); parameterFilters.put("not", (parameter, environment) -> { diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/NewCardsAtTest.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/NewCardsAtTest.java index a2e2ce5d4..d0caf8bda 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/NewCardsAtTest.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/NewCardsAtTest.java @@ -376,6 +376,49 @@ public class NewCardsAtTest extends AbstractAtTest { assertEquals(7 + 3, _game.getModifiersQuerying().getStrength(_game, gandalf)); } + @Test + public void strengthBonusDependingOnCharacterPlayedOn2() throws DecisionResultInvalidException, CardNotFoundException { + initializeSimplestGame(); + + final PhysicalCardImpl gandalf = createCard(P1, "40_70"); + final PhysicalCardImpl boromir = createCard(P1, "40_101"); + final PhysicalCardImpl goBackToTheShadows = createCard(P1, "40_312"); + final PhysicalCardImpl nazgul = createCard(P2, "40_211"); + + _game.getGameState().addCardToZone(_game, gandalf, Zone.FREE_CHARACTERS); + _game.getGameState().addCardToZone(_game, boromir, Zone.FREE_CHARACTERS); + _game.getGameState().addCardToZone(_game, goBackToTheShadows, Zone.HAND); + _game.getGameState().addCardToZone(_game, nazgul, Zone.SHADOW_CHARACTERS); + _game.getGameState().removeBurdens(_game.getGameState().getBurdens()); + + skipMulligans(); + + // Pass in fellowship + playerDecided(P1, ""); + + // Pass in shadow + playerDecided(P2, ""); + +//Pass in maneuver + playerDecided(P1, ""); + playerDecided(P2, ""); + +//Pass in archery + playerDecided(P1, ""); + playerDecided(P2, ""); + +//Pass in assignment + playerDecided(P1, ""); + playerDecided(P2, ""); + + playerDecided(P1, boromir.getCardId() + " " + nazgul.getCardId()); + playerDecided(P1, "" + boromir.getCardId()); + + playerDecided(P1, "0"); + + assertEquals(14 - 3, _game.getModifiersQuerying().getStrength(_game, nazgul)); + } + @Test public void mathProgrammingDiscardBoth() throws DecisionResultInvalidException, CardNotFoundException { initializeSimplestGame();