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

- "Wizard Staff" now correctly takes a card from deck (not discard) into hand, also shuffles the deck afterwards.

Browse Source
This commit is contained in:
marcin.sciesinski
2017-11-13 12:22:11 -08:00
parent 4b8a28ce0c
commit e8e7431ff9
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html
View File

@@ -9,6 +9,7 @@
- "Troll Knife" now correctly costs 2. - "Troll Knife" now correctly costs 2.
- Changed Hobbit format's deck building restrictions and they are now displayed in the formats. - Changed Hobbit format's deck building restrictions and they are now displayed in the formats.
- "Dawn Take You All" now correctly works during Skirmish. - "Dawn Take You All" now correctly works during Skirmish.
- "Wizard Staff" now correctly takes a card from deck (not discard) into hand, also shuffles the deck afterwards.
<b>17 Dec. 2015</b> <b>17 Dec. 2015</b>
- "Armor of Khazad" no longer allows to return itself from discard and can now be transferred. - "Armor of Khazad" no longer allows to return itself from discard and can now be transferred.

14
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_018.java
View File

@@ -4,6 +4,8 @@ import com.gempukku.lotro.cards.AbstractAttachableFPPossession;
import com.gempukku.lotro.cards.TriggerConditions; import com.gempukku.lotro.cards.TriggerConditions;
import com.gempukku.lotro.cards.effects.ExertCharactersEffect; import com.gempukku.lotro.cards.effects.ExertCharactersEffect;
import com.gempukku.lotro.cards.effects.PutCardFromDiscardIntoHandEffect; import com.gempukku.lotro.cards.effects.PutCardFromDiscardIntoHandEffect;
import com.gempukku.lotro.cards.effects.ShuffleDeckEffect;
import com.gempukku.lotro.cards.effects.choose.ChooseAndPutCardFromDeckIntoHandEffect;
import com.gempukku.lotro.cards.effects.choose.ChooseOpponentEffect; import com.gempukku.lotro.cards.effects.choose.ChooseOpponentEffect;
import com.gempukku.lotro.common.*; import com.gempukku.lotro.common.*;
import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.filters.Filters;
@@ -45,15 +47,9 @@ public class Card31_018 extends AbstractAttachableFPPossession {
final OptionalTriggerAction action = new OptionalTriggerAction(self); final OptionalTriggerAction action = new OptionalTriggerAction(self);
action.appendCost(new ExertCharactersEffect(action, self, self.getAttachedTo())); action.appendCost(new ExertCharactersEffect(action, self, self.getAttachedTo()));
action.appendEffect( action.appendEffect(
new ChooseArbitraryCardsEffect(playerId, "Choose GANDALF spell", game.getGameState().getDiscard(playerId), Filters.and(Culture.GANDALF, Keyword.SPELL), 1, 1) { new ChooseAndPutCardFromDeckIntoHandEffect(action, playerId, 1, 1, Culture.GANDALF, Keyword.SPELL));
@Override action.appendEffect(
protected void cardsSelected(LotroGame game, Collection<PhysicalCard> selectedCards) { new ShuffleDeckEffect(playerId));
for (PhysicalCard selectedCard : selectedCards) {
action.appendEffect(
new PutCardFromDiscardIntoHandEffect(selectedCard));
}
}
});
return Collections.singletonList(action); return Collections.singletonList(action);
} }
return null; return null;