ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding race parameter to Ally so it's less likely to be forgotten.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-09-06 14:50:56 +00:00
parent 1dd3e95201
commit bb026329cf
22 changed files with 32 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAlly.java
View File

@@ -18,17 +18,24 @@ public class AbstractAlly extends AbstractLotroCardBlueprint {
private int _siteNumber; private int _siteNumber;
private int _strength; private int _strength;
private int _vitality; private int _vitality;
private Keyword _race;
public AbstractAlly(int twilight, int siteNumber, int strength, int vitality, Culture culture, String name) { public AbstractAlly(int twilight, int siteNumber, int strength, int vitality, Keyword race, Culture culture, String name) {
this(twilight, siteNumber, strength, vitality, culture, name, false); 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); super(Side.FREE_PEOPLE, CardType.ALLY, culture, name, unique);
_twilight = twilight; _twilight = twilight;
_siteNumber = siteNumber; _siteNumber = siteNumber;
_strength = strength; _strength = strength;
_vitality = vitality; _vitality = vitality;
_race = race;
addKeyword(_race);
}
public Keyword getRace() {
return _race;
} }
@Override @Override

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractResponseEvent.java
View File

@@ -2,13 +2,14 @@ package com.gempukku.lotro.cards;
import com.gempukku.lotro.cards.actions.PlayEventAction; import com.gempukku.lotro.cards.actions.PlayEventAction;
import com.gempukku.lotro.common.Culture; import com.gempukku.lotro.common.Culture;
import com.gempukku.lotro.common.Phase;
import com.gempukku.lotro.common.Side; import com.gempukku.lotro.common.Side;
import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.game.state.LotroGame;
public abstract class AbstractResponseEvent extends AbstractEvent { public abstract class AbstractResponseEvent extends AbstractEvent {
public AbstractResponseEvent(Side side, Culture culture, String name) { public AbstractResponseEvent(Side side, Culture culture, String name) {
super(side, culture, name, null); super(side, culture, name, (Phase) null);
} }
@Override @Override

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_017.java
View File

@@ -32,8 +32,7 @@ import java.util.List;
*/ */
public class Card1_017 extends AbstractAlly { public class Card1_017 extends AbstractAlly {
public Card1_017() { public Card1_017() {
super(1, 3, 3, 3, Culture.DWARVEN, "Grimir", true); super(1, 3, 3, 3, Keyword.DWARF, Culture.DWARVEN, "Grimir", true);
addKeyword(Keyword.DWARF);
} }
@Override @Override

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_027.java
View File

@@ -31,8 +31,7 @@ import java.util.List;
*/ */
public class Card1_027 extends AbstractAlly { public class Card1_027 extends AbstractAlly {
public Card1_027() { public Card1_027() {
super(1, 3, 4, 2, Culture.DWARVEN, "Thrarin", true); super(1, 3, 4, 2, Keyword.DWARF, Culture.DWARVEN, "Thrarin", true);
addKeyword(Keyword.DWARF);
} }
@Override @Override

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_034.java
View File

@@ -31,8 +31,7 @@ import java.util.List;
*/ */
public class Card1_034 extends AbstractAlly { public class Card1_034 extends AbstractAlly {
public Card1_034() { public Card1_034() {
super(2, 6, 6, 3, Culture.ELVEN, "Celeborn", true); super(2, 6, 6, 3, Keyword.ELF, Culture.ELVEN, "Celeborn", true);
addKeyword(Keyword.ELF);
} }
@Override @Override

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_040.java
View File

@@ -33,8 +33,7 @@ import java.util.List;
*/ */
public class Card1_040 extends AbstractAlly { public class Card1_040 extends AbstractAlly {
public Card1_040() { public Card1_040() {
super(4, 3, 8, 4, Culture.ELVEN, "Elrond", true); super(4, 3, 8, 4, Keyword.ELF, Culture.ELVEN, "Elrond", true);
addKeyword(Keyword.ELF);
} }
@Override @Override

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_045.java
View File

@@ -36,8 +36,7 @@ import java.util.List;
*/ */
public class Card1_045 extends AbstractAlly { public class Card1_045 extends AbstractAlly {
public Card1_045() { public Card1_045() {
super(3, 6, 3, 3, Culture.ELVEN, "Galadriel", true); super(3, 6, 3, 3, Keyword.ELF, Culture.ELVEN, "Galadriel", true);
addKeyword(Keyword.ELF);
} }
@Override @Override

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_056.java
View File

@@ -30,8 +30,7 @@ import java.util.List;
*/ */
public class Card1_056 extends AbstractAlly { public class Card1_056 extends AbstractAlly {
public Card1_056() { public Card1_056() {
super(2, 6, 3, 3, Culture.ELVEN, "Orophin", true); super(2, 6, 3, 3, Keyword.ELF, Culture.ELVEN, "Orophin", true);
addKeyword(Keyword.ELF);
addKeyword(Keyword.ARCHER); addKeyword(Keyword.ARCHER);
} }

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_057.java
View File

@@ -30,8 +30,7 @@ import java.util.List;
*/ */
public class Card1_057 extends AbstractAlly { public class Card1_057 extends AbstractAlly {
public Card1_057() { public Card1_057() {
super(2, 6, 3, 3, Culture.ELVEN, "Rúmil", true); super(2, 6, 3, 3, Keyword.ELF, Culture.ELVEN, "Rúmil", true);
addKeyword(Keyword.ELF);
addKeyword(Keyword.ARCHER); addKeyword(Keyword.ARCHER);
} }

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_060.java
View File

@@ -30,8 +30,7 @@ import java.util.List;
*/ */
public class Card1_060 extends AbstractAlly { public class Card1_060 extends AbstractAlly {
public Card1_060() { public Card1_060() {
super(2, 3, 5, 2, Culture.ELVEN, "Silinde", true); super(2, 3, 5, 2, Keyword.ELF, Culture.ELVEN, "Silinde", true);
addKeyword(Keyword.ELF);
} }
private Filter getFilter(PhysicalCard self) { private Filter getFilter(PhysicalCard self) {

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_067.java
View File

@@ -30,8 +30,7 @@ import java.util.List;
*/ */
public class Card1_067 extends AbstractAlly { public class Card1_067 extends AbstractAlly {
public Card1_067() { public Card1_067() {
super(2, 6, 5, 2, Culture.ELVEN, "Uruviel", true); super(2, 6, 5, 2, Keyword.ELF, Culture.ELVEN, "Uruviel", true);
addKeyword(Keyword.ELF);
} }
private Filter getFilter(PhysicalCard self) { private Filter getFilter(PhysicalCard self) {

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_069.java
View File

@@ -31,8 +31,7 @@ import java.util.List;
*/ */
public class Card1_069 extends AbstractAlly { public class Card1_069 extends AbstractAlly {
public Card1_069() { public Card1_069() {
super(1, 1, 3, 3, Culture.GANDALF, "Albert Dreary", true); super(1, 1, 3, 3, Keyword.MAN, Culture.GANDALF, "Albert Dreary", true);
addKeyword(Keyword.MAN);
} }
@Override @Override

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_070.java
View File

@@ -31,8 +31,7 @@ import java.util.List;
*/ */
public class Card1_070 extends AbstractAlly { public class Card1_070 extends AbstractAlly {
public Card1_070() { public Card1_070() {
super(0, 1, 1, 2, Culture.GANDALF, "Barliman Butterbur", true); super(0, 1, 1, 2, Keyword.MAN, Culture.GANDALF, "Barliman Butterbur", true);
addKeyword(Keyword.MAN);
} }
@Override @Override

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gandalf/Card1_080.java
View File

@@ -32,8 +32,7 @@ import java.util.List;
*/ */
public class Card1_080 extends AbstractAlly { public class Card1_080 extends AbstractAlly {
public Card1_080() { public Card1_080() {
super(1, 3, 2, 2, Culture.GANDALF, "Ottar", true); super(1, 3, 2, 2, Keyword.MAN, Culture.GANDALF, "Ottar", true);
addKeyword(Keyword.MAN);
} }
@Override @Override

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_284.java
View File

@@ -31,8 +31,7 @@ import java.util.List;
*/ */
public class Card1_284 extends AbstractAlly { public class Card1_284 extends AbstractAlly {
public Card1_284() { public Card1_284() {
super(2, 3, 2, 3, Culture.SHIRE, "Bilbo", true); super(2, 3, 2, 3, Keyword.HOBBIT, Culture.SHIRE, "Bilbo", true);
addKeyword(Keyword.HOBBIT);
} }
@Override @Override

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_286.java
View File

@@ -32,8 +32,7 @@ import java.util.List;
*/ */
public class Card1_286 extends AbstractAlly { public class Card1_286 extends AbstractAlly {
public Card1_286() { public Card1_286() {
super(1, 2, 2, 2, Culture.SHIRE, "Bounder"); super(1, 2, 2, 2, Keyword.HOBBIT, Culture.SHIRE, "Bounder");
addKeyword(Keyword.HOBBIT);
} }
@Override @Override

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_288.java
View File

@@ -32,8 +32,7 @@ import java.util.List;
*/ */
public class Card1_288 extends AbstractAlly { public class Card1_288 extends AbstractAlly {
public Card1_288() { public Card1_288() {
super(1, 1, 2, 3, Culture.SHIRE, "Farmer Maggot", true); super(1, 1, 2, 3, Keyword.HOBBIT, Culture.SHIRE, "Farmer Maggot", true);
addKeyword(Keyword.HOBBIT);
} }
@Override @Override

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_291.java
View File

@@ -32,8 +32,7 @@ import java.util.List;
*/ */
public class Card1_291 extends AbstractAlly { public class Card1_291 extends AbstractAlly {
public Card1_291() { public Card1_291() {
super(1, 1, 2, 2, Culture.SHIRE, "The Gaffer", true); super(1, 1, 2, 2, Keyword.HOBBIT, Culture.SHIRE, "The Gaffer", true);
addKeyword(Keyword.HOBBIT);
} }
@Override @Override

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_295.java
View File

@@ -37,8 +37,7 @@ import java.util.List;
*/ */
public class Card1_295 extends AbstractAlly { public class Card1_295 extends AbstractAlly {
public Card1_295() { public Card1_295() {
super(1, 1, 2, 2, Culture.SHIRE, "Hobbit Farmer"); super(1, 1, 2, 2, Keyword.HOBBIT, Culture.SHIRE, "Hobbit Farmer");
addKeyword(Keyword.HOBBIT);
} }
private Filter getFilter(PhysicalCard self) { private Filter getFilter(PhysicalCard self) {

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_297.java
View File

@@ -33,8 +33,7 @@ import java.util.List;
*/ */
public class Card1_297 extends AbstractAlly { public class Card1_297 extends AbstractAlly {
public Card1_297() { public Card1_297() {
super(1, 1, 2, 2, Culture.SHIRE, "Hobbit Party Guest"); super(1, 1, 2, 2, Keyword.HOBBIT, Culture.SHIRE, "Hobbit Party Guest");
addKeyword(Keyword.HOBBIT);
} }
@Override @Override

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_301.java
View File

@@ -30,8 +30,7 @@ import java.util.List;
*/ */
public class Card1_301 extends AbstractAlly { public class Card1_301 extends AbstractAlly {
public Card1_301() { public Card1_301() {
super(1, 1, 2, 2, Culture.SHIRE, "Master Proudfoot", true); super(1, 1, 2, 2, Keyword.HOBBIT, Culture.SHIRE, "Master Proudfoot", true);
addKeyword(Keyword.HOBBIT);
} }
@Override @Override

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_309.java
View File

@@ -31,8 +31,7 @@ import java.util.List;
*/ */
public class Card1_309 extends AbstractAlly { public class Card1_309 extends AbstractAlly {
public Card1_309() { public Card1_309() {
super(1, 1, 1, 2, Culture.SHIRE, "Rosie Cotton", true); super(1, 1, 1, 2, Keyword.HOBBIT, Culture.SHIRE, "Rosie Cotton", true);
addKeyword(Keyword.HOBBIT);
} }
@Override @Override