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 000000000..851af2a6e Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/archery.png differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/fpArchery.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/fpArchery.png new file mode 100644 index 000000000..cbf54674e Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/fpArchery.png differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/move.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/move.png new file mode 100644 index 000000000..7b581f21c Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/move.png differ 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 000000000..f8425b63c Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/shadowArchery.png 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 798b62369..7e0b12bd8 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,6 +1,7 @@
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);