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

- Fixed display of minions when they are removed from skirmish (for example by Merry or Pippin effect).

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-10-27 23:00:04 +00:00
parent 86c713dacf
commit 7b21e19de5
5 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java
View File

@@ -685,6 +685,11 @@ public class GameState {
startAffectingStacked(game, stackedCard);
}
public void reapplyAffectingForCard(LotroGame game, PhysicalCard card) {
((PhysicalCardImpl) card).stopAffectingGame();
((PhysicalCardImpl) card).startAffectingGame(game);
}
public void stopAffectingCardsForCurrentPlayer() {
for (PhysicalCardImpl physicalCard : _inPlay) {
if (isCardInPlayActive(physicalCard) && physicalCard.getBlueprint().getCardType() != CardType.SITE)

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

@@ -1,6 +1,7 @@
<pre style="font-size:80%">
<b>27 Oct. 2011</b>
- "Wizard Staff" is no longer considered an artifact by the game, it's just a mere possession.
- Fixed display of minions when they are removed from skirmish (for example by Merry or Pippin effect).
<b>26 Oct. 2011</b>
- Added card overlay to active characters showing their current strength.

7
gemp-lotr/gemp-lotr-web/src/main/webapp/js/deckBuildingUi.js
View File

@@ -155,10 +155,15 @@ var GempLotrDeckBuildingUI = Class.extend({
+ "<option value='1'>01 - The Fellowship of the Ring</option>"
+ "<option value='2'>02 - Mines of Moria</option>"
+ "<option value='3'>03 - Realms of the Elf-lords</option>"
+ "<option value='4,5,6'>The Two Towers Block</option>"
+ "<option value='4,5,6'>Towers Block</option>"
+ "<option value='4'>04 - The Two Towers</option>"
+ "<option value='5'>05 - Battle of Helm's Deep</option>"
+ "<option value='6'>06 - Ents of Fangorn</option>"
+ "<option value='7,8,10'>King Block</option>"
+ "<option value='7'>07 - The Return of the King</option>"
+ "<option value='8'>08 - Siege of Gondor</option>"
+ "<option value='9'>09 - Reflections</option>"
+ "<option value='10'>10 - Mount Doom</option>"
+ "</select>");
combos.append(" <select id='cardType'>"

3
gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameAnimations.js
View File

@@ -552,7 +552,8 @@ var GameAnimations = Class.extend({
var cardId = element.getAttribute("cardId");
$(".card:cardId(" + cardId + ")").each(function() {
$(this).data("card").skirmish = false;
var cardData = $(this).data("card");
delete cardData.skirmish;
});
next();

2
gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js
View File

@@ -396,7 +396,7 @@ var GempLotrGameUI = Class.extend({
var currentPlayerTurn = (this.currentPlayerId == this.bottomPlayerId);
if (this.advPathGroup != null) {
this.statsDiv.css({position: "absolute", left: padding + "px", top: height - (padding * 2) - chatHeight - 34 + "px", width: advPathWidth, height: 34});
this.statsDiv.css({position: "absolute", left: padding + "px", top: height - (padding * 2) - chatHeight - 34 + "px", width: advPathWidth - 4 , height: 30});
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);