From 36beb0b249c28475614f16eb505d3d21fc196a69 Mon Sep 17 00:00:00 2001 From: "marcin.sciesinski" Date: Sat, 10 Aug 2019 10:05:36 -0700 Subject: [PATCH] Sam, Humble Halfling should allow to remove burdens --- .../lotro/cards/set40/shire/Card40_268.java | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/shire/Card40_268.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/shire/Card40_268.java index e2cc62634..68d11cd4d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/shire/Card40_268.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/shire/Card40_268.java @@ -50,9 +50,14 @@ public class Card40_268 extends AbstractCompanion { } @Override - public List getOptionalAfterTriggersFromHand(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { + public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { + if (TriggerConditions.forEachKilled(game, effectResult, Filters.frodo, Filters.ringBearer)) { + OptionalTriggerAction action = new OptionalTriggerAction(self); + action.appendEffect(new MakeRingBearerEffect(self)); + return Collections.singletonList(action); + } if (TriggerConditions.startOfTurn(game, effectResult) - && PlayConditions.canSelfExert(self, game)) { + && PlayConditions.canSelfExert(self, game)) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendCost( new SelfExertEffect(action, self)); @@ -60,16 +65,6 @@ public class Card40_268 extends AbstractCompanion { new RemoveBurdenEffect(playerId, self)); return Collections.singletonList(action); } - return null; - } - - @Override - public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (TriggerConditions.forEachKilled(game, effectResult, Filters.frodo, Filters.ringBearer)) { - OptionalTriggerAction action = new OptionalTriggerAction(self); - action.appendEffect(new MakeRingBearerEffect(self)); - return Collections.singletonList(action); - } return null; }