From d4ac3f38f0a8bc519708a45c27981ba3152579e5 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Tue, 6 Sep 2011 14:54:30 +0000 Subject: [PATCH] Adding race parameter to Minion so it's less likely to be forgotten. --- .../java/com/gempukku/lotro/cards/AbstractMinion.java | 9 ++++++--- .../gempukku/lotro/cards/set1/isengard/Card1_127.java | 3 +-- .../gempukku/lotro/cards/set1/isengard/Card1_131.java | 3 +-- .../gempukku/lotro/cards/set1/isengard/Card1_143.java | 3 +-- .../gempukku/lotro/cards/set1/isengard/Card1_145.java | 3 +-- .../gempukku/lotro/cards/set1/isengard/Card1_146.java | 3 +-- .../gempukku/lotro/cards/set1/isengard/Card1_147.java | 3 +-- .../gempukku/lotro/cards/set1/isengard/Card1_148.java | 3 +-- .../gempukku/lotro/cards/set1/isengard/Card1_149.java | 3 +-- .../gempukku/lotro/cards/set1/isengard/Card1_150.java | 3 +-- .../gempukku/lotro/cards/set1/isengard/Card1_151.java | 3 +-- .../gempukku/lotro/cards/set1/isengard/Card1_152.java | 3 +-- .../gempukku/lotro/cards/set1/isengard/Card1_153.java | 3 +-- .../gempukku/lotro/cards/set1/isengard/Card1_154.java | 3 +-- .../gempukku/lotro/cards/set1/isengard/Card1_155.java | 3 +-- .../gempukku/lotro/cards/set1/isengard/Card1_156.java | 3 +-- .../gempukku/lotro/cards/set1/isengard/Card1_158.java | 3 +-- .../com/gempukku/lotro/cards/set1/moria/Card1_178.java | 3 +-- 18 files changed, 23 insertions(+), 37 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractMinion.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractMinion.java index 3515cb417..8b11726d8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractMinion.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractMinion.java @@ -14,17 +14,20 @@ public class AbstractMinion extends AbstractLotroCardBlueprint { private int _strength; private int _vitality; private int _site; + private Keyword _race; - public AbstractMinion(int twilightCost, int strength, int vitality, int site, Culture culture, String name) { - this(twilightCost, strength, vitality, site, culture, name, false); + public AbstractMinion(int twilightCost, int strength, int vitality, int site, Keyword race, Culture culture, String name) { + this(twilightCost, strength, vitality, site, race, culture, name, false); } - public AbstractMinion(int twilightCost, int strength, int vitality, int site, Culture culture, String name, boolean unique) { + public AbstractMinion(int twilightCost, int strength, int vitality, int site, Keyword race, Culture culture, String name, boolean unique) { super(Side.SHADOW, CardType.MINION, culture, name, unique); _twilightCost = twilightCost; _strength = strength; _vitality = vitality; _site = site; + _race = race; + addKeyword(_race); } private void appendPlayMinionActions(List actions, String playerId, LotroGame game, PhysicalCard self) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_127.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_127.java index 1d187e0a6..e79269302 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_127.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_127.java @@ -29,8 +29,7 @@ import java.util.List; */ public class Card1_127 extends AbstractMinion { public Card1_127() { - super(7, 13, 3, 5, Culture.ISENGARD, "Lurtz", true); - addKeyword(Keyword.URUK_HAI); + super(7, 13, 3, 5, Keyword.URUK_HAI, Culture.ISENGARD, "Lurtz", true); addKeyword(Keyword.ARCHER); addKeyword(Keyword.DAMAGE, 1); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_131.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_131.java index abd5773c4..2feb28675 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_131.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_131.java @@ -17,8 +17,7 @@ import com.gempukku.lotro.common.Keyword; */ public class Card1_131 extends AbstractMinion { public Card1_131() { - super(5, 10, 3, 5, Culture.ISENGARD, "Orthanc Assassin", true); - addKeyword(Keyword.URUK_HAI); + super(5, 10, 3, 5, Keyword.URUK_HAI, Culture.ISENGARD, "Orthanc Assassin", true); addKeyword(Keyword.ARCHER); addKeyword(Keyword.DAMAGE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_143.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_143.java index 76e7aae45..347d58d4f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_143.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_143.java @@ -25,8 +25,7 @@ import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; */ public class Card1_143 extends AbstractMinion { public Card1_143() { - super(5, 9, 4, 5, Culture.ISENGARD, "Troop of Uruk-hai"); - addKeyword(Keyword.URUK_HAI); + super(5, 9, 4, 5, Keyword.URUK_HAI, Culture.ISENGARD, "Troop of Uruk-hai"); addKeyword(Keyword.DAMAGE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_145.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_145.java index 653c85925..bf8b6c1ac 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_145.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_145.java @@ -33,8 +33,7 @@ import java.util.List; */ public class Card1_145 extends AbstractMinion { public Card1_145() { - super(4, 9, 2, 5, Culture.ISENGARD, "Uruk Brood"); - addKeyword(Keyword.URUK_HAI); + super(4, 9, 2, 5, Keyword.URUK_HAI, Culture.ISENGARD, "Uruk Brood"); addKeyword(Keyword.DAMAGE, 1); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_146.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_146.java index c73e922b7..f749cecd1 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_146.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_146.java @@ -30,8 +30,7 @@ import java.util.List; */ public class Card1_146 extends AbstractMinion { public Card1_146() { - super(3, 8, 2, 5, Culture.ISENGARD, "Uruk Fighter"); - addKeyword(Keyword.URUK_HAI); + super(3, 8, 2, 5, Keyword.URUK_HAI, Culture.ISENGARD, "Uruk Fighter"); addKeyword(Keyword.DAMAGE, 1); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_147.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_147.java index c6a56ed7f..8eb0e4b19 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_147.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_147.java @@ -33,8 +33,7 @@ import java.util.List; */ public class Card1_147 extends AbstractMinion { public Card1_147() { - super(4, 9, 2, 5, Culture.ISENGARD, "Uruk Guard"); - addKeyword(Keyword.URUK_HAI); + super(4, 9, 2, 5, Keyword.URUK_HAI, Culture.ISENGARD, "Uruk Guard"); addKeyword(Keyword.DAMAGE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_148.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_148.java index f37ede8f4..5aeeabaa5 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_148.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_148.java @@ -24,8 +24,7 @@ import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; */ public class Card1_148 extends AbstractMinion { public Card1_148() { - super(3, 8, 2, 5, Culture.ISENGARD, "Uruk Lieutenant"); - addKeyword(Keyword.URUK_HAI); + super(3, 8, 2, 5, Keyword.URUK_HAI, Culture.ISENGARD, "Uruk Lieutenant"); addKeyword(Keyword.DAMAGE, 1); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_149.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_149.java index d2434e0ca..250df2bcf 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_149.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_149.java @@ -25,8 +25,7 @@ import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; */ public class Card1_149 extends AbstractMinion { public Card1_149() { - super(2, 6, 1, 5, Culture.ISENGARD, "Uruk Messenger"); - addKeyword(Keyword.URUK_HAI); + super(2, 6, 1, 5, Keyword.URUK_HAI, Culture.ISENGARD, "Uruk Messenger"); addKeyword(Keyword.DAMAGE, 1); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_150.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_150.java index 6be9d9f44..99c4862ca 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_150.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_150.java @@ -28,8 +28,7 @@ import java.util.List; */ public class Card1_150 extends AbstractMinion { public Card1_150() { - super(4, 9, 2, 5, Culture.ISENGARD, "Uruk Rager"); - addKeyword(Keyword.URUK_HAI); + super(4, 9, 2, 5, Keyword.URUK_HAI, Culture.ISENGARD, "Uruk Rager"); addKeyword(Keyword.DAMAGE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_151.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_151.java index 32505cadb..f52c5a65b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_151.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_151.java @@ -17,8 +17,7 @@ import com.gempukku.lotro.common.Keyword; */ public class Card1_151 extends AbstractMinion { public Card1_151() { - super(2, 5, 3, 5, Culture.ISENGARD, "Uruk Savage"); - addKeyword(Keyword.URUK_HAI); + super(2, 5, 3, 5, Keyword.URUK_HAI, Culture.ISENGARD, "Uruk Savage"); addKeyword(Keyword.DAMAGE); } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_152.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_152.java index 48b4b74b3..793aff55c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_152.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_152.java @@ -30,8 +30,7 @@ import java.util.List; */ public class Card1_152 extends AbstractMinion { public Card1_152() { - super(3, 8, 2, 5, Culture.ISENGARD, "Uruk Shaman"); - addKeyword(Keyword.URUK_HAI); + super(3, 8, 2, 5, Keyword.URUK_HAI, Culture.ISENGARD, "Uruk Shaman"); addKeyword(Keyword.DAMAGE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_153.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_153.java index 63e884435..23a28423b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_153.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_153.java @@ -31,8 +31,7 @@ import java.util.List; */ public class Card1_153 extends AbstractMinion { public Card1_153() { - super(4, 9, 2, 5, Culture.ISENGARD, "Uruk Slayer"); - addKeyword(Keyword.URUK_HAI); + super(4, 9, 2, 5, Keyword.URUK_HAI, Culture.ISENGARD, "Uruk Slayer"); addKeyword(Keyword.DAMAGE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_154.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_154.java index 8d777ff86..db3826d53 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_154.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_154.java @@ -29,8 +29,7 @@ import java.util.List; */ public class Card1_154 extends AbstractMinion { public Card1_154() { - super(2, 7, 1, 5, Culture.ISENGARD, "Uruk Soldier"); - addKeyword(Keyword.URUK_HAI); + super(2, 7, 1, 5, Keyword.URUK_HAI, Culture.ISENGARD, "Uruk Soldier"); addKeyword(Keyword.DAMAGE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_155.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_155.java index ef2bc3e40..c7c071f04 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_155.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_155.java @@ -34,8 +34,7 @@ import java.util.List; */ public class Card1_155 extends AbstractMinion { public Card1_155() { - super(2, 7, 2, 5, Culture.ISENGARD, "Uruk Spy"); - addKeyword(Keyword.URUK_HAI); + super(2, 7, 2, 5, Keyword.URUK_HAI, Culture.ISENGARD, "Uruk Spy"); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_156.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_156.java index fda337716..9682031cc 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_156.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_156.java @@ -30,8 +30,7 @@ import java.util.List; */ public class Card1_156 extends AbstractMinion { public Card1_156() { - super(3, 9, 2, 5, Culture.ISENGARD, "Uruk Warrior"); - addKeyword(Keyword.URUK_HAI); + super(3, 9, 2, 5, Keyword.URUK_HAI, Culture.ISENGARD, "Uruk Warrior"); addKeyword(Keyword.DAMAGE); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_158.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_158.java index b23b9e921..5595ebc55 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_158.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_158.java @@ -17,8 +17,7 @@ import com.gempukku.lotro.common.Keyword; */ public class Card1_158 extends AbstractMinion { public Card1_158() { - super(4, 9, 3, 5, Culture.ISENGARD, "Uruk-hai Raiding Party"); - addKeyword(Keyword.URUK_HAI); + super(4, 9, 3, 5, Keyword.URUK_HAI, Culture.ISENGARD, "Uruk-hai Raiding Party"); addKeyword(Keyword.DAMAGE); } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_178.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_178.java index 0991c336e..b9c0ad032 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_178.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_178.java @@ -28,8 +28,7 @@ import java.util.List; */ public class Card1_178 extends AbstractMinion { public Card1_178() { - super(1, 5, 1, 4, Culture.MORIA, "Goblin Runner"); - addKeyword(Keyword.ORC); + super(1, 5, 1, 4, Keyword.ORC, Culture.MORIA, "Goblin Runner"); } @Override