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 ad572527c..9fd4212aa 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 @@ -27,7 +27,7 @@ import java.util.List; public class Card1_289 extends AbstractCompanion { public Card1_289() { super(0, 3, 4, Culture.SHIRE, Race.HOBBIT, Signet.GANDALF, "Frodo", true); - addKeyword(Keyword.RING_BEARER); + addKeyword(Keyword.CAN_START_WITH_RING); } @Override 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 beaccc825..fe4762210 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 @@ -28,7 +28,7 @@ import java.util.List; public class Card1_290 extends AbstractCompanion { public Card1_290() { super(0, 3, 4, Culture.SHIRE, Race.HOBBIT, Signet.FRODO, "Frodo", true); - addKeyword(Keyword.RING_BEARER); + addKeyword(Keyword.CAN_START_WITH_RING); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_102.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_102.java index adb3f9092..66dd8f4fd 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_102.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_102.java @@ -30,7 +30,7 @@ import java.util.List; public class Card2_102 extends AbstractCompanion { public Card2_102() { super(0, 3, 4, Culture.SHIRE, Race.HOBBIT, Signet.ARAGORN, "Frodo", true); - addKeyword(Keyword.RING_BEARER); + addKeyword(Keyword.CAN_START_WITH_RING); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_301.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_301.java index 872a65ac5..eeb8fbfd8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_301.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_301.java @@ -28,7 +28,7 @@ import java.util.List; public class Card4_301 extends AbstractCompanion { public Card4_301() { super(0, 3, 4, Culture.SHIRE, Race.HOBBIT, Signet.FRODO, "Frodo", true); - addKeyword(Keyword.RING_BEARER); + addKeyword(Keyword.CAN_START_WITH_RING); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_302.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_302.java index 04eba4055..e29a3305f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_302.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_302.java @@ -27,7 +27,7 @@ import java.util.List; public class Card4_302 extends AbstractCompanion { public Card4_302() { super(0, 3, 4, Culture.SHIRE, Race.HOBBIT, Signet.GANDALF, "Frodo", true); - addKeyword(Keyword.RING_BEARER); + addKeyword(Keyword.CAN_START_WITH_RING); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/shire/Card5_111.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/shire/Card5_111.java index c8264490f..cd954f4d6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/shire/Card5_111.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/shire/Card5_111.java @@ -28,7 +28,7 @@ import java.util.List; public class Card5_111 extends AbstractCompanion { public Card5_111() { super(0, 3, 4, Culture.SHIRE, Race.HOBBIT, Signet.ARAGORN, "Frodo", true); - addKeyword(Keyword.RING_BEARER); + addKeyword(Keyword.CAN_START_WITH_RING); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_317.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_317.java index cdb1db7c1..405befb4d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_317.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_317.java @@ -31,7 +31,7 @@ import java.util.List; public class Card7_317 extends AbstractCompanion { public Card7_317() { super(0, 3, 4, Culture.SHIRE, Race.HOBBIT, Signet.ARAGORN, "Frodo", true); - addKeyword(Keyword.RING_BEARER); + addKeyword(Keyword.CAN_START_WITH_RING); addKeyword(Keyword.RING_BOUND); } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_318.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_318.java index 4c3ad4b6b..8b5928327 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_318.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_318.java @@ -29,7 +29,7 @@ import java.util.List; public class Card7_318 extends AbstractCompanion { public Card7_318() { super(0, 3, 4, Culture.SHIRE, Race.HOBBIT, Signet.GANDALF, "Frodo", true); - addKeyword(Keyword.RING_BEARER); + addKeyword(Keyword.CAN_START_WITH_RING); addKeyword(Keyword.RING_BOUND); } diff --git a/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Keyword.java b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Keyword.java index 319b7234a..1c418851d 100644 --- a/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Keyword.java +++ b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Keyword.java @@ -5,6 +5,8 @@ public enum Keyword implements Filterable { SKIRMISH("Skirmish"), FELLOWSHIP("Fellowship"), RESPONSE("Response"), MANEUVER("Maneuver"), ARCHERY("Archery"), SHADOW("Shadow"), ASSIGNMENT("Assignment"), REGROUP("Regroup"), + CAN_START_WITH_RING("Can-bear-ring", false), + RING_BOUND("Ring-Bound", true), RING_BEARER("Ring-Bearer", true), ENDURING("Enduring", true), ROAMING("Roaming", true), TWILIGHT("Twilight", true), diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/DefaultLotroFormat.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/DefaultLotroFormat.java index eb2bc69b9..71eec4d94 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/DefaultLotroFormat.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/DefaultLotroFormat.java @@ -68,7 +68,7 @@ public abstract class DefaultLotroFormat implements LotroFormat { if (deck.getRingBearer() == null) throw new DeckInvalidException("Deck doesn't have a Ring-bearer"); LotroCardBlueprint ringBearer = _library.getLotroCardBlueprint(deck.getRingBearer()); - if (!ringBearer.hasKeyword(Keyword.RING_BEARER)) + if (!ringBearer.hasKeyword(Keyword.CAN_START_WITH_RING)) throw new DeckInvalidException("Card assigned as Ring-bearer can not bear the ring"); // Ring 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 4a4183865..a9d56e12b 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 @@ -311,7 +311,7 @@ var GempLotrDeckBuildingUI = Class.extend({ this.ringBearerDiv.click( function() { if ($(".card", that.ringBearerDiv).length == 0) - that.showPredefinedFilter("keyword:RING_BEARER", that.ringBearerDiv); + that.showPredefinedFilter("keyword:CAN_START_WITH_RING", that.ringBearerDiv); }); this.ringBearerGroup = new NormalCardGroup(this.ringBearerDiv, function(card) { return true; @@ -384,11 +384,11 @@ var GempLotrDeckBuildingUI = Class.extend({ this.infoDialog = $("
") .dialog({ - autoOpen: false, - closeOnEscape: true, - resizable: false, - title: "Card information" - }); + autoOpen: false, + closeOnEscape: true, + resizable: false, + title: "Card information" + }); var swipeOptions = { threshold: 20,