ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Multiple cards played on a site in adventure path should be now layed out correctly - all should be visible, rather than only the one played most recently, also the played cards will be placed "under" the site, rather than on top. Also player tokens on the site will be put on top of the site and will not be obscured from view by the cards on top of the site.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-10-05 10:20:29 +00:00
parent 0da3541ffe
commit 2070f6aa10
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
View File

@@ -1,4 +1,11 @@
<pre style="font-size:80%">
<b>5 Oct. 2011</b>
- Added timestamps to the chat messages in GameHall.
- Multiple cards played on a site in adventure path should be now layed out correctly - all should be visible, rather
than only the one played most recently, also the played cards will be placed "under" the site, rather than on top. Also
player tokens on the site will be put on top of the site and will not be obscured from view by the cards on top of the
site.
<b>4 Oct. 2011</b>
- Added Deck Builder filtering in collection by set and card type. Also cards in deck builder collection are sorted
by name.

15
gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCardGroup.js
View File

@@ -106,7 +106,7 @@ var AdvPathCardGroup = CardGroup.extend({
function(first, second) {
return (first.data("card").siteNumber - second.data("card").siteNumber);
}
);
);
var cardCount = cardsToLayout.length;
var totalHeight = 0;
@@ -129,13 +129,18 @@ var AdvPathCardGroup = CardGroup.extend({
if (this.positions[i] == cardData.siteNumber)
cardData.tokens["" + (i + 1)] = 1;
this.layoutCard(cardElem, x, y, this.width, cardHeight, index);
for (var i = 0; i < cardData.attachedCards.length; i++) {
this.layoutCard(cardData.attachedCards[i], x + (this.width - cardHeight) / 2, y - (this.width - cardHeight) / 2, cardHeight, this.width, index);
if (cardData.attachedCards.length == 1) {
this.layoutCard(cardData.attachedCards[0], x + (this.width - cardHeight) / 2, y - (this.width - cardHeight) / 2, cardHeight, this.width, index);
index++;
} else {
for (var i = 0; i < cardData.attachedCards.length; i++) {
this.layoutCard(cardData.attachedCards[0], x + i * (this.width - cardHeight) / (cardData.attachedCards.length - 1), y - (this.width - cardHeight) / 2, cardHeight, this.width, index);
index++;
}
}
this.layoutCard(cardElem, x, y, this.width, cardHeight, index);
y += cardHeight + resultPadding;
index++;
}