From 4e9404e8816d83b9662817e2ce86208b5b3f3313 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Tue, 6 Sep 2011 00:01:21 +0000 Subject: [PATCH] Introducing Signet into AbstractCompanion constructor. --- .../com/gempukku/lotro/cards/AbstractCompanion.java | 11 ++++------- .../gempukku/lotro/cards/set1/dwarven/Card1_007.java | 2 +- .../gempukku/lotro/cards/set1/dwarven/Card1_011.java | 2 +- .../gempukku/lotro/cards/set1/dwarven/Card1_012.java | 3 +-- .../gempukku/lotro/cards/set1/dwarven/Card1_013.java | 3 +-- .../gempukku/lotro/cards/set1/elven/Card1_030.java | 3 +-- .../gempukku/lotro/cards/set1/elven/Card1_048.java | 2 +- .../gempukku/lotro/cards/set1/elven/Card1_050.java | 3 +-- .../gempukku/lotro/cards/set1/elven/Card1_051.java | 3 +-- .../gempukku/lotro/cards/set1/elven/Card1_053.java | 2 +- .../gempukku/lotro/cards/set1/shire/Card1_289.java | 3 +-- .../gempukku/lotro/cards/set1/shire/Card1_290.java | 3 +-- .../gempukku/lotro/cards/set1/shire/Card1_302.java | 3 +-- .../gempukku/lotro/cards/set1/shire/Card1_303.java | 3 +-- .../gempukku/lotro/cards/set1/shire/Card1_306.java | 3 +-- .../gempukku/lotro/cards/set1/shire/Card1_307.java | 3 +-- .../gempukku/lotro/cards/set1/shire/Card1_310.java | 3 +-- .../gempukku/lotro/cards/set1/shire/Card1_311.java | 3 +-- 18 files changed, 21 insertions(+), 37 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractCompanion.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractCompanion.java index ac9edae02..a1366f6fe 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractCompanion.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractCompanion.java @@ -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 actions, String playerId, LotroGame game, PhysicalCard self) { if (PlayConditions.canPlayFPCardDuringPhase(game, Phase.FELLOWSHIP, self)) actions.add(getPlayCardAction(playerId, game, self, 0)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_007.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_007.java index 62f3f5244..fa6033934 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_007.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_007.java @@ -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); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_011.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_011.java index 54d98f246..2a2a6c299 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_011.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_011.java @@ -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); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_012.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_012.java index e3d6426b6..6480c3636 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_012.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_012.java @@ -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); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_013.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_013.java index a69a11db9..d7a30c7c9 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_013.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_013.java @@ -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); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_030.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_030.java index b87be4ca6..e28d1eb07 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_030.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_030.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_048.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_048.java index 80954a4c7..f161d1233 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_048.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_048.java @@ -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); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_050.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_050.java index 0ef72d6a5..2a33a9728 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_050.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_050.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_051.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_051.java index bc58ee80c..b658a02e7 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_051.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_051.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_053.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_053.java index 49ed2d0bd..f970da612 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_053.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_053.java @@ -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); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_289.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_289.java index 14ee01341..9adbeed79 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_289.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_289.java @@ -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); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_290.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_290.java index 5f4f8f123..633073b68 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_290.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_290.java @@ -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); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_302.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_302.java index 77faab791..b83e95d19 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_302.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_302.java @@ -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); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_303.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_303.java index 85d4c62c9..225f1de2d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_303.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_303.java @@ -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); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_306.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_306.java index 700c38503..1a568c30b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_306.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_306.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_307.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_307.java index 086405d7f..18c3723c8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_307.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_307.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_310.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_310.java index 82c7da671..b40b527f6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_310.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_310.java @@ -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 diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_311.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_311.java index db35de14a..87a8507a6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_311.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/shire/Card1_311.java @@ -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