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

Games can be now cancelled by system if there is an error processing them.

Browse Source
This commit is contained in:
marcins78@gmail.com
2012-05-09 18:09:14 +00:00
parent ae24dc607b
commit 6df0affb0d
7 changed files with 78 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/DefaultLotroGame.java
View File

@@ -30,6 +30,8 @@ public class DefaultLotroGame implements LotroGame {
private UserFeedback _userFeedback;
private TurnProcedure _turnProcedure;
private ActionStack _actionStack;
private boolean _cancelled;
private boolean _finished;
private LotroFormat _format;
@@ -105,11 +107,13 @@ public class DefaultLotroGame implements LotroGame {
}
public void startGame() {
_turnProcedure.carryOutPendingActionsUntilDecisionNeeded();
if (!_cancelled)
_turnProcedure.carryOutPendingActionsUntilDecisionNeeded();
}
public void carryOutPendingActionsUntilDecisionNeeded() {
_turnProcedure.carryOutPendingActionsUntilDecisionNeeded();
if (!_cancelled)
_turnProcedure.carryOutPendingActionsUntilDecisionNeeded();
}
@Override
@@ -117,17 +121,37 @@ public class DefaultLotroGame implements LotroGame {
return _winnerPlayerId;
}
public boolean isFinished() {
return _finished;
}
public void cancelGame() {
if (!_finished) {
_cancelled = true;
for (GameResultListener gameResultListener : _gameResultListeners)
gameResultListener.gameCancelled();
_finished = true;
}
}
public boolean isCancelled() {
return _cancelled;
}
@Override
public void playerWon(String playerId, String reason) {
// Any remaining players have lost
Set<String> losers = new HashSet<String>(_allPlayers);
losers.removeAll(_losers.keySet());
losers.remove(playerId);
if (!_finished) {
// Any remaining players have lost
Set<String> losers = new HashSet<String>(_allPlayers);
losers.removeAll(_losers.keySet());
losers.remove(playerId);
for (String loser : losers)
_losers.put(loser, "Other player won");
for (String loser : losers)
_losers.put(loser, "Other player won");
gameWon(playerId, reason);
gameWon(playerId, reason);
}
}
private void gameWon(String winner, String reason) {
@@ -138,20 +162,24 @@ public class DefaultLotroGame implements LotroGame {
for (GameResultListener gameResultListener : _gameResultListeners)
gameResultListener.gameFinished(_winnerPlayerId, reason, _losers);
_finished = true;
}
@Override
public void playerLost(String playerId, String reason) {
if (_losers.get(playerId) == null) {
log.debug("Player " + playerId + " lost due to: " + reason);
_losers.put(playerId, reason);
if (_gameState != null)
_gameState.sendMessage(playerId + " lost due to: " + reason);
if (!_finished) {
if (_losers.get(playerId) == null) {
log.debug("Player " + playerId + " lost due to: " + reason);
_losers.put(playerId, reason);
if (_gameState != null)
_gameState.sendMessage(playerId + " lost due to: " + reason);
if (_losers.size() + 1 == _allPlayers.size()) {
List<String> allPlayers = new LinkedList<String>(_allPlayers);
allPlayers.removeAll(_losers.keySet());
gameWon(allPlayers.get(0), "Last remaining player in game");
if (_losers.size() + 1 == _allPlayers.size()) {
List<String> allPlayers = new LinkedList<String>(_allPlayers);
allPlayers.removeAll(_losers.keySet());
gameWon(allPlayers.get(0), "Last remaining player in game");
}
}
}
}

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

@@ -4,4 +4,6 @@ import java.util.Map;
public interface GameResultListener {
public void gameFinished(String winnerPlayerId, String winReason, Map<String, String> loserPlayerIdsWithReasons);
public void gameCancelled();
}

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

@@ -11,6 +11,7 @@ import com.gempukku.lotro.logic.modifiers.Modifier;
import com.gempukku.lotro.logic.timing.DefaultLotroGame;
import com.gempukku.lotro.logic.timing.GameResultListener;
import com.gempukku.lotro.logic.vo.LotroDeck;
import org.apache.log4j.Logger;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
@@ -18,6 +19,8 @@ import java.util.*;
import java.util.concurrent.locks.ReentrantReadWriteLock;
public class LotroGameMediator {
private static final Logger LOG = Logger.getLogger(LotroGameMediator.class);
private Map<String, GatheringParticipantCommunicationChannel> _communicationChannels = new HashMap<String, GatheringParticipantCommunicationChannel>();
private DefaultUserFeedback _userFeedback;
private DefaultLotroGame _lotroGame;
@@ -96,7 +99,9 @@ public class LotroGameMediator {
}
public String getGameStatus() {
if (_lotroGame.getWinnerPlayerId() != null)
if (_lotroGame.isCancelled())
return "Cancelled";
if (_lotroGame.isFinished())
return "Finished";
final Phase currentPhase = _lotroGame.getGameState().getCurrentPhase();
if (currentPhase == Phase.PLAY_STARTING_FELLOWSHIP || currentPhase == Phase.PUT_RING_BEARER)
@@ -270,7 +275,7 @@ public class LotroGameMediator {
if (communicationChannel.getChannelNumber() == channelNumber) {
AwaitingDecision awaitingDecision = _userFeedback.getAwaitingDecision(playerName);
if (awaitingDecision != null) {
if (awaitingDecision.getAwaitingDecisionId() == decisionId) {
if (awaitingDecision.getAwaitingDecisionId() == decisionId && !_lotroGame.isFinished()) {
try {
_userFeedback.participantDecided(playerName);
awaitingDecision.decisionMade(answer);
@@ -285,6 +290,9 @@ public class LotroGameMediator {
// Participant provided wrong answer - send a warning message, and ask again for the same decision
_userFeedback.sendWarning(playerName, decisionResultInvalidException.getWarningMessage());
_userFeedback.sendAwaitingDecision(playerName, awaitingDecision);
} catch (RuntimeException runtimeException) {
LOG.error("Error processing game decision", runtimeException);
_lotroGame.cancelGame();
}
}
}

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

@@ -123,7 +123,7 @@ public class LotroServer extends AbstractServer {
return "Game" + gameId;
}
public synchronized String createNewGame(LotroFormat lotroFormat, String tournament, LotroGameParticipant[] participants, boolean competetive) {
public synchronized String createNewGame(LotroFormat lotroFormat, String tournament, final LotroGameParticipant[] participants, boolean competetive) {
if (participants.length < 2)
throw new IllegalArgumentException("There has to be at least two players");
final String gameId = String.valueOf(_nextGameId);
@@ -149,6 +149,13 @@ public class LotroServer extends AbstractServer {
_finishedGamesTime.put(gameId, new Date());
}
}
@Override
public void gameCancelled() {
synchronized (_finishedGamesTime) {
_finishedGamesTime.put(gameId, new Date());
}
}
});
lotroGameMediator.sendMessageToPlayers("You're starting a game of " + lotroFormat.getName());
@@ -172,6 +179,11 @@ public class LotroServer extends AbstractServer {
gameRecordingInProgress.finishRecording(winnerPlayerId, winReason, loserEntry.getKey(), loserEntry.getValue());
}
@Override
public void gameCancelled() {
gameRecordingInProgress.finishRecording(participants[0].getPlayerId(), "Game cancelled due to error", participants[1].getPlayerId(), "Game cancelled due to error");
}
}
);

5
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java
View File

@@ -308,6 +308,11 @@ public class HallServer extends AbstractServer {
public void gameFinished(String winnerPlayerId, String winReason, Map<String, String> loserPlayerIdsWithReasons) {
_leagueService.reportLeagueGameResult(league, leagueSerie, winnerPlayerId, loserPlayerIdsWithReasons.keySet().iterator().next());
}
@Override
public void gameCancelled() {
// Do nothing...
}
});
}
lotroGameMediator.startGame();

12
gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/GameResource.java
View File

@@ -9,7 +9,6 @@ import com.gempukku.lotro.game.state.EventSerializer;
import com.gempukku.lotro.game.state.GameEvent;
import com.gempukku.lotro.logic.modifiers.LoggingThreadLocal;
import com.sun.jersey.spi.resource.Singleton;
import org.apache.log4j.Logger;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -32,7 +31,6 @@ import java.util.Set;
@Singleton
@Path("/game")
public class GameResource extends AbstractResource {
private static final Logger _logger = Logger.getLogger(GameResource.class);
@Context
private LotroServer _lotroServer;
@@ -143,14 +141,8 @@ public class GameResource extends AbstractResource {
gameMediator.setPlayerAutoPassSettings(resourceOwner.getName(), getAutoPassPhases(request));
if (decisionId != null) {
try {
gameMediator.playerAnswered(resourceOwner, channelNumber, decisionId, decisionValue);
} catch (RuntimeException exp) {
_logger.error("Error while sending decision", exp);
throw exp;
}
}
if (decisionId != null)
gameMediator.playerAnswered(resourceOwner, channelNumber, decisionId, decisionValue);
DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();

12
gemp-lotr/gemp-lotr-web-server/src/main/resources/log4j.xml
View File

@@ -15,18 +15,6 @@
<param name="ConversionPattern" value="%d{ABSOLUTE} %5p %c{1}:%L - %m%n"/>
</layout>
</appender>
<appender name="M" class="org.apache.log4j.RollingFileAppender">
<param name="file" value="logs/modifiers.log"/>
<param name="MaxFileSize" value="100MB"/>
<param name="MaxBackupIndex" value="20"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d{ABSOLUTE} %5p %c{1}:%L - %m%n"/>
</layout>
</appender>
<logger name="com.gempukku.lotro.logic.modifiers" additivity="false">
<level value="debug"/>
<appender-ref ref="M"/>
</logger>
<logger name="com.gempukku" additivity="false">
<level value="debug"/>
<appender-ref ref="R"/>