From 1bca7ff4f5d45ec4e4f9b03012c354b097a89f88 Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Fri, 16 Sep 2011 12:29:11 +0000
Subject: [PATCH] Scaling tokens according to card size.

---
 gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCardGroup.js | 9 ++++++---
 gemp-lotr/todo.txt                                       | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

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 3539b55c9..236021f61 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
@@ -46,6 +46,9 @@ var CardGroup = Class.extend({
         var borderOverlay = $(".borderOverlay", cardElem);
         borderOverlay.css({position: "absolute", left: 0 + "px", top: 0 + "px", width: width - 4, height: height - 4});
 
+        var maxDimension = Math.max(width, height);
+        var tokenSize = Math.floor(maxDimension / 20) * 2;
+
         var tokens = cardElem.data("card").tokens;
         if (tokens != null) {
             var tokenTypesCount = 0;
@@ -57,11 +60,11 @@ var CardGroup = Class.extend({
             var tokenIndex = 1;
             for (var token in tokens)
                 if (tokens.hasOwnProperty(token) && tokens[token] > 0) {
-                    var tokenX = (tokenIndex * (width / (tokenTypesCount + 1))) - 11;
+                    var tokenX = (tokenIndex * (width / (tokenTypesCount + 1))) - (tokenSize / 2);
                     var tokenCount = tokens[token];
 
                     for (var i = 0; i < tokenCount; i++) {
-                        var tokenElem = $("<img src='images/" + token.toLowerCase() + ".png'></img>").css({position: "absolute", left: tokenX + "px", top: 15 * (1 + i) + "px"});
+                        var tokenElem = $("<img src='images/" + token.toLowerCase() + ".png'></img>").css({position: "absolute", left: tokenX + "px", top: (tokenSize / 2) * (1 + i) + "px"});
                         tokenOverlay.append(tokenElem);
                     }
                     tokenIndex ++;
@@ -98,7 +101,7 @@ var AdvPathCardGroup = CardGroup.extend({
                 function(first, second) {
                     return (first.data("card").siteNumber - second.data("card").siteNumber);
                 }
-                );
+        );
 
         var cardCount = cardsToLayout.length;
         var totalHeight = 0;
diff --git a/gemp-lotr/todo.txt b/gemp-lotr/todo.txt
index 7d46a0c60..9f1a564e6 100644
--- a/gemp-lotr/todo.txt
+++ b/gemp-lotr/todo.txt
@@ -1,8 +1,6 @@
 TO DO:
 Before release:
 15. Add join game screen, where players can choose to play and get paired automatically when a pair becomes available.
-18. Add display of site where player is on adventure path.
-21. Scale wounds, burdens, other tokens with the card size.
 22. If skirmish is in progress, the total strength of each side should be displayed.
 20. Display "chess-clock" for each player.
 
@@ -39,3 +37,5 @@ with Filters.sameCard(...) filter.
 9. Add checkbox option to auto-pass if there is no actions to be played.
 8. Add checkbox option to auto-accept choices on the client, also allow to cancel selection to reset to none-selected
 and go with different selection.
+18. Add display of site where player is on adventure path.
+21. Scale wounds, burdens, other tokens with the card size.