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

Cleaned up the GameState sending warnings, but also fixed tests double-modifiers issue

Browse Source
This commit is contained in:
marcin.sciesinski
2021-03-17 05:04:03 -07:00
parent 2b47d26fdb
commit 3a76d33635
8 changed files with 88 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Phase.java
View File

@@ -1,23 +1,25 @@
package com.gempukku.lotro.common;
public enum Phase {
PUT_RING_BEARER("Put Ring-bearer", false),
PLAY_STARTING_FELLOWSHIP("Play starting fellowship", false),
FELLOWSHIP("Fellowship", true),
SHADOW("Shadow", true),
MANEUVER("Maneuver", true),
ARCHERY("Archery", true),
ASSIGNMENT("Assignment", true),
SKIRMISH("Skirmish", true),
REGROUP("Regroup", true),
BETWEEN_TURNS("Between turns", false);
PUT_RING_BEARER("Put Ring-bearer", false, false),
PLAY_STARTING_FELLOWSHIP("Play starting fellowship", false, true),
FELLOWSHIP("Fellowship", true, true),
SHADOW("Shadow", true, true),
MANEUVER("Maneuver", true, true),
ARCHERY("Archery", true, true),
ASSIGNMENT("Assignment", true, true),
SKIRMISH("Skirmish", true, true),
REGROUP("Regroup", true, true),
BETWEEN_TURNS("Between turns", false, false);
private String humanReadable;
private boolean realPhase;
private boolean cardsAffectGame;
private Phase(String humanReadable, boolean realPhase) {
Phase(String humanReadable, boolean realPhase, boolean cardsAffectGame) {
this.humanReadable = humanReadable;
this.realPhase = realPhase;
this.cardsAffectGame = cardsAffectGame;
}
public String getHumanReadable() {
@@ -27,4 +29,8 @@ public enum Phase {
public boolean isRealPhase() {
return realPhase;
}
public boolean isCardsAffectGame() {
return cardsAffectGame;
}
}

2
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/communication/GameStateListener.java
View File

@@ -55,4 +55,6 @@ public interface GameStateListener {
public void cardActivated(String playerPerforming, PhysicalCard card);
public void decisionRequired(String playerId, AwaitingDecision awaitingDecision);
public void sendWarning(String playerId, String warning);
}

2
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/communication/UserFeedback.java
View File

@@ -5,7 +5,5 @@ import com.gempukku.lotro.logic.decisions.AwaitingDecision;
public interface UserFeedback {
public void sendAwaitingDecision(String playerId, AwaitingDecision awaitingDecision);
public void sendWarning(String playerId, String warning);
public boolean hasPendingDecisions();
}

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

@@ -187,6 +187,12 @@ public class GameCommunicationChannel implements GameStateListener, LongPollable
appendEvent(new GameEvent(DECISION).awaitingDecision(decision).participantId(playerId));
}
@Override
public void sendWarning(String playerId, String warning) {
if (playerId.equals(_self))
appendEvent(new GameEvent(SEND_WARNING).message(warning));
}
public List<GameEvent> consumeGameEvents() {
updateLastAccess();
List<GameEvent> result = _events;

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

@@ -489,7 +489,7 @@ public class GameState {
listener.cardCreated(card);
}
if (_currentPhase != Phase.PUT_RING_BEARER) {
if (_currentPhase.isCardsAffectGame()) {
if (zone.isInPlay())
if (card.getBlueprint().getCardType() != CardType.SITE || (getCurrentPhase() != Phase.PLAY_STARTING_FELLOWSHIP && getCurrentSite() == card))
startAffecting(game, card);
@@ -1041,4 +1041,9 @@ public class GameState {
for (GameStateListener listener : getAllGameStateListeners())
listener.sendGameStats(gameStats);
}
public void sendWarning(String player, String warning) {
for (GameStateListener listener : getAllGameStateListeners())
listener.sendWarning(player, warning);
}
}

14
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/DefaultUserFeedback.java
View File

@@ -10,7 +10,6 @@ import java.util.Set;
public class DefaultUserFeedback implements UserFeedback {
private Map<String, AwaitingDecision> _awaitingDecisionMap = new HashMap<String, AwaitingDecision>();
private Map<String, String> _warnings = new HashMap<String, String>();
private LotroGame _game;
@@ -33,24 +32,11 @@ public class DefaultUserFeedback implements UserFeedback {
_game.getGameState().playerDecisionStarted(playerId, awaitingDecision);
}
@Override
public void sendWarning(String playerId, String warning) {
_warnings.put(playerId, warning);
}
@Override
public boolean hasPendingDecisions() {
return _awaitingDecisionMap.size() > 0;
}
public String consumeWarning(String playerId) {
return _warnings.remove(playerId);
}
public boolean hasWarning(String playerId) {
return _warnings.containsKey(playerId);
}
public Set<String> getUsersPendingDecision() {
return _awaitingDecisionMap.keySet();
}

9
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroGameMediator.java
View File

@@ -301,8 +301,7 @@ public class LotroGameMediator {
}
public void cancel(Player player) {
if (!_cancellable)
_userFeedback.sendWarning(player.getName(), "You can't cancel this game");
_lotroGame.getGameState().sendWarning(player.getName(), "You can't cancel this game");
String playerId = player.getName();
_writeLock.lock();
@@ -336,7 +335,7 @@ public class LotroGameMediator {
} catch (DecisionResultInvalidException decisionResultInvalidException) {
// Participant provided wrong answer - send a warning message, and ask again for the same decision
_userFeedback.sendWarning(playerName, decisionResultInvalidException.getWarningMessage());
_lotroGame.getGameState().sendWarning(playerName, decisionResultInvalidException.getWarningMessage());
_userFeedback.sendAwaitingDecision(playerName, awaitingDecision);
} catch (RuntimeException runtimeException) {
LOG.error("Error processing game decision", runtimeException);
@@ -384,10 +383,6 @@ public class LotroGameMediator {
for (GameEvent gameEvent : communicationChannel.consumeGameEvents())
visitor.visitGameEvent(gameEvent);
String warning = _userFeedback.consumeWarning(playerName);
if (warning != null)
visitor.visitGameEvent(new GameEvent(GameEvent.Type.SEND_WARNING).message(warning));
Map<String, Integer> secondsLeft = new HashMap<String, Integer>();
for (Map.Entry<String, Integer> playerClock : _playerClocks.entrySet()) {
String playerClockName = playerClock.getKey();

55
gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/IndividualCardAtTest.java
View File

@@ -1410,4 +1410,59 @@ public class IndividualCardAtTest extends AbstractAtTest {
System.out.println();
}
@Test
public void FarinStrengthBoostWhileSkirmishingOrc() throws DecisionResultInvalidException, CardNotFoundException {
//Pre-game setup
initializeSimplestGame();
// Farin, Dwarven Emissary; 5 strength, "while skirmishing an Orc, Farin is strength +2"
final PhysicalCardImpl farin = createCard(P1, "1_11");
_game.getGameState().addCardToZone(_game, farin, Zone.FREE_CHARACTERS);
//Orc Scouting Band, 8 strength
final PhysicalCardImpl orc = createCard(P2, "1_270");
_game.getGameState().addCardToZone(_game, orc, Zone.SHADOW_CHARACTERS);
skipMulligans();
_game.getGameState().setTwilight(10);
playerDecided(P1, "");
// Pass in shadow
playerDecided(P2, "");
//Pass in maneuver
playerDecided(P1, "");
playerDecided(P2, "");
//Pass in archery
playerDecided(P1, "");
playerDecided(P2, "");
//Pass in assignment
playerDecided(P1, "");
playerDecided(P2, "");
// assign Farin to an Orc
playerDecided(P1, farin.getCardId() + " " + orc.getCardId());
//Farin's strength is still the base of 5
assertEquals(5, _game.getModifiersQuerying().getStrength(_game, farin));
//Choose to resolve Farin's skirmish
playerDecided(P1, "" + farin.getCardId());
//This test fails. Farin has two instances of the ModifyStrength modifier applied for some reason,
// which puts him at 9 strength instead of the expected 7.
assertEquals(5 + 2, _game.getModifiersQuerying().getStrength(_game, farin));
playerDecided(P1, "");
playerDecided(P2, "");
// If the above test is commented out, then Farin wins the skirmish and applies skirmish wounds to the Orc
assertEquals(1, _game.getGameState().getWounds(farin));
assertEquals(0, _game.getGameState().getWounds(orc));
}
}