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

Fixing Sam being able to be a skirmisher and not lost between turns due to game not detecting Ring-bearer (The One Ring was already not affecting game).

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-09-20 21:45:38 +00:00
parent 6a1622c84c
commit 09566838a8
6 changed files with 144 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_217.java
View File

@@ -30,7 +30,7 @@ public class Card1_217 extends AbstractEvent {
public PlayEventAction getPlayCardAction(final String playerId, final LotroGame game, PhysicalCard self, int twilightModifier) {
PlayEventAction action = new PlayEventAction(self);
action.addEffect(
new ChooseCardsFromHandEffect(playerId, "Choose an Elf to play", 1, 1, Filters.race(Race.NAZGUL), Filters.playable(game, -2)) {
new ChooseCardsFromHandEffect(playerId, "Choose a Nazgul to play", 1, 1, Filters.race(Race.NAZGUL), Filters.playable(game, -2)) {
@Override
protected void cardsSelected(List<PhysicalCard> selectedCards) {
PhysicalCard selectedCard = selectedCards.get(0);

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

@@ -539,11 +539,13 @@ public class GameState {
Side side = card.getBlueprint().getSide();
// Either it's not attached or attached to active card
// AND is a site or fp/ring of current player or shadow of any other player
return (
(card.getAttachedTo() == null || isCardInPlayActive(card.getAttachedTo()))
&& (side == Side.SITE
|| (card.getOwner().equals(_currentPlayerId) && (side == Side.FREE_PEOPLE || side == Side.RING))
|| (!card.getOwner().equals(_currentPlayerId) && (side == Side.SHADOW))));
return side == Side.SITE
|| (
card.getAttachedTo() == null &&
((card.getOwner().equals(_currentPlayerId) && (side == Side.FREE_PEOPLE))
|| (!card.getOwner().equals(_currentPlayerId) && (side == Side.SHADOW))))
|| (
card.getAttachedTo() != null && isCardInPlayActive(card.getAttachedTo()));
}
public void startAffectingCardsForCurrentPlayer(ModifiersEnvironment modifiersEnvironment) {

2
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/DefaultLotroGame.java
View File

@@ -144,7 +144,7 @@ public class DefaultLotroGame implements LotroGame {
@Override
public void checkLoseConditions() {
GameState gameState = getGameState();
if (gameState != null && gameState.getCurrentPhase() != Phase.GAME_SETUP) {
if (gameState != null && gameState.getCurrentPhase() != Phase.GAME_SETUP && gameState.getCurrentPhase() != Phase.BETWEEN_TURNS) {
// Ring-bearer death
if (!Filters.canSpot(gameState, getModifiersQuerying(), Filters.keyword(Keyword.RING_BEARER))) {
playerLost(getGameState().getCurrentPlayerId(), "The Ring-Bearer is dead");

2
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/FreePeoplePlayerAssignsMinionsGameProcess.java
View File

@@ -37,7 +37,7 @@ public class FreePeoplePlayerAssignsMinionsGameProcess implements GameProcess {
Filters.keyword(Keyword.FIERCE),
minionFilter);
final List<PhysicalCard> minions = Filters.filterActive(gameState, _game.getModifiersQuerying(), minionFilter);
final List<PhysicalCard> minions = Filters.filterActive(gameState, _game.getModifiersQuerying(), minionFilter, Filters.notAssigned());
if (minions.size() > 0) {
final List<PhysicalCard> freePeopleTargets = Filters.filterActive(gameState, _game.getModifiersQuerying(),
Filters.or(

7
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/assign/ShadowPlayerAssignsHisMinionsGameProcess.java
View File

@@ -7,7 +7,6 @@ import com.gempukku.lotro.filters.Filters;
import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.GameState;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.game.state.Skirmish;
import com.gempukku.lotro.logic.PlayOrder;
import com.gempukku.lotro.logic.actions.DefaultCostToEffectAction;
import com.gempukku.lotro.logic.decisions.DecisionResultInvalidException;
@@ -41,11 +40,7 @@ public class ShadowPlayerAssignsHisMinionsGameProcess implements GameProcess {
Filters.keyword(Keyword.FIERCE),
minionFilter);
final List<PhysicalCard> minions = Filters.filterActive(gameState, _game.getModifiersQuerying(), minionFilter);
for (Skirmish skirmish : gameState.getAssignments())
minions.removeAll(skirmish.getShadowCharacters());
final List<PhysicalCard> minions = Filters.filterActive(gameState, _game.getModifiersQuerying(), minionFilter, Filters.notAssigned());
if (minions.size() > 0) {
final List<PhysicalCard> freePeopleTargets = Filters.filterActive(gameState, _game.getModifiersQuerying(),
Filters.or(

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

@@ -253,21 +253,21 @@ var GempLotrGameUI = Class.extend({
initializeDialogs: function() {
this.smallDialog = $("<div></div>")
.dialog({
autoOpen: false,
closeOnEscape: false,
resizable: false,
width: 400,
height: 200
});
autoOpen: false,
closeOnEscape: false,
resizable: false,
width: 400,
height: 200
});
this.cardActionDialog = $("<div></div>")
.dialog({
autoOpen: false,
closeOnEscape: false,
resizable: true,
width: 600,
height: 300
});
autoOpen: false,
closeOnEscape: false,
resizable: true,
width: 600,
height: 300
});
var that = this;
@@ -279,15 +279,15 @@ var GempLotrGameUI = Class.extend({
this.infoDialog = $("<div></div>")
.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
});
var swipeOptions = {
threshold: 20,
@@ -566,9 +566,9 @@ var GempLotrGameUI = Class.extend({
else if (zone == "DISCARD")
$("#discard" + this.getPlayerIndex(playerId)).text("Discard: " + count);
else if (zone == "DEAD")
$("#deadPile" + this.getPlayerIndex(playerId)).text("Dead pile: " + count);
else if (zone == "DECK")
$("#deck" + this.getPlayerIndex(playerId)).text("Deck: " + count);
$("#deadPile" + this.getPlayerIndex(playerId)).text("Dead pile: " + count);
else if (zone == "DECK")
$("#deck" + this.getPlayerIndex(playerId)).text("Deck: " + count);
},
playerPosition: function(element) {
@@ -722,7 +722,7 @@ var GempLotrGameUI = Class.extend({
if (index != -1)
cardData.attachedCards.splice(index, 1);
}
);
);
var card = $(".card:cardId(" + cardId + ")");
var cardData = card.data("card");
@@ -843,7 +843,7 @@ var GempLotrGameUI = Class.extend({
if (index != -1)
cardData.attachedCards.splice(index, 1);
}
);
);
}
card.remove();
@@ -915,13 +915,13 @@ var GempLotrGameUI = Class.extend({
this.smallDialog
.html(text + "<br /><input id='integerDecision' type='text' value='0'>")
.dialog("option", "buttons",
{
"OK": function() {
$(this).dialog("close");
that.decisionFunction(id, $("#integerDecision").val());
}
}
);
{
"OK": function() {
$(this).dialog("close");
that.decisionFunction(id, $("#integerDecision").val());
}
}
);
$("#integerDecision").SpinnerControl({ type: 'range',
typedata: {
@@ -953,13 +953,13 @@ var GempLotrGameUI = Class.extend({
this.smallDialog
.html(html)
.dialog("option", "buttons",
{
"OK": function() {
$(this).dialog("close");
that.decisionFunction(id, $("#multipleChoiceDecision").val());
}
}
);
{
"OK": function() {
$(this).dialog("close");
that.decisionFunction(id, $("#multipleChoiceDecision").val());
}
}
);
this.smallDialog.dialog("open");
},
@@ -993,6 +993,7 @@ var GempLotrGameUI = Class.extend({
$(".card:cardId(" + cardIds + ")").addClass("selectableCard");
},
// Choosing cards from a predefined selection (for example stating fellowship)
arbitraryCardsDecision: function(decision) {
var id = decision.getAttribute("id");
var text = decision.getAttribute("text");
@@ -1066,7 +1067,7 @@ var GempLotrGameUI = Class.extend({
return;
} else {
that.clearSelection();
$(".card:cardId(" + cardId + ")").addClass("selectedCard");
$(".card:cardId(" + selectedCardIds + ")").addClass("selectedCard");
}
} else {
$(".card:cardId(" + cardId + ")").removeClass("selectableCard").addClass("selectedCard");
@@ -1085,6 +1086,7 @@ var GempLotrGameUI = Class.extend({
this.arbitraryDialogResize(false);
},
// Choosing one action to resolve, for example phase actions
cardActionChoiceDecision: function (decision) {
var id = decision.getAttribute("id");
var text = decision.getAttribute("text");
@@ -1177,6 +1179,7 @@ var GempLotrGameUI = Class.extend({
processButtons();
},
// Choosing one action to resolve, for example required triggered actions
actionChoiceDecision: function (decision) {
var id = decision.getAttribute("id");
var text = decision.getAttribute("text");
@@ -1195,13 +1198,6 @@ var GempLotrGameUI = Class.extend({
var cardIds = new Array();
var finishChoice = function() {
that.cardActionDialog.dialog("close");
$("#arbitraryChoice").html("");
that.clearSelection();
that.decisionFunction(id, "" + selectedActionIds);
};
for (var i = 0; i < blueprintIds.length; i++) {
var blueprintId = blueprintIds[i];
@@ -1213,33 +1209,60 @@ var GempLotrGameUI = Class.extend({
$("#arbitraryChoice").append(cardDiv);
}
this.selectionFunction = function(cardId) {
var actionId = actionIds[parseInt(cardId.substring(4))];
selectedActionIds.push(actionId);
var finishChoice = function() {
that.cardActionDialog.dialog("close");
$("#arbitraryChoice").html("");
that.clearSelection();
if (this.settingsAutoAccept) {
finishChoice();
} else {
this.cardActionDialog.dialog("option", "buttons", {
"DONE": function() {
finishChoice();
}
});
$(".card:cardId(" + cardId + ")").addClass("selectedCard");
}
that.decisionFunction(id, "" + selectedActionIds);
};
this.attachSelectionFunctions(cardIds);
var resetChoice = function() {
selectedActionIds = new Array();
that.clearSelection();
allowSelection();
processButtons();
};
var processButtons = function() {
var buttons = {};
if (selectedActionIds.length > 0) {
buttons["Clear selection"] = function() {
resetChoice();
processButtons();
};
buttons["Done"] = function() {
finishChoice();
};
}
that.cardActionDialog.dialog("option", "buttons", buttons);
};
var allowSelection = function() {
that.selectionFunction = function(cardId) {
var actionId = actionIds[parseInt(cardId.substring(4))];
selectedActionIds.push(actionId);
that.clearSelection();
if (this.settingsAutoAccept) {
finishChoice();
} else {
processButtons();
$(".card:cardId(" + cardId + ")").addClass("selectedCard");
}
};
that.attachSelectionFunctions(cardIds);
};
allowSelection();
processButtons();
$(".ui-dialog-titlebar").show();
this.cardActionDialog.dialog("open");
this.arbitraryDialogResize(true);
this.arbitraryDialogResize(false);
},
// Choosing some number of cards, for example to character
cardSelectionDecision: function(decision) {
var id = decision.getAttribute("id");
var text = decision.getAttribute("text");
@@ -1261,35 +1284,52 @@ var GempLotrGameUI = Class.extend({
that.decisionFunction(id, "" + selectedCardIds);
};
if (min == 0) {
this.alertButtons.append("<button id='DONE'>DONE</button>");
$("#DONE").button().click(function() {
finishChoice();
});
}
var resetChoice = function() {
selectedCardIds = new Array();
that.clearSelection();
allowSelection();
processButtons();
};
this.selectionFunction = function(cardId) {
selectedCardIds.push(cardId);
if (selectedCardIds.length == min) {
this.alertButtons.append("<button id='DONE'>DONE</button>");
$("#DONE").button().click(function() {
var processButtons = function() {
that.alertButtons.html("");
if (selectedCardIds.length > 0) {
that.alertButtons.append("<button id='ClearSelection'>Clear selection</button>");
$("#ClearSelection").button().click(function() {
resetChoice();
});
}
if (selectedCardIds.length >= min) {
that.alertButtons.append("<button id='Done'>Done</button>");
$("#Done").button().click(function() {
finishChoice();
});
}
if (selectedCardIds.length == max) {
if (this.settingsAutoAccept) {
finishChoice();
} else {
$(".selectableCard").removeClass("selectableCard");
$(".card:cardId(" + cardId + ")").addClass("selectedCard");
}
} else {
$(".card:cardId(" + cardId + ")").removeClass("selectableCard").addClass("selectedCard");
}
};
this.attachSelectionFunctions(cardIds);
var allowSelection = function() {
that.selectionFunction = function(cardId) {
selectedCardIds.push(cardId);
if (selectedCardIds.length == max) {
if (this.settingsAutoAccept) {
finishChoice();
return;
} else {
that.clearSelection();
$(".card:cardId(" + selectedCardIds + ")").addClass("selectedCard");
}
} else {
$(".card:cardId(" + cardId + ")").removeClass("selectableCard").addClass("selectedCard");
}
processButtons();
};
that.attachSelectionFunctions(cardIds);
};
allowSelection();
processButtons();
},
assignMinionsDecision: function(decision) {
@@ -1302,8 +1342,8 @@ var GempLotrGameUI = Class.extend({
var that = this;
this.alertText.text(text);
this.alertButtons.html("<br><button id='DONE'>DONE</button>");
$("#DONE").button().click(function() {
this.alertButtons.html("<button id='Done'>Done</button>");
$("#Done").button().click(function() {
that.alertText.html("");
that.alertButtons.html("");
that.clearSelection();