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

- "Deagol" should be able to play an artifact or possession without freezing the game.

Browse Source
This commit is contained in:
marcins78@gmail.com
2012-01-17 10:28:10 +00:00
parent 9e0bd46cee
commit 01ab00a480
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/gollum/Card13_046.java
View File

@@ -60,6 +60,8 @@ public class Card13_046 extends AbstractFollower {
&& PlayConditions.canSpot(game, Filters.hasAttached(self), Filters.notAssignedToSkirmish) && PlayConditions.canSpot(game, Filters.hasAttached(self), Filters.notAssignedToSkirmish)
&& PlayConditions.canSelfDiscard(self, game)) { && PlayConditions.canSelfDiscard(self, game)) {
final PhysicalCard attachedTo = self.getAttachedTo();
ActivateCardAction action = new ActivateCardAction(self); ActivateCardAction action = new ActivateCardAction(self);
action.appendCost( action.appendCost(
new SelfDiscardEffect(self)); new SelfDiscardEffect(self));
@@ -68,12 +70,12 @@ public class Card13_046 extends AbstractFollower {
new ChooseArbitraryCardsEffect(playerId, "Choose card to play", game.getGameState().getDeck(playerId), new ChooseArbitraryCardsEffect(playerId, "Choose card to play", game.getGameState().getDeck(playerId),
Filters.and( Filters.and(
Filters.or(CardType.ARTIFACT, CardType.POSSESSION), Filters.or(CardType.ARTIFACT, CardType.POSSESSION),
ExtraFilters.attachableTo(game, self.getAttachedTo())), 1, 1) { ExtraFilters.attachableTo(game, attachedTo)), 1, 1) {
@Override @Override
protected void cardsSelected(LotroGame game, Collection<PhysicalCard> selectedCards) { protected void cardsSelected(LotroGame game, Collection<PhysicalCard> selectedCards) {
if (selectedCards.size() > 0) { if (selectedCards.size() > 0) {
PhysicalCard selectedCard = selectedCards.iterator().next(); PhysicalCard selectedCard = selectedCards.iterator().next();
game.getActionsEnvironment().addActionToStack(((AbstractAttachable) selectedCard.getBlueprint()).getPlayCardAction(playerId, game, selectedCard, self.getAttachedTo(), 0)); game.getActionsEnvironment().addActionToStack(((AbstractAttachable) selectedCard.getBlueprint()).getPlayCardAction(playerId, game, selectedCard, attachedTo, 0));
} }
} }
}); });

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

@@ -1,4 +1,7 @@
<pre style="font-size:80%"> <pre style="font-size:80%">
<b>17 Jan. 2012</b>
- "Deagol" should be able to play an artifact or possession without freezing the game.
<b>16 Jan. 2012</b> <b>16 Jan. 2012</b>
- "Fearless" should now be giving a proper bonus to the minion. - "Fearless" should now be giving a proper bonus to the minion.
- "Orthanc Warrior" has a proper name now. - "Orthanc Warrior" has a proper name now.