diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1-sauron.hjson b/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1-sauron.hjson index cebbc694a..7abab0f0e 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1-sauron.hjson +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1-sauron.hjson @@ -22,7 +22,7 @@ effects: { type: event effect: { - type: duplicate + type: repeat amount: { type: forEachYouCanSpot filter: companion @@ -365,7 +365,7 @@ effects: { type: event effect: { - type: duplicate + type: repeat amount: { type: forEachYouCanSpot filter: companion diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1-wraith.hjson b/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1-wraith.hjson index 1371547fe..857687d1e 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1-wraith.hjson +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1-wraith.hjson @@ -983,7 +983,7 @@ filter: self } effect: { - type: duplicate + type: repeat amount: { type: forEachYouCanSpot filter: companion diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1.hjson b/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1.hjson index f13a4e9c6..f8c8559f4 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1.hjson +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set01/set1.hjson @@ -1212,7 +1212,7 @@ phase: shadow effect: [ { - type: duplicate + type: repeat amount: 3 effect: { type: playCardFromDiscard diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set09/set9-1.hjson b/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set09/set9-1.hjson index 037527afc..01e9d684f 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set09/set9-1.hjson +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set09/set9-1.hjson @@ -489,7 +489,7 @@ memorize: spottedElfCount } { - type: duplicate + type: repeat amount: { type: fromMemory memory: spottedElfCount @@ -728,7 +728,7 @@ phase: fellowship effect: [ { - type: duplicate + type: repeat amount: { type: forEachVitality filter: bearer diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set09/set9-2.hjson b/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set09/set9-2.hjson index dcd1e4fcf..2f13d831b 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set09/set9-2.hjson +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set09/set9-2.hjson @@ -108,7 +108,7 @@ filter: all(any) } { - type: duplicate + type: repeat amount: { type: forEachInHand filter: side(shadow) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set14/set14.hjson b/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set14/set14.hjson index 65a2fcdea..305147e38 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set14/set14.hjson +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/official/set14/set14.hjson @@ -506,7 +506,7 @@ phase: assignment } effect: { - type: duplicate + type: repeat effect: { type: heal filter: choose(uruk-hai) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set31/set31-fp.hjson b/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set31/set31-fp.hjson index 921aea110..cdd8bd7a7 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set31/set31-fp.hjson +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set31/set31-fp.hjson @@ -64,7 +64,7 @@ filter: siteNumber(1-5),siteBlock(hobbit) } effect: { - type: duplicate + type: repeat amount: { type: twilightCostInMemory memory: discardedFollower diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set31/set31-shadow.hjson b/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set31/set31-shadow.hjson index 8b925f031..0d9d5ce5d 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set31/set31-shadow.hjson +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set31/set31-shadow.hjson @@ -733,7 +733,7 @@ filter: self } effect: { - type: duplicate + type: repeat amount: { type: forEachYouCanSpot filter: culture(dwarven),companion diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set32/set32-shadow.hjson b/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set32/set32-shadow.hjson index 5ed5857f1..c38c96f84 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set32/set32-shadow.hjson +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set32/set32-shadow.hjson @@ -184,7 +184,7 @@ times: 2 } effect: { - type: duplicate + type: repeat amount: { type: forEachYouCanSpot filter: culture(dwarven),companion diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set33/set33-fp.hjson b/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set33/set33-fp.hjson index e4ecbd9bf..ca3eb00a6 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set33/set33-fp.hjson +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set33/set33-fp.hjson @@ -749,7 +749,7 @@ memorize: cardsInHand } { - type: duplicate + type: repeat amount: { type: forEachMatchingInMemory memory: cardsInHand diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set33/set33-sites.hjson b/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set33/set33-sites.hjson index 640069c66..7bf60eb68 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set33/set33-sites.hjson +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/hobbit/set33/set33-sites.hjson @@ -111,7 +111,7 @@ memorizeTransferred: transferredFollowers } { - type: duplicate + type: repeat amount: { type: forEachYouCanSpot filter: follower,culture(dwarven),not(memory(transferredFollowers)) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set01/set01-Ringwraith-errata.hjson b/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set01/set01-Ringwraith-errata.hjson index cfeb8569e..774800d42 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set01/set01-Ringwraith-errata.hjson +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/pc/errata/set01/set01-Ringwraith-errata.hjson @@ -41,7 +41,7 @@ filter: self } effect: { - type: duplicate + type: repeat amount: { type: forEachYouCanSpot filter: companion diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/second-edition/set40/set40-moria.hjson b/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/second-edition/set40/set40-moria.hjson index 13772936a..f34a11405 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/second-edition/set40/set40-moria.hjson +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/unofficial/second-edition/set40/set40-moria.hjson @@ -404,7 +404,7 @@ filter: self } effect: { - type: duplicate + type: repeat amount: { type: forEachYouCanSpot filter: companion diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/EffectAppenderFactory.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/EffectAppenderFactory.java index 0e25e695c..f99159ad7 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/EffectAppenderFactory.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/EffectAppenderFactory.java @@ -57,7 +57,7 @@ public class EffectAppenderFactory { effectAppenderProducers.put("discardtopcardsfromdeck", new DiscardTopCardFromDeck()); effectAppenderProducers.put("doesnotaddtoarcherytotal", new DoesNotAddToArcheryTotal()); effectAppenderProducers.put("drawcards", new DrawCards()); - effectAppenderProducers.put("duplicate", new Duplicate()); + effectAppenderProducers.put("repeat", new Repeat()); effectAppenderProducers.put("endphase", new EndPhase()); effectAppenderProducers.put("exert", new Exert()); effectAppenderProducers.put("exhaust", new Exhaust()); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Duplicate.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Repeat.java similarity index 97% rename from gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Duplicate.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Repeat.java index 9bd46ba32..99a94c7f6 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Duplicate.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Repeat.java @@ -14,7 +14,7 @@ import com.gempukku.lotro.logic.effects.StackActionEffect; import com.gempukku.lotro.logic.timing.Effect; import org.json.simple.JSONObject; -public class Duplicate implements EffectAppenderProducer { +public class Repeat implements EffectAppenderProducer { @Override public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { FieldUtils.validateAllowedFields(effectObject, "amount", "effect");