diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAlly.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAlly.java index fae7d1851..ecaddd4a4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAlly.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAlly.java @@ -18,17 +18,24 @@ public class AbstractAlly extends AbstractLotroCardBlueprint { private int _siteNumber; private int _strength; private int _vitality; + private Keyword _race; - public AbstractAlly(int twilight, int siteNumber, int strength, int vitality, Culture culture, String name) { - this(twilight, siteNumber, strength, vitality, culture, name, false); + public AbstractAlly(int twilight, int siteNumber, int strength, int vitality, Keyword race, Culture culture, String name) { + this(twilight, siteNumber, strength, vitality, race, culture, name, false); } - public AbstractAlly(int twilight, int siteNumber, int strength, int vitality, Culture culture, String name, boolean unique) { + public AbstractAlly(int twilight, int siteNumber, int strength, int vitality, Keyword race, Culture culture, String name, boolean unique) { super(Side.FREE_PEOPLE, CardType.ALLY, culture, name, unique); _twilight = twilight; _siteNumber = siteNumber; _strength = strength; _vitality = vitality; + _race = race; + addKeyword(_race); + } + + public Keyword getRace() { + return _race; } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractResponseEvent.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractResponseEvent.java index ea5cf8d1b..c0d617a30 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractResponseEvent.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractResponseEvent.java @@ -2,13 +2,14 @@ package com.gempukku.lotro.cards; import com.gempukku.lotro.cards.actions.PlayEventAction; import com.gempukku.lotro.common.Culture; +import com.gempukku.lotro.common.Phase; import com.gempukku.lotro.common.Side; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; public abstract class AbstractResponseEvent extends AbstractEvent { public AbstractResponseEvent(Side side, Culture culture, String name) { - super(side, culture, name, null); + super(side, culture, name, (Phase) null); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_017.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_017.java index 5e8da9154..3c1a00657 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_017.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_017.java @@ -32,8 +32,7 @@ import java.util.List; */ public class Card1_017 extends AbstractAlly { public Card1_017() { - super(1, 3, 3, 3, Culture.DWARVEN, "Grimir", true); - addKeyword(Keyword.DWARF); + super(1, 3, 3, 3, Keyword.DWARF, Culture.DWARVEN, "Grimir", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_027.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_027.java index fa24d2263..e5bac28a5 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_027.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_027.java @@ -31,8 +31,7 @@ import java.util.List; */ public class Card1_027 extends AbstractAlly { public Card1_027() { - super(1, 3, 4, 2, Culture.DWARVEN, "Thrarin", true); - addKeyword(Keyword.DWARF); + super(1, 3, 4, 2, Keyword.DWARF, Culture.DWARVEN, "Thrarin", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_034.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_034.java index fdfe6c875..108fb9ac4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_034.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_034.java @@ -31,8 +31,7 @@ import java.util.List; */ public class Card1_034 extends AbstractAlly { public Card1_034() { - super(2, 6, 6, 3, Culture.ELVEN, "Celeborn", true); - addKeyword(Keyword.ELF); + super(2, 6, 6, 3, Keyword.ELF, Culture.ELVEN, "Celeborn", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_040.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_040.java index 03c6b1d48..c994a5957 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_040.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_040.java @@ -33,8 +33,7 @@ import java.util.List; */ public class Card1_040 extends AbstractAlly { public Card1_040() { - super(4, 3, 8, 4, Culture.ELVEN, "Elrond", true); - addKeyword(Keyword.ELF); + super(4, 3, 8, 4, Keyword.ELF, Culture.ELVEN, "Elrond", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_045.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_045.java index d96c80f85..3c3b46de3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_045.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_045.java @@ -36,8 +36,7 @@ import java.util.List; */ public class Card1_045 extends AbstractAlly { public Card1_045() { - super(3, 6, 3, 3, Culture.ELVEN, "Galadriel", true); - addKeyword(Keyword.ELF); + super(3, 6, 3, 3, Keyword.ELF, Culture.ELVEN, "Galadriel", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_056.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_056.java index 193496792..44ddaef9e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_056.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_056.java @@ -30,8 +30,7 @@ import java.util.List; */ public class Card1_056 extends AbstractAlly { public Card1_056() { - super(2, 6, 3, 3, Culture.ELVEN, "Orophin", true); - addKeyword(Keyword.ELF); + super(2, 6, 3, 3, Keyword.ELF, Culture.ELVEN, "Orophin", true); addKeyword(Keyword.ARCHER); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_057.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_057.java index 791240cf3..894859f59 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_057.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_057.java @@ -30,8 +30,7 @@ import java.util.List; */ public class Card1_057 extends AbstractAlly { public Card1_057() { - super(2, 6, 3, 3, Culture.ELVEN, "Rúmil", true); - addKeyword(Keyword.ELF); + super(2, 6, 3, 3, Keyword.ELF, Culture.ELVEN, "Rúmil", true); addKeyword(Keyword.ARCHER); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_060.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_060.java index 8e508730a..2e172281f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_060.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_060.java @@ -30,8 +30,7 @@ import java.util.List; */ public class Card1_060 extends AbstractAlly { public Card1_060() { - super(2, 3, 5, 2, Culture.ELVEN, "Silinde", true); - addKeyword(Keyword.ELF); + super(2, 3, 5, 2, Keyword.ELF, Culture.ELVEN, "Silinde", true); } private Filter getFilter(PhysicalCard self) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_067.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_067.java index 3c674a87a..baa0301e9 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_067.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_067.java @@ -30,8 +30,7 @@ import java.util.List; */ public class Card1_067 extends AbstractAlly { public Card1_067() { - super(2, 6, 5, 2, Culture.ELVEN, "Uruviel", true); - addKeyword(Keyword.ELF); + super(2, 6, 5, 2, Keyword.ELF, Culture.ELVEN, "Uruviel", true); } private Filter getFilter(PhysicalCard self) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_069.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_069.java index f28a038ee..7924d19eb 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_069.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_069.java @@ -31,8 +31,7 @@ import java.util.List; */ public class Card1_069 extends AbstractAlly { public Card1_069() { - super(1, 1, 3, 3, Culture.GANDALF, "Albert Dreary", true); - addKeyword(Keyword.MAN); + super(1, 1, 3, 3, Keyword.MAN, Culture.GANDALF, "Albert Dreary", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_070.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_070.java index bf860d3aa..0d6493bdf 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_070.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_070.java @@ -31,8 +31,7 @@ import java.util.List; */ public class Card1_070 extends AbstractAlly { public Card1_070() { - super(0, 1, 1, 2, Culture.GANDALF, "Barliman Butterbur", true); - addKeyword(Keyword.MAN); + super(0, 1, 1, 2, Keyword.MAN, Culture.GANDALF, "Barliman Butterbur", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_080.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_080.java index 10d6ad339..16619d18c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_080.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_080.java @@ -32,8 +32,7 @@ import java.util.List; */ public class Card1_080 extends AbstractAlly { public Card1_080() { - super(1, 3, 2, 2, Culture.GANDALF, "Ottar", true); - addKeyword(Keyword.MAN); + super(1, 3, 2, 2, Keyword.MAN, Culture.GANDALF, "Ottar", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_284.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_284.java index 19cb8f232..335431bb9 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_284.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_284.java @@ -31,8 +31,7 @@ import java.util.List; */ public class Card1_284 extends AbstractAlly { public Card1_284() { - super(2, 3, 2, 3, Culture.SHIRE, "Bilbo", true); - addKeyword(Keyword.HOBBIT); + super(2, 3, 2, 3, Keyword.HOBBIT, Culture.SHIRE, "Bilbo", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_286.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_286.java index d38f51cda..ebc6015fc 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_286.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_286.java @@ -32,8 +32,7 @@ import java.util.List; */ public class Card1_286 extends AbstractAlly { public Card1_286() { - super(1, 2, 2, 2, Culture.SHIRE, "Bounder"); - addKeyword(Keyword.HOBBIT); + super(1, 2, 2, 2, Keyword.HOBBIT, Culture.SHIRE, "Bounder"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_288.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_288.java index 7d638ce21..406870275 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_288.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_288.java @@ -32,8 +32,7 @@ import java.util.List; */ public class Card1_288 extends AbstractAlly { public Card1_288() { - super(1, 1, 2, 3, Culture.SHIRE, "Farmer Maggot", true); - addKeyword(Keyword.HOBBIT); + super(1, 1, 2, 3, Keyword.HOBBIT, Culture.SHIRE, "Farmer Maggot", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_291.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_291.java index e15df0052..18face999 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_291.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_291.java @@ -32,8 +32,7 @@ import java.util.List; */ public class Card1_291 extends AbstractAlly { public Card1_291() { - super(1, 1, 2, 2, Culture.SHIRE, "The Gaffer", true); - addKeyword(Keyword.HOBBIT); + super(1, 1, 2, 2, Keyword.HOBBIT, Culture.SHIRE, "The Gaffer", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_295.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_295.java index da7a29cdb..6ef925e37 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_295.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_295.java @@ -37,8 +37,7 @@ import java.util.List; */ public class Card1_295 extends AbstractAlly { public Card1_295() { - super(1, 1, 2, 2, Culture.SHIRE, "Hobbit Farmer"); - addKeyword(Keyword.HOBBIT); + super(1, 1, 2, 2, Keyword.HOBBIT, Culture.SHIRE, "Hobbit Farmer"); } private Filter getFilter(PhysicalCard self) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_297.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_297.java index e9040c9a2..6831febaa 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_297.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_297.java @@ -33,8 +33,7 @@ import java.util.List; */ public class Card1_297 extends AbstractAlly { public Card1_297() { - super(1, 1, 2, 2, Culture.SHIRE, "Hobbit Party Guest"); - addKeyword(Keyword.HOBBIT); + super(1, 1, 2, 2, Keyword.HOBBIT, Culture.SHIRE, "Hobbit Party Guest"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_301.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_301.java index 1417e8d3b..e5faca41a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_301.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_301.java @@ -30,8 +30,7 @@ import java.util.List; */ public class Card1_301 extends AbstractAlly { public Card1_301() { - super(1, 1, 2, 2, Culture.SHIRE, "Master Proudfoot", true); - addKeyword(Keyword.HOBBIT); + super(1, 1, 2, 2, Keyword.HOBBIT, Culture.SHIRE, "Master Proudfoot", true); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_309.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_309.java index 4880f4e94..eac5479c0 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_309.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_309.java @@ -31,8 +31,7 @@ import java.util.List; */ public class Card1_309 extends AbstractAlly { public Card1_309() { - super(1, 1, 1, 2, Culture.SHIRE, "Rosie Cotton", true); - addKeyword(Keyword.HOBBIT); + super(1, 1, 1, 2, Keyword.HOBBIT, Culture.SHIRE, "Rosie Cotton", true); } @Override