From 73c21e6a4ded6c8ae2cb9d6b6c667719ef421924 Mon Sep 17 00:00:00 2001 From: "marcin.sciesinski" Date: Sun, 29 Sep 2019 21:30:35 -0700 Subject: [PATCH] Fixing couple of bugs --- .../src/main/web/cards/set1/{set1.json => set1-shire.json} | 0 .../java/com/gempukku/lotro/cards/set2/gandalf/Card2_023.java | 2 +- .../lotro/cards/build/field/effect/EventEffectProcessor.java | 2 +- .../cards/build/field/effect/ResponseEventEffectProcessor.java | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/{set1.json => set1-shire.json} (100%) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-shire.json similarity index 100% rename from gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1.json rename to gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-shire.json diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gandalf/Card2_023.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gandalf/Card2_023.java index c41c15deb..328c8ed03 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gandalf/Card2_023.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/gandalf/Card2_023.java @@ -37,7 +37,7 @@ public class Card2_023 extends AbstractPermanent { CardType.ARTIFACT), ModifierEffect.TWILIGHT_COST_MODIFIER) { @Override public int getTwilightCostModifier(LotroGame game, PhysicalCard physicalCard, PhysicalCard target, boolean ignoreRoamingPenalty) { - if (target != null && physicalCard.getBlueprint().getCardType() == CardType.POSSESSION || physicalCard.getBlueprint().getCardType() == CardType.ARTIFACT) { + if (target != null && (physicalCard.getBlueprint().getCardType() == CardType.POSSESSION || physicalCard.getBlueprint().getCardType() == CardType.ARTIFACT)) { CardType cardType = target.getBlueprint().getCardType(); if (target.getBlueprint().getTitle().equals("Gandalf") || (cardType == CardType.COMPANION && target.getBlueprint().getSignet() == Signet.GANDALF)) return -1; diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/EventEffectProcessor.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/EventEffectProcessor.java index 40a2a2845..184843073 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/EventEffectProcessor.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/EventEffectProcessor.java @@ -17,7 +17,7 @@ public class EventEffectProcessor implements EffectProcessor { DefaultActionSource actionSource = new DefaultActionSource(); actionSource.setRequiresRanger(requiresRanger); - EffectUtils.processCostsAndEffects(value, environment, actionSource); + EffectUtils.processRequirementsCostsAndEffects(value, environment, actionSource); blueprint.setPlayEventAction(actionSource); } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/ResponseEventEffectProcessor.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/ResponseEventEffectProcessor.java index 616bc4d60..c9726ebf9 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/ResponseEventEffectProcessor.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/ResponseEventEffectProcessor.java @@ -21,7 +21,7 @@ public class ResponseEventEffectProcessor implements EffectProcessor { DefaultActionSource triggerActionSource = new DefaultActionSource(); triggerActionSource.addPlayRequirement(triggerChecker); - EffectUtils.processCostsAndEffects(value, environment, triggerActionSource); + EffectUtils.processRequirementsCostsAndEffects(value, environment, triggerActionSource); if (before) { blueprint.appendOptionalInHandBeforeAction(triggerActionSource);