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

- Adding adventure deck to the user UI in game.

Browse Source
This commit is contained in:
marcins78@gmail.com
2012-03-15 11:30:05 +00:00
parent ec5b101ec5
commit 8f02509b71
7 changed files with 96 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Zone.java
View File

@@ -10,6 +10,7 @@ public enum Zone implements Filterable {
// Private knowledge
HAND("hand", false, true, false), DISCARD("discard", false, true, false),
ADVENTURE_DECK("adventureDeck", false, true, false),
// Nobody sees
VOID("void", false, false, false), DECK("deck", false, false, false), REMOVED("removed", false, false, false);

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

@@ -165,7 +165,7 @@ public class GameEvent {
PhysicalCard stackedOn = physicalCard.getStackedOn();
if (stackedOn != null)
gameEvent = gameEvent.targetCardId(stackedOn.getCardId());
if (physicalCard.getBlueprint().getCardType() == CardType.SITE)
if (physicalCard.getBlueprint().getCardType() == CardType.SITE && physicalCard.getZone().isInPlay())
gameEvent = gameEvent.index(physicalCard.getSiteNumber());
return gameEvent;
}

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

@@ -93,12 +93,13 @@ public class GameState {
private void addPlayerCards(String playerId, List<String> cards, LotroCardBlueprintLibrary library) {
for (String blueprintId : cards) {
PhysicalCardImpl physicalCard = createPhysicalCard(playerId, library, blueprintId);
physicalCard.setZone(Zone.DECK);
if (physicalCard.getBlueprint().getCardType() == CardType.SITE)
if (physicalCard.getBlueprint().getCardType() == CardType.SITE) {
physicalCard.setZone(Zone.ADVENTURE_DECK);
_adventureDecks.get(playerId).add(physicalCard);
else
} else {
physicalCard.setZone(Zone.DECK);
_decks.get(playerId).add(physicalCard);
}
}
}
@@ -307,9 +308,9 @@ public class GameState {
}
private List<PhysicalCardImpl> getZoneCards(String playerId, CardType type, Zone zone) {
if (zone == Zone.DECK && type != CardType.SITE)
if (zone == Zone.DECK)
return _decks.get(playerId);
else if (zone == Zone.DECK)
else if (zone == Zone.ADVENTURE_DECK)
return _adventureDecks.get(playerId);
else if (zone == Zone.DISCARD)
return _discards.get(playerId);

4
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/PlaySiteEffect.java
View File

@@ -119,7 +119,7 @@ public class PlaySiteEffect extends AbstractEffect {
gameState.removeCardsFromZone(_playerId, Collections.singleton(oldSite));
oldSite.setSiteNumber(null);
gameState.addCardToZone(game, oldSite, Zone.DECK);
gameState.addCardToZone(game, oldSite, Zone.ADVENTURE_DECK);
if (gameState.getCurrentSiteNumber() == siteNumber
&& !_playerId.equals(gameState.getCurrentPlayerId()))
game.getModifiersEnvironment().addUntilEndOfTurnModifier(
@@ -140,7 +140,7 @@ public class PlaySiteEffect extends AbstractEffect {
}
sitePlayedCallback(newSite);
game.getActionsEnvironment().emitEffectResult(new PlayCardResult(Zone.DECK, newSite, null, null));
game.getActionsEnvironment().emitEffectResult(new PlayCardResult(Zone.ADVENTURE_DECK, newSite, null, null));
}
});

1
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/GameStats.java
View File

@@ -112,6 +112,7 @@ public class GameStats {
final HashMap<Zone, Integer> playerZoneSizes = new HashMap<Zone, Integer>();
playerZoneSizes.put(Zone.HAND, game.getGameState().getHand(player).size());
playerZoneSizes.put(Zone.DECK, game.getGameState().getDeck(player).size());
playerZoneSizes.put(Zone.ADVENTURE_DECK, game.getGameState().getAdventureDeck(player).size());
playerZoneSizes.put(Zone.DISCARD, game.getGameState().getDiscard(player).size());
playerZoneSizes.put(Zone.DEAD, game.getGameState().getDeadPile(player).size());
newZoneSizes.put(player, playerZoneSizes);

11
gemp-lotr/gemp-lotr-web/src/main/webapp/game.html
View File

@@ -66,6 +66,17 @@ body {
background-image: url('images/deadPile-42.png');
}
.adventureDeckSize {
display: none;
text-align: center;
vertical-align: middle;
font-size: 200%;
font-weight: bolder;
width: 42px;
height: 42px;
background-image: url('images/adventureDeck-42.png');
}
.showStats {
display: table-cell;
}

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

@@ -28,6 +28,8 @@ var GempLotrGameUI = Class.extend({
discardPileDialogs: null,
discardPileGroups: null,
adventureDeckDialogs: null,
adventureDeckGroups: null,
deadPileDialogs: null,
deadPileGroups: null,
@@ -110,6 +112,8 @@ var GempLotrGameUI = Class.extend({
this.discardPileDialogs = {};
this.discardPileGroups = {};
this.adventureDeckDialogs = {};
this.adventureDeckGroups = {};
this.deadPileDialogs = {};
this.deadPileGroups = {};
@@ -263,7 +267,7 @@ var GempLotrGameUI = Class.extend({
for (var i = 0; i < this.allPlayerIds.length; i++) {
this.gameStateElem.append("<div class='player'>" + (i + 1) + ". " + this.allPlayerIds[i] + "<div id='clock" + i + "' class='clock'></div>"
+ "<div class='playerStats'><div id='deck" + i + "' class='deckSize'></div><div id='hand" + i + "' class='handSize'></div><div id='threats" + i + "' class='threatsSize'></div><div id='showStats" + i + "' class='showStats'></div><div id='discard" + i + "' class='discardSize'></div><div id='deadPile" + i + "' class='deadPileSize'></div></div></div>");
+ "<div class='playerStats'><div id='deck" + i + "' class='deckSize'></div><div id='hand" + i + "' class='handSize'></div><div id='threats" + i + "' class='threatsSize'></div><div id='showStats" + i + "' class='showStats'></div><div id='discard" + i + "' class='discardSize'></div><div id='deadPile" + i + "' class='deadPileSize'></div><div id='adventureDeck" + i + "' class='adventureDeckSize'></div></div></div>");
}
this.gameStateElem.append("<div class='twilightPool'>0</div>");
@@ -283,10 +287,12 @@ var GempLotrGameUI = Class.extend({
$(this).removeClass("opened").css({width: 150 - that.padding});
$("#discard" + playerIndex).css({display: "none"});
$("#deadPile" + playerIndex).css({display: "none"});
$("#adventureDeck" + playerIndex).css({display: "none"});
} else {
$(this).addClass("opened").css({width: 150 - that.padding + 80});
$(this).addClass("opened").css({width: 150 - that.padding + 126});
$("#discard" + playerIndex).css({display: "table-cell"});
$("#deadPile" + playerIndex).css({display: "table-cell"});
$("#adventureDeck" + playerIndex).css({display: "table-cell"});
}
}
});
@@ -296,13 +302,20 @@ var GempLotrGameUI = Class.extend({
$("#showStats" + i).append(showBut);
}
if (!this.spectatorMode)
if (!this.spectatorMode) {
$("#discard" + this.getPlayerIndex(this.bottomPlayerId)).addClass("clickable").click(
(function(index) {
return function() {
openSizeDialog(that.discardPileDialogs[that.bottomPlayerId]);
};
})(i));
$("#adventureDeck" + this.getPlayerIndex(this.bottomPlayerId)).addClass("clickable").click(
(function(index) {
return function() {
openSizeDialog(that.adventureDeckDialogs[that.bottomPlayerId]);
};
})(i));
}
for (var i = 0; i < this.allPlayerIds.length; i++) {
$("#deadPile" + i).addClass("clickable").click(
@@ -645,21 +658,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;
@@ -674,11 +687,11 @@ var GempLotrGameUI = Class.extend({
this.infoDialog = $("<div></div>")
.dialog({
autoOpen: false,
closeOnEscape: true,
resizable: false,
title: "Card information"
});
autoOpen: false,
closeOnEscape: true,
resizable: false,
title: "Card information"
});
var swipeOptions = {
threshold: 20,
@@ -809,6 +822,10 @@ var GempLotrGameUI = Class.extend({
if (this.discardPileGroups.hasOwnProperty(playerId))
this.discardPileGroups[playerId].layoutCards();
for (var playerId in this.adventureDeckGroups)
if (this.adventureDeckGroups.hasOwnProperty(playerId))
this.adventureDeckGroups[playerId].layoutCards();
for (var playerId in this.deadPileGroups)
if (this.deadPileGroups.hasOwnProperty(playerId))
this.deadPileGroups[playerId].layoutCards();
@@ -1069,6 +1086,28 @@ var GempLotrGameUI = Class.extend({
discardPileDialog.bind("dialogresize", function() {
that.dialogResize(discardPileDialog, that.discardPileGroups[participantId]);
});
var adventureDeckDialog = $("<div></div>").dialog({
autoOpen: false,
closeOnEscape: true,
resizable: true,
title: "Adventure deck - " + participantId,
minHeight: 80,
minWidth: 200,
width: 600,
height: 300
});
this.adventureDeckDialogs[participantId] = adventureDeckDialog;
this.adventureDeckGroups[participantId] = new NormalCardGroup(adventureDeckDialog, function(card) {
return true;
}, false);
this.adventureDeckGroups[participantId].setBounds(this.padding, this.padding, 580 - 2 * (this.padding), 250 - 2 * (this.padding));
adventureDeckDialog.bind("dialogresize", function() {
that.dialogResize(adventureDeckDialog, that.adventureDeckGroups[participantId]);
});
}
for (var i = 0; i < this.allPlayerIds.length; i++) {
@@ -1159,12 +1198,12 @@ var GempLotrGameUI = Class.extend({
if (!this.replayMode) {
this.smallDialog.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',
@@ -1202,12 +1241,12 @@ var GempLotrGameUI = Class.extend({
if (!this.replayMode) {
this.smallDialog.dialog("option", "buttons",
{
"OK": function() {
that.smallDialog.dialog("close");
that.decisionFunction(id, $("#multipleChoiceDecision").val());
}
});
{
"OK": function() {
that.smallDialog.dialog("close");
that.decisionFunction(id, $("#multipleChoiceDecision").val());
}
});
}
} else {
this.smallDialog.append("<br />");
@@ -1595,8 +1634,8 @@ var GempLotrGameUI = Class.extend({
$(div).find('LI.hover').removeClass('hover');
$(this).parent().addClass('hover');
}).mouseout(function() {
$(div).find('LI.hover').removeClass('hover');
});
$(div).find('LI.hover').removeClass('hover');
});
var getRidOfContextMenu = function() {
$(div).remove();