Main Deck: Dwarven culture

2016-11-30 12:41:51 -05:00
parent 4850b5be04
commit ab1f0a9b0a
19 changed files with 1047 additions and 0 deletions
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_002.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_002.java
@@ -0,0 +1,60 @@
+package com.gempukku.lotro.cards.set30.dwarven;
+
+import com.gempukku.lotro.cards.AbstractCompanion;
+import com.gempukku.lotro.cards.PlayConditions;
+import com.gempukku.lotro.cards.effects.SelfExertEffect;
+import com.gempukku.lotro.cards.effects.ShuffleCardsFromDiscardIntoDeckEffect;
+import com.gempukku.lotro.common.*;
+import com.gempukku.lotro.filters.Filters;
+import com.gempukku.lotro.game.PhysicalCard;
+import com.gempukku.lotro.game.state.LotroGame;
+import com.gempukku.lotro.logic.actions.ActivateCardAction;
+import com.gempukku.lotro.logic.effects.ChooseArbitraryCardsEffect;
+import com.gempukku.lotro.logic.timing.Action;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+
+/**
+ * Set: Main Deck
+ * Side: Free
+ * Culture: Dwarven
+ * Twilight Cost: 3
+ * Type: Companion • Dwarf
+ * Strength: 7
+ * Vitality: 3
+ * Resistance: 6
+ * Game Text: Fellowship: Exert Balin to shuffle a Free Peoples event from your discard pile into your draw deck.
+ */
+public class Card30_002 extends AbstractCompanion{
+    public Card30_002() {
+        super(3, 7, 3, 6, Culture.DWARVEN, Race.DWARF, null, "Balin", "Brother of Dwalin", true);
+    }
+
+    @Override
+    protected List<ActivateCardAction> getExtraInPlayPhaseActions(final String playerId, LotroGame game, PhysicalCard self) {
+        if (PlayConditions.canUseFPCardDuringPhase(game, Phase.FELLOWSHIP, self)
+                && PlayConditions.canExert(self, game, self)) {
+            final ActivateCardAction action = new ActivateCardAction(self);
+            action.appendCost(new SelfExertEffect(action, self));
+
+            Collection<PhysicalCard> discardedFreePeoplesEvents = Filters.filter(game.getGameState().getDiscard(playerId), game.getGameState(), game.getModifiersQuerying(), Side.FREE_PEOPLE, CardType.EVENT);
+
+            action.appendEffect(
+                    new ChooseArbitraryCardsEffect(playerId, "Choose card to shuffle into draw deck", new LinkedList<PhysicalCard>(discardedFreePeoplesEvents), 1, 1) {
+                        @Override
+                        protected void cardsSelected(LotroGame game, Collection<PhysicalCard> selectedCards) {
+                            action.insertEffect(
+                                    new ShuffleCardsFromDiscardIntoDeckEffect(self, playerId, selectedCards));
+                        }
+                    }
+            );
+            return Collections.singletonList(action);
+        }
+        return null;
+    }
+}
+
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_003.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_003.java
@@ -0,0 +1,35 @@
+package com.gempukku.lotro.cards.set30.dwarven;
+
+import com.gempukku.lotro.cards.AbstractEvent;
+import com.gempukku.lotro.cards.actions.PlayEventAction;
+import com.gempukku.lotro.cards.effects.choose.ChooseAndAddUntilEOPStrengthBonusEffect;
+import com.gempukku.lotro.cards.modifiers.evaluator.CardMatchesEvaluator;
+import com.gempukku.lotro.common.*;
+import com.gempukku.lotro.filters.Filters;
+import com.gempukku.lotro.game.PhysicalCard;
+import com.gempukku.lotro.game.state.LotroGame;
+import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect;
+
+
+/**
+ * Set: Main Deck
+ * Side: Free
+ * Culture: Dwarven
+ * Twilight Cost: 1
+ * Type: Event • Skirmish
+ * Game Text: Make a Dwarf strength +3 (or +4 if he bears a [DWARVEN] follower).
+ */
+public class Card30_003 extends AbstractEvent {
+    public Card30_003() {
+        super(Side.FREE_PEOPLE, 1, Culture.DWARVEN, "Battle Fury", Phase.SKIRMISH);
+    }
+
+    @Override
+    public PlayEventAction getPlayCardAction(String playerId, LotroGame game, final PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) {
+        final PlayEventAction action = new PlayEventAction(self);
+           action.appendEffect(
+                new ChooseAndAddUntilEOPStrengthBonusEffect(action, self, playerId,
+                        new CardMatchesEvaluator(3, 4, Filters.hasAttached(CardType.FOLLOWER)), Race.DWARF, Filters.or(CardType.COMPANION, CardType.ALLY)));
+return action;
+    }
+}
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_004.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_004.java
@@ -0,0 +1,59 @@
+package com.gempukku.lotro.cards.set30.dwarven;
+
+import com.gempukku.lotro.cards.AbstractEvent;
+import com.gempukku.lotro.cards.PlayConditions;
+import com.gempukku.lotro.cards.actions.PlayEventAction;
+import com.gempukku.lotro.cards.effects.choose.ChooseAndExertCharactersEffect;
+import com.gempukku.lotro.common.Culture;
+import com.gempukku.lotro.common.Phase;
+import com.gempukku.lotro.common.Race;
+import com.gempukku.lotro.common.Side;
+import com.gempukku.lotro.filters.Filters;
+import com.gempukku.lotro.game.PhysicalCard;
+import com.gempukku.lotro.game.state.LotroGame;
+import com.gempukku.lotro.logic.effects.ChooseActiveCardsEffect;
+import com.gempukku.lotro.logic.effects.WoundCharactersEffect;
+
+import java.util.Collection;
+
+/**
+ * Set: Main Deck
+ * Side: Free
+ * Culture: Dwarven
+ * Twilight Cost: 0
+ * Type: Event
+ * Game Text: Maneuver: Exert a Dwarf character to wound 2 Orcs or to wound 1 Orc twice.
+ */
+public class Card30_004 extends AbstractEvent {
+    public Card30_004() {//
+        super(Side.FREE_PEOPLE, 0, Culture.DWARVEN, "Battle of Azanulbizar", Phase.MANEUVER);
+    }
+
+    @Override
+    public boolean checkPlayRequirements(String playerId, LotroGame game, PhysicalCard self, int withTwilightRemoved, int twilightModifier, boolean ignoreRoamingPenalty, boolean ignoreCheckingDeadPile) {
+        return super.checkPlayRequirements(playerId, game, self, withTwilightRemoved, twilightModifier, ignoreRoamingPenalty, ignoreCheckingDeadPile)
+                && PlayConditions.canExert(self, game, Race.DWARF);
+    }
+
+    @Override
+    public PlayEventAction getPlayCardAction(final String playerId, LotroGame game, final PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) {
+        final PlayEventAction action = new PlayEventAction(self);
+        action.appendCost(
+                new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Race.DWARF));
+        action.appendEffect(
+                new ChooseActiveCardsEffect(self, playerId, "Choose Orc(s) to wound", 1, 2, Race.ORC) {
+                    @Override
+                    protected void cardsSelected(LotroGame game, Collection<PhysicalCard> cards) {
+                        if (cards.size() == 2) {
+                            action.appendEffect(
+                                    new WoundCharactersEffect(self, Filters.in(cards)));
+                        } else {
+                            action.appendEffect(new WoundCharactersEffect(self, Filters.in(cards)));
+                            action.appendEffect(new WoundCharactersEffect(self, Filters.in(cards)));
+                        }
+                    }
+                }
+        );
+        return action;
+    }
+}
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_005.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_005.java
@@ -0,0 +1,67 @@
+package com.gempukku.lotro.cards.set30.dwarven;
+
+import com.gempukku.lotro.cards.AbstractFollower;
+import com.gempukku.lotro.cards.PlayConditions;
+import com.gempukku.lotro.cards.TriggerConditions;
+import com.gempukku.lotro.cards.effects.ExertCharactersEffect;
+import com.gempukku.lotro.cards.effects.choose.ChooseAndDiscardCardsFromPlayEffect;
+import com.gempukku.lotro.cards.effects.choose.ChooseAndExertCharactersEffect;
+import com.gempukku.lotro.common.CardType;
+import com.gempukku.lotro.common.Culture;
+import com.gempukku.lotro.common.Race;
+import com.gempukku.lotro.common.Side;
+import com.gempukku.lotro.filters.Filters;
+import com.gempukku.lotro.game.PhysicalCard;
+import com.gempukku.lotro.game.state.LotroGame;
+import com.gempukku.lotro.logic.actions.OptionalTriggerAction;
+import com.gempukku.lotro.logic.timing.Action;
+import com.gempukku.lotro.logic.timing.Effect;
+import com.gempukku.lotro.logic.timing.EffectResult;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Set: Main Deck
+ * Side: Free
+ * Culture: Dwarven
+ * Twilight Cost: 1
+ * Type: Follower • Dwarf
+ * Strength: +1
+ * Game Text: Aid - Exert a companion. (At the start of the maneuver phase, you may exert a companion
+ * to transfer this to a companion.)
+ * Each time bearer wins a fierce skirmish, you may discard a condition from play.
+ */
+public class Card30_005 extends AbstractFollower {
+    public Card30_005() {
+        super(Side.FREE_PEOPLE, 1, 1, 0, 0, Culture.DWARVEN, "Bifur", "Inarticulate", true);
+    }
+	
+	@Override
+	public Race getRace() {
+		return Race.DWARF;
+	}
+	
+    @Override
+    protected boolean canPayAidCost(LotroGame game, PhysicalCard self) {
+        return PlayConditions.canExert(self, game, CardType.COMPANION);
+    }
+
+    @Override
+    protected Effect getAidCost(LotroGame game, Action action, PhysicalCard self) {
+        return new ChooseAndExertCharactersEffect(action, self.getOwner(), 1, 1, CardType.COMPANION);
+	}
+
+
+    @Override
+    protected List<OptionalTriggerAction> getExtraOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) {
+        if (TriggerConditions.winsSkirmish(game, effectResult, Filters.hasAttached(self))//
+				&& game.getGameState().isFierceSkirmishes()) {
+            OptionalTriggerAction action = new OptionalTriggerAction(self);
+            action.appendEffect(
+                    new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, CardType.CONDITION));
+            return Collections.singletonList(action);
+        }
+        return null;
+    }
+}
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_006.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_006.java
@@ -0,0 +1,67 @@
+package com.gempukku.lotro.cards.set30.dwarven;
+
+import com.gempukku.lotro.cards.AbstractFollower;
+import com.gempukku.lotro.cards.PlayConditions;
+import com.gempukku.lotro.cards.TriggerConditions;
+import com.gempukku.lotro.cards.effects.AddBurdenEffect;
+import com.gempukku.lotro.cards.effects.PreventCardEffect;
+import com.gempukku.lotro.cards.effects.TransferToSupportEffect;
+import com.gempukku.lotro.common.Culture;
+import com.gempukku.lotro.common.Race;
+import com.gempukku.lotro.common.Side;
+import com.gempukku.lotro.filters.Filters;
+import com.gempukku.lotro.game.PhysicalCard;
+import com.gempukku.lotro.game.state.LotroGame;
+import com.gempukku.lotro.logic.actions.ActivateCardAction;
+import com.gempukku.lotro.logic.effects.WoundCharactersEffect;
+import com.gempukku.lotro.logic.timing.Action;
+import com.gempukku.lotro.logic.timing.Effect;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Set: Main Deck
+ * Side: Free
+ * Culture: Dwarven
+ * Twilight Cost: 2
+ * Type: Follower • Dwarf
+ * Strength: +1
+ * Game Text: Aid - Add a doubt. (At the start of the maneuver phase, you may add a doubt to transfer this
+ * to a companion.)
+ * Response: If bearer is about to take a wound, transfer Bofur to your support area
+ * to prevent that wound.
+ */
+public class Card30_006 extends AbstractFollower {
+    public Card30_006() {
+        super(Side.FREE_PEOPLE, 2, 1, 0, 0, Culture.DWARVEN, "Bofur", "Encouraging Fellow", true);
+    }
+	
+	@Override
+	public Race getRace() {
+		return Race.DWARF;
+	}
+	
+    @Override
+    protected boolean canPayAidCost(LotroGame game, PhysicalCard self) {
+        return true;
+    }
+
+    @Override
+    protected Effect getAidCost(LotroGame game, Action action, PhysicalCard self) {
+        return new AddBurdenEffect(self.getOwner(), self, 1);
+    }
+
+    @Override
+    public List<? extends ActivateCardAction> getOptionalInPlayBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) {
+        if (TriggerConditions.isGettingWounded(effect, game, Filters.hasAttached(self))) {
+            ActivateCardAction action = new ActivateCardAction(self);
+            action.appendCost(
+                    new TransferToSupportEffect(self));
+            action.appendEffect(
+                    new PreventCardEffect((WoundCharactersEffect) effect, self.getAttachedTo()));
+            return Collections.singletonList(action);
+        }
+        return null;
+    }
+}
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_007.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_007.java
@@ -0,0 +1,54 @@
+package com.gempukku.lotro.cards.set30.dwarven;
+
+import com.gempukku.lotro.cards.AbstractFollower;
+import com.gempukku.lotro.cards.PlayConditions;
+import com.gempukku.lotro.cards.effects.choose.ChooseAndExertCharactersEffect;
+import com.gempukku.lotro.common.*;
+import com.gempukku.lotro.filters.Filters;
+import com.gempukku.lotro.game.PhysicalCard;
+import com.gempukku.lotro.game.state.LotroGame;
+import com.gempukku.lotro.logic.modifiers.KeywordModifier;
+import com.gempukku.lotro.logic.modifiers.Modifier;
+import com.gempukku.lotro.logic.timing.Action;
+import com.gempukku.lotro.logic.timing.Effect;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * Set: Main Deck
+ * Side: Free
+ * Culture: Dwarven
+ * Twilight Cost: 3
+ * Type: Follower • Dwarf
+ * Strength: +2
+ * Game Text: Aid - Exert a [DWARVEN] companion. (At the start of the maneuver phase, you may exert a [DWARVEN] companion
+ * to transfer this to a companion.)
+ */
+public class Card30_007 extends AbstractFollower {
+    public Card30_007() {
+        super(Side.FREE_PEOPLE, 3, 2, 0, 0, Culture.DWARVEN, "Bombur", "Chief Cook", true);
+    }
+	
+	@Override
+	public Race getRace() {
+		return Race.DWARF;
+	}
+	
+    @Override
+    protected boolean canPayAidCost(LotroGame game, PhysicalCard self) {
+        return PlayConditions.canExert(self, game, Culture.DWARVEN, CardType.COMPANION);
+    }
+
+    @Override
+    protected Effect getAidCost(LotroGame game, Action action, PhysicalCard self) {
+        return new ChooseAndExertCharactersEffect(action, self.getOwner(), 1, 1, Culture.DWARVEN, CardType.COMPANION);
+    }
+	
+	@Override
+    protected List<? extends Modifier> getNonBasicStatsModifiers(PhysicalCard self) {
+        return Collections.singletonList(
+                new KeywordModifier(self, Filters.hasAttached(self), Keyword.DAMAGE));
+	}
+}
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_008.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_008.java
@@ -0,0 +1,56 @@
+package com.gempukku.lotro.cards.set30.dwarven;
+
+import com.gempukku.lotro.cards.AbstractFollower;
+import com.gempukku.lotro.cards.PlayConditions;
+import com.gempukku.lotro.cards.modifiers.OverwhelmedByMultiplierModifier;
+import com.gempukku.lotro.common.Culture;
+import com.gempukku.lotro.common.Race;
+import com.gempukku.lotro.common.Side;
+import com.gempukku.lotro.filters.Filters;
+import com.gempukku.lotro.game.PhysicalCard;
+import com.gempukku.lotro.game.state.LotroGame;
+import com.gempukku.lotro.logic.effects.AddTwilightEffect;
+import com.gempukku.lotro.cards.effects.choose.ChooseAndExertCharactersEffect;
+import com.gempukku.lotro.logic.modifiers.Modifier;
+import com.gempukku.lotro.logic.timing.Action;
+import com.gempukku.lotro.logic.timing.Effect;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Set: Main Deck
+ * Side: Free
+ * Culture: Dwarven
+ * Twilight Cost: 1
+ * Type: Follower • Dwarf
+ * Strength: +1
+ * Game Text: Aid - Exert Bilbo. (At the start of the maneuver phase, you may exert Bilbo to transfer this to a companion.)
+ * Bearer may not be overwhelmed unless his or her strength is tripled.
+ */
+public class Card30_008 extends AbstractFollower {
+    public Card30_008() {
+        super(Side.FREE_PEOPLE, 2, 1, 0, 0, Culture.DWARVEN, "Dori", "Really a Decent Fellow", true);
+    }
+	
+	@Override
+	public Race getRace() {
+		return Race.DWARF;
+	}
+		
+    @Override
+    protected boolean canPayAidCost(LotroGame game, PhysicalCard self) {
+        return PlayConditions.canExert(self, game, Filters.name("Bilbo"));
+    }
+
+    @Override
+    protected Effect getAidCost(LotroGame game, Action action, PhysicalCard self) {
+        return new ChooseAndExertCharactersEffect(action, self.getOwner(), 1, 1, Filters.name("Bilbo"));
+	}
+
+    @Override
+    protected List<? extends Modifier> getNonBasicStatsModifiers(PhysicalCard self) {
+        return Collections.singletonList(
+                new OverwhelmedByMultiplierModifier(self, Filters.hasAttached(self), 3));
+    }
+}
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_009.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_009.java
@@ -0,0 +1,47 @@
+package com.gempukku.lotro.cards.set30.dwarven;
+
+import com.gempukku.lotro.cards.AbstractCompanion;
+import com.gempukku.lotro.cards.PlayConditions;
+import com.gempukku.lotro.cards.effects.AddUntilStartOfPhaseModifierEffect;
+import com.gempukku.lotro.cards.effects.SelfExertEffect;
+import com.gempukku.lotro.common.*;
+import com.gempukku.lotro.game.PhysicalCard;
+import com.gempukku.lotro.game.state.LotroGame;
+import com.gempukku.lotro.logic.actions.ActivateCardAction;
+import com.gempukku.lotro.logic.modifiers.KeywordModifier;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Set: Main Deck
+ * Side: Free
+ * Culture: Dwarven
+ * Twilight Cost: 3
+ * Type: Companion • Dwarf
+ * Strength: 7
+ * Vitality: 3
+ * Resistance: 6
+ * Game Text: Damage +1. Maneuver: Exert Dwalin to make him defender +1 until the regroup phase.
+ */
+public class Card30_009 extends AbstractCompanion {
+    public Card30_009() {
+        super(3, 7, 3, 6, Culture.DWARVEN, Race.DWARF, null, "Dwalin", "Brother of Balin", true);
+        addKeyword(Keyword.DAMAGE, 1);
+    }
+
+    @Override
+    protected List<ActivateCardAction> getExtraInPlayPhaseActions(String playerId, LotroGame game, PhysicalCard self) {
+        if (PlayConditions.canUseFPCardDuringPhase(game, Phase.MANEUVER, self)
+                && PlayConditions.canExert(self, game, self)) {
+            ActivateCardAction action = new ActivateCardAction(self);
+            action.appendCost(
+                    new SelfExertEffect(action, self));
+            action.appendEffect(
+                    new AddUntilStartOfPhaseModifierEffect(
+                            new KeywordModifier(self, self, Keyword.DEFENDER), Phase.REGROUP));
+            return Collections.singletonList(action);
+        }
+        return null;
+    }
+}
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_010.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_010.java
@@ -0,0 +1,62 @@
+package com.gempukku.lotro.cards.set30.dwarven;
+
+import com.gempukku.lotro.cards.AbstractCompanion;
+import com.gempukku.lotro.cards.PlayConditions;
+import com.gempukku.lotro.cards.TriggerConditions;
+import com.gempukku.lotro.cards.effects.PreventCardEffect;
+import com.gempukku.lotro.cards.effects.SelfExertEffect;
+import com.gempukku.lotro.common.*;
+import com.gempukku.lotro.filters.Filters;
+import com.gempukku.lotro.game.PhysicalCard;
+import com.gempukku.lotro.game.state.LotroGame;
+import com.gempukku.lotro.logic.actions.ActivateCardAction;
+import com.gempukku.lotro.logic.effects.AddTwilightEffect;
+import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect;
+import com.gempukku.lotro.logic.effects.WoundCharactersEffect;
+import com.gempukku.lotro.logic.timing.Effect;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Set: Main Deck
+ * Side: Free
+ * Culture: Dwarven
+ * Twilight Cost: 2
+ * Type: Companion • Dwarf
+ * Strength: 6
+ * Vitality: 3
+ * Resistance: 6
+ * Game Text: Damage +1 Response: If an [DWARVEN] companion is about to take a wound, exert Fili and add (1)
+ * to prevent that wound.
+ */
+public class Card30_010 extends AbstractCompanion {
+    public Card30_010() {
+        super(2, 6, 3, 6, Culture.DWARVEN, Race.DWARF, null, "Fili", "Brother of Kili", true);
+        addKeyword(Keyword.DAMAGE, 1); 
+    }
+
+    @Override
+    public List<? extends ActivateCardAction> getOptionalInPlayBeforeActions(String playerId, LotroGame game, Effect effect, PhysicalCard self) {
+        if (TriggerConditions.isGettingWounded(effect, game, Culture.DWARVEN, CardType.COMPANION)
+                && PlayConditions.canExert(self, game, self)) {
+            final WoundCharactersEffect woundEffects = (WoundCharactersEffect) effect;
+
+            final ActivateCardAction action = new ActivateCardAction(self);
+            action.appendCost(
+                    new SelfExertEffect(action, self));
+            action.appendCost(
+                    new AddTwilightEffect(self, 1));
+            action.appendEffect(
+                    new ChooseActiveCardEffect(self, playerId, "Choose a companion", Filters.in(woundEffects.getAffectedCardsMinusPrevented(game)), Culture.DWARVEN, CardType.COMPANION) {
+                        @Override
+                        protected void cardSelected(LotroGame game, PhysicalCard card) {
+                            action.insertEffect(
+                                    new PreventCardEffect(woundEffects, card));
+                        }
+                    });
+            return Collections.singletonList(action);
+        }
+        return null;
+    }
+}
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_011.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_011.java
@@ -0,0 +1,46 @@
+package com.gempukku.lotro.cards.set30.dwarven;
+
+import com.gempukku.lotro.cards.AbstractCompanion;
+import com.gempukku.lotro.cards.PlayConditions;
+import com.gempukku.lotro.cards.effects.AddUntilEndOfPhaseModifierEffect;
+import com.gempukku.lotro.cards.effects.SelfExertEffect;
+import com.gempukku.lotro.common.*;
+import com.gempukku.lotro.game.PhysicalCard;
+import com.gempukku.lotro.game.state.LotroGame;
+import com.gempukku.lotro.logic.actions.ActivateCardAction;
+import com.gempukku.lotro.logic.modifiers.StrengthModifier;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Set: Main Deck
+ * Side: Free
+ * Culture: Dwarven
+ * Twilight Cost: 2
+ * Type: Companion • Dwarf
+ * Strength: 6
+ * Vitality: 3
+ * Resistance: 6
+ * Game Text: Damage +1. Skirmish: Exert Gloin to make him strength +2.
+ */
+public class Card30_011 extends AbstractCompanion {
+    public Card30_011() {
+        super(2, 6, 3, 6, Culture.DWARVEN, Race.DWARF, null, "Gloin", "Father of Gimli", true);
+        addKeyword(Keyword.DAMAGE, 1);
+    }
+
+    @Override
+    protected List<ActivateCardAction> getExtraInPlayPhaseActions(String playerId, LotroGame game, PhysicalCard self) {
+        if (PlayConditions.canUseFPCardDuringPhase(game, Phase.SKIRMISH, self)
+                && PlayConditions.canExert(self, game, self)) {
+            ActivateCardAction action = new ActivateCardAction(self);
+
+            action.appendCost(new SelfExertEffect(action, self));
+            action.appendEffect(new AddUntilEndOfPhaseModifierEffect(new StrengthModifier(self, self, 3)));
+
+            return Collections.singletonList(action);
+        }
+        return null;
+    }
+}
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_012.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_012.java
@@ -0,0 +1,50 @@
+package com.gempukku.lotro.cards.set30.dwarven;
+
+import com.gempukku.lotro.cards.AbstractCompanion;
+import com.gempukku.lotro.cards.PlayConditions;
+import com.gempukku.lotro.cards.effects.AddUntilEndOfPhaseModifierEffect;
+import com.gempukku.lotro.cards.effects.SelfExertEffect;
+import com.gempukku.lotro.cards.modifiers.DoesNotAddToArcheryTotalModifier;
+import com.gempukku.lotro.common.*;
+import com.gempukku.lotro.game.PhysicalCard;
+import com.gempukku.lotro.game.state.LotroGame;
+import com.gempukku.lotro.logic.actions.ActivateCardAction;
+import com.gempukku.lotro.logic.effects.ChooseAndWoundCharactersEffect;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Set: Main Deck
+ * Side: Free
+ * Culture: Dwarven
+ * Twilight Cost: 2
+ * Type: Companion • Dwarf
+ * Strength: 6
+ * Vitality: 3
+ * Resistance: 6
+ * Game Text: Archer. Archery: Exert Kili to wound a minion; Kili does not add to the fellowship archery total.
+ */
+public class Card30_012 extends AbstractCompanion {
+    public Card30_012() {
+        super(2, 6, 3, 6, Culture.DWARVEN, Race.DWARF, null, "Kili", "Brother of Fili", true);
+        addKeyword(Keyword.ARCHER);
+    }
+
+    @Override
+    protected List<ActivateCardAction> getExtraInPlayPhaseActions(final String playerId, LotroGame game, final PhysicalCard self) {
+        if (PlayConditions.canUseFPCardDuringPhase(game, Phase.ARCHERY, self)
+                && PlayConditions.canExert(self, game, self)) {
+            final ActivateCardAction action = new ActivateCardAction(self);
+            action.appendCost(new SelfExertEffect(action, self));
+            action.appendEffect(
+                    new AddUntilEndOfPhaseModifierEffect(
+                            new DoesNotAddToArcheryTotalModifier(self, self)));
+            action.appendEffect(
+                    new ChooseAndWoundCharactersEffect(action, playerId, 1, 1, CardType.MINION));
+
+            return Collections.singletonList(action);
+        }
+        return null;
+    }
+}
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_013.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_013.java
@@ -0,0 +1,51 @@
+package com.gempukku.lotro.cards.set30.dwarven;
+
+import com.gempukku.lotro.cards.AbstractEvent;
+import com.gempukku.lotro.cards.actions.PlayEventAction;
+import com.gempukku.lotro.common.*;
+import com.gempukku.lotro.filters.Filters;
+import com.gempukku.lotro.game.PhysicalCard;
+import com.gempukku.lotro.game.state.LotroGame;
+import com.gempukku.lotro.logic.decisions.MultipleChoiceAwaitingDecision;
+import com.gempukku.lotro.logic.effects.ChooseAndHealCharactersEffect;
+import com.gempukku.lotro.logic.effects.PlayoutDecisionEffect;
+
+
+/**
+ * Set: Main Deck
+ * Side: Free
+ * Culture: Dwarven
+ * Twilight Cost: 1
+ * Type: Event
+ * Game Text: Maneuver: Heal a companion (or 2 Dwarf companions if you spot Elrond).
+ */
+public class Card30_013 extends AbstractEvent {
+    public Card30_013() {
+        super(Side.FREE_PEOPLE, 1, Culture.DWARVEN, "Lore of Imladris", Phase.MANEUVER);
+    }
+
+    @Override
+	public PlayEventAction getPlayCardAction(final String playerId, LotroGame game, final PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) {
+		final PlayEventAction action = new PlayEventAction(self);
+		if (Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.name("Elrond")))
+            action.appendEffect(
+                    new PlayoutDecisionEffect(playerId,
+							new MultipleChoiceAwaitingDecision(1, "Do you want to spot Elrond to heal 2 Dwarf companions?", new String[]{"Yes", "No"}) {
+								@Override
+                                protected void validDecisionMade(int index, String result) {
+                                    if (result.equals("Yes")) {
+                                        action.appendEffect(
+                                                new ChooseAndHealCharactersEffect(action, playerId, 0, 2, CardType.COMPANION, Race.DWARF));
+                                    } else {
+                                        action.appendEffect(
+                                                new ChooseAndHealCharactersEffect(action, playerId, CardType.COMPANION));
+                                    }
+                                }
+                            }));
+        else
+            action.appendEffect(
+                    new ChooseAndHealCharactersEffect(action, playerId, CardType.COMPANION));
+
+        return action;
+    }
+}
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_014.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_014.java
@@ -0,0 +1,44 @@
+package com.gempukku.lotro.cards.set30.dwarven;
+
+import com.gempukku.lotro.cards.AbstractEvent;
+import com.gempukku.lotro.cards.PlayConditions;
+import com.gempukku.lotro.cards.actions.PlayEventAction;
+import com.gempukku.lotro.cards.effects.AddUntilEndOfPhaseModifierEffect;
+import com.gempukku.lotro.cards.effects.choose.ChooseAndExertCharactersEffect;
+import com.gempukku.lotro.common.*;
+import com.gempukku.lotro.filters.Filters;
+import com.gempukku.lotro.game.PhysicalCard;
+import com.gempukku.lotro.game.state.LotroGame;
+import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect;
+import com.gempukku.lotro.logic.modifiers.StrengthModifier;
+
+/**
+ * Set: Main Deck
+ * Side: Free
+ * Culture: Dwarven
+ * Twilight Cost: 0
+ * Type: Event
+ * Game Text: Skirmish: Exert a companion (except Bilbo) to make Bilbo strength +3.
+ */
+public class Card30_014 extends AbstractEvent {
+    public Card30_014() {
+        super(Side.FREE_PEOPLE, 0, Culture.DWARVEN, "Noble Intentions", Phase.SKIRMISH);
+    }
+
+    @Override
+    public boolean checkPlayRequirements(String playerId, LotroGame game, PhysicalCard self, int withTwilightRemoved, int twilightModifier, boolean ignoreRoamingPenalty, boolean ignoreCheckingDeadPile) {
+        return super.checkPlayRequirements(playerId, game, self, withTwilightRemoved, twilightModifier, ignoreRoamingPenalty, ignoreCheckingDeadPile)
+                && PlayConditions.canExert(self, game, CardType.COMPANION, Filters.not(Filters.name("Bilbo")));
+    }
+
+    @Override
+    public PlayEventAction getPlayCardAction(String playerId, LotroGame game, final PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) {
+        final PlayEventAction action = new PlayEventAction(self);
+        action.appendCost(
+                new ChooseAndExertCharactersEffect(action, playerId, 1, 1, CardType.COMPANION, Filters.not(Filters.name("Bilbo"))));
+         action.appendEffect(
+                new AddUntilEndOfPhaseModifierEffect(
+						new StrengthModifier(self, Filters.name("Bilbo"), 5)));
+        return action;
+    }
+}
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_015.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_015.java
@@ -0,0 +1,51 @@
+package com.gempukku.lotro.cards.set30.dwarven;
+
+import com.gempukku.lotro.cards.AbstractCompanion;
+import com.gempukku.lotro.cards.PlayConditions;
+import com.gempukku.lotro.cards.effects.SelfExertEffect;
+import com.gempukku.lotro.cards.effects.choose.ChooseAndDiscardCardsFromPlayEffect;
+import com.gempukku.lotro.common.*;
+import com.gempukku.lotro.filters.Filters;
+import com.gempukku.lotro.game.PhysicalCard;
+import com.gempukku.lotro.game.state.LotroGame;
+import com.gempukku.lotro.logic.actions.ActivateCardAction;
+
+import java.util.Collections;
+import java.util.List;
+ 
+ /**
+ * Set: Main Deck
+ * Side: Free
+ * Culture: Dwarven
+ * Twilight Cost: 3
+ * Type: Companion • Dwarf
+ * Strength: 7
+ * Vitality: 3
+ * Resistance: 6
+ * Game Text: Skirmish: Exert Nori twice and discard a [DWARVEN] follower to discard a possession
+ */
+public class Card30_015 extends AbstractCompanion {
+    public Card30_015() {
+        super(3, 7, 3, 6, Culture.DWARVEN, Race.DWARF, null, "Nori", "Of the Blue Mountains", true);
+    }
+
+
+    @Override
+    protected List<ActivateCardAction> getExtraInPlayPhaseActions(String playerId, LotroGame game, PhysicalCard self) {
+        if (PlayConditions.canUseFPCardDuringPhase(game, Phase.SKIRMISH, self)
+                && PlayConditions.canExert(self, game, 2, self)
+				&& PlayConditions.canDiscardFromPlay(self, game, Culture.DWARVEN, CardType.FOLLOWER)) {
+            ActivateCardAction action = new ActivateCardAction(self);
+            action.appendCost(
+                    new SelfExertEffect(action, self));
+			action.appendCost(
+                    new SelfExertEffect(action, self));
+			action.appendCost(
+					new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, Culture.DWARVEN, CardType.FOLLOWER));
+            action.appendEffect(
+                    new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, CardType.POSSESSION));
+            return Collections.singletonList(action);
+        }
+        return null;
+    }
+}
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_016.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_016.java
@@ -0,0 +1,70 @@
+package com.gempukku.lotro.cards.set30.dwarven;
+
+import com.gempukku.lotro.cards.AbstractFollower;
+import com.gempukku.lotro.cards.PlayConditions;
+import com.gempukku.lotro.cards.TriggerConditions;
+import com.gempukku.lotro.cards.effects.AddBurdenEffect;
+import com.gempukku.lotro.common.CardType;
+import com.gempukku.lotro.common.Culture;
+import com.gempukku.lotro.common.Keyword;
+import com.gempukku.lotro.common.Race;
+import com.gempukku.lotro.common.Side;
+import com.gempukku.lotro.filters.Filter;
+import com.gempukku.lotro.filters.Filters;
+import com.gempukku.lotro.game.PhysicalCard;
+import com.gempukku.lotro.game.state.LotroGame;
+import com.gempukku.lotro.logic.actions.RequiredTriggerAction;
+import com.gempukku.lotro.logic.effects.ChooseAndDiscardCardsFromHandEffect;
+import com.gempukku.lotro.logic.effects.HealCharactersEffect;
+import com.gempukku.lotro.logic.timing.Action;
+import com.gempukku.lotro.logic.timing.Effect;
+import com.gempukku.lotro.logic.timing.EffectResult;
+
+import java.util.Collections;
+import java.util.List;
+
+ /**
+ * Set: Main Deck
+ * Side: Free
+ * Culture: Dwarven
+ * Twilight Cost: 1
+ * Type: Follower
+ * Strength: +1
+ * Game Text: Aid - Discard a [DWARVEN] card from hand. (At the start of the maneuver phase, you may discard a 
+ * a [DWARVEN] card from hand to transfer this to a companion.) When you transfer Oin, heal bearer.
+ */
+public class Card30_016 extends AbstractFollower {
+    public Card30_016() {
+        super(Side.FREE_PEOPLE, 1, 1, 0, 0, Culture.DWARVEN, "Oin", "Knowledgeable Healer", true);
+    }
+	
+	@Override
+	public Race getRace() {
+		return Race.DWARF;
+	}
+	
+    @Override
+    protected boolean canPayAidCost(LotroGame game, PhysicalCard self) {
+		if (PlayConditions.canDiscardFromHand(game, self.getOwner(), 1, Culture.DWARVEN)) {
+			return true;
+		} else {
+			return false;
+		}
+    }
+
+    @Override
+    protected Effect getAidCost(LotroGame game, Action action, PhysicalCard self) {
+        return new ChooseAndDiscardCardsFromHandEffect(action, self.getOwner(), false, 1, 1, Culture.DWARVEN);
+    }
+
+    @Override
+    public List<RequiredTriggerAction> getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) {
+        if (TriggerConditions.transferredCard(game, effectResult, self, null, CardType.COMPANION)) {
+            RequiredTriggerAction action = new RequiredTriggerAction(self);
+            action.appendEffect(
+                    new HealCharactersEffect(self, Filters.hasAttached(self)));
+            return Collections.singletonList(action);
+        }
+        return null;
+    }
+}
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_017.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_017.java
@@ -0,0 +1,55 @@
+package com.gempukku.lotro.cards.set30.dwarven;
+
+import com.gempukku.lotro.cards.AbstractAttachableFPPossession;
+import com.gempukku.lotro.cards.TriggerConditions;
+import com.gempukku.lotro.common.*;
+import com.gempukku.lotro.filters.Filter;
+import com.gempukku.lotro.filters.Filters;
+import com.gempukku.lotro.game.PhysicalCard;
+import com.gempukku.lotro.game.state.LotroGame;
+import com.gempukku.lotro.logic.actions.OptionalTriggerAction;
+import com.gempukku.lotro.logic.effects.ChooseAndWoundCharactersEffect;
+import com.gempukku.lotro.logic.modifiers.KeywordModifier;
+import com.gempukku.lotro.logic.modifiers.Modifier;
+import com.gempukku.lotro.logic.timing.EffectResult;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Set: Main Deck
+ * Side: Free
+ * Culture: Dwarven
+ * Twilight Cost: 2
+ * Type: Artifact • Hand Weapon
+ * Strength: +2
+ * Game Text: Bearer must be Thorin. He is damage +1. Each time Thorin wins a skirmish, you may wound an Orc.
+ */
+public class Card30_017 extends AbstractAttachableFPPossession {
+    public Card30_017() {
+        super(2, 2, 0, Culture.DWARVEN, CardType.ARTIFACT, PossessionClass.HAND_WEAPON, "Orcrist", null, true);
+    }
+
+    @Override
+    protected Filter getValidTargetFilter(String playerId, LotroGame game, PhysicalCard self) {
+        return Filters.name("Thorin");
+    }
+
+    @Override
+    protected List<? extends Modifier> getNonBasicStatsModifiers(PhysicalCard self) {
+        return Collections.singletonList(new KeywordModifier(self, Filters.hasAttached(self), Keyword.DAMAGE));
+    }
+
+    @Override
+    public List<OptionalTriggerAction> getOptionalAfterTriggers(final String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) {
+        if (TriggerConditions.winsSkirmish(game, effectResult, self.getAttachedTo())) {
+            final OptionalTriggerAction action = new OptionalTriggerAction(self);
+            action.appendEffect(
+                    new ChooseAndWoundCharactersEffect(action, playerId, 1, 1, Race.ORC));
+
+            return Collections.singletonList(action);
+        }
+
+        return null;
+    }
+}
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_018.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_018.java
@@ -0,0 +1,68 @@
+package com.gempukku.lotro.cards.set30.dwarven;
+
+import com.gempukku.lotro.cards.AbstractFollower;
+import com.gempukku.lotro.cards.PlayConditions;
+import com.gempukku.lotro.cards.TriggerConditions;
+import com.gempukku.lotro.common.CardType;
+import com.gempukku.lotro.common.Culture;
+import com.gempukku.lotro.common.Race;
+import com.gempukku.lotro.common.Side;
+import com.gempukku.lotro.filters.Filter;
+import com.gempukku.lotro.filters.Filters;
+import com.gempukku.lotro.game.PhysicalCard;
+import com.gempukku.lotro.game.state.LotroGame;
+import com.gempukku.lotro.logic.actions.OptionalTriggerAction;
+import com.gempukku.lotro.logic.effects.ChooseAndDiscardCardsFromHandEffect;
+import com.gempukku.lotro.logic.effects.DrawCardsEffect;
+import com.gempukku.lotro.logic.timing.Action;
+import com.gempukku.lotro.logic.timing.Effect;
+import com.gempukku.lotro.logic.timing.EffectResult;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Set: Main Deck
+ * Side: Free
+ * Culture: Dwarven
+ * Twilight Cost: 1
+ * Type: Follower • Dwarf
+ * Strength: +1
+ * Game Text: Aid - Discard a [DWARVEN] card from hand. (At the start of the maneuver phase, you may discard a [DWARVEN]
+ * card from hand to transfer this to a companion.) When you transfer Ori to Balin, you may draw 3 cards.
+ */
+public class Card30_018 extends AbstractFollower {
+    public Card30_018() {
+        super(Side.FREE_PEOPLE, 1, 1, 0, 0, Culture.DWARVEN, "Ori", "Dwarven Chronicler", true);
+    }
+	
+	@Override
+	public Race getRace() {
+		return Race.DWARF;
+	}
+	
+    @Override
+    protected boolean canPayAidCost(LotroGame game, PhysicalCard self) {
+		if (PlayConditions.canDiscardFromHand(game, self.getOwner(), 1, Culture.DWARVEN)) {
+			return true;
+		} else {
+			return false;
+		}
+    }
+
+    @Override
+    protected Effect getAidCost(LotroGame game, Action action, PhysicalCard self) {
+        return new ChooseAndDiscardCardsFromHandEffect(action, self.getOwner(), false, 1, 1, Culture.DWARVEN);
+    }
+
+    @Override
+    protected List<OptionalTriggerAction> getExtraOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) {
+        if (TriggerConditions.transferredCard(game, effectResult, self, null, Filters.name("Balin"))) {
+            OptionalTriggerAction action = new OptionalTriggerAction(self);
+            action.appendEffect(
+                    new DrawCardsEffect(action, playerId, 3));
+            return Collections.singletonList(action);
+        }
+        return null;
+    }
+}
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_019.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_019.java
@@ -0,0 +1,69 @@
+package com.gempukku.lotro.cards.set30.dwarven;
+
+import com.gempukku.lotro.cards.AbstractCompanion;
+import com.gempukku.lotro.cards.PlayConditions;
+import com.gempukku.lotro.cards.effects.PutCardFromDiscardOnBottomOfDeckEffect;
+import com.gempukku.lotro.cards.effects.choose.ChooseAndDiscardCardsFromPlayEffect;
+import com.gempukku.lotro.cards.modifiers.evaluator.CountActiveEvaluator;
+import com.gempukku.lotro.common.*;
+import com.gempukku.lotro.filters.Filters;
+import com.gempukku.lotro.game.PhysicalCard;
+import com.gempukku.lotro.game.state.GameState;
+import com.gempukku.lotro.game.state.LotroGame;
+import com.gempukku.lotro.logic.actions.ActivateCardAction;
+import com.gempukku.lotro.logic.effects.ChooseArbitraryCardsEffect;
+import com.gempukku.lotro.logic.modifiers.Modifier;
+import com.gempukku.lotro.logic.modifiers.ModifiersQuerying;
+import com.gempukku.lotro.logic.modifiers.StrengthModifier;
+import com.gempukku.lotro.logic.timing.EffectResult;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Set: Main Deck
+ * Side: Free
+ * Culture: Dwarven
+ * Twilight Cost: 2
+ * Type: Companion • Dwarf
+ * Strength: 7
+ * Vitality: 4
+ * Game Text: Damage +1. Thorin is strength +1 for each [DWARVEN] follower he bears. Fellowship: Discard a [DWARVEN]
+ * follower to place a [DWARVEN] artifact from your discard pile beneath your draw deck.
+ */
+public class Card30_019 extends AbstractCompanion {
+    public Card30_019() {
+        super(2, 7, 4, 0, Culture.DWARVEN, Race.DWARF, null, "Thorin", "Oakenshield", true);
+        addKeyword(Keyword.DAMAGE, 1);
+    }
+
+
+    @Override
+    public List<? extends Modifier> getAlwaysOnModifiers(LotroGame game, PhysicalCard self) {
+        return Collections.singletonList(
+                new StrengthModifier(self, self, null, new CountActiveEvaluator(Filters.attachedTo(self), Culture.DWARVEN, CardType.FOLLOWER)));
+    }
+	
+	@Override
+	protected List<ActivateCardAction> getExtraInPlayPhaseActions(String playerId, LotroGame game, PhysicalCard self) {
+        if (PlayConditions.canUseFPCardDuringPhase(game, Phase.FELLOWSHIP, self)
+				&& PlayConditions.canDiscardFromPlay(self, game, 1, Culture.DWARVEN, CardType.FOLLOWER)) {
+            ActivateCardAction action = new ActivateCardAction(self);
+            action.appendCost(
+					new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, Culture.DWARVEN, CardType.FOLLOWER));
+            action.appendEffect(
+                    new ChooseArbitraryCardsEffect(playerId, "Choose DWARVEN artifact", game.getGameState().getDiscard(playerId), Filters.and(Culture.DWARVEN, CardType.ARTIFACT), 1, 1) {
+				@Override
+				protected void cardsSelected(LotroGame game, Collection<PhysicalCard> selectedCards) {
+					for (PhysicalCard selectedCard : selectedCards) {
+						action.appendEffect(
+								new PutCardFromDiscardOnBottomOfDeckEffect(selectedCard));
+					}
+				}
+			});
+            return Collections.singletonList(action);
+        }
+        return null;
+	}
+}
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_020.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set30/dwarven/Card30_020.java
@@ -0,0 +1,36 @@
+package com.gempukku.lotro.cards.set30.dwarven;
+
+import com.gempukku.lotro.cards.AbstractEvent;
+import com.gempukku.lotro.cards.actions.PlayEventAction;
+import com.gempukku.lotro.cards.effects.choose.ChooseAndPlayCardFromDiscardEffect;
+import com.gempukku.lotro.common.*;
+import com.gempukku.lotro.game.PhysicalCard;
+import com.gempukku.lotro.game.state.LotroGame;
+import com.gempukku.lotro.logic.timing.Effect;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * Set: Main Deck
+ * Side: Free
+ * Culture: Dwarven
+ * Twilight Cost: 0
+ * Type: Event
+ * Game Text: Fellowship: Play a [DWARVEN] follower from your discard pile.
+ */
+public class Card30_020 extends AbstractEvent {
+    public Card30_020() {
+        super(Side.FREE_PEOPLE, 0, Culture.DWARVEN, "To me! O My Kinsfolk!", Phase.FELLOWSHIP);
+    }
+
+
+    @Override
+    public PlayEventAction getPlayCardAction(String playerId, LotroGame game, PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) {
+        PlayEventAction action = new PlayEventAction(self);
+        action.appendEffect(
+				new ChooseAndPlayCardFromDiscardEffect(playerId, game, Culture.DWARVEN, CardType.FOLLOWER));
+		return action;
+    }
+}