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

Trying to address discard ability for moria vset1

Browse Source
This commit is contained in:
Christian 'ketura' McCarty
2021-11-07 23:58:19 -06:00
parent e8c69f13c6
commit 9694d092c2
3 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
gemp-lotr/gemp-lotr-async/src/main/web/cards/set101/set101_moria_playtest.json
View File

@@ -156,10 +156,14 @@
"type": "abouttodiscard",
"filter": "self"
},
"condition": {
"type": "canSpot",
"filter": "self,hasStackedCount(1,tentacle)"
},
"cost": {
"type": "discardstackedcards",
"on": "self",
"filter": "choose(tentacle)",
"on": "any",
"filter": "choose(any)",
"count": 1
},
"effect": {
@@ -181,26 +185,33 @@
{
"type": "activated",
"phase": "shadow",
"effect":{
"type": "stackCardsFromHand",
"filter": "choose(culture(moria),item)",
"where": "self"
},
},
{
"type": "activated",
"phase": "shadow",
"condition": {
"type": "canSpot",
"filter": "name(The Balrog)"
},
"effect": {
"type": "putStackedCardsIntoHand",
"filter": "choose(culture(moria),item)",
"on": "self"
"type": "choice",
"texts": [
"Stack a [Moria] item here.",
"Take a [Moria] item stacked here into hand."
],
"effects": [
{
"type": "stackCardsFromHand",
"filter": "choose(culture(moria),item)",
"where": "self"
},
{
"type": "conditional",
"condition": {
"type": "canSpot",
"filter": "name(The Balrog)"
},
"effect": {
"type": "putStackedCardsIntoHand",
"filter": "choose(culture(moria),item)",
"on": "self"
}
}
]
}
},
}
]
},

4
gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/GenericCardTestHelper.java
View File

@@ -456,8 +456,8 @@ public class GenericCardTestHelper extends AbstractAtTest {
public void FreepsChooseToMove() throws DecisionResultInvalidException { playerDecided(P1, "0"); }
public void FreepsChooseToStay() throws DecisionResultInvalidException { playerDecided(P1, "1"); }
public boolean FreepsHasOptionalTriggerAvailable() throws DecisionResultInvalidException { return FreepsDecisionAvailable("Optional Response"); }
public boolean ShadowHasOptionalTriggerAvailable() throws DecisionResultInvalidException { return ShadowDecisionAvailable("Optional Response"); }
public boolean FreepsHasOptionalTriggerAvailable() throws DecisionResultInvalidException { return FreepsDecisionAvailable("Optional"); }
public boolean ShadowHasOptionalTriggerAvailable() throws DecisionResultInvalidException { return ShadowDecisionAvailable("Optional"); }
public void FreepsAcceptOptionalTrigger() throws DecisionResultInvalidException { playerDecided(P1, "0"); }
public void FreepsDeclineOptionalTrigger() throws DecisionResultInvalidException { playerDecided(P1, ""); }

8
gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vset1/vpack1/Card_V1_034Tests.java
View File

@@ -114,14 +114,18 @@ public class Card_V1_034Tests
PhysicalCardImpl ftentacle1 = scn.GetShadowCard("ftentacle1");
PhysicalCardImpl ftentacle2 = scn.GetShadowCard("ftentacle2");
scn.ShadowMoveCardToSupportArea(darkwaters);
scn.StackCardsOn(darkwaters, ftentacle1, ftentacle2);
//scn.ShadowMoveCardToHand(ftentacle1, ftentacle2);
scn.StartGame();
scn.StackCardsOn(darkwaters, ftentacle1, ftentacle2);
scn.FreepsUseCardAction(song);
scn.FreepsChooseCard(darkwaters);
assertTrue(scn.ShadowHasOptionalTriggerAvailable());
scn.ShadowAcceptOptionalTrigger();
scn.ShadowChooseCard(ftentacle1);
assertEquals(Zone.DISCARD, ftentacle1.getZone());
assertEquals(Zone.SUPPORT, darkwaters);
}
}