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

Assigning new ids to cards each time they change zones, except for transfering or taking control.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-11-09 02:07:52 +00:00
parent 8337fc2219
commit 17ba695cd4
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java
View File

@@ -434,19 +434,23 @@ public class Filters {
}
public static Filter sameCard(final PhysicalCard card) {
final int cardId = card.getCardId();
return new Filter() {
@Override
public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {
return (physicalCard == card);
return (physicalCard.getCardId() == cardId);
}
};
}
public static Filter in(final Collection<PhysicalCard> cards) {
final Set<Integer> cardIds = new HashSet<Integer>();
for (PhysicalCard card : cards)
cardIds.add(card.getCardId());
return new Filter() {
@Override
public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {
return cards.contains(physicalCard);
return cardIds.contains(physicalCard.getCardId());
}
};
}

4
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/PhysicalCardImpl.java
View File

@@ -32,6 +32,10 @@ public class PhysicalCardImpl implements PhysicalCard {
_blueprint = blueprint;
}
public void setCardId(int cardId) {
_cardId = cardId;
}
@Override
public String getBlueprintId() {
return _blueprintId;

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

@@ -352,6 +352,8 @@ public class GameState {
}
private void addCardToZone(LotroGame game, PhysicalCard card, Zone zone, boolean end) {
assignNewCardId(card);
List<PhysicalCardImpl> zoneCards = getZoneCards(card.getOwner(), card.getBlueprint().getCardType(), zone);
if (end)
zoneCards.add((PhysicalCardImpl) card);
@@ -380,6 +382,13 @@ public class GameState {
}
}
private void assignNewCardId(PhysicalCard card) {
_allCards.remove(card.getCardId());
int newCardId = nextCardId();
((PhysicalCardImpl) card).setCardId(newCardId);
_allCards.put(newCardId, ((PhysicalCardImpl) card));
}
private void removeAllTokens(PhysicalCard card) {
Map<Token, Integer> map = _cardTokens.get(card);
if (map != null) {