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

Fixing issues with HasInHand

Browse Source
This commit is contained in:
Christian 'ketura' McCarty
2022-07-25 06:07:48 -05:00
parent 733bb99285
commit cc4fbb9108
4 changed files with 52 additions and 20 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

@@ -150,10 +150,17 @@
}
},
{
"type": "playCardFromStacked",
"filter": "choose(tentacle)",
"on": "self"
}
"type": "conditional",
"condition": {
"type": "canSpot",
"filter": "self,hasStacked(any)"
},
"effect": {
"type": "playCardFromStacked",
"filter": "choose(tentacle)",
"on": "self"
}
},
]
}
},
@@ -192,18 +199,26 @@
{
"type": "activated",
"phase": "shadow",
"condition": {
"type": "or",
"condition": [
{
"type": "hasInHand",
"filter": "culture(moria),item"
},
{
"type": "canSpot",
"filter": "name(The Balrog)"
}
]
},
"effect": {
"type": "choice",
"texts": [
"Stack a [Moria] item here.",
"Take a [Moria] item stacked here into hand."
"Take a [Moria] card stacked here into hand."
],
"effects": [
{
"type": "stackCardsFromHand",
"filter": "choose(culture(moria),item)",
"where": "self"
},
{
"type": "conditional",
"condition": {
@@ -218,13 +233,19 @@
},
{
"type": "conditional",
"condition": {
"type": "canSpot",
"filter": "name(The Balrog)"
},
"condition": [
{
"type": "canSpot",
"filter": "title(The Balrog)"
},
{
"type": "canSpot",
"filter": "self,hasStacked(any)"
},
],
"effect": {
"type": "putStackedCardsIntoHand",
"filter": "choose(culture(moria),item)",
"filter": "choose(culture(moria))",
"on": "self"
}
}

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

@@ -21,7 +21,7 @@ public class HasInHand implements RequirementProducer {
final FilterableSource filterableSource = environment.getFilterFactory().generateFilter(filter, environment);
return (actionContext) -> {
final Filterable filterable = filterableSource.getFilterable(actionContext);
return !PlayConditions.hasCardInHand(actionContext.getGame(), playerSource.getPlayer(actionContext), count, filterable);
return PlayConditions.hasCardInHand(actionContext.getGame(), playerSource.getPlayer(actionContext), count, filterable);
};
}
}

1
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/requirement/RequirementFactory.java
View File

@@ -28,6 +28,7 @@ public class RequirementFactory {
requirementProducers.put("controlssite", new ControlsSite());
requirementProducers.put("didwinskirmish", new DidWinSkirmish());
requirementProducers.put("fierceskirmish", new FierceSkirmish());
requirementProducers.put("hasinhand", new HasInHand());
requirementProducers.put("hasinzonedata", new HasInZoneData());
requirementProducers.put("haveinitiative", new HaveInitiative());
requirementProducers.put("ismore", new IsMore());

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

@@ -3,9 +3,11 @@ package com.gempukku.lotro.cards.unofficial.pc.vset1.vpack1;
import com.gempukku.lotro.cards.GenericCardTestHelper;
import com.gempukku.lotro.common.*;
import com.gempukku.lotro.filters.Filters;
import com.gempukku.lotro.game.CardNotFoundException;
import com.gempukku.lotro.game.PhysicalCardImpl;
import com.gempukku.lotro.logic.decisions.DecisionResultInvalidException;
import com.gempukku.lotro.logic.modifiers.KeywordModifier;
import org.junit.Test;
import java.util.HashMap;
@@ -71,24 +73,32 @@ public class Card_V1_035_Tests
PhysicalCardImpl spear = scn.GetShadowCard("spear");
scn.ShadowMoveCardToHand(darkness, balrog, whip, spear);
//so the balrog doesn't self-discard
scn.ApplyAdHocModifier(new KeywordModifier(null, Filters.siteNumber(2), Keyword.UNDERGROUND));
scn.StartGame();
scn.SetTwilight(17);
scn.FreepsPassCurrentPhaseAction();
scn.ShadowPlayCard(darkness);
assertTrue(scn.ShadowActionAvailable("Darkness Grew"));
assertTrue(scn.ShadowCardActionAvailable(darkness));
assertEquals(0, scn.GetStackedCards(darkness).size());
scn.ShadowUseCardAction(darkness);
scn.ShadowChooseCard(whip);
assertEquals(1, scn.GetStackedCards(darkness).size());
assertEquals(Zone.STACKED, whip.getZone());
scn.ShadowUseCardAction(darkness);
assertEquals(2, scn.GetStackedCards(darkness).size());
assertFalse(scn.ShadowActionAvailable("Darkness Grew"));
assertEquals(Zone.STACKED, spear.getZone());
assertFalse(scn.ShadowCardActionAvailable(darkness));
//for some reason, pulling cards stacked on a condition flat out doesn't work here in the test rig.
scn.ShadowPlayCard(balrog);
assertTrue(scn.ShadowActionAvailable("Darkness Grew"));
assertTrue(scn.ShadowCardActionAvailable(darkness));
scn.ShadowUseCardAction(darkness);
assertTrue(scn.ShadowDecisionAvailable("Choose cards to take into hand"));
assertEquals(2, scn.GetShadowCardChoiceCount());
scn.ShadowChooseCard(whip);
assertEquals(1, scn.GetStackedCards(darkness).size());
}