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

Introducing Signet into AbstractCompanion constructor.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-09-06 00:01:21 +00:00
parent bc2aec0c9f
commit 4e9404e881
18 changed files with 21 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractCompanion.java
View File

@@ -19,15 +19,16 @@ public abstract class AbstractCompanion extends AbstractLotroCardBlueprint {
private int _vitality;
private Signet _signet;
public AbstractCompanion(int twilightCost, int strength, int vitality, Culture culture, String name) {
this(twilightCost, strength, vitality, culture, name, false);
public AbstractCompanion(int twilightCost, int strength, int vitality, Culture culture, Signet signet, String name) {
this(twilightCost, strength, vitality, culture, signet, name, false);
}
public AbstractCompanion(int twilightCost, int strength, int vitality, Culture culture, String name, boolean unique) {
public AbstractCompanion(int twilightCost, int strength, int vitality, Culture culture, Signet signet, String name, boolean unique) {
super(Side.FREE_PEOPLE, CardType.COMPANION, culture, name, unique);
_twilightCost = twilightCost;
_strength = strength;
_vitality = vitality;
_signet = signet;
}
@Override
@@ -35,10 +36,6 @@ public abstract class AbstractCompanion extends AbstractLotroCardBlueprint {
return _signet;
}
protected void setSignet(Signet signet) {
_signet = signet;
}
private void appendPlayCompanionActions(List<Action> actions, String playerId, LotroGame game, PhysicalCard self) {
if (PlayConditions.canPlayFPCardDuringPhase(game, Phase.FELLOWSHIP, self))
actions.add(getPlayCardAction(playerId, game, self, 0));

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

@@ -20,7 +20,7 @@ import com.gempukku.lotro.game.state.LotroGame;
*/
public class Card1_007 extends AbstractCompanion {
public Card1_007() {
super(1, 4, 2, Culture.DWARVEN, "Dwarf Guard", false);
super(1, 4, 2, Culture.DWARVEN, null, "Dwarf Guard", false);
addKeyword(Keyword.DWARF);
}

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

@@ -26,7 +26,7 @@ import com.gempukku.lotro.logic.modifiers.ModifiersQuerying;
*/
public class Card1_011 extends AbstractCompanion {
public Card1_011() {
super(2, 5, 3, Culture.DWARVEN, "Farin", true);
super(2, 5, 3, Culture.DWARVEN, null, "Farin", true);
addKeyword(Keyword.DWARF);
}

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

@@ -30,8 +30,7 @@ import java.util.List;
*/
public class Card1_012 extends AbstractCompanion {
public Card1_012() {
super(2, 6, 3, Culture.DWARVEN, "Gimli", true);
setSignet(Signet.ARAGORN);
super(2, 6, 3, Culture.DWARVEN, Signet.ARAGORN, "Gimli", true);
addKeyword(Keyword.DWARF);
addKeyword(Keyword.DAMAGE, 1);
}

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

@@ -32,8 +32,7 @@ import java.util.List;
*/
public class Card1_013 extends AbstractCompanion {
public Card1_013() {
super(2, 6, 3, Culture.DWARVEN, "Gimli", true);
setSignet(Signet.GANDALF);
super(2, 6, 3, Culture.DWARVEN, Signet.GANDALF, "Gimli", true);
addKeyword(Keyword.DWARF);
addKeyword(Keyword.DAMAGE, 1);
}

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

@@ -27,10 +27,9 @@ import com.gempukku.lotro.logic.modifiers.ModifiersQuerying;
*/
public class Card1_030 extends AbstractCompanion {
public Card1_030() {
super(2, 6, 3, Culture.ELVEN, "Arwen", true);
super(2, 6, 3, Culture.ELVEN, Signet.ARAGORN, "Arwen", true);
addKeyword(Keyword.RANGER);
addKeyword(Keyword.ELF);
setSignet(Signet.ARAGORN);
}
@Override

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

@@ -25,7 +25,7 @@ import com.gempukku.lotro.logic.modifiers.ModifiersQuerying;
*/
public class Card1_048 extends AbstractCompanion {
public Card1_048() {
super(2, 5, 3, Culture.ELVEN, "Haldir", true);
super(2, 5, 3, Culture.ELVEN, null, "Haldir", true);
addKeyword(Keyword.ELF);
}

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

@@ -31,10 +31,9 @@ import java.util.List;
*/
public class Card1_050 extends AbstractCompanion {
public Card1_050() {
super(2, 6, 3, Culture.ELVEN, "Legolas", true);
super(2, 6, 3, Culture.ELVEN, Signet.FRODO, "Legolas", true);
addKeyword(Keyword.ELF);
addKeyword(Keyword.ARCHER);
setSignet(Signet.FRODO);
}
@Override

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

@@ -27,10 +27,9 @@ import com.gempukku.lotro.logic.modifiers.ModifiersQuerying;
*/
public class Card1_051 extends AbstractCompanion {
public Card1_051() {
super(2, 6, 3, Culture.ELVEN, "Legolas", true);
super(2, 6, 3, Culture.ELVEN, Signet.GANDALF, "Legolas", true);
addKeyword(Keyword.ELF);
addKeyword(Keyword.ARCHER);
setSignet(Signet.GANDALF);
}
@Override

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

@@ -20,7 +20,7 @@ import com.gempukku.lotro.game.state.LotroGame;
*/
public class Card1_053 extends AbstractCompanion {
public Card1_053() {
super(1, 4, 2, Culture.ELVEN, "Lorien Elf");
super(1, 4, 2, Culture.ELVEN, null, "Lorien Elf");
addKeyword(Keyword.ELF);
}

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

@@ -31,8 +31,7 @@ import java.util.List;
*/
public class Card1_289 extends AbstractCompanion {
public Card1_289() {
super(0, 3, 4, Culture.SHIRE, "Frodo", true);
setSignet(Signet.GANDALF);
super(0, 3, 4, Culture.SHIRE, Signet.GANDALF, "Frodo", true);
addKeyword(Keyword.HOBBIT);
addKeyword(Keyword.RING_BEARER);
}

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

@@ -29,8 +29,7 @@ import java.util.List;
*/
public class Card1_290 extends AbstractCompanion {
public Card1_290() {
super(0, 3, 4, Culture.SHIRE, "Frodo", true);
setSignet(Signet.FRODO);
super(0, 3, 4, Culture.SHIRE, Signet.FRODO, "Frodo", true);
addKeyword(Keyword.HOBBIT);
addKeyword(Keyword.RING_BEARER);
}

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

@@ -32,8 +32,7 @@ import java.util.List;
*/
public class Card1_302 extends AbstractCompanion {
public Card1_302() {
super(1, 3, 4, Culture.SHIRE, "Merry", true);
setSignet(Signet.FRODO);
super(1, 3, 4, Culture.SHIRE, Signet.FRODO, "Merry", true);
addKeyword(Keyword.HOBBIT);
}

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

@@ -23,8 +23,7 @@ import com.gempukku.lotro.logic.modifiers.Modifier;
*/
public class Card1_303 extends AbstractCompanion {
public Card1_303() {
super(1, 3, 4, Culture.SHIRE, "Merry", true);
setSignet(Signet.ARAGORN);
super(1, 3, 4, Culture.SHIRE, Signet.ARAGORN, "Merry", true);
addKeyword(Keyword.HOBBIT);
}

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

@@ -23,9 +23,8 @@ import com.gempukku.lotro.logic.modifiers.Modifier;
*/
public class Card1_306 extends AbstractCompanion {
public Card1_306() {
super(1, 3, 4, Culture.SHIRE, "Pippin", true);
super(1, 3, 4, Culture.SHIRE, Signet.FRODO, "Pippin", true);
addKeyword(Keyword.HOBBIT);
setSignet(Signet.FRODO);
}
@Override

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

@@ -36,9 +36,8 @@ import java.util.List;
*/
public class Card1_307 extends AbstractCompanion {
public Card1_307() {
super(1, 3, 4, Culture.SHIRE, "Pippin", true);
super(1, 3, 4, Culture.SHIRE, Signet.GANDALF, "Pippin", true);
addKeyword(Keyword.HOBBIT);
setSignet(Signet.GANDALF);
}
@Override

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

@@ -35,9 +35,8 @@ import java.util.List;
*/
public class Card1_310 extends AbstractCompanion {
public Card1_310() {
super(2, 3, 4, Culture.SHIRE, "Sam", true);
super(2, 3, 4, Culture.SHIRE, Signet.FRODO, "Sam", true);
addKeyword(Keyword.HOBBIT);
setSignet(Signet.FRODO);
}
@Override

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

@@ -34,9 +34,8 @@ import java.util.List;
*/
public class Card1_311 extends AbstractCompanion {
public Card1_311() {
super(2, 3, 4, Culture.SHIRE, "Sam", true);
super(2, 3, 4, Culture.SHIRE, Signet.ARAGORN, "Sam", true);
addKeyword(Keyword.HOBBIT);
setSignet(Signet.ARAGORN);
}
@Override