diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_049.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_049.java index 0e54e37b7..fcc37c0d9 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_049.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_049.java @@ -34,7 +34,7 @@ public class Card1_049 extends AbstractAttachable { @Override public Modifier getAlwaysOnEffect(PhysicalCard self) { - return new AbstractModifier(self, "Streng +1 for each Elf you can spot (limit +3)", Filters.hasAttached(self), new ModifierEffect[]{ModifierEffect.STRENGTH_MODIFIER}) { + return new AbstractModifier(self, "Strength +1 for each Elf you can spot (limit +3)", Filters.hasAttached(self), new ModifierEffect[]{ModifierEffect.STRENGTH_MODIFIER}) { @Override public int getStrength(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard, int result) { int count = Math.min(3, Filters.countActive(gameState, modifiersQuerying, Filters.race(Race.ELF))); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java index 6240069a7..e56c493ff 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java @@ -128,20 +128,25 @@ public class GameState { for (Map.Entry stringIntegerEntry : _playerPosition.entrySet()) listener.setPlayerPosition(stringIntegerEntry.getKey(), stringIntegerEntry.getValue()); - // First non-stacked non-attached cards + // First non-attached cards for (List physicalCards : _inPlay.values()) for (PhysicalCardImpl physicalCard : physicalCards) { - if (physicalCard.getZone() != Zone.ATTACHED && physicalCard.getZone() != Zone.STACKED) + if (physicalCard.getZone() != Zone.ATTACHED) listener.cardCreated(physicalCard); } - // Now the stacked and attached ones + // Now the attached ones for (List physicalCards : _inPlay.values()) for (PhysicalCardImpl physicalCard : physicalCards) { - if (physicalCard.getZone() == Zone.ATTACHED || physicalCard.getZone() == Zone.STACKED) + if (physicalCard.getZone() == Zone.ATTACHED) listener.cardCreated(physicalCard); } + // Finally the stacked ones + for (List physicalCards : _stacked.values()) + for (PhysicalCardImpl physicalCard : physicalCards) + listener.cardCreated(physicalCard); + List hand = _hands.get(playerId); if (hand != null) { for (PhysicalCardImpl physicalCard : hand) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/DefaultLotroGame.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/DefaultLotroGame.java index 28d4921b6..385da3202 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/DefaultLotroGame.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/DefaultLotroGame.java @@ -107,7 +107,7 @@ public class DefaultLotroGame implements LotroGame { public void playerLost(String playerId, String reason) { _losers.put(playerId, reason); if (_gameState != null) - _gameState.sendMessage(playerId + " lst due to: " + reason); + _gameState.sendMessage(playerId + " lost due to: " + reason); if (_losers.size() + 1 == _allPlayers.size()) { List allPlayers = new LinkedList(_allPlayers); 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 8e87f02a2..5f1b3d05d 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 @@ -1063,7 +1063,7 @@ var GempLotrGameUI = Class.extend({ $(".ui-dialog-titlebar").show(); this.cardActionDialog.dialog("open"); - this.arbitraryDialogResize(); + this.arbitraryDialogResize(false); }, cardActionChoiceDecision: function (decision) { @@ -1187,6 +1187,8 @@ var GempLotrGameUI = Class.extend({ $(".ui-dialog-titlebar").show(); this.cardActionDialog.dialog("open"); + + this.arbitraryDialogResize(true); }, cardSelectionDecision: function(decision) { @@ -1367,7 +1369,12 @@ var GempLotrGameUI = Class.extend({ group.setBounds(this.padding, this.padding, width - 2 * this.padding, height - 2 * this.padding); }, - arbitraryDialogResize: function() { - this.dialogResize(this.cardActionDialog, this.specialGroup); + arbitraryDialogResize: function(texts) { + if (texts) { + var width = this.cardActionDialog.width() + 10; + var height = this.cardActionDialog.height() - 10; + this.specialGroup.setBounds(this.padding, this.padding, width - 2 * this.padding, height - 2 * this.padding); + } else + this.dialogResize(this.cardActionDialog, this.specialGroup); } });