From 0c2d6aa2df7778420387a208986998d36ac2a324 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Tue, 6 Dec 2011 19:56:17 +0000 Subject: [PATCH] Display of site number and resistance. --- .../gemp-lotr-web/src/main/webapp/game.html | 36 ------------------ .../src/main/webapp/images/o_icon_compass.png | Bin 0 -> 3729 bytes .../main/webapp/images/o_icon_resistance.png | Bin 0 -> 3567 bytes .../src/main/webapp/js/gameAnimations.js | 6 ++- .../src/main/webapp/js/gameUi.js | 16 +++++++- 5 files changed, 20 insertions(+), 38 deletions(-) create mode 100644 gemp-lotr/gemp-lotr-web/src/main/webapp/images/o_icon_compass.png create mode 100644 gemp-lotr/gemp-lotr-web/src/main/webapp/images/o_icon_resistance.png 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 2f89707e1..eae49e411 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html @@ -102,52 +102,16 @@ body { .cardSiteNumber { text-align: center; - background-color: #877a4e; - opacity: 1; font-weight: bolder; color: #ffffff; } .cardResistance { text-align: center; - background-color: #16151a; - opacity: 1; font-weight: bolder; color: #ffffff; } -.cardResistance.aragorn { - text-align: center; - background-color: transparent; - opacity: 1; - font-weight: bolder; - color: #000000; -} - -.cardResistance.frodo { - text-align: center; - background-color: transparent; - opacity: 1; - font-weight: bolder; - color: #000000; -} - -.cardResistance.gandalf { - text-align: center; - background-color: transparent; - opacity: 1; - font-weight: bolder; - color: #000000; -} - -.cardResistance.theoden { - text-align: center; - background-color: transparent; - opacity: 1; - font-weight: bolder; - color: #000000; -} - .selectableCard > .borderOverlay { border-color: #00af00; cursor: pointer; diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/o_icon_compass.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/o_icon_compass.png new file mode 100644 index 0000000000000000000000000000000000000000..68043e030969cc082d73b63183d85ba95db837a2 GIT binary patch literal 3729 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 WPRu`J!!rFTf#40>gC4JE=KK%6W(N2G literal 0 HcmV?d00001 diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/o_icon_resistance.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/o_icon_resistance.png new file mode 100644 index 0000000000000000000000000000000000000000..0822d147b6db83e4ef6f9aac4f09f8a353fef67a GIT binary patch literal 3567 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 M{@?AaW"); tokenOverlay.append(cardVitalityDiv); + var cardSiteNumberBgDiv = $("
"); + cardSiteNumberBgDiv.css({display: "none"}); + tokenOverlay.append(cardSiteNumberBgDiv); + var cardSiteNumberDiv = $("
"); cardSiteNumberDiv.css({display: "none"}); tokenOverlay.append(cardSiteNumberDiv); + var cardResistanceBgDiv = $("
"); + cardResistanceBgDiv.css({display: "none"}); + tokenOverlay.append(cardResistanceBgDiv); + var cardResistanceDiv = $("
"); cardResistanceDiv.css({display: "none"}); tokenOverlay.append(cardResistanceDiv); @@ -1061,7 +1069,7 @@ var GempLotrGameUI = Class.extend({ var x = 0.09 * maxDimension - size / 2; var strengthY = 0.678 * maxDimension - size / 2; var vitalityY = 0.795 * maxDimension - size / 2; - var minionSiteNumberY = 0.89135 * maxDimension - size / 2; + var minionSiteNumberY = 0.900 * maxDimension - size / 2; var fontPerc = (size * 6) + "%"; var borderRadius = Math.ceil(size / 5) + "px"; @@ -1075,11 +1083,17 @@ var GempLotrGameUI = Class.extend({ var vitBgY = 0.7465 * height; var vitalityBgSize = 0.105 * height; + var thirdBoxX = 0.0532 * width; + var thirdBoxY = 0.845 * height; + var thirdBoxSize = 0.115 * height; + $(".cardStrengthBg", cardElem).css({position: "absolute", left: strBgX + "px", top: strBgY + "px", width: strBgWidth, height: strBgHeight}); $(".cardStrength", cardElem).css({position: "absolute", "font-size": fontPerc, left: x + "px", top: strengthY + "px", width: size, height: size}); $(".cardVitalityBg", cardElem).css({position: "absolute", left: vitBgX + "px", top: vitBgY + "px", width: vitalityBgSize, height: vitalityBgSize}); $(".cardVitality", cardElem).css({position: "absolute", "font-size": fontPerc, left: x + "px", top: vitalityY + "px", width: size, height: size}); + $(".cardSiteNumberBg", cardElem).css({position: "absolute", left: thirdBoxX + "px", top: thirdBoxY + "px", width: thirdBoxSize, height: thirdBoxSize}); $(".cardSiteNumber", cardElem).css({position: "absolute", "border-radius": borderRadius, "font-size": fontPerc, left: x + "px", top: minionSiteNumberY + "px", width: size, height: size}); + $(".cardResistanceBg", cardElem).css({position: "absolute", left: thirdBoxX + "px", top: thirdBoxY + "px", width: thirdBoxSize, height: thirdBoxSize}); $(".cardResistance", cardElem).css({position: "absolute", "border-radius": borderRadius, "font-size": fontPerc, left: x + "px", top: minionSiteNumberY + "px", width: size, height: size}); } };