diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html index b57da7b1d..bc88d13e3 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html @@ -15,6 +15,10 @@ border: 2px solid #000000; } + .foilOverlay { + opacity: 0.2; + } + .selectableCard > .borderOverlay { border: 2px solid #00ff00; cursor: pointer; diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html index c3a78864f..69e99d89d 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html @@ -15,6 +15,10 @@ border: solid #000000; } + .foilOverlay { + opacity: 0.2; + } + .selectableCard > .borderOverlay { border-color: #00af00; cursor: pointer; diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/holo.jpg b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/holo.jpg new file mode 100644 index 000000000..ef0198004 Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/holo.jpg differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html index db224ec6f..e2a54280e 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html @@ -1,4 +1,4 @@ -
+
 22 Sept. 2011
 - Changed the main page after logging in to give access to additional documents.
 - Changed the play event animation so that player might actually recognize the card.
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/chat.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/chat.js
index 08337a384..99dc1b728 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/chat.js
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/chat.js
@@ -64,7 +64,7 @@ var ChatBoxUI = Class.extend({
         if (msgClass == undefined)
             msgClass = "chatMessage";
         this.chatMessagesDiv.append("
" + message + "
"); - if ($("div", this.chatMessagesDiv).length > 50) { + if ($("div", this.chatMessagesDiv).length > 100) { $("div", this.chatMessagesDiv).first().remove(); } this.chatMessagesDiv.prop({ scrollTop: this.chatMessagesDiv.prop("scrollHeight") }); 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 49fa00e48..6f5dc57c8 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 @@ -296,7 +296,7 @@ var GempLotrDeckBuildingUI = Class.extend({ addCardToContainer: function(blueprintId, zone, container) { var card = new Card(blueprintId, zone, "deck", "player"); - var cardDiv = createCardDiv(card.imageUrl, null); + var cardDiv = createCardDiv(card.imageUrl, null, card.isFoil()); cardDiv.data("card", card); container.append(cardDiv); this.layoutUI(); @@ -428,7 +428,7 @@ var GempLotrDeckBuildingUI = Class.extend({ var blueprintId = cardElem.getAttribute("blueprintId"); var count = cardElem.getAttribute("count"); var card = new Card(blueprintId, "collection", "collection" + i, "player"); - var cardDiv = createCardDiv(card.imageUrl, null); + var cardDiv = createCardDiv(card.imageUrl, null, card.isFoil()); cardDiv.data("card", card); cardDiv.addClass("cardInCollection"); if (this.normalCollectionDiv.is(":visible")) diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js index 77480cb8d..48020c7b5 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js @@ -721,7 +721,7 @@ var GempLotrGameUI = Class.extend({ else card = new Card(blueprintId, zone, cardId, participantId); - var cardDiv = this.createCardDiv(card); + var cardDiv = this.createCardDiv(card, null, card.isFoil()); if (zone == "DISCARD") this.discardPileDialogs[participantId].append(cardDiv); else if (zone == "DEAD") @@ -995,8 +995,8 @@ var GempLotrGameUI = Class.extend({ this.smallDialog.dialog("open"); }, - createCardDiv: function(card, text) { - var cardDiv = createCardDiv(card.imageUrl, text); + createCardDiv: function(card, text, foil) { + var cardDiv = createCardDiv(card.imageUrl, text, foil); cardDiv.data("card", card); var that = this; diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCardGroup.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCardGroup.js index d1b464fe3..38465e9b5 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCardGroup.js +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCardGroup.js @@ -43,6 +43,8 @@ var CardGroup = Class.extend({ tokenOverlay.css({position: "absolute", left: 0 + "px", top: 0 + "px", width: width, height: height}) .html(""); + $(".foilOverlay", cardElem).css({position: "absolute", left: 0 + "px", top: 0 + "px", width: width, height: height}); + var maxDimension = Math.max(width, height); var borderWidth = Math.floor(maxDimension / 30); diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js index add97bc8b..72511ad5c 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js @@ -3,6 +3,7 @@ var cardScale = 357 / 497; var Card = Class.extend({ blueprintId: null, + foil: null, horizontal: null, imageUrl: null, zone: null, @@ -12,7 +13,14 @@ var Card = Class.extend({ attachedCards: null, init: function(blueprintId, zone, cardId, owner, siteNumber) { + var len = blueprintId.length; + this.foil = blueprintId.substring(len - 1, len) == "*"; + + if (this.foil) + blueprintId = blueprintId.substring(0, len - 1); + this.blueprintId = blueprintId; + this.zone = zone; this.cardId = cardId; this.owner = owner; @@ -37,6 +45,10 @@ var Card = Class.extend({ } }, + isFoil: function() { + return this.foil; + }, + isHorizontal: function(blueprintId) { var separator = blueprintId.indexOf("_"); var setNo = parseInt(blueprintId.substr(0, separator)); @@ -80,8 +92,13 @@ var Card = Class.extend({ } }); -function createCardDiv(image, text) { +function createCardDiv(image, text, foil) { var cardDiv = $("
" + ((text != null) ? text : "") + "
"); + if (foil) { + var foilDiv = $("
"); + cardDiv.append(foilDiv); + } + var overlayDiv = $("
"); cardDiv.append(overlayDiv); var borderDiv = $("
");