From 875d2177d8cdf438f144a5a40b1c499e9da50e4b Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Mon, 16 Jan 2012 16:13:29 +0000
Subject: [PATCH] "Elladan"

---
 .../lotro/cards/set14/elven/Card14_002.java   | 45 +++++++++++++++++++
 .../com/gempukku/lotro/game/LotroServer.java  |  2 +-
 .../src/main/webapp/js/deckBuildingUi.js      | 43 +++++++++---------
 3 files changed, 68 insertions(+), 22 deletions(-)
 create mode 100644 gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set14/elven/Card14_002.java

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set14/elven/Card14_002.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set14/elven/Card14_002.java
new file mode 100644
index 000000000..96a4a6920
--- /dev/null
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set14/elven/Card14_002.java
@@ -0,0 +1,45 @@
+package com.gempukku.lotro.cards.set14.elven;
+
+import com.gempukku.lotro.cards.AbstractCompanion;
+import com.gempukku.lotro.common.CardType;
+import com.gempukku.lotro.common.Culture;
+import com.gempukku.lotro.common.Race;
+import com.gempukku.lotro.filters.Filters;
+import com.gempukku.lotro.game.PhysicalCard;
+import com.gempukku.lotro.game.state.LotroGame;
+import com.gempukku.lotro.logic.modifiers.Modifier;
+import com.gempukku.lotro.logic.modifiers.SpotCondition;
+import com.gempukku.lotro.logic.modifiers.TwilightCostModifier;
+
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * Set: Expanded Middle-earth
+ * Side: Free
+ * Culture: Elven
+ * Twilight Cost: 3
+ * Type: Companion • Elf
+ * Strength: 7
+ * Vitality: 3
+ * Resistance: 6
+ * Game Text: Elrohir is twilight cost -2. Each time you play an [ELVEN] event during a skirmish involving Elladan
+ * or Elrohir, that event is twilight cost -2.
+ */
+public class Card14_002 extends AbstractCompanion {
+    public Card14_002() {
+        super(3, 7, 3, 6, Culture.ELVEN, Race.ELF, null, "Elladan", true);
+    }
+
+    @Override
+    public List<? extends Modifier> getAlwaysOnModifiers(LotroGame game, PhysicalCard self) {
+        List<Modifier> modifiers = new LinkedList<Modifier>();
+        modifiers.add(
+                new TwilightCostModifier(self, Filters.name("Elrohir"), -2));
+        modifiers.add(
+                new TwilightCostModifier(self,
+                        Filters.and(Filters.owner(self.getOwner()), CardType.EVENT, Culture.ELVEN),
+                        new SpotCondition(Filters.or(Filters.name("Elladan"), Filters.name("Elrohir")), Filters.inSkirmish), -2));
+        return modifiers;
+    }
+}
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java
index 97fb89451..38110d324 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java
@@ -49,7 +49,7 @@ public class LotroServer extends AbstractServer {
         _test = test;
         _defaultCollection = new DefaultCardCollection();
 
-        final int[] cardCounts = new int[]{129, 365, 122, 122, 365, 128, 128, 365, 122, 52, 122, 266, 203, 203};
+        final int[] cardCounts = new int[]{129, 365, 122, 122, 365, 128, 128, 365, 122, 52, 122, 266, 203, 203, 15};
 
         Thread thr = new Thread(
                 new Runnable() {
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/deckBuildingUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/deckBuildingUi.js
index 6d1c1d8ac..1fb32b1c9 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/deckBuildingUi.js
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/deckBuildingUi.js
@@ -163,6 +163,7 @@ var GempLotrDeckBuildingUI = Class.extend({
                 + "<option value='11'>11 - Shadows</option>"
                 + "<option value='12'>12 - Black Rider</option>"
                 + "<option value='13'>13 - Bloodlines</option>"
+                + "<option value='14'>14 - Expanded Middle-earth</option>"
                 + "</select>");
         this.fullFilterDiv.append("<input type='text' id='cardName' value='Card name'>");
         this.fullFilterDiv.append("<select id='sort'>"
@@ -406,11 +407,11 @@ var GempLotrDeckBuildingUI = Class.extend({
 
         this.infoDialog = $("<div></div>")
                 .dialog({
-            autoOpen: false,
-            closeOnEscape: true,
-            resizable: false,
-            title: "Card information"
-        });
+                    autoOpen: false,
+                    closeOnEscape: true,
+                    resizable: false,
+                    title: "Card information"
+                });
 
         var swipeOptions = {
             threshold: 20,
@@ -453,14 +454,14 @@ var GempLotrDeckBuildingUI = Class.extend({
             if (that.deckListDialog == null) {
                 that.deckListDialog = $("<div></div>")
                         .dialog({
-                    title: "Your stored decks",
-                    autoOpen: false,
-                    closeOnEscape: true,
-                    resizable: true,
-                    width: 400,
-                    height: 400,
-                    modal: true
-                });
+                            title: "Your stored decks",
+                            autoOpen: false,
+                            closeOnEscape: true,
+                            resizable: true,
+                            width: 400,
+                            height: 400,
+                            modal: true
+                        });
             }
             that.deckListDialog.html("");
 
@@ -558,14 +559,14 @@ var GempLotrDeckBuildingUI = Class.extend({
                             if (this.selectionDialog == null) {
                                 this.selectionDialog = $("<div></div>")
                                         .dialog({
-                                    title: "Choose one",
-                                    autoOpen: false,
-                                    closeOnEscape: true,
-                                    resizable: true,
-                                    width: 400,
-                                    height: 200,
-                                    modal: true
-                                });
+                                            title: "Choose one",
+                                            autoOpen: false,
+                                            closeOnEscape: true,
+                                            resizable: true,
+                                            width: 400,
+                                            height: 200,
+                                            modal: true
+                                        });
 
                                 this.selectionGroup = new NormalCardGroup(this.selectionDialog, function(card) {
                                     return true;