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

- "Pillage of Rohan" and other similar cards should be active at the right time now (only on your turn).

Browse Source
This commit is contained in:
marcins78@gmail.com
2012-03-26 06:29:10 +00:00
parent 38eccc71d7
commit 0060a6961d
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -786,17 +786,26 @@ public class GameState {
return _fierceSkirmishes;
}
public boolean isCardInPlayActive(PhysicalCard card) {
private boolean isCardInPlayActive(PhysicalCard card) {
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.getBlueprint().getCardType() == CardType.SITE && _currentPhase != Phase.PUT_RING_BEARER && _currentPhase != Phase.PLAY_STARTING_FELLOWSHIP)
|| (
card.getAttachedTo() == null &&
((card.getOwner().equals(_currentPlayerId) && (side == Side.FREE_PEOPLE))
|| (!card.getOwner().equals(_currentPlayerId) && (side == Side.SHADOW))))
|| (
card.getAttachedTo() != null && isCardInPlayActive(card.getAttachedTo()));
if (card.getBlueprint().getCardType() == CardType.SITE)
return _currentPhase != Phase.PUT_RING_BEARER && _currentPhase != Phase.PLAY_STARTING_FELLOWSHIP;
if (card.getBlueprint().getCardType() == CardType.THE_ONE_RING)
return card.getOwner().equals(_currentPlayerId);
if (card.getOwner().equals(_currentPlayerId) && side == Side.SHADOW)
return false;
if (!card.getOwner().equals(_currentPlayerId) && side == Side.FREE_PEOPLE)
return false;
if (card.getAttachedTo() != null)
return isCardInPlayActive(card.getAttachedTo());
return true;
}
public void startAffectingCardsForCurrentPlayer(LotroGame game) {

3
gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
View File

@@ -1,4 +1,7 @@
<pre style="font-size:80%">
<b>26 Mar. 2012</b>
- "Pillage of Rohan" and other similar cards should be active at the right time now (only on your turn).
<b>16 Mar. 2012</b>
- When "Mountain-troll" is played with discarding 5 minions, now it should properly gain Fierce.
- "Gimli, Feared Axeman" should now properly be usable when a card is discarded by an action of an opponent.