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

Discard card from hand effect

Browse Source
This commit is contained in:
marcin.sciesinski
2019-09-02 12:21:13 -07:00
parent 0ef0644215
commit d5a56a8cd0
3 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gemp-lotr/gemp-lotr-async/src/main/web/cards/set40/set40-gondor.json
View File

@@ -20,7 +20,8 @@
"optional": true,
"cost": {
"type": "discardFromHand",
"filter": "side(free people)"
"filter": "choose(side(free people))",
"forced": false
},
"effect": {
"type": "discard",

2
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/EffectAppenderFactory.java
View File

@@ -59,7 +59,7 @@ public class EffectAppenderFactory {
effectAppenderProducers.put("cantbeoverwhelmedmultiplier", new CantBeOverwhelmedMultiplier());
effectAppenderProducers.put("play", new PlayCardFromHand());
effectAppenderProducers.put("cancelskirmish", new CancelSkirmish());
effectAppenderProducers.put("discardfromhand", new CancelSkirmish());
effectAppenderProducers.put("discardfromhand", new DiscardCardsFromHand());
effectAppenderProducers.put("chooseandremovetwilight", new ChooseAndRemoveTwilight());
effectAppenderProducers.put("removetwilight", new RemoveTwilight());
effectAppenderProducers.put("stackcards", new StackCardsFromPlay());

30
gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/NewCardsAtTest.java
View File

@@ -268,7 +268,7 @@ public class NewCardsAtTest extends AbstractAtTest {
}
@Test
public void battleFeverCantBePlayedOnSkirmishingGimli() throws DecisionResultInvalidException, CardNotFoundException {
public void checkingEventCostsAsRequirements() throws DecisionResultInvalidException, CardNotFoundException {
initializeSimplestGame();
final PhysicalCardImpl battleFever = createCard(P1, "40_5");
@@ -305,4 +305,32 @@ public class NewCardsAtTest extends AbstractAtTest {
assertNull(getCardActionId(P1, "Play Battle Fever"));
}
@Test
public void discardCardEffect() throws DecisionResultInvalidException, CardNotFoundException {
initializeSimplestGame();
final PhysicalCardImpl blackBreath = createCard(P2, "40_183");
final PhysicalCardImpl athelas = createCard(P1, "40_313");
final PhysicalCardImpl athelasInHand = createCard(P1, "40_313");
PhysicalCardImpl aragorn = createCard(P1, "40_94");
_game.getGameState().addCardToZone(_game, aragorn, Zone.FREE_CHARACTERS);
_game.getGameState().attachCard(_game, blackBreath, aragorn);
_game.getGameState().addCardToZone(_game, athelas, Zone.HAND);
_game.getGameState().addCardToZone(_game, athelasInHand, Zone.HAND);
skipMulligans();
// Play athelas
playerDecided(P1, "0");
// Attach to Aragorn
playerDecided(P1, "" + aragorn.getCardId());
playerDecided(P1, "0");
playerDecided(P1, "0");
assertEquals(Zone.DISCARD, blackBreath.getZone());
}
}