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

Consolidating both CantUseSpecialAbilities and PlayerCantUseSpecialAbilities (formerly called CantPlaySpecialAbilities) under CantUseSpecialAbilities (but using the superior implementation of CantPlaySpecialAbilities).

Browse Source
This commit is contained in:
Christian 'ketura' McCarty
2024-05-29 19:59:36 -05:00
parent 2e04760c6f
commit 136bb0170c
10 changed files with 24 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set3-isengard.hjson
View File

@@ -326,7 +326,7 @@
{
type: modifier
modifier: {
type: PlayerCantUseSpecialAbilities
type: CantUseSpecialAbilities
requires: {
type: canSpot
filter: another,culture(isengard),orc

4
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Elven.hjson
View File

@@ -61,7 +61,7 @@
{
type: addModifier
modifier: {
type: PlayerCantUseSpecialAbilities
type: CantUseSpecialAbilities
player: you
phase: archery
}
@@ -245,7 +245,7 @@
{
type: addModifier
modifier: {
type: PlayerCantUseSpecialAbilities
type: CantUseSpecialAbilities
player: you
phase: archery
}

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

@@ -494,7 +494,7 @@
{
type: addModifier
modifier: {
type: PlayerCantUseSpecialAbilities
type: CantUseSpecialAbilities
player: free people
phase: archery
}

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Sites.hjson
View File

@@ -262,7 +262,7 @@
{
type: modifier
modifier: {
type: PlayerCantUseSpecialAbilities
type: CantUseSpecialAbilities
phase: skirmish
}
}

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

@@ -312,7 +312,7 @@
{
type: addModifier
modifier: {
type: PlayerCantUseSpecialAbilities
type: CantUseSpecialAbilities
phase: skirmish
filter: or(memory(assignedCompanion),memory(assignedMinion))
}

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

@@ -291,7 +291,7 @@
{
type: modifier
modifier: {
type: PlayerCantUseSpecialAbilities
type: CantUseSpecialAbilities
requires: {
type: canSpot
filter: bearer,unique,companion

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

@@ -514,7 +514,7 @@
effect: {
type: addModifier
modifier: {
type: PlayerCantUseSpecialAbilities
type: CantUseSpecialAbilities
filter: memory(spottedMinion)
}
until: regroup

28
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/CantUseSpecialAbilities.java
View File

@@ -3,6 +3,9 @@ package com.gempukku.lotro.cards.build.field.effect.modifier;
import com.gempukku.lotro.cards.build.*;
import com.gempukku.lotro.cards.build.field.FieldUtils;
import com.gempukku.lotro.cards.build.field.effect.appender.resolver.PlayerResolver;
import com.gempukku.lotro.common.Phase;
import com.gempukku.lotro.logic.modifiers.CantUseSpecialAbilitiesModifier;
import com.gempukku.lotro.logic.modifiers.Modifier;
import com.gempukku.lotro.logic.modifiers.PlayerCantUseCardSpecialAbilitiesModifier;
import com.gempukku.lotro.logic.modifiers.PlayersCantUseCardSpecialAbilitiesModifier;
import org.json.simple.JSONObject;
@@ -10,24 +13,25 @@ import org.json.simple.JSONObject;
public class CantUseSpecialAbilities implements ModifierSourceProducer {
@Override
public ModifierSource getModifierSource(JSONObject object, CardGenerationEnvironment environment) throws InvalidCardDefinitionException {
FieldUtils.validateAllowedFields(object, "filter", "requires", "player");
FieldUtils.validateAllowedFields(object, "player", "phase", "requires", "filter");
String player = FieldUtils.getString(object.get("player"), "player");
final Phase phase = FieldUtils.getEnum(Phase.class, object.get("phase"), "phase");
final JSONObject[] conditionArray = FieldUtils.getObjectArray(object.get("requires"), "requires");
final String filter = FieldUtils.getString(object.get("filter"), "filter", "any");
final String player = FieldUtils.getString(object.get("player"), "player");
String filter = FieldUtils.getString(object.get("filter"), "filter", "any");
final Requirement[] requirements = environment.getRequirementFactory().getRequirements(conditionArray, environment);
final FilterableSource filterableSource = environment.getFilterFactory().generateFilter(filter, environment);
PlayerSource playerSource = player != null ? PlayerResolver.resolvePlayer(player, environment) : null;
FilterableSource filterableSource = environment.getFilterFactory().generateFilter(filter, environment);
return actionContext -> {
if (playerSource != null) {
return new PlayerCantUseCardSpecialAbilitiesModifier(actionContext.getSource(),
playerSource.getPlayer(actionContext),
RequirementCondition.createCondition(requirements, actionContext), filterableSource.getFilterable(actionContext));
} else {
return new PlayersCantUseCardSpecialAbilitiesModifier(actionContext.getSource(),
RequirementCondition.createCondition(requirements, actionContext), filterableSource.getFilterable(actionContext));
return new ModifierSource() {
@Override
public Modifier getModifier(ActionContext actionContext) {
String bannedPlayer = (playerSource != null) ? playerSource.getPlayer(actionContext) : null;
return new CantUseSpecialAbilitiesModifier(actionContext.getSource(),
RequirementCondition.createCondition(requirements, actionContext), phase, bannedPlayer, filterableSource.getFilterable(actionContext));
}
};
}

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

@@ -57,7 +57,6 @@ 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());

36
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/modifier/PlayerCantUseSpecialAbilities.java
View File

@@ -1,36 +0,0 @@
package com.gempukku.lotro.cards.build.field.effect.modifier;
import com.gempukku.lotro.cards.build.*;
import com.gempukku.lotro.cards.build.field.FieldUtils;
import com.gempukku.lotro.cards.build.field.effect.appender.resolver.PlayerResolver;
import com.gempukku.lotro.common.Phase;
import com.gempukku.lotro.logic.modifiers.CantUseSpecialAbilitiesModifier;
import com.gempukku.lotro.logic.modifiers.Modifier;
import org.json.simple.JSONObject;
public class PlayerCantUseSpecialAbilities implements ModifierSourceProducer {
@Override
public ModifierSource getModifierSource(JSONObject object, CardGenerationEnvironment environment) throws InvalidCardDefinitionException {
FieldUtils.validateAllowedFields(object, "player", "phase", "requires", "filter");
String player = FieldUtils.getString(object.get("player"), "player");
final Phase phase = FieldUtils.getEnum(Phase.class, object.get("phase"), "phase");
final JSONObject[] conditionArray = FieldUtils.getObjectArray(object.get("requires"), "requires");
String filter = FieldUtils.getString(object.get("filter"), "filter", "any");
final Requirement[] requirements = environment.getRequirementFactory().getRequirements(conditionArray, environment);
PlayerSource playerSource = player != null ? PlayerResolver.resolvePlayer(player, environment) : null;
FilterableSource filterableSource = environment.getFilterFactory().generateFilter(filter, environment);
return new ModifierSource() {
@Override
public Modifier getModifier(ActionContext actionContext) {
String bannedPlayer = (playerSource != null) ? playerSource.getPlayer(actionContext) : null;
return new CantUseSpecialAbilitiesModifier(actionContext.getSource(),
RequirementCondition.createCondition(requirements, actionContext), phase, bannedPlayer, filterableSource.getFilterable(actionContext));
}
};
}
}