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

Refactored names of methods

Browse Source
This commit is contained in:
marcin.sciesinski
2019-10-01 18:44:28 -07:00
parent fc2feb3573
commit 3126bfc5d2
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,7 +54,7 @@ public class DefaultActionsEnvironment implements ActionsEnvironment {
_actionProxies.add(actionProxy);
}
public void removeStartOfPhaseActionProxies(Phase phase) {
public void signalStartOfPhase(Phase phase) {
List<ActionProxy> list = _untilStartOfPhaseActionProxies.get(phase);
if (list != null) {
_actionProxies.removeAll(list);
@@ -62,7 +62,7 @@ public class DefaultActionsEnvironment implements ActionsEnvironment {
}
}
public void removeEndOfPhaseActionProxies(Phase phase) {
public void signalEndOfPhase(Phase phase) {
List<ActionProxy> list = _untilEndOfPhaseActionProxies.get(phase);
if (list != null) {
_actionProxies.removeAll(list);
@@ -71,7 +71,7 @@ public class DefaultActionsEnvironment implements ActionsEnvironment {
phaseEffectResults.clear();
}
public void removeEndOfTurnActionProxies() {
public void signalEndOfTurn() {
_actionProxies.removeAll(_untilEndOfTurnActionProxies);
_untilEndOfTurnActionProxies.clear();
turnEffectResults.clear();

8
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/SkirmishPhaseAction.java
View File

@@ -30,8 +30,8 @@ public class SkirmishPhaseAction extends SystemQueueAction {
new UnrespondableEffect() {
@Override
protected void doPlayEffect(LotroGame game) {
((ModifiersLogic) game.getModifiersEnvironment()).removeStartOfPhase(Phase.SKIRMISH);
((DefaultActionsEnvironment) game.getActionsEnvironment()).removeStartOfPhaseActionProxies(Phase.SKIRMISH);
((ModifiersLogic) game.getModifiersEnvironment()).signalStartOfPhase(Phase.SKIRMISH);
((DefaultActionsEnvironment) game.getActionsEnvironment()).signalStartOfPhase(Phase.SKIRMISH);
}
});
appendEffect(
@@ -67,8 +67,8 @@ public class SkirmishPhaseAction extends SystemQueueAction {
new UnrespondableEffect() {
@Override
protected void doPlayEffect(LotroGame game) {
((ModifiersLogic) game.getModifiersEnvironment()).removeEndOfPhase(Phase.SKIRMISH);
((DefaultActionsEnvironment) game.getActionsEnvironment()).removeEndOfPhaseActionProxies(Phase.SKIRMISH);
((ModifiersLogic) game.getModifiersEnvironment()).signalEndOfPhase(Phase.SKIRMISH);
((DefaultActionsEnvironment) game.getActionsEnvironment()).signalEndOfPhase(Phase.SKIRMISH);
}
});
}

6
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersLogic.java
View File

@@ -157,7 +157,7 @@ public class ModifiersLogic implements ModifiersEnvironment, ModifiersQuerying {
}
}
public void removeEndOfPhase(Phase phase) {
public void signalEndOfPhase(Phase phase) {
List<Modifier> list = _untilEndOfPhaseModifiers.get(phase);
if (list != null) {
removeModifiers(list);
@@ -171,7 +171,7 @@ public class ModifiersLogic implements ModifiersEnvironment, ModifiersQuerying {
_woundsPerPhaseMap.clear();
}
public void removeStartOfPhase(Phase phase) {
public void signalStartOfPhase(Phase phase) {
List<Modifier> list = _untilStartOfPhaseModifiers.get(phase);
if (list != null) {
removeModifiers(list);
@@ -183,7 +183,7 @@ public class ModifiersLogic implements ModifiersEnvironment, ModifiersQuerying {
counterMap.clear();
}
public void removeEndOfTurn() {
public void signalEndOfTurn() {
removeModifiers(_untilEndOfTurnModifiers);
_untilEndOfTurnModifiers.clear();

4
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/EndOfTurnGameProcess.java
View File

@@ -31,8 +31,8 @@ public class EndOfTurnGameProcess implements GameProcess {
@Override
public void playEffect(LotroGame game) {
((ModifiersLogic) game.getModifiersEnvironment()).removeEndOfTurn();
((DefaultActionsEnvironment) game.getActionsEnvironment()).removeEndOfTurnActionProxies();
((ModifiersLogic) game.getModifiersEnvironment()).signalEndOfTurn();
((DefaultActionsEnvironment) game.getActionsEnvironment()).signalEndOfTurn();
game.getGameState().stopAffectingCardsForCurrentPlayer();
game.getGameState().setCurrentPhase(Phase.BETWEEN_TURNS);
}

4
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/EndOfPhaseGameProcess.java
View File

@@ -39,8 +39,8 @@ public class EndOfPhaseGameProcess implements GameProcess {
@Override
public void playEffect(LotroGame game) {
((ModifiersLogic) game.getModifiersEnvironment()).removeEndOfPhase(_phase);
((DefaultActionsEnvironment) game.getActionsEnvironment()).removeEndOfPhaseActionProxies(_phase);
((ModifiersLogic) game.getModifiersEnvironment()).signalEndOfPhase(_phase);
((DefaultActionsEnvironment) game.getActionsEnvironment()).signalEndOfPhase(_phase);
}
});
game.getActionsEnvironment().addActionToStack(action);

4
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/StartOfPhaseGameProcess.java
View File

@@ -47,8 +47,8 @@ public class StartOfPhaseGameProcess implements GameProcess {
@Override
public void playEffect(LotroGame game) {
((ModifiersLogic) game.getModifiersEnvironment()).removeStartOfPhase(_phase);
((DefaultActionsEnvironment) game.getActionsEnvironment()).removeStartOfPhaseActionProxies(_phase);
((ModifiersLogic) game.getModifiersEnvironment()).signalStartOfPhase(_phase);
((DefaultActionsEnvironment) game.getActionsEnvironment()).signalStartOfPhase(_phase);
}
});