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

Extracting rules for playing required triggers

Browse Source
This commit is contained in:
marcin.sciesinski
2019-10-01 15:16:22 -07:00
parent 7df524733c
commit 96b8fe6281
6 changed files with 123 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set11/site/Card11_243.java
View File

@@ -1,7 +1,5 @@
package com.gempukku.lotro.cards.set11.site;
import com.gempukku.lotro.logic.cardtype.AbstractShadowsSite;
import com.gempukku.lotro.logic.effects.AddUntilStartOfPhaseModifierEffect;
import com.gempukku.lotro.common.CardType;
import com.gempukku.lotro.common.Culture;
import com.gempukku.lotro.common.Keyword;
@@ -11,6 +9,8 @@ import com.gempukku.lotro.game.AbstractActionProxy;
import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.actions.RequiredTriggerAction;
import com.gempukku.lotro.logic.cardtype.AbstractShadowsSite;
import com.gempukku.lotro.logic.effects.AddUntilStartOfPhaseModifierEffect;
import com.gempukku.lotro.logic.modifiers.RemoveKeywordModifier;
import com.gempukku.lotro.logic.timing.EffectResult;
import com.gempukku.lotro.logic.timing.UnrespondableEffect;
@@ -37,40 +37,53 @@ public class Card11_243 extends AbstractShadowsSite {
public List<RequiredTriggerAction> getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, final PhysicalCard self) {
if (game.getModifiersQuerying().getUntilStartOfPhaseLimitCounter(self, Phase.REGROUP).getUsedLimit() < 1
&& !game.getGameState().getCurrentPhase().equals(Phase.REGROUP)) {
game.getActionsEnvironment().addUntilStartOfPhaseActionProxy(
new AbstractActionProxy() {
private Set<Integer> _minionsMarked = new HashSet<Integer>();
RequiredTriggerAction action = new RequiredTriggerAction(self);
action.appendEffect(
new UnrespondableEffect() {
@Override
public List<? extends RequiredTriggerAction> getRequiredAfterTriggers(LotroGame game, EffectResult effectResult) {
Set<PhysicalCard> toLose = new HashSet<PhysicalCard>();
final Set<Integer> toLoseInts = new HashSet<Integer>();
for (PhysicalCard minion : Filters.filterActive(game, Filters.inSkirmishAgainst(Culture.ROHAN, CardType.COMPANION))) {
if (!_minionsMarked.contains(minion.getCardId())) {
toLose.add(minion);
toLoseInts.add(minion.getCardId());
}
}
if (toLose.size() > 0) {
RequiredTriggerAction action = new RequiredTriggerAction(self);
action.appendEffect(
new UnrespondableEffect() {
@Override
protected void doPlayEffect(LotroGame game) {
_minionsMarked.addAll(toLoseInts);
}
});
action.appendEffect(
new AddUntilStartOfPhaseModifierEffect(
new RemoveKeywordModifier(self, Filters.in(toLose), Keyword.FIERCE), Phase.REGROUP));
return Collections.singletonList(action);
}
return null;
protected void doPlayEffect(LotroGame game) {
game.getModifiersQuerying().getUntilStartOfPhaseLimitCounter(self, Phase.REGROUP).incrementToLimit(1, 1);
}
}, Phase.REGROUP);
});
action.appendEffect(
new UnrespondableEffect() {
@Override
protected void doPlayEffect(LotroGame game) {
game.getActionsEnvironment().addUntilStartOfPhaseActionProxy(
new AbstractActionProxy() {
private Set<Integer> _minionsMarked = new HashSet<Integer>();
game.getModifiersQuerying().getUntilStartOfPhaseLimitCounter(self, Phase.REGROUP).incrementToLimit(1, 1);
@Override
public List<? extends RequiredTriggerAction> getRequiredAfterTriggers(LotroGame game, EffectResult effectResult) {
Set<PhysicalCard> toLose = new HashSet<PhysicalCard>();
final Set<Integer> toLoseInts = new HashSet<Integer>();
for (PhysicalCard minion : Filters.filterActive(game, Filters.inSkirmishAgainst(Culture.ROHAN, CardType.COMPANION))) {
if (!_minionsMarked.contains(minion.getCardId())) {
toLose.add(minion);
toLoseInts.add(minion.getCardId());
}
}
if (toLose.size() > 0) {
RequiredTriggerAction action = new RequiredTriggerAction(self);
action.appendEffect(
new UnrespondableEffect() {
@Override
protected void doPlayEffect(LotroGame game) {
_minionsMarked.addAll(toLoseInts);
}
});
action.appendEffect(
new AddUntilStartOfPhaseModifierEffect(
new RemoveKeywordModifier(self, Filters.in(toLose), Keyword.FIERCE), Phase.REGROUP));
return Collections.singletonList(action);
}
return null;
}
}, Phase.REGROUP);
}
});
return Collections.singletonList(action);
}
return null;
}

4
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java
View File

@@ -649,6 +649,10 @@ public class GameState {
return Collections.unmodifiableList(_adventureDecks.get(playerId));
}
public List<? extends PhysicalCard> getInPlay() {
return Collections.unmodifiableList(_inPlay);
}
public String getCurrentPlayerId() {
return _currentPlayerId;
}

12
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/actions/DefaultActionsEnvironment.java
View File

@@ -123,11 +123,7 @@ public class DefaultActionsEnvironment implements ActionsEnvironment {
@Override
public List<Action> getRequiredBeforeTriggers(Effect effect) {
GatherRequiredBeforeTriggers gatherActions = new GatherRequiredBeforeTriggers(effect);
_lotroGame.getGameState().iterateActiveTextCards(gatherActions);
List<Action> gatheredActions = gatherActions.getActions();
List<Action> gatheredActions = new LinkedList<>();
for (ActionProxy actionProxy : _actionProxies) {
List<? extends RequiredTriggerAction> actions = actionProxy.getRequiredBeforeTriggers(_lotroGame, effect);
@@ -180,11 +176,7 @@ public class DefaultActionsEnvironment implements ActionsEnvironment {
@Override
public List<Action> getRequiredAfterTriggers(Collection<? extends EffectResult> effectResults) {
GatherRequiredAfterTriggers gatherActions = new GatherRequiredAfterTriggers(effectResults);
_lotroGame.getGameState().iterateActiveTextCards(gatherActions);
List<Action> gatheredActions = gatherActions.getActions();
List<Action> gatheredActions = new LinkedList<>();
if (effectResults != null) {
for (ActionProxy actionProxy : _actionProxies) {

2
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/RuleSet.java
View File

@@ -57,6 +57,8 @@ public class RuleSet {
new ActivateResponseAbilitiesRule(_actionsEnvironment).applyRule();
new RequiredTriggersRule(_actionsEnvironment).applyRule();
new TakeOffRingRule(_actionsEnvironment).applyRule();
}
}

4
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/ActivateResponseAbilitiesRule.java
View File

@@ -31,7 +31,7 @@ public class ActivateResponseAbilitiesRule {
@Override
public List<? extends Action> getOptionalBeforeActions(String playerId, LotroGame game, Effect effect) {
List<Action> result = new LinkedList<>();
for (PhysicalCard activableCard : Filters.filterActive(game, getActivatableCardsFilter(playerId))) {
for (PhysicalCard activableCard : Filters.filter(game.getGameState().getInPlay(), game, getActivatableCardsFilter(playerId))) {
if (!game.getModifiersQuerying().hasTextRemoved(game, activableCard)) {
final List<? extends ActivateCardAction> actions = activableCard.getBlueprint().getOptionalInPlayBeforeActions(playerId, game, effect, activableCard);
if (actions != null)
@@ -45,7 +45,7 @@ public class ActivateResponseAbilitiesRule {
@Override
public List<? extends Action> getOptionalAfterActions(String playerId, LotroGame game, EffectResult effectResult) {
List<Action> result = new LinkedList<>();
for (PhysicalCard activableCard : Filters.filterActive(game, getActivatableCardsFilter(playerId))) {
for (PhysicalCard activableCard : Filters.filter(game.getGameState().getInPlay(), game, getActivatableCardsFilter(playerId))) {
if (!game.getModifiersQuerying().hasTextRemoved(game, activableCard)) {
final List<? extends ActivateCardAction> actions = activableCard.getBlueprint().getOptionalInPlayAfterActions(playerId, game, effectResult, activableCard);
if (actions != null)

67
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/RequiredTriggersRule.java Normal file
View File

@@ -0,0 +1,67 @@
package com.gempukku.lotro.logic.timing.rules;
import com.gempukku.lotro.common.CardType;
import com.gempukku.lotro.common.Phase;
import com.gempukku.lotro.filters.Filter;
import com.gempukku.lotro.filters.Filters;
import com.gempukku.lotro.game.AbstractActionProxy;
import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.game.state.actions.DefaultActionsEnvironment;
import com.gempukku.lotro.logic.actions.RequiredTriggerAction;
import com.gempukku.lotro.logic.modifiers.condition.OrCondition;
import com.gempukku.lotro.logic.modifiers.condition.PhaseCondition;
import com.gempukku.lotro.logic.timing.Effect;
import com.gempukku.lotro.logic.timing.EffectResult;
import java.util.LinkedList;
import java.util.List;
public class RequiredTriggersRule {
private DefaultActionsEnvironment actionsEnvironment;
public RequiredTriggersRule(DefaultActionsEnvironment actionsEnvironment) {
this.actionsEnvironment = actionsEnvironment;
}
public void applyRule() {
actionsEnvironment.addAlwaysOnActionProxy(
new AbstractActionProxy() {
@Override
public List<? extends RequiredTriggerAction> getRequiredBeforeTriggers(LotroGame game, Effect effect) {
List<RequiredTriggerAction> result = new LinkedList<>();
for (PhysicalCard activableCard : Filters.filter(game.getGameState().getInPlay(), game, getActivatableCardsFilter())) {
if (!game.getModifiersQuerying().hasTextRemoved(game, activableCard)) {
final List<? extends RequiredTriggerAction> actions = activableCard.getBlueprint().getRequiredBeforeTriggers(game, effect, activableCard);
if (actions != null)
result.addAll(actions);
}
}
return result;
}
@Override
public List<? extends RequiredTriggerAction> getRequiredAfterTriggers(LotroGame game, EffectResult effectResult) {
List<RequiredTriggerAction> result = new LinkedList<>();
for (PhysicalCard activableCard : Filters.filter(game.getGameState().getInPlay(), game, getActivatableCardsFilter())) {
if (!game.getModifiersQuerying().hasTextRemoved(game, activableCard)) {
final List<? extends RequiredTriggerAction> actions = activableCard.getBlueprint().getRequiredAfterTriggers(game, effectResult, activableCard);
if (actions != null)
result.addAll(actions);
}
}
return result;
}
}
);
}
private Filter getActivatableCardsFilter() {
return Filters.conditionFilter(
Filters.or(Filters.currentSite, Filters.and(Filters.not(CardType.SITE))),
new OrCondition(new PhaseCondition(Phase.PUT_RING_BEARER), new PhaseCondition(Phase.PLAY_STARTING_FELLOWSHIP)),
Filters.and(Filters.not(CardType.SITE)));
}
}