diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/RequiredTriggerAction.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/RequiredTriggerAction.java index a59f7a5b5..adb899558 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/RequiredTriggerAction.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/RequiredTriggerAction.java @@ -20,6 +20,6 @@ public class RequiredTriggerAction extends DefaultCostToEffectAction { @Override protected String getMessage() { - return _physicalCard.getBlueprint().getName() + " optional triggered effect is used"; + return _physicalCard.getBlueprint().getName() + " required triggered effect is used"; } } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/KillEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/KillEffect.java index 90a8c2bf5..a9bcee9f9 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/KillEffect.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/KillEffect.java @@ -27,7 +27,7 @@ public class KillEffect extends AbstractEffect { @Override public String getText() { - return "Kills character"; + return "Kill " + _card.getBlueprint().getName(); } @Override diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/OverwhelmedEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/OverwhelmedEffect.java index d055cc884..7cf6a2e40 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/OverwhelmedEffect.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/OverwhelmedEffect.java @@ -34,7 +34,7 @@ public class OverwhelmedEffect extends AbstractEffect { @Override public EffectResult playEffect(LotroGame game) { - game.getGameState().sendMessage("Skirmish finishes with an overwhelming"); + game.getGameState().sendMessage("Skirmish finishes with an overwhelm"); return new OverwhelmSkirmishResult(_winners, _losers); } } 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 d784c58ec..00c8167c1 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 @@ -127,17 +127,21 @@ public class DefaultLotroGame implements LotroGame { // Ring-bearer death if (!Filters.canSpot(gameState, getModifiersQuerying(), Filters.keyword(Keyword.RING_BEARER))) { playerLost(getGameState().getCurrentPlayerId(), "The Ring-Bearer is dead"); - } - // Ring-bearer corruption - PhysicalCard ringBearer = Filters.findFirstActive(getGameState(), getModifiersQuerying(), Filters.keyword(Keyword.RING_BEARER)); - int ringBearerResistance = ringBearer.getBlueprint().getResistance(); - if (getGameState().getBurdens() >= ringBearerResistance) { - playerLost(getGameState().getCurrentPlayerId(), "The Ring-Bearer is corrupted"); + return; + } else { + // Ring-bearer corruption + PhysicalCard ringBearer = Filters.findFirstActive(getGameState(), getModifiersQuerying(), Filters.keyword(Keyword.RING_BEARER)); + int ringBearerResistance = ringBearer.getBlueprint().getResistance(); + if (getGameState().getBurdens() >= ringBearerResistance) { + playerLost(getGameState().getCurrentPlayerId(), "The Ring-Bearer is corrupted"); + return; + } } // Fellowship in regroup at the last site if (getGameState().getCurrentPhase() == Phase.REGROUP && getGameState().getCurrentSiteNumber() == 9) { playerWon(getGameState().getCurrentPlayerId(), "Surviving to Regroup phase on site 9"); + return; } } } 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 7e026b411..e338afa43 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 @@ -90,7 +90,7 @@ var GempLotrGameUI = Class.extend({ this.specialGroup = new NormalCardGroup(this.dialogInstance, function(card) { return (card.zone == "SPECIAL"); }, false); - this.specialGroup.setBounds(this.padding, this.padding, 400, 200); + this.specialGroup.setBounds(this.padding, this.padding, this.dialogInstance.width() + 20, this.dialogInstance.height() + 20); this.gameStateElem = $("
"); this.gameStateElem.css({"border-radius": "7px"}); @@ -167,31 +167,34 @@ var GempLotrGameUI = Class.extend({ initializeDialogs: function() { this.dialogInstance = $("") .dialog({ - autoOpen: false, - closeOnEscape: false, - resizable: true, - minHeight: 80 - }); + autoOpen: false, + closeOnEscape: false, + resizable: true, + width: 600, + height: 300 + }); - this.dialogInstance.bind("resize", function() { - var width = $(this).width(); - var height = $(this).height(); - this.specialGroup.setBounds(this.padding, this.padding, width - 2 * this.padding, height - 2 * this.padding); + var that = this; + + this.dialogInstance.bind("dialogresize", function() { + var width = $(this).width() + 20; + var height = $(this).height() + 20; + that.specialGroup.setBounds(that.padding, that.padding, width - 2 * that.padding, height - 2 * that.padding); }); $(".ui-dialog-titlebar-close").hide(); this.infoDialog = $("") .dialog({ - autoOpen: false, - closeOnEscape: true, - resizable: true, - title: "Card information", - minHeight: 80, - minWidth: 200, - width: 600, - height: 300 - }); + autoOpen: false, + closeOnEscape: true, + resizable: true, + title: "Card information", + minHeight: 80, + minWidth: 200, + width: 600, + height: 300 + }); }, @@ -484,7 +487,7 @@ var GempLotrGameUI = Class.extend({ if (index != -1) cardData.attachedCards.splice(index, 1); } - ); + ); var card = $(".card:cardId(" + cardId + ")"); var cardData = card.data("card"); @@ -547,7 +550,7 @@ var GempLotrGameUI = Class.extend({ if (index != -1) cardData.attachedCards.splice(index, 1); } - ); + ); } card.remove(); @@ -614,16 +617,13 @@ var GempLotrGameUI = Class.extend({ this.dialogInstance .html(text + "