From 2e04760c6f3fec8e695e50522449719c1af71fe4 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Wed, 29 May 2024 19:19:29 -0500 Subject: [PATCH] Renamed cantPlaySpecialAbilities -> PlayerCantUseSpecialAbilities --- .../main/resources/cards/official/set03/set3-isengard.hjson | 2 +- .../src/main/resources/cards/official/set08/set08-Elven.hjson | 4 ++-- .../main/resources/cards/official/set08/set08-Sauron.hjson | 2 +- .../src/main/resources/cards/official/set11/set11-Sites.hjson | 2 +- .../src/main/resources/cards/official/set13/set13-Elven.hjson | 2 +- .../src/main/resources/cards/official/set18/set18-Elven.hjson | 2 +- .../main/resources/cards/official/set18/set18-Gandalf.hjson | 2 +- .../build/field/effect/modifier/ModifierSourceFactory.java | 2 +- ...ecialAbilities.java => PlayerCantUseSpecialAbilities.java} | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) rename gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/{CantPlaySpecialAbilities.java => PlayerCantUseSpecialAbilities.java} (96%) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set3-isengard.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set3-isengard.hjson index 3077778f6..55600ea2b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set3-isengard.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set3-isengard.hjson @@ -326,7 +326,7 @@ { type: modifier modifier: { - type: cantPlaySpecialAbilities + type: PlayerCantUseSpecialAbilities requires: { type: canSpot filter: another,culture(isengard),orc diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Elven.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Elven.hjson index ff41f60fe..0a56ea7a2 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Elven.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Elven.hjson @@ -61,7 +61,7 @@ { type: addModifier modifier: { - type: cantPlaySpecialAbilities + type: PlayerCantUseSpecialAbilities player: you phase: archery } @@ -245,7 +245,7 @@ { type: addModifier modifier: { - type: cantPlaySpecialAbilities + type: PlayerCantUseSpecialAbilities player: you phase: archery } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Sauron.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Sauron.hjson index 4de9dd2e5..57a1a0383 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Sauron.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Sauron.hjson @@ -494,7 +494,7 @@ { type: addModifier modifier: { - type: cantPlaySpecialAbilities + type: PlayerCantUseSpecialAbilities player: free people phase: archery } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Sites.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Sites.hjson index 66a5e7936..3424cae3b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Sites.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Sites.hjson @@ -262,7 +262,7 @@ { type: modifier modifier: { - type: cantPlaySpecialAbilities + type: PlayerCantUseSpecialAbilities phase: skirmish } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Elven.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Elven.hjson index d277a8e36..e54a817de 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Elven.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Elven.hjson @@ -312,7 +312,7 @@ { type: addModifier modifier: { - type: cantPlaySpecialAbilities + type: PlayerCantUseSpecialAbilities phase: skirmish filter: or(memory(assignedCompanion),memory(assignedMinion)) } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set18/set18-Elven.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set18/set18-Elven.hjson index 02cfdc9a7..31cf5b2a7 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set18/set18-Elven.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set18/set18-Elven.hjson @@ -291,7 +291,7 @@ { type: modifier modifier: { - type: cantPlaySpecialAbilities + type: PlayerCantUseSpecialAbilities requires: { type: canSpot filter: bearer,unique,companion diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set18/set18-Gandalf.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set18/set18-Gandalf.hjson index 67c7cf676..19403ee53 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set18/set18-Gandalf.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set18/set18-Gandalf.hjson @@ -514,7 +514,7 @@ effect: { type: addModifier modifier: { - type: cantPlaySpecialAbilities + type: PlayerCantUseSpecialAbilities filter: memory(spottedMinion) } until: regroup diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifierSourceFactory.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifierSourceFactory.java index 2ba70ef33..76e7b550f 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifierSourceFactory.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/ModifierSourceFactory.java @@ -47,7 +47,6 @@ public class ModifierSourceFactory { modifierProducers.put("cantplayphaseevents", new CantPlayPhaseEvents()); modifierProducers.put("cantplayphaseeventsorphasespecialabilities", new CantPlayPhaseEventsOrPhaseSpecialAbilities()); modifierProducers.put("cantplaysite", new CantPlaySite()); - modifierProducers.put("cantplayspecialabilities", new CantPlaySpecialAbilities()); modifierProducers.put("cantpreventwounds", new AddModifierFlag(ModifierFlag.CANT_PREVENT_WOUNDS)); modifierProducers.put("cantremoveburdens", new CantRemoveBurdens()); modifierProducers.put("cantremovethreats", new CantRemoveThreats()); @@ -58,6 +57,7 @@ public class ModifierSourceFactory { modifierProducers.put("canttakewoundsfromlosingskirmish", new CantTakeWoundsFromLosingSkirmish()); modifierProducers.put("canttouchtokens", new AddModifierFlag(ModifierFlag.CANT_TOUCH_CULTURE_TOKENS)); modifierProducers.put("cantusespecialabilities", new CantUseSpecialAbilities()); + modifierProducers.put("playercantusespecialabilities", new PlayerCantUseSpecialAbilities()); modifierProducers.put("disablegametext", new DisableGameText()); modifierProducers.put("doesnotaddtoarcherytotal", new DoesNotAddToArcheryTotal()); modifierProducers.put("extracosttoplay", new ExtraCostToPlay()); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/CantPlaySpecialAbilities.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/PlayerCantUseSpecialAbilities.java similarity index 96% rename from gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/CantPlaySpecialAbilities.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/PlayerCantUseSpecialAbilities.java index 0129da851..c96e1c24d 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/CantPlaySpecialAbilities.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/PlayerCantUseSpecialAbilities.java @@ -8,7 +8,7 @@ import com.gempukku.lotro.logic.modifiers.CantUseSpecialAbilitiesModifier; import com.gempukku.lotro.logic.modifiers.Modifier; import org.json.simple.JSONObject; -public class CantPlaySpecialAbilities implements ModifierSourceProducer { +public class PlayerCantUseSpecialAbilities implements ModifierSourceProducer { @Override public ModifierSource getModifierSource(JSONObject object, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { FieldUtils.validateAllowedFields(object, "player", "phase", "requires", "filter");