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

Fixing Gollum.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-11-03 09:53:46 +00:00
parent 52d3be0b95
commit c409a9d6ee
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gollum/Card7_058.java
View File

@@ -7,8 +7,6 @@ import com.gempukku.lotro.common.Phase;
import com.gempukku.lotro.common.Side;
import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.actions.ActivateCardAction;
import com.gempukku.lotro.logic.effects.PlayCardEffect;
import com.gempukku.lotro.logic.timing.Action;
import java.util.Collections;
@@ -35,10 +33,7 @@ public class Card7_058 extends AbstractMinion {
if (PlayConditions.isPhase(game, Phase.SHADOW)
&& PlayConditions.hasInitiative(game, Side.SHADOW)
&& PlayConditions.canPlayFromDiscard(playerId, game, self)) {
ActivateCardAction action = new ActivateCardAction(self);
action.appendEffect(
new PlayCardEffect(self));
return Collections.singletonList(action);
return Collections.singletonList(getPlayCardAction(playerId, game, self, 0));
}
return null;
}

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

@@ -15,8 +15,6 @@ import com.gempukku.lotro.logic.timing.results.WhenMoveFromResult;
import com.gempukku.lotro.logic.timing.results.WhenMoveToResult;
import com.gempukku.lotro.logic.timing.results.WhenMovesResult;
import java.util.Collections;
public class PlayerPlaysNextSiteIfNotThereGameProcess implements GameProcess {
private LotroGame _game;
private GameProcess _afterMoveGameProcess;
@@ -51,9 +49,6 @@ public class PlayerPlaysNextSiteIfNotThereGameProcess implements GameProcess {
nextSite = Filters.filter(gameState.getAdventureDeck(playerToPlaySite), gameState, _game.getModifiersQuerying(),
Filters.siteNumber(nextSiteNumber)).iterator().next();
gameState.removeCardsFromZone(null, Collections.singleton(nextSite));
gameState.addCardToZone(_game, nextSite, Zone.ADVENTURE_PATH);
final PhysicalCard site = nextSite;
_nextProcess =
@@ -61,7 +56,7 @@ public class PlayerPlaysNextSiteIfNotThereGameProcess implements GameProcess {
@Override
public void process() {
_game.getActionsEnvironment().addActionToStack(
new SimpleEffectAction(new PlayCardEffect(site), "Plays next site"));
new SimpleEffectAction(new PlayCardEffect(site, Zone.ADVENTURE_PATH), "Plays next site"));
}
@Override