From 0246077793bfdf8cbfa0e7fb44bd2f46607b93eb Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Fri, 9 Sep 2011 14:53:26 +0000 Subject: [PATCH] Adding Class to possessions to simplify playing them. --- .../gempukku/lotro/cards/AbstractAttachable.java | 15 ++++++++------- .../cards/AbstractAttachableFPPossession.java | 8 ++++---- .../lotro/cards/set1/dwarven/Card1_008.java | 3 +-- .../lotro/cards/set1/dwarven/Card1_009.java | 3 +-- .../lotro/cards/set1/dwarven/Card1_010.java | 2 +- .../lotro/cards/set1/dwarven/Card1_014.java | 3 +-- .../lotro/cards/set1/dwarven/Card1_015.java | 3 +-- .../lotro/cards/set1/elven/Card1_031.java | 3 +-- .../lotro/cards/set1/elven/Card1_033.java | 3 +-- .../lotro/cards/set1/elven/Card1_041.java | 3 +-- .../lotro/cards/set1/elven/Card1_042.java | 3 +-- .../lotro/cards/set1/elven/Card1_047.java | 3 +-- .../lotro/cards/set1/elven/Card1_049.java | 2 +- .../lotro/cards/set1/elven/Card1_062.java | 2 +- .../lotro/cards/set1/elven/Card1_066.java | 3 ++- .../lotro/cards/set1/elven/Card1_068.java | 3 +-- .../lotro/cards/set1/gandalf/Card1_074.java | 3 +-- .../lotro/cards/set1/gandalf/Card1_075.java | 3 +-- .../lotro/cards/set1/gondor/Card1_090.java | 3 +-- .../lotro/cards/set1/gondor/Card1_091.java | 3 +-- .../lotro/cards/set1/gondor/Card1_092.java | 3 +-- .../lotro/cards/set1/gondor/Card1_094.java | 2 +- .../lotro/cards/set1/gondor/Card1_095.java | 3 +-- .../lotro/cards/set1/gondor/Card1_098.java | 3 +-- .../lotro/cards/set1/gondor/Card1_101.java | 3 +-- .../lotro/cards/set1/gondor/Card1_107.java | 3 +-- .../lotro/cards/set1/gondor/Card1_108.java | 2 +- .../lotro/cards/set1/gondor/Card1_112.java | 3 +-- .../lotro/cards/set1/gondor/Card1_114.java | 3 ++- .../lotro/cards/set1/isengard/Card1_160.java | 3 +-- .../lotro/cards/set1/moria/Card1_166.java | 3 +-- .../lotro/cards/set1/moria/Card1_180.java | 3 +-- .../lotro/cards/set1/moria/Card1_182.java | 3 +-- .../lotro/cards/set1/moria/Card1_190.java | 3 +-- .../lotro/cards/set1/shire/Card1_285.java | 3 +-- .../lotro/cards/set1/shire/Card1_292.java | 3 +-- .../lotro/cards/set1/shire/Card1_299.java | 3 +-- .../lotro/cards/set1/shire/Card1_313.java | 3 +-- .../lotro/cards/set1/shire/Card1_314.java | 2 +- .../lotro/cards/set1/shire/Card1_317.java | 2 +- .../lotro/cards/set1/wraith/Card1_208.java | 3 +-- 41 files changed, 53 insertions(+), 80 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachable.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachable.java index ec4284402..0a55daf20 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachable.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachable.java @@ -1,10 +1,7 @@ package com.gempukku.lotro.cards; import com.gempukku.lotro.cards.actions.AttachPermanentAction; -import com.gempukku.lotro.common.CardType; -import com.gempukku.lotro.common.Culture; -import com.gempukku.lotro.common.Phase; -import com.gempukku.lotro.common.Side; +import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filter; import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; @@ -18,14 +15,18 @@ import java.util.Map; public abstract class AbstractAttachable extends AbstractLotroCardBlueprint { private int _twilight; + private Keyword _possessionClass; - public AbstractAttachable(Side side, CardType cardType, int twilight, Culture culture, String name) { - this(side, cardType, twilight, culture, name, false); + public AbstractAttachable(Side side, CardType cardType, int twilight, Culture culture, Keyword possessionClass, String name) { + this(side, cardType, twilight, culture, possessionClass, name, false); } - public AbstractAttachable(Side side, CardType cardType, int twilight, Culture culture, String name, boolean unique) { + public AbstractAttachable(Side side, CardType cardType, int twilight, Culture culture, Keyword possessionClass, String name, boolean unique) { super(side, cardType, culture, name, unique); _twilight = twilight; + _possessionClass = possessionClass; + if (_possessionClass != null) + addKeyword(_possessionClass); } protected abstract Filter getValidTargetFilter(String playerId, LotroGame game, PhysicalCard self); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachableFPPossession.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachableFPPossession.java index 26a58a32f..04ab68872 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachableFPPossession.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachableFPPossession.java @@ -14,12 +14,12 @@ import java.util.LinkedList; import java.util.List; public abstract class AbstractAttachableFPPossession extends AbstractAttachable { - public AbstractAttachableFPPossession(int twilight, Culture culture, String name) { - this(twilight, culture, name, false); + public AbstractAttachableFPPossession(int twilight, Culture culture, Keyword possessionClass, String name) { + this(twilight, culture, possessionClass, name, false); } - public AbstractAttachableFPPossession(int twilight, Culture culture, String name, boolean unique) { - super(Side.FREE_PEOPLE, CardType.POSSESSION, twilight, culture, name, unique); + public AbstractAttachableFPPossession(int twilight, Culture culture, Keyword possessionClass, String name, boolean unique) { + super(Side.FREE_PEOPLE, CardType.POSSESSION, twilight, culture, possessionClass, name, unique); } private void appendTransferPossessionAction(List actions, LotroGame game, PhysicalCard self, Filter validTargetFilter) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_008.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_008.java index 28b56628b..423cc256d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_008.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_008.java @@ -20,8 +20,7 @@ import com.gempukku.lotro.logic.modifiers.Modifier; */ public class Card1_008 extends AbstractAttachableFPPossession { public Card1_008() { - super(0, Culture.DWARVEN, "Dwarven Armor"); - addKeyword(Keyword.ARMOR); + super(0, Culture.DWARVEN, Keyword.ARMOR, "Dwarven Armor"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_009.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_009.java index 68044daca..230d42a3c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_009.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_009.java @@ -33,8 +33,7 @@ import java.util.Set; */ public class Card1_009 extends AbstractAttachableFPPossession { public Card1_009() { - super(0, Culture.DWARVEN, "Dwarven Axe"); - addKeyword(Keyword.HAND_WEAPON); + super(0, Culture.DWARVEN, Keyword.HAND_WEAPON, "Dwarven Axe"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_010.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_010.java index 39d8d38d7..2c9c3f939 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_010.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_010.java @@ -30,7 +30,7 @@ import java.util.List; */ public class Card1_010 extends AbstractAttachable { public Card1_010() { - super(Side.FREE_PEOPLE, CardType.CONDITION, 0, Culture.DWARVEN, "Dwarven Heart"); + super(Side.FREE_PEOPLE, CardType.CONDITION, 0, Culture.DWARVEN, null, "Dwarven Heart"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_014.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_014.java index 080697790..acb8aebc3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_014.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_014.java @@ -33,8 +33,7 @@ import java.util.List; */ public class Card1_014 extends AbstractAttachableFPPossession { public Card1_014() { - super(2, Culture.DWARVEN, "Gimli's Battle Axe", true); - addKeyword(Keyword.HAND_WEAPON); + super(2, Culture.DWARVEN, Keyword.HAND_WEAPON, "Gimli's Battle Axe", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_015.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_015.java index 877a0fe43..72d7d1adf 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_015.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_015.java @@ -30,8 +30,7 @@ import java.util.List; */ public class Card1_015 extends AbstractAttachableFPPossession { public Card1_015() { - super(0, Culture.DWARVEN, "Gimli's Helm", true); - addKeyword(Keyword.HELM); + super(0, Culture.DWARVEN, Keyword.HELM, "Gimli's Helm", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_031.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_031.java index b74ce46be..ee955c36b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_031.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_031.java @@ -34,8 +34,7 @@ import java.util.Map; */ public class Card1_031 extends AbstractAttachableFPPossession { public Card1_031() { - super(2, Culture.ELVEN, "Asfaloth", true); - addKeyword(Keyword.MOUNT); + super(2, Culture.ELVEN, Keyword.MOUNT, "Asfaloth", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_033.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_033.java index 3b27aa27a..d0c9a13f1 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_033.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_033.java @@ -31,8 +31,7 @@ import java.util.List; */ public class Card1_033 extends AbstractAttachableFPPossession { public Card1_033() { - super(1, Culture.ELVEN, "Bow of the Galadhrim", true); - addKeyword(Keyword.RANGED_WEAPON); + super(1, Culture.ELVEN, Keyword.RANGED_WEAPON, "Bow of the Galadhrim", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_041.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_041.java index 9882704c1..9027a16dc 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_041.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_041.java @@ -20,8 +20,7 @@ import com.gempukku.lotro.logic.modifiers.Modifier; */ public class Card1_041 extends AbstractAttachableFPPossession { public Card1_041() { - super(1, Culture.ELVEN, "Elven Bow"); - addKeyword(Keyword.RANGED_WEAPON); + super(1, Culture.ELVEN, Keyword.RANGED_WEAPON, "Elven Bow"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_042.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_042.java index 57b6fa83d..95210cffb 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_042.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_042.java @@ -22,8 +22,7 @@ import com.gempukku.lotro.logic.modifiers.Modifier; */ public class Card1_042 extends AbstractAttachableFPPossession { public Card1_042() { - super(1, Culture.ELVEN, "Elven Cloak"); - addKeyword(Keyword.CLOAK); + super(1, Culture.ELVEN, Keyword.CLOAK, "Elven Cloak"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_047.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_047.java index 083dada7c..361109fa8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_047.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_047.java @@ -38,8 +38,7 @@ import java.util.List; */ public class Card1_047 extends AbstractAttachableFPPossession { public Card1_047() { - super(2, Culture.ELVEN, "Gwemegil", true); - addKeyword(Keyword.HAND_WEAPON); + super(2, Culture.ELVEN, Keyword.HAND_WEAPON, "Gwemegil", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_049.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_049.java index 18a26f887..0e25023c5 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_049.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_049.java @@ -26,7 +26,7 @@ import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; */ public class Card1_049 extends AbstractAttachable { public Card1_049() { - super(Side.FREE_PEOPLE, CardType.CONDITION, 1, Culture.ELVEN, "The Last Alliance of Elves and Men"); + super(Side.FREE_PEOPLE, CardType.CONDITION, 1, Culture.ELVEN, null, "The Last Alliance of Elves and Men"); addKeyword(Keyword.TALE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_062.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_062.java index 797467963..302ed2d3a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_062.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_062.java @@ -27,7 +27,7 @@ import java.util.List; */ public class Card1_062 extends AbstractAttachable { public Card1_062() { - super(Side.FREE_PEOPLE, CardType.CONDITION, 1, Culture.ELVEN, "The Splendor of Their Banners", true); + super(Side.FREE_PEOPLE, CardType.CONDITION, 1, Culture.ELVEN, null, "The Splendor of Their Banners", true); addKeyword(Keyword.TALE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_066.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_066.java index 2ee674038..2c110c87e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_066.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_066.java @@ -29,7 +29,8 @@ import java.util.List; */ public class Card1_066 extends AbstractAttachable { public Card1_066() { - super(Side.FREE_PEOPLE, CardType.CONDITION, 1, Culture.ELVEN, "The Tale of Gil-galad", true); + super(Side.FREE_PEOPLE, CardType.CONDITION, 1, Culture.ELVEN, null, "The Tale of Gil-galad", true); + addKeyword(Keyword.TALE); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_068.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_068.java index f55c24cf7..e091be3e5 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_068.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_068.java @@ -27,8 +27,7 @@ import java.util.List; */ public class Card1_068 extends AbstractAttachable { public Card1_068() { - super(Side.FREE_PEOPLE, CardType.CONDITION, 1, Culture.ELVEN, "The White Arrows of Lorien"); - addKeyword(Keyword.TALE); + super(Side.FREE_PEOPLE, CardType.CONDITION, 1, Culture.ELVEN, null, "The White Arrows of Lorien"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_074.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_074.java index d75b85292..d8e9ed02b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_074.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_074.java @@ -32,8 +32,7 @@ import java.util.List; */ public class Card1_074 extends AbstractAttachableFPPossession { public Card1_074() { - super(0, Culture.GANDALF, "Gandalf's Pipe", true); - addKeyword(Keyword.PIPE); + super(0, Culture.GANDALF, Keyword.PIPE, "Gandalf's Pipe", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_075.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_075.java index 15b2ee7cf..bc9fb5322 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_075.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_075.java @@ -35,8 +35,7 @@ import java.util.List; */ public class Card1_075 extends AbstractAttachableFPPossession { public Card1_075() { - super(2, Culture.GANDALF, "Glamdring", true); - addKeyword(Keyword.HAND_WEAPON); + super(2, Culture.GANDALF, Keyword.HAND_WEAPON, "Glamdring", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_090.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_090.java index 9d25b1a9f..597954836 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_090.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_090.java @@ -34,8 +34,7 @@ import java.util.List; */ public class Card1_090 extends AbstractAttachableFPPossession { public Card1_090() { - super(1, Culture.GONDOR, "Aragorn's Bow", true); - addKeyword(Keyword.RANGED_WEAPON); + super(1, Culture.GONDOR, Keyword.RANGED_WEAPON, "Aragorn's Bow", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_091.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_091.java index 60926ee39..773bea55f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_091.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_091.java @@ -30,8 +30,7 @@ import java.util.List; */ public class Card1_091 extends AbstractAttachableFPPossession { public Card1_091() { - super(1, Culture.GONDOR, "Aragorn's Pipe", true); - addKeyword(Keyword.PIPE); + super(1, Culture.GONDOR, Keyword.PIPE, "Aragorn's Pipe", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_092.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_092.java index 1db10935e..c603b5091 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_092.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_092.java @@ -28,8 +28,7 @@ import java.util.List; */ public class Card1_092 extends AbstractAttachableFPPossession { public Card1_092() { - super(1, Culture.GONDOR, "Armor"); - addKeyword(Keyword.ARMOR); + super(1, Culture.GONDOR, Keyword.ARMOR, "Armor"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_094.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_094.java index b4c3fc690..f83cad2b0 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_094.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_094.java @@ -30,7 +30,7 @@ import java.util.List; */ public class Card1_094 extends AbstractAttachableFPPossession { public Card1_094() { - super(1, Culture.GONDOR, "Athelas"); + super(1, Culture.GONDOR, null, "Athelas"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_095.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_095.java index ae5703434..5fc2f9d42 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_095.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_095.java @@ -36,8 +36,7 @@ import java.util.List; */ public class Card1_095 extends AbstractAttachableFPPossession { public Card1_095() { - super(1, Culture.GONDOR, "Blade of Gondor", true); - addKeyword(Keyword.HAND_WEAPON); + super(1, Culture.GONDOR, Keyword.HAND_WEAPON, "Blade of Gondor", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_098.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_098.java index b283c1651..1e5238656 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_098.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_098.java @@ -29,8 +29,7 @@ import java.util.List; */ public class Card1_098 extends AbstractAttachableFPPossession { public Card1_098() { - super(0, Culture.GONDOR, "Boromir's Cloak", true); - addKeyword(Keyword.CLOAK); + super(0, Culture.GONDOR, Keyword.CLOAK, "Boromir's Cloak", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_101.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_101.java index 73d5bb391..64c75ad3b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_101.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_101.java @@ -20,8 +20,7 @@ import com.gempukku.lotro.logic.modifiers.Modifier; */ public class Card1_101 extends AbstractAttachableFPPossession { public Card1_101() { - super(1, Culture.GONDOR, "Coat of Mail"); - addKeyword(Keyword.ARMOR); + super(1, Culture.GONDOR, Keyword.ARMOR, "Coat of Mail"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_107.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_107.java index 53bdd9e91..404b9ea2a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_107.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_107.java @@ -21,8 +21,7 @@ import com.gempukku.lotro.logic.modifiers.Modifier; */ public class Card1_107 extends AbstractAttachableFPPossession { public Card1_107() { - super(1, Culture.GONDOR, "Great Shield"); - addKeyword(Keyword.SHIELD); + super(1, Culture.GONDOR, Keyword.SHIELD, "Great Shield"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_108.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_108.java index b4483ae69..b1e37a881 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_108.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_108.java @@ -22,7 +22,7 @@ import com.gempukku.lotro.logic.modifiers.TwilightCostModifier; */ public class Card1_108 extends AbstractAttachable { public Card1_108() { - super(Side.FREE_PEOPLE, CardType.CONDITION, 0, Culture.GONDOR, "No Stranger to the Shadows"); + super(Side.FREE_PEOPLE, CardType.CONDITION, 0, Culture.GONDOR, null, "No Stranger to the Shadows"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_112.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_112.java index f4f9aa8c2..e581949a7 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_112.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_112.java @@ -26,8 +26,7 @@ import java.util.List; */ public class Card1_112 extends AbstractAttachableFPPossession { public Card1_112() { - super(1, Culture.GONDOR, "Ranger's Sword", true); - addKeyword(Keyword.HAND_WEAPON); + super(1, Culture.GONDOR, Keyword.HAND_WEAPON, "Ranger's Sword", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_114.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_114.java index 5622a49fd..d7f6306d5 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_114.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_114.java @@ -29,7 +29,8 @@ import java.util.List; */ public class Card1_114 extends AbstractAttachable { public Card1_114() { - super(Side.FREE_PEOPLE, CardType.CONDITION, 1, Culture.GONDOR, "The Saga of Elendil", true); + super(Side.FREE_PEOPLE, CardType.CONDITION, 1, Culture.GONDOR, null, "The Saga of Elendil", true); + addKeyword(Keyword.TALE); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_160.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_160.java index 82c4d574e..27e33e4d9 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_160.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_160.java @@ -32,8 +32,7 @@ import java.util.List; */ public class Card1_160 extends AbstractAttachable { public Card1_160() { - super(Side.SHADOW, CardType.POSSESSION, 1, Culture.ISENGARD, "Uruk-hai Sword"); - addKeyword(Keyword.HAND_WEAPON); + super(Side.SHADOW, CardType.POSSESSION, 1, Culture.ISENGARD, Keyword.HAND_WEAPON, "Uruk-hai Sword"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_166.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_166.java index a7fb52cf3..d9704a9e3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_166.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_166.java @@ -28,8 +28,7 @@ import java.util.List; */ public class Card1_166 extends AbstractAttachable { public Card1_166() { - super(Side.SHADOW, CardType.POSSESSION, 1, Culture.MORIA, "Cave Troll's Hammer", true); - addKeyword(Keyword.HAND_WEAPON); + super(Side.SHADOW, CardType.POSSESSION, 1, Culture.MORIA, Keyword.HAND_WEAPON, "Cave Troll's Hammer", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_180.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_180.java index 7bb5c3ab0..19c68ff16 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_180.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_180.java @@ -31,8 +31,7 @@ import java.util.List; */ public class Card1_180 extends AbstractAttachable { public Card1_180() { - super(Side.SHADOW, CardType.POSSESSION, 0, Culture.MORIA, "Goblin Scimitar"); - addKeyword(Keyword.HAND_WEAPON); + super(Side.SHADOW, CardType.POSSESSION, 0, Culture.MORIA, Keyword.HAND_WEAPON, "Goblin Scimitar"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_182.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_182.java index 23409b1ae..7d7c9a0e3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_182.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_182.java @@ -33,8 +33,7 @@ import java.util.List; */ public class Card1_182 extends AbstractAttachable { public Card1_182() { - super(Side.SHADOW, CardType.POSSESSION, 1, Culture.MORIA, "Goblin Spear"); - addKeyword(Keyword.HAND_WEAPON); + super(Side.SHADOW, CardType.POSSESSION, 1, Culture.MORIA, Keyword.HAND_WEAPON, "Goblin Spear"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_190.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_190.java index 25ed4c698..96d3216a2 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_190.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_190.java @@ -31,8 +31,7 @@ import java.util.List; */ public class Card1_190 extends AbstractAttachable { public Card1_190() { - super(Side.SHADOW, CardType.POSSESSION, 1, Culture.MORIA, "Moria Axe"); - addKeyword(Keyword.HAND_WEAPON); + super(Side.SHADOW, CardType.POSSESSION, 1, Culture.MORIA, Keyword.HAND_WEAPON, "Moria Axe"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_285.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_285.java index 99190ad68..508f8d1c3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_285.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_285.java @@ -35,8 +35,7 @@ import java.util.List; */ public class Card1_285 extends AbstractAttachableFPPossession { public Card1_285() { - super(1, Culture.SHIRE, "Bilbo's Pipe", true); - addKeyword(Keyword.PIPE); + super(1, Culture.SHIRE, Keyword.PIPE, "Bilbo's Pipe", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_292.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_292.java index 06012a0f1..ee5252f57 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_292.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_292.java @@ -32,8 +32,7 @@ import java.util.List; */ public class Card1_292 extends AbstractAttachableFPPossession { public Card1_292() { - super(1, Culture.SHIRE, "The Gaffer's Pipe", true); - addKeyword(Keyword.PIPE); + super(1, Culture.SHIRE, Keyword.PIPE, "The Gaffer's Pipe", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_299.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_299.java index fd8ffd196..1b92a2685 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_299.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_299.java @@ -21,8 +21,7 @@ import com.gempukku.lotro.logic.modifiers.Modifier; */ public class Card1_299 extends AbstractAttachableFPPossession { public Card1_299() { - super(1, Culture.SHIRE, "Hobbit Sword"); - addKeyword(Keyword.HAND_WEAPON); + super(1, Culture.SHIRE, Keyword.HAND_WEAPON, "Hobbit Sword"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_313.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_313.java index 3cad69955..757a35676 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_313.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_313.java @@ -34,8 +34,7 @@ import java.util.List; */ public class Card1_313 extends AbstractAttachableFPPossession { public Card1_313() { - super(1, Culture.SHIRE, "Sting", true); - addKeyword(Keyword.HAND_WEAPON); + super(1, Culture.SHIRE, Keyword.HAND_WEAPON, "Sting", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_314.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_314.java index c1b274486..8d78ef62a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_314.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_314.java @@ -26,7 +26,7 @@ import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; */ public class Card1_314 extends AbstractAttachable { public Card1_314() { - super(Side.FREE_PEOPLE, CardType.CONDITION, 2, Culture.SHIRE, "Stone Trolls"); + super(Side.FREE_PEOPLE, CardType.CONDITION, 2, Culture.SHIRE, null, "Stone Trolls"); addKeyword(Keyword.TALE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_317.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_317.java index c24b77bea..a2771eedd 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_317.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_317.java @@ -27,7 +27,7 @@ import java.util.List; */ public class Card1_317 extends AbstractAttachable { public Card1_317() { - super(Side.FREE_PEOPLE, CardType.CONDITION, 1, Culture.SHIRE, "There and Back Again", true); + super(Side.FREE_PEOPLE, CardType.CONDITION, 1, Culture.SHIRE, null, "There and Back Again", true); addKeyword(Keyword.TALE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_208.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_208.java index 8f9496f0d..5ed16abb8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_208.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_208.java @@ -34,8 +34,7 @@ import java.util.List; */ public class Card1_208 extends AbstractAttachable { public Card1_208() { - super(Side.SHADOW, CardType.POSSESSION, 1, Culture.WRAITH, "Black Steed"); - addKeyword(Keyword.MOUNT); + super(Side.SHADOW, CardType.POSSESSION, 1, Culture.WRAITH, Keyword.MOUNT, "Black Steed"); } @Override