From d0fc13c1c0dd2634d4516e762696fa63cb13d9a8 Mon Sep 17 00:00:00 2001 From: "marcin.sciesinski" Date: Sun, 1 Sep 2019 00:14:13 -0700 Subject: [PATCH] Switched from "owner" being default to "you" (player performing action) --- .../gempukku/lotro/cards/build/BuiltLotroCardBlueprint.java | 4 ++-- .../lotro/cards/build/field/effect/appender/AddBurden.java | 2 +- .../lotro/cards/build/field/effect/appender/AddKeyword.java | 2 +- .../field/effect/appender/AssignToSkirmishAgainstMinion.java | 2 +- .../build/field/effect/appender/CantBeAssignedToSkirmish.java | 2 +- .../field/effect/appender/CantBeOverwhelmedMultiplier.java | 2 +- .../build/field/effect/appender/CantTakeMoreWoundsThan.java | 2 +- .../lotro/cards/build/field/effect/appender/Choice.java | 2 +- .../build/field/effect/appender/DiscardCardsFromHand.java | 2 +- .../cards/build/field/effect/appender/DiscardFromPlay.java | 2 +- .../build/field/effect/appender/DiscardStackedCards.java | 2 +- .../build/field/effect/appender/DiscardTopCardFromDeck.java | 2 +- .../build/field/effect/appender/DoesNotAddToArcheryTotal.java | 2 +- .../lotro/cards/build/field/effect/appender/DrawCards.java | 2 +- .../lotro/cards/build/field/effect/appender/Exert.java | 2 +- .../lotro/cards/build/field/effect/appender/Heal.java | 2 +- .../cards/build/field/effect/appender/ModifyStrength.java | 2 +- .../lotro/cards/build/field/effect/appender/NegateWound.java | 2 +- .../build/field/effect/appender/PlayCardFromDiscard.java | 2 +- .../cards/build/field/effect/appender/PlayCardFromHand.java | 2 +- .../field/effect/appender/PreventCardEffectAppender.java | 2 +- .../lotro/cards/build/field/effect/appender/PreventWound.java | 2 +- .../field/effect/appender/PutCardsFromDiscardIntoHand.java | 2 +- .../field/effect/appender/PutCardsFromHandOnBottomOfDeck.java | 2 +- .../build/field/effect/appender/PutStackedCardsIntoHand.java | 2 +- .../cards/build/field/effect/appender/RemoveBurdens.java | 2 +- .../cards/build/field/effect/appender/ReplaceInSkirmish.java | 2 +- .../build/field/effect/appender/RevealTopCardsOfDrawDeck.java | 2 +- .../lotro/cards/build/field/effect/appender/Spot.java | 2 +- .../build/field/effect/appender/StackCardsFromDiscard.java | 4 ++-- .../cards/build/field/effect/appender/StackCardsFromHand.java | 4 ++-- .../cards/build/field/effect/appender/StackPlayedEvent.java | 2 +- .../build/field/effect/appender/StackTopCardsOfDrawDeck.java | 4 ++-- .../lotro/cards/build/field/effect/appender/Wound.java | 2 +- .../cards/build/field/effect/requirement/ControlsSite.java | 2 +- 35 files changed, 39 insertions(+), 39 deletions(-) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/BuiltLotroCardBlueprint.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/BuiltLotroCardBlueprint.java index de5b87e79..482c56bb4 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/BuiltLotroCardBlueprint.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/BuiltLotroCardBlueprint.java @@ -439,7 +439,7 @@ public class BuiltLotroCardBlueprint implements LotroCardBlueprint { List result = new LinkedList<>(); for (ActionSource requiredBeforeTrigger : requiredBeforeTriggers) { - DefaultActionContext actionContext = new DefaultActionContext(null, game, self, null, effect); + DefaultActionContext actionContext = new DefaultActionContext(self.getOwner(), game, self, null, effect); if (requiredBeforeTrigger.isValid(actionContext)) { RequiredTriggerAction action = new RequiredTriggerAction(self); requiredBeforeTrigger.createAction(action, actionContext); @@ -458,7 +458,7 @@ public class BuiltLotroCardBlueprint implements LotroCardBlueprint { List result = new LinkedList<>(); for (ActionSource requiredAfterTrigger : requiredAfterTriggers) { - DefaultActionContext actionContext = new DefaultActionContext(null, game, self, effectResult, null); + DefaultActionContext actionContext = new DefaultActionContext(self.getOwner(), game, self, effectResult, null); if (requiredAfterTrigger.isValid(actionContext)) { RequiredTriggerAction action = new RequiredTriggerAction(self); requiredAfterTrigger.createAction(action, actionContext); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AddBurden.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AddBurden.java index 3425ccda8..8246db194 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AddBurden.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AddBurden.java @@ -20,7 +20,7 @@ public class AddBurden implements EffectAppenderProducer { FieldUtils.validateAllowedFields(effectObject, "amount", "player"); final int amount = FieldUtils.getInteger(effectObject.get("amount"), "amount", 1); - final String player = FieldUtils.getString(effectObject.get("player"), "player", "owner"); + final String player = FieldUtils.getString(effectObject.get("player"), "player", "you"); final PlayerSource playerSource = PlayerResolver.resolvePlayer(player, environment); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AddKeyword.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AddKeyword.java index 8184157e7..6ae7fda7b 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AddKeyword.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AddKeyword.java @@ -42,7 +42,7 @@ public class AddKeyword implements EffectAppenderProducer { MultiEffectAppender result = new MultiEffectAppender(); result.addEffectAppender( - CardResolver.resolveCards(filter, valueSource, memory, "owner", "Choose cards to add keywork to", environment)); + CardResolver.resolveCards(filter, valueSource, memory, "you", "Choose cards to add keywork to", 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/AssignToSkirmishAgainstMinion.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AssignToSkirmishAgainstMinion.java index 9bc373027..fcae17ce4 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AssignToSkirmishAgainstMinion.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AssignToSkirmishAgainstMinion.java @@ -21,7 +21,7 @@ public class AssignToSkirmishAgainstMinion implements EffectAppenderProducer { public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { FieldUtils.validateAllowedFields(effectObject, "player", "fpCharacter", "against"); - final String player = FieldUtils.getString(effectObject.get("player"), "player", "owner"); + final String player = FieldUtils.getString(effectObject.get("player"), "player", "you"); final String fpCharacter = FieldUtils.getString(effectObject.get("fpCharacter"), "fpCharacter"); final String against = FieldUtils.getString(effectObject.get("against"), "against"); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/CantBeAssignedToSkirmish.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/CantBeAssignedToSkirmish.java index 4df9358ab..4bce15b83 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/CantBeAssignedToSkirmish.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/CantBeAssignedToSkirmish.java @@ -30,7 +30,7 @@ public class CantBeAssignedToSkirmish implements EffectAppenderProducer { MultiEffectAppender result = new MultiEffectAppender(); result.addEffectAppender( - CardResolver.resolveCards(filter, new ConstantEvaluator(1), "_temp", "owner", "Choose characters that you want to make unable to be assigned to skirmish", environment)); + CardResolver.resolveCards(filter, new ConstantEvaluator(1), "_temp", "you", "Choose characters that you want to make unable to be assigned to skirmish", 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/CantBeOverwhelmedMultiplier.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/CantBeOverwhelmedMultiplier.java index 068a4291d..bb036124c 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/CantBeOverwhelmedMultiplier.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/CantBeOverwhelmedMultiplier.java @@ -31,7 +31,7 @@ public class CantBeOverwhelmedMultiplier implements EffectAppenderProducer { MultiEffectAppender result = new MultiEffectAppender(); result.addEffectAppender( - CardResolver.resolveCards(filter, new ConstantEvaluator(1), "_temp", "owner", "Choose characters that you want to make unable to be assigned to skirmish", environment)); + CardResolver.resolveCards(filter, new ConstantEvaluator(1), "_temp", "you", "Choose characters that you want to make unable to be assigned to skirmish", 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/CantTakeMoreWoundsThan.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/CantTakeMoreWoundsThan.java index db65c1497..eb768a8a8 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/CantTakeMoreWoundsThan.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/CantTakeMoreWoundsThan.java @@ -30,7 +30,7 @@ public class CantTakeMoreWoundsThan implements EffectAppenderProducer { MultiEffectAppender result = new MultiEffectAppender(); result.addEffectAppender( - CardResolver.resolveCards(filter, new ConstantEvaluator(1), memory, "owner", "Choose cards to make take no more than " + wounds + " wound(s)", environment)); + CardResolver.resolveCards(filter, new ConstantEvaluator(1), memory, "you", "Choose cards to make take no more than " + wounds + " wound(s)", 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/Choice.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Choice.java index 8f9c74d7c..6cb210e1b 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Choice.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Choice.java @@ -26,7 +26,7 @@ public class Choice implements EffectAppenderProducer { public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { FieldUtils.validateAllowedFields(effectObject, "player", "effects", "texts"); - final String player = FieldUtils.getString(effectObject.get("player"), "player", "owner"); + final String player = FieldUtils.getString(effectObject.get("player"), "player", "you"); final JSONObject[] effectArray = FieldUtils.getObjectArray(effectObject.get("effects"), "effects"); final String[] textArray = FieldUtils.getStringArray(effectObject.get("texts"), "texts"); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DiscardCardsFromHand.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DiscardCardsFromHand.java index ec1696a4c..cf95da945 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DiscardCardsFromHand.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DiscardCardsFromHand.java @@ -30,7 +30,7 @@ public class DiscardCardsFromHand implements EffectAppenderProducer { MultiEffectAppender result = new MultiEffectAppender(); result.addEffectAppender( - CardResolver.resolveCardsInHand(filter, countSource, "_temp", "owner", "Choose cards to discard", environment)); + CardResolver.resolveCardsInHand(filter, countSource, "_temp", "you", "Choose cards to discard", 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/DiscardFromPlay.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DiscardFromPlay.java index f8dc2e5e5..32727862e 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DiscardFromPlay.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DiscardFromPlay.java @@ -23,7 +23,7 @@ public class DiscardFromPlay implements EffectAppenderProducer { public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { FieldUtils.validateAllowedFields(effectObject, "player", "count", "filter", "memorize", "memorizeStackedCards"); - final String player = FieldUtils.getString(effectObject.get("player"), "player", "owner"); + final String player = FieldUtils.getString(effectObject.get("player"), "player", "you"); final PlayerSource discardingPlayer = PlayerResolver.resolvePlayer(player, environment); final ValueSource valueSource = ValueResolver.resolveEvaluator(effectObject.get("count"), 1, environment); final String filter = FieldUtils.getString(effectObject.get("filter"), "filter"); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DiscardStackedCards.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DiscardStackedCards.java index d9124de31..107a9a108 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DiscardStackedCards.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DiscardStackedCards.java @@ -24,7 +24,7 @@ public class DiscardStackedCards implements EffectAppenderProducer { MultiEffectAppender result = new MultiEffectAppender(); result.addEffectAppender( - CardResolver.resolveStackedCards(filter, valueSource, onFilterSource, "_temp", "owner", "Choose cards to discard", environment)); + CardResolver.resolveStackedCards(filter, valueSource, onFilterSource, "_temp", "you", "Choose cards to discard", 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/DiscardTopCardFromDeck.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DiscardTopCardFromDeck.java index a64bc07a3..4cff72ac3 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DiscardTopCardFromDeck.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DiscardTopCardFromDeck.java @@ -19,7 +19,7 @@ public class DiscardTopCardFromDeck implements EffectAppenderProducer { public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { FieldUtils.validateAllowedFields(effectObject, "deck", "count", "forced"); - final String deck = FieldUtils.getString(effectObject.get("deck"), "deck", "owner"); + final String deck = FieldUtils.getString(effectObject.get("deck"), "deck", "you"); final int count = FieldUtils.getInteger(effectObject.get("count"), "count", 1); final boolean forced = FieldUtils.getBoolean(effectObject.get("forced"), "forced"); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DoesNotAddToArcheryTotal.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DoesNotAddToArcheryTotal.java index 3105e0dfb..a54e12d45 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DoesNotAddToArcheryTotal.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DoesNotAddToArcheryTotal.java @@ -32,7 +32,7 @@ public class DoesNotAddToArcheryTotal implements EffectAppenderProducer { result.addEffectAppender( CardResolver.resolveCards(filter, - valueSource, memory, "owner", "Choose cards to make not add to archery total", environment)); + valueSource, memory, "you", "Choose cards to make not add to archery total", 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/DrawCards.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DrawCards.java index b605b16a2..c493951cc 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DrawCards.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DrawCards.java @@ -17,7 +17,7 @@ public class DrawCards implements EffectAppenderProducer { public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { FieldUtils.validateAllowedFields(effectObject, "count", "player"); - final String player = FieldUtils.getString(effectObject.get("player"), "player", "owner"); + final String player = FieldUtils.getString(effectObject.get("player"), "player", "you"); final PlayerSource playerSource = PlayerResolver.resolvePlayer(player, environment); final ValueSource count = ValueResolver.resolveEvaluator(effectObject.get("count"), 1, environment); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Exert.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Exert.java index f08da0323..317a803ef 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Exert.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Exert.java @@ -25,7 +25,7 @@ public class Exert implements EffectAppenderProducer { public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { FieldUtils.validateAllowedFields(effectObject, "player", "count", "times", "filter", "memorize"); - final String player = FieldUtils.getString(effectObject.get("player"), "player", "owner"); + final String player = FieldUtils.getString(effectObject.get("player"), "player", "you"); final ValueSource valueSource = ValueResolver.resolveEvaluator(effectObject.get("count"), 1, environment); final int times = FieldUtils.getInteger(effectObject.get("times"), "times", 1); final String filter = FieldUtils.getString(effectObject.get("filter"), "filter"); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Heal.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Heal.java index 91ccccfad..426462ca3 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Heal.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Heal.java @@ -32,7 +32,7 @@ public class Heal implements EffectAppenderProducer { result.addEffectAppender( CardResolver.resolveCards(filter, (actionContext) -> Filters.canHeal, - count, memory, "owner", "Choose cards to heal", environment)); + count, memory, "you", "Choose cards to heal", 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/ModifyStrength.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ModifyStrength.java index 49f10ebde..c24ebe710 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ModifyStrength.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ModifyStrength.java @@ -35,7 +35,7 @@ public class ModifyStrength implements EffectAppenderProducer { MultiEffectAppender result = new MultiEffectAppender(); result.addEffectAppender( - CardResolver.resolveCards(filter, valueSource, memory, "owner", "Choose cards to modify strength of", environment)); + CardResolver.resolveCards(filter, valueSource, memory, "you", "Choose cards to modify strength of", 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/NegateWound.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/NegateWound.java index 13daf6ecb..5fc91dbbb 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/NegateWound.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/NegateWound.java @@ -32,7 +32,7 @@ public class NegateWound implements EffectAppenderProducer { (actionContext) -> { final WoundCharactersEffect woundEffect = (WoundCharactersEffect) actionContext.getEffect(); return Filters.in(woundEffect.getAffectedCardsMinusPrevented(actionContext.getGame())); - }, new ConstantEvaluator(1), "_temp", "owner", "Choose characters to negate wound to", environment)); + }, new ConstantEvaluator(1), "_temp", "you", "Choose characters to negate wound to", 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/PlayCardFromDiscard.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PlayCardFromDiscard.java index ab2fb9944..d4fbcfafc 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PlayCardFromDiscard.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PlayCardFromDiscard.java @@ -31,7 +31,7 @@ public class PlayCardFromDiscard implements EffectAppenderProducer { result.addEffectAppender( CardResolver.resolveCardsInDiscard(filter, (actionContext) -> Filters.playable(actionContext.getGame()), - new ConstantEvaluator(1), "_temp", "owner", "Choose card to play", environment)); + new ConstantEvaluator(1), "_temp", "you", "Choose card to play", 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/PlayCardFromHand.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PlayCardFromHand.java index 9d7cbfb8a..e45a27615 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PlayCardFromHand.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PlayCardFromHand.java @@ -29,7 +29,7 @@ public class PlayCardFromHand implements EffectAppenderProducer { result.addEffectAppender( CardResolver.resolveCardsInHand(filter, (actionContext) -> Filters.playable(actionContext.getGame()), - new ConstantEvaluator(1), "_temp", "owner", "Choose card to play", environment)); + new ConstantEvaluator(1), "_temp", "you", "Choose card to play", 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/PreventCardEffectAppender.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PreventCardEffectAppender.java index b61cfbc37..cede5580f 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PreventCardEffectAppender.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PreventCardEffectAppender.java @@ -26,7 +26,7 @@ public class PreventCardEffectAppender implements EffectAppenderProducer { result.addEffectAppender( CardResolver.resolveCard(filter, (actionContext) -> Filters.in(((PreventableCardEffect) actionContext.getEffect()).getAffectedCardsMinusPrevented(actionContext.getGame())), - memory, "owner", "Choose card to prevent effect on", environment)); + memory, "you", "Choose card to prevent effect on", 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/PreventWound.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PreventWound.java index 9a1ae073e..9b7c8935a 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PreventWound.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PreventWound.java @@ -34,7 +34,7 @@ public class PreventWound implements EffectAppenderProducer { (actionContext) -> { final WoundCharactersEffect woundEffect = (WoundCharactersEffect) actionContext.getEffect(); return Filters.in(woundEffect.getAffectedCardsMinusPrevented(actionContext.getGame())); - }, new ConstantEvaluator(1), "_temp", "owner", "Choose characters to prevent wound to", environment)); + }, new ConstantEvaluator(1), "_temp", "you", "Choose characters to prevent wound to", 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/PutCardsFromDiscardIntoHand.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromDiscardIntoHand.java index fbf1f0f5a..05ab65524 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromDiscardIntoHand.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromDiscardIntoHand.java @@ -30,7 +30,7 @@ public class PutCardsFromDiscardIntoHand implements EffectAppenderProducer { MultiEffectAppender result = new MultiEffectAppender(); result.addEffectAppender( - CardResolver.resolveCardsInDiscard(filter, valueSource, "_temp", "owner", "Choose cards from discard", environment)); + CardResolver.resolveCardsInDiscard(filter, valueSource, "_temp", "you", "Choose cards from discard", 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/PutCardsFromHandOnBottomOfDeck.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromHandOnBottomOfDeck.java index cc1ae77b9..7d62cbcbd 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromHandOnBottomOfDeck.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromHandOnBottomOfDeck.java @@ -22,7 +22,7 @@ public class PutCardsFromHandOnBottomOfDeck implements EffectAppenderProducer { public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { FieldUtils.validateAllowedFields(effectObject, "player", "count", "filter"); - final String player = FieldUtils.getString(effectObject.get("player"), "player", "owner"); + final String player = FieldUtils.getString(effectObject.get("player"), "player", "you"); final ValueSource valueSource = ValueResolver.resolveEvaluator(effectObject.get("count"), 1, environment); final String filter = FieldUtils.getString(effectObject.get("filter"), "filter", "choose(any)"); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutStackedCardsIntoHand.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutStackedCardsIntoHand.java index 815eeb45d..c0f881c06 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutStackedCardsIntoHand.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutStackedCardsIntoHand.java @@ -28,7 +28,7 @@ public class PutStackedCardsIntoHand implements EffectAppenderProducer { MultiEffectAppender result = new MultiEffectAppender(); result.addEffectAppender( - CardResolver.resolveStackedCards(filter, valueSource, onFilterSource, "_temp", "owner", "Choose cards to discard", environment)); + CardResolver.resolveStackedCards(filter, valueSource, onFilterSource, "_temp", "you", "Choose cards to discard", 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/RemoveBurdens.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/RemoveBurdens.java index d246e372e..3ab147871 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/RemoveBurdens.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/RemoveBurdens.java @@ -18,7 +18,7 @@ public class RemoveBurdens implements EffectAppenderProducer { public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { FieldUtils.validateAllowedFields(effectObject, "player", "amount"); - final String player = FieldUtils.getString(effectObject.get("player"), "player", "owner"); + final String player = FieldUtils.getString(effectObject.get("player"), "player", "you"); final PlayerSource playerSource = PlayerResolver.resolvePlayer(player, environment); final ValueSource valueSource = ValueResolver.resolveEvaluator(effectObject.get("amount"), 1, environment); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ReplaceInSkirmish.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ReplaceInSkirmish.java index 13e7aafd1..ec9914684 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ReplaceInSkirmish.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ReplaceInSkirmish.java @@ -26,7 +26,7 @@ public class ReplaceInSkirmish implements EffectAppenderProducer { MultiEffectAppender result = new MultiEffectAppender(); result.addEffectAppender( - CardResolver.resolveCard(with, "_temp", "owner", "Choose character to replace with in skirmish", environment)); + CardResolver.resolveCard(with, "_temp", "you", "Choose character to replace with in skirmish", 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/RevealTopCardsOfDrawDeck.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/RevealTopCardsOfDrawDeck.java index 12652b505..cbe054d65 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/RevealTopCardsOfDrawDeck.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/RevealTopCardsOfDrawDeck.java @@ -21,7 +21,7 @@ public class RevealTopCardsOfDrawDeck implements EffectAppenderProducer { public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { FieldUtils.validateAllowedFields(effectObject, "deck", "count", "memorize"); - final String deck = FieldUtils.getString(effectObject.get("deck"), "deck", "owner"); + final String deck = FieldUtils.getString(effectObject.get("deck"), "deck", "you"); final int count = FieldUtils.getInteger(effectObject.get("count"), "count", 1); final String memorize = FieldUtils.getString(effectObject.get("memorize"), "memorize"); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Spot.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Spot.java index 0769f3342..9579c8801 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Spot.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Spot.java @@ -17,6 +17,6 @@ public class Spot implements EffectAppenderProducer { final String memorize = FieldUtils.getString(effectObject.get("memorize"), "memorize", "_temp"); return CardResolver.resolveCard( - filter, memorize, "owner", "Choose card to spot", environment); + filter, memorize, "you", "Choose card to spot", environment); } } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/StackCardsFromDiscard.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/StackCardsFromDiscard.java index cb244c2ed..b8dfbfc9a 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/StackCardsFromDiscard.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/StackCardsFromDiscard.java @@ -31,9 +31,9 @@ public class StackCardsFromDiscard implements EffectAppenderProducer { MultiEffectAppender result = new MultiEffectAppender(); result.addEffectAppender( - CardResolver.resolveCard(where, "_temp1", "owner", "Choose card to stack on", environment)); + CardResolver.resolveCard(where, "_temp1", "you", "Choose card to stack on", environment)); result.addEffectAppender( - CardResolver.resolveCardsInDiscard(filter, valueSource, "_temp2", "owner", "Choose cards to stack", environment)); + CardResolver.resolveCardsInDiscard(filter, valueSource, "_temp2", "you", "Choose cards to stack", 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/StackCardsFromHand.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/StackCardsFromHand.java index c6eb9dd43..7752ce3b0 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/StackCardsFromHand.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/StackCardsFromHand.java @@ -31,9 +31,9 @@ public class StackCardsFromHand implements EffectAppenderProducer { MultiEffectAppender result = new MultiEffectAppender(); result.addEffectAppender( - CardResolver.resolveCard(where, "_temp1", "owner", "Choose card to stack on", environment)); + CardResolver.resolveCard(where, "_temp1", "you", "Choose card to stack on", environment)); result.addEffectAppender( - CardResolver.resolveCardsInHand(filter, valueSource, "_temp2", "owner", "Choose cards to stack", environment)); + CardResolver.resolveCardsInHand(filter, valueSource, "_temp2", "you", "Choose cards to stack", 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/StackPlayedEvent.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/StackPlayedEvent.java index 5edf93691..27ac984af 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/StackPlayedEvent.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/StackPlayedEvent.java @@ -24,7 +24,7 @@ public class StackPlayedEvent implements EffectAppenderProducer { MultiEffectAppender result = new MultiEffectAppender(); result.addEffectAppender( - CardResolver.resolveCard(where, "_temp1", "owner", "Choose card to stack on", environment)); + CardResolver.resolveCard(where, "_temp1", "you", "Choose card to stack on", 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/StackTopCardsOfDrawDeck.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/StackTopCardsOfDrawDeck.java index 82847ea2e..033802bc9 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/StackTopCardsOfDrawDeck.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/StackTopCardsOfDrawDeck.java @@ -19,7 +19,7 @@ public class StackTopCardsOfDrawDeck implements EffectAppenderProducer { public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { FieldUtils.validateAllowedFields(effectObject, "deck", "where", "count"); - final String deck = FieldUtils.getString(effectObject.get("deck"), "deck", "owner"); + final String deck = FieldUtils.getString(effectObject.get("deck"), "deck", "you"); final String where = FieldUtils.getString(effectObject.get("where"), "where"); final int count = FieldUtils.getInteger(effectObject.get("count"), "count", 1); @@ -30,7 +30,7 @@ public class StackTopCardsOfDrawDeck implements EffectAppenderProducer { result.addEffectAppender( PlayerResolver.resolvePlayer(deck, deckPlayerMemory, environment)); result.addEffectAppender( - CardResolver.resolveCard(where, cardMemory, "owner", "Choose card to stack on", environment)); + CardResolver.resolveCard(where, cardMemory, "you", "Choose card to stack on", 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/Wound.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Wound.java index c692d66cf..f88900118 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Wound.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Wound.java @@ -35,7 +35,7 @@ public class Wound implements EffectAppenderProducer { result.addEffectAppender( CardResolver.resolveCards(filter, (actionContext) -> Filters.canTakeWounds(actionContext.getSource(), times), - valueSource, memory, "owner", "Choose cards to wound", environment)); + valueSource, memory, "you", "Choose cards to wound", environment)); result.addEffectAppender( new DelayedAppender() { @Override diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/requirement/ControlsSite.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/requirement/ControlsSite.java index a2d2a4e9c..abd776c90 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/requirement/ControlsSite.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/requirement/ControlsSite.java @@ -14,7 +14,7 @@ public class ControlsSite implements RequirementProducer { public Requirement getPlayRequirement(JSONObject object, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { FieldUtils.validateAllowedFields(object, "player"); - final String player = FieldUtils.getString(object.get("player"), "player", "owner"); + final String player = FieldUtils.getString(object.get("player"), "player", "you"); final PlayerSource playerSource = PlayerResolver.resolvePlayer(player, environment); return (actionContext) -> {