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

Preparation for alternative ring-bearers (adding new hidden keyword - CAN_START_WITH_RING).

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-11-15 16:21:55 +00:00
parent ab3dc6d86d
commit b13c64901b
11 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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

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

@@ -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

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/shire/Card2_102.java
View File

@@ -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

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_301.java
View File

@@ -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

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/shire/Card4_302.java
View File

@@ -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

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/shire/Card5_111.java
View File

@@ -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

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_317.java
View File

@@ -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);
}

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/shire/Card7_318.java
View File

@@ -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);
}

2
gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Keyword.java
View File

@@ -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),

2
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/DefaultLotroFormat.java
View File

@@ -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

12
gemp-lotr/gemp-lotr-web/src/main/webapp/js/deckBuildingUi.js
View File

@@ -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 = $("<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,