From bda7a7070908a006aaf0c1343a4b2362d34ec834 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Wed, 26 Oct 2011 22:14:57 +0000 Subject: [PATCH] Archery totals and move count/limit added to UI. --- .../gemp-lotr-web/src/main/webapp/game.html | 44 ++++++++++++++++++ .../src/main/webapp/images/archery.png | Bin 0 -> 1528 bytes .../src/main/webapp/images/fpArchery.png | Bin 0 -> 960 bytes .../src/main/webapp/images/move.png | Bin 0 -> 585 bytes .../src/main/webapp/images/shadowArchery.png | Bin 0 -> 984 bytes .../src/main/webapp/includes/changeLog.html | 1 + .../src/main/webapp/js/gameAnimations.js | 9 ++++ .../src/main/webapp/js/gameUi.js | 12 ++++- 8 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 gemp-lotr/gemp-lotr-web/src/main/webapp/images/archery.png create mode 100644 gemp-lotr/gemp-lotr-web/src/main/webapp/images/fpArchery.png create mode 100644 gemp-lotr/gemp-lotr-web/src/main/webapp/images/move.png create mode 100644 gemp-lotr/gemp-lotr-web/src/main/webapp/images/shadowArchery.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 546b2316a..46841db1f 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html @@ -46,6 +46,50 @@ border-color: #009f9f; } + .stats { + text-align: center; + padding: 2px; + } + + .fpArchery { + display: inline-block; + background-image: url('images/fpArchery.png'); + background-repeat: no-repeat; + color: #007777; + text-align: center; + vertical-align: middle; + font-size: 200%; + font-weight: bolder; + width: 30px; + height: 30px; + } + + .shadowArchery { + display: inline-block; + background-image: url('images/shadowArchery.png'); + background-repeat: no-repeat; + color: #007777; + text-align: center; + vertical-align: middle; + font-size: 200%; + font-weight: bolder; + width: 30px; + height: 30px; + } + + .move { + display: inline-block; + background-image: url('images/move.png'); + background-repeat: no-repeat; + color: #007777; + text-align: center; + vertical-align: middle; + font-size: 200%; + font-weight: bolder; + width: 30px; + height: 30px; + } + .player { color: #ffffff; } diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/archery.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/archery.png new file mode 100644 index 0000000000000000000000000000000000000000..851af2a6e9d7c2649bf2102d3e25f7bee17ed6f3 GIT binary patch literal 1528 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 X?8`Z1bGCFI00000NkvXXu0mjf>x%ID literal 0 HcmV?d00001 diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/shadowArchery.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/shadowArchery.png new file mode 100644 index 0000000000000000000000000000000000000000..f8425b63c797ee4850fc26bf3e9b63617947b691 GIT binary patch literal 984 zcmV;}11J26P)Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RW3K|tUG~dahK>z>%9cffpbVF}# zZDnqB0000007G(RVRU6=Aa`kWXdp*PO;BVmWd{HN13^hdK~zY`y_SDSQ&AMhzdko{ zb82%BNyYVt(UdW4EDKYJg3zF*D=U{pq%5cm2^0@&T#p%K`IMsTUD1eqE&T&_P}V|ZTYxCWl9E1;oEzn9R}+J^47cE(~^uY^Py z5*2b(7MCGzhZOdq;f;$+OiJ+Zr5P@#6Ffd2Kc=Tqe^U?J&`3Z9m5?YyVRK1OQBoj-%y%GbYEz(V(y15Y7hb0amD#P^gr2;6eQzx_UQ) z*BK3d3&}4yS6AS557){Uyv}GqgT5M*W8>_>>v!AQ)XX?|J)A3)zE0VB+SOM0+2*&3 zDfp9tUXW 26 Oct. 2011 - Added card overlay to active characters showing their current strength. +- Archery totals and move count/limit added to UI. 25 Oct. 2011 - "Vengeance" now correctly counts cards attached to oposing character. 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 7a4a09c25..04fcfa8d8 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 @@ -697,6 +697,15 @@ var GameAnimations = Class.extend({ } } + var fellowshipArchery = element.getAttribute("fellowshipArchery"); + var shadowArchery = element.getAttribute("shadowArchery"); + var moveCount = element.getAttribute("moveCount"); + var moveLimit = element.getAttribute("moveLimit"); + + $(".fpArchery").html(fellowshipArchery); + $(".shadowArchery").html(shadowArchery); + $(".move").html(moveCount + "/" + moveLimit); + var playerZones = element.getElementsByTagName("playerZones"); for (var i = 0; i < playerZones.length; i++) { var playerZone = playerZones[i]; 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 91a9ed9e5..4540b3a46 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 @@ -31,6 +31,8 @@ var GempLotrGameUI = Class.extend({ deadPileDialogs: null, deadPileGroups: null, + statsDiv: null, + skirmishGroupDiv: null, fpStrengthDiv: null, shadowStrengthDiv: null, @@ -195,11 +197,15 @@ var GempLotrGameUI = Class.extend({ $("#main").append(this.alertBox); + this.statsDiv = $("
"); + this.statsDiv.css({"border-radius": "7px"}); + this.statsDiv.append("
"); + $("#main").append(this.statsDiv); + $("body").click( function (event) { that.clickCardFunction(event); }); - }, addBottomLeftTabPane: function() { @@ -390,7 +396,9 @@ var GempLotrGameUI = Class.extend({ var currentPlayerTurn = (this.currentPlayerId == this.bottomPlayerId); if (this.advPathGroup != null) { - this.advPathGroup.setBounds(padding, padding, advPathWidth, height - (padding * 3) - chatHeight); + this.statsDiv.css({position: "absolute", left: padding + "px", top: height - (padding * 2) - chatHeight - 34 + "px", width: advPathWidth, height: 34}); + + this.advPathGroup.setBounds(padding, padding, advPathWidth, height - (padding * 3) - chatHeight - 34 - padding); this.supportOpponent.setBounds(advPathWidth + specialUiWidth + (padding * 2), padding + yScales[0] * heightPerScale, width - (advPathWidth + specialUiWidth + padding * 3), heightScales[0] * heightPerScale); this.charactersOpponent.setBounds(advPathWidth + specialUiWidth + (padding * 2), padding * 2 + yScales[1] * heightPerScale, currentPlayerTurn ? charsWidth : charsWidthWithAssignments, heightScales[1] * heightPerScale);