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

Rename StackCards -> StackCardsFromPlay

Browse Source
This commit is contained in:
Christian 'ketura' McCarty
2024-06-01 18:50:27 -05:00
parent 543ffdc453
commit 6a05210198
23 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-moria.hjson
View File

@@ -481,7 +481,7 @@
filter: your,culture(moria),orc,inSkirmish
}
effect: {
type: stackCards
type: StackCardsFromPlay
select: choose(your,culture(moria),orc,inSkirmish)
where: self
}

4
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Dunland.hjson
View File

@@ -409,7 +409,7 @@
filter: self
}
effect: {
type: stackCards
type: StackCardsFromPlay
select: self
where: choose(controlledSite)
}
@@ -1124,7 +1124,7 @@
filter: self
}
effect: {
type: stackCards
type: StackCardsFromPlay
select: self
where: choose(controlledSite)
}

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Gandalf.hjson
View File

@@ -802,7 +802,7 @@
filter: unbound,hobbit
}
effect: {
type: stackCards
type: StackCardsFromPlay
select: choose(unbound,hobbit,gettingDiscarded)
where: self
}

6
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Isengard.hjson
View File

@@ -2623,7 +2623,7 @@
type: controlsSite
}
effect: {
type: stackCards
type: StackCardsFromPlay
select: self
where: choose(controlledSite)
}
@@ -3761,7 +3761,7 @@
type: controlsSite
}
effect: {
type: stackCards
type: StackCardsFromPlay
select: self
where: choose(controlledSite)
}
@@ -3893,7 +3893,7 @@
type: controlsSite
}
effect: {
type: stackCards
type: StackCardsFromPlay
select: self
where: choose(controlledSite)
}

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set05/set05-Sauron.hjson
View File

@@ -996,7 +996,7 @@
}
]
effect: {
type: stackCards
type: StackCardsFromPlay
select: memory(spottedOrc)
where: self
}

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set06/set06-Isengard.hjson
View File

@@ -1126,7 +1126,7 @@
against: culture(isengard),man
}
effect: {
type: stackCards
type: StackCardsFromPlay
select: choose(possession)
where: self
}

6
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Sauron.hjson
View File

@@ -709,7 +709,7 @@
count: 1
}
effect: {
type: stackCards
type: StackCardsFromPlay
select: choose(culture(sauron),orc,besieger)
where: choose(controlledSite)
}
@@ -724,7 +724,7 @@
count: 2
}
effect: {
type: stackCards
type: StackCardsFromPlay
select: choose(culture(sauron),orc,not(besieger))
where: choose(controlledSite)
}
@@ -1073,7 +1073,7 @@
type: activated
phase: skirmish
cost: {
type: stackCards
type: StackCardsFromPlay
select: choose(besieger)
where: choose(controlledSite)
}

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Gollum.hjson
View File

@@ -553,7 +553,7 @@
}
]
effect: {
type: stackCards
type: StackCardsFromPlay
select: choose(your,or(orc,and(culture(gollum),minion)))
where: self
}

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Ringwraith.hjson
View File

@@ -297,7 +297,7 @@
}
]
effect: {
type: stackCards
type: StackCardsFromPlay
select: choose(your,culture(wraith),minion)
where: self
}

6
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Sauron.hjson
View File

@@ -316,7 +316,7 @@
select: self
}
{
type: stackCards
type: StackCardsFromPlay
select: self
where: choose(controlledSite)
}
@@ -968,7 +968,7 @@
type: removeThreats
}
effect: {
type: stackCards
type: StackCardsFromPlay
select: choose(your,culture(sauron),minion)
where: choose(controlledSite)
}
@@ -1051,7 +1051,7 @@
select: self
}
effect: {
type: stackCards
type: StackCardsFromPlay
select: choose(your,besieger)
where: choose(controlledSite)
}

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10-Sauron.hjson
View File

@@ -622,7 +622,7 @@
type: activated
phase: regroup
effect: {
type: stackCards
type: StackCardsFromPlay
select: self
where: choose(controlledSite)
}

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Orc.hjson
View File

