diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html index 057a1a170..edbff714d 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html @@ -1,6 +1,6 @@
 17 Dec. 2015
-- "Armor of Khazad" not longer allows to return itself from discard.
+- "Armor of Khazad" no longer allows to return itself from discard and can now be transferred.
 
 20 Nov. 2014
 - "Stewards' Legacy" now allows to distinguish Boromir and Faramir abilities.
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/dwarven/Card17_001.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/dwarven/Card17_001.java
index 588295703..8b88d30d5 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/dwarven/Card17_001.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/dwarven/Card17_001.java
@@ -1,6 +1,6 @@
 package com.gempukku.lotro.cards.set17.dwarven;
 
-import com.gempukku.lotro.cards.AbstractAttachable;
+import com.gempukku.lotro.cards.AbstractAttachableFPPossession;
 import com.gempukku.lotro.cards.PlayConditions;
 import com.gempukku.lotro.cards.TriggerConditions;
 import com.gempukku.lotro.cards.effects.PreventCardEffect;
@@ -12,7 +12,6 @@ import com.gempukku.lotro.common.Filterable;
 import com.gempukku.lotro.common.Phase;
 import com.gempukku.lotro.common.PossessionClass;
 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;
@@ -35,9 +34,9 @@ import java.util.List;
  * Game Text: Bearer must be a Dwarf. Each time bearer is about to take a wound, you may add a threat to prevent that.
  * Regroup: Discard this possession to take up to 2 other [DWARVEN] possessions into hand from your discard pile.
  */
-public class Card17_001 extends AbstractAttachable {
+public class Card17_001 extends AbstractAttachableFPPossession {
     public Card17_001() {
-        super(Side.FREE_PEOPLE, CardType.POSSESSION, 2, Culture.DWARVEN, PossessionClass.ARMOR, "Armor of Khazad");
+        super(2, 0, 0, Culture.DWARVEN, PossessionClass.ARMOR, "Armor of Khazad");
     }
 
     @Override
@@ -60,7 +59,7 @@ public class Card17_001 extends AbstractAttachable {
     }
 
     @Override
-    protected List getExtraPhaseActions(String playerId, LotroGame game, PhysicalCard self) {
+    protected List getExtraInPlayPhaseActions(String playerId, LotroGame game, PhysicalCard self) {
         if (PlayConditions.canUseFPCardDuringPhase(game, Phase.REGROUP, self)
                 && PlayConditions.canSelfDiscard(self, game)) {
             ActivateCardAction action = new ActivateCardAction(self);