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

Fixing problem with skirmish where FP char was removed (ie. killed).

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-09-22 23:24:59 +00:00
parent 60550389d5
commit 80100e2d16
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/GatheringParticipantCommunicationChannel.java
View File

@@ -46,7 +46,10 @@ public class GatheringParticipantCommunicationChannel implements GameStateListen
@Override @Override
public void startSkirmish(PhysicalCard freePeople, List<PhysicalCard> minions) { public void startSkirmish(PhysicalCard freePeople, List<PhysicalCard> minions) {
_events.add(new GameEvent(START_SKIRMISH).cardId(freePeople.getCardId()).opposingCardIds(getCardIds(minions))); GameEvent gameEvent = new GameEvent(START_SKIRMISH).opposingCardIds(getCardIds(minions));
if (freePeople != null)
gameEvent.cardId(freePeople.getCardId());
_events.add(gameEvent);
} }
@Override @Override

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

@@ -654,10 +654,15 @@ var GempLotrGameUI = Class.extend({
var cardId = element.getAttribute("cardId"); var cardId = element.getAttribute("cardId");
var opposingCardIds = element.getAttribute("opposingCardIds").split(","); var opposingCardIds = element.getAttribute("opposingCardIds").split(",");
$(".card:cardId(" + opposingCardIds + "," + cardId + ")").each(function() { $(".card:cardId(" + opposingCardIds + ")").each(function() {
$(this).data("card").skirmish = true; $(this).data("card").skirmish = true;
}); });
if (cardId != null)
$(".card:cardId(" + cardId + ")").each(function() {
$(this).data("card").skirmish = true;
});
this.fpStrengthDiv = $("<div class='fpStrength'></div>"); this.fpStrengthDiv = $("<div class='fpStrength'></div>");
this.shadowStrengthDiv = $("<div class='shadowStrength'></div>"); this.shadowStrengthDiv = $("<div class='shadowStrength'></div>");