@@ -244,7 +244,7 @@
memorize: spottedMinion
}
effect: {
type: stackCards
type: StackCardsFromPlay
select: memory(spottedMinion)
where: self
}

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Men.hjson
View File

@@ -518,7 +518,7 @@
checkTarget: true
}
effect: {
type: stackCards
type: StackCardsFromPlay
select: choose(culture(men),minion)
where: choose(culture(men),possession,zone(support))
}

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set18/set18-Men.hjson
View File

@@ -949,7 +949,7 @@
select: self
}
effect: {
type: stackCards
type: StackCardsFromPlay
select: choose(culture(men),man)
where: choose(possession)
}

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set31/set31-shadow.hjson
View File

@@ -617,7 +617,7 @@
filter: your,orc,inSkirmish
}
effect: {
type: stackCards
type: StackCardsFromPlay
select: choose(your,orc,inSkirmish)
where: self
}

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set32/set32-shadow.hjson
View File

@@ -609,7 +609,7 @@
times: 2
}
effect: {
type: stackCards
type: StackCardsFromPlay
select: memory(wiseCharacter)
where: self
}

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-shadow.hjson
View File

@@ -442,7 +442,7 @@
}
]
effect: {
type: stackCards
type: StackCardsFromPlay
select: choose(lowestStrength(culture(dwarven),companion))
where: self
}

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_elven.hjson
View File

@@ -289,7 +289,7 @@
phase: fellowship
cost: {
type: stackcards
type: StackCardsFromPlay
select: choose(your,or(tale,artifact),not(self))
where: self
}

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_moria.hjson
View File

@@ -14,7 +14,7 @@
filter: your,tentacle,inSkirmish
}
effect: {
type: stackCards
type: StackCardsFromPlay
select: choose(your,tentacle,inSkirmish)
where: self
}

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-isengard.hjson
View File

@@ -653,7 +653,7 @@
type: activated
phase: regroup
effect: {
type: stackCards
type: StackCardsFromPlay
select: choose(name(Saruman),not(exhausted))
where: self
}

6
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-moria.hjson
View File

@@ -277,7 +277,7 @@
filter: self
}
effect: {
type: stackCards
type: StackCardsFromPlay
select: choose(goblin)
where: choose(culture(moria),condition)
}
@@ -570,7 +570,7 @@
filter: culture(moria),goblin,inSkirmish
}
effect: {
type: stackCards
type: StackCardsFromPlay
where: self
select: choose(culture(moria),goblin,inSkirmish)
}
@@ -806,7 +806,7 @@
amount: 3
}
effect: {
type: stackCards
type: StackCardsFromPlay
select: choose(culture(moria),goblin)
where: choose(culture(moria),support area,condition)
}

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

@@ -176,7 +176,7 @@ public class EffectAppenderFactory {
effectAppenderProducers.put("shuffledeck", new ShuffleDeck());
effectAppenderProducers.put("shufflehandintodrawdeck", new ShuffleHandIntoDrawDeck());
effectAppenderProducers.put("spot", new Spot());
effectAppenderProducers.put("stackcards", new StackCards());
effectAppenderProducers.put("stackcardsfromplay", new StackCardsFromPlay());
effectAppenderProducers.put("stackcardsfromdeck", new StackCardsFromDeck());
effectAppenderProducers.put("stackcardsfromdiscard", new StackCardsFromDiscard());
effectAppenderProducers.put("stackcardsfromhand", new StackCardsFromHand());

4
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/StackCards.java → gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/StackCardsFromPlay.java
View File

@@ -19,7 +19,7 @@ import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
public class StackCards implements EffectAppenderProducer {
public class StackCardsFromPlay implements EffectAppenderProducer {
@Override
public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException {
FieldUtils.validateAllowedFields(effectObject, "select", "where", "count");
@@ -28,7 +28,7 @@ public class StackCards implements EffectAppenderProducer {
final String where = FieldUtils.getString(effectObject.get("where"), "where");
if (where == null)
throw new InvalidCardDefinitionException("You need to define where to stack the cards");
throw new InvalidCardDefinitionException("You need to define where to stack the cards for StackCards effect");
final ValueSource valueSource = ValueResolver.resolveEvaluator(effectObject.get("count"), 1, environment);