ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Palantir of Orthanc, Seveth Seeing-stone failing to place cards on the bottom of the deck if it was the opponent's deck.

Browse Source
This commit is contained in:
Christian 'ketura' McCarty
2025-03-20 18:33:50 -05:00
parent 5bd3ec8dff
commit 208f9fc0bb
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Isengard.hjson
View File

@@ -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
}

6
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromDeckOnBottomOfDeck.java
View File

@@ -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

6
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromDeckOnTopOfDeck.java
View File

@@ -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