From 208f9fc0bb3732132ffc21965ff25635121c7f09 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Thu, 20 Mar 2025 18:33:50 -0500 Subject: [PATCH] Fixed Palantir of Orthanc, Seveth Seeing-stone failing to place cards on the bottom of the deck if it was the opponent's deck. --- .../resources/cards/official/set04/set04-Isengard.hjson | 2 ++ .../effect/appender/PutCardsFromDeckOnBottomOfDeck.java | 6 ++++-- .../field/effect/appender/PutCardsFromDeckOnTopOfDeck.java | 6 ++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Isengard.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Isengard.hjson index 2f3e2f10c..a2fdef717 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Isengard.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Isengard.hjson @@ -1410,6 +1410,7 @@ text: Would you like to put {revealedCard} beneath your deck? effect: { type: putCardsFromDeckOnBottomOfDeck + deck: shadow select: memory(revealedCard) reveal: true } @@ -1429,6 +1430,7 @@ text: Would you like to put {revealedCard} beneath their deck? effect: { type: putCardsFromDeckOnBottomOfDeck + deck: fp select: memory(revealedCard) reveal: true } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromDeckOnBottomOfDeck.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromDeckOnBottomOfDeck.java index e29426c69..30afeea35 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromDeckOnBottomOfDeck.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromDeckOnBottomOfDeck.java @@ -23,8 +23,9 @@ import java.util.*; public class PutCardsFromDeckOnBottomOfDeck implements EffectAppenderProducer { @Override public EffectAppender createEffectAppender(boolean cost, JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { - FieldUtils.validateAllowedFields(effectObject, "count", "select", "reveal"); + FieldUtils.validateAllowedFields(effectObject, "deck", "count", "select", "reveal"); + final String deck = FieldUtils.getString(effectObject.get("deck"), "deck", "you"); final ValueSource valueSource = ValueResolver.resolveEvaluator(effectObject.get("count"), 1, environment); final String select = FieldUtils.getString(effectObject.get("select"), "select", "choose(any)"); final boolean reveal = FieldUtils.getBoolean(effectObject.get("reveal"), "reveal"); @@ -32,7 +33,8 @@ public class PutCardsFromDeckOnBottomOfDeck implements EffectAppenderProducer { MultiEffectAppender result = new MultiEffectAppender(); result.addEffectAppender( - CardResolver.resolveCardsInDeck(select, null, valueSource, "_temp", "you", "you", false, "Choose cards from deck", environment)); + CardResolver.resolveCardsInDeck(select, null, valueSource, "_temp", "you", + deck, false, "Choose cards from deck", environment)); result.addEffectAppender( new DelayedAppender() { @Override diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromDeckOnTopOfDeck.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromDeckOnTopOfDeck.java index 4e7489b87..d3899397b 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromDeckOnTopOfDeck.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromDeckOnTopOfDeck.java @@ -23,8 +23,9 @@ import java.util.*; public class PutCardsFromDeckOnTopOfDeck implements EffectAppenderProducer { @Override public EffectAppender createEffectAppender(boolean cost, JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { - FieldUtils.validateAllowedFields(effectObject, "count", "select", "reveal"); + FieldUtils.validateAllowedFields(effectObject, "deck", "count", "select", "reveal"); + final String deck = FieldUtils.getString(effectObject.get("deck"), "deck", "you"); final ValueSource valueSource = ValueResolver.resolveEvaluator(effectObject.get("count"), 1, environment); final String select = FieldUtils.getString(effectObject.get("select"), "select", "choose(any)"); final boolean reveal = FieldUtils.getBoolean(effectObject.get("reveal"), "reveal"); @@ -32,7 +33,8 @@ public class PutCardsFromDeckOnTopOfDeck implements EffectAppenderProducer { MultiEffectAppender result = new MultiEffectAppender(); result.addEffectAppender( - CardResolver.resolveCardsInDeck(select, null, valueSource, "_temp", "you", "you", false, "Choose cards from deck", environment)); + CardResolver.resolveCardsInDeck(select, null, valueSource, "_temp", "you", + deck, false, "Choose cards from deck", environment)); result.addEffectAppender( new DelayedAppender() { @Override