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 2aad64825..2f89707e1 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html @@ -90,16 +90,12 @@ body { .cardStrength { text-align: center; - background-color: #7a6a53; - opacity: 1; font-weight: bolder; color: #ffffff; } .cardVitality { text-align: center; - background-color: #8a1f0d; - opacity: 1; font-weight: bolder; color: #ffffff; } diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/strength.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/strength.png new file mode 100644 index 000000000..c0894d430 Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/strength.png differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/vitality.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/vitality.png new file mode 100644 index 000000000..6ea82c8e1 Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/vitality.png differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameAnimations.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameAnimations.js index 72c99e889..2e92713d7 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameAnimations.js +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameAnimations.js @@ -710,7 +710,9 @@ var GameAnimations = Class.extend({ $("#main").queue( function(next) { $(".cardStrength").css({display: "none"}); + $(".cardStrengthBg").css({display: "none"}); $(".cardVitality").css({display: "none"}); + $(".cardVitalityBg").css({display: "none"}); $(".cardSiteNumber").css({display: "none"}); $(".cardResistance").css({display: "none"}); @@ -721,7 +723,9 @@ var GameAnimations = Class.extend({ var cardStats = charStatsArr[i].split("="); var cardDiv = $(".card:cardId(" + cardStats[0] + ")"); var cardStatArr = cardStats[1].split("|"); + $(".cardStrengthBg", cardDiv).css({display: ""}); $(".cardStrength", cardDiv).html(cardStatArr[0]).css({display: ""}); + $(".cardVitalityBg", cardDiv).css({display: ""}); $(".cardVitality", cardDiv).html(cardStatArr[1]).css({display: ""}); if (cardStatArr.length > 2) { if (cardStatArr[2].indexOf("R") == 0) { 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 fd5c8226d..219c9ffa2 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 @@ -1032,10 +1032,18 @@ var GempLotrGameUI = Class.extend({ var tokenOverlay = $(".tokenOverlay", cardDiv); + var cardStrengthBgDiv = $("

