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

Fixed the end-of-regroup reconcile skipping code not triggering a true reconcile for the end-of-game detection to work. As a result, re-enabled the flag for PC formats.

Browse Source
This commit is contained in:
Christian 'ketura' McCarty
2023-05-14 19:11:02 -05:00
parent 997fb83173
commit 3498aa3ee9
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gemp-lotr/gemp-lotr-cards/src/main/resources/lotrFormats.json
View File

@@ -23,7 +23,7 @@
"order": 2,
"sites":"FELLOWSHIP",
"cancelRingBearerSkirmish":true,
"winAtEndOfRegroup":false,
"winAtEndOfRegroup":true,
"discardPileIsPublic":true,
"set":[1, 2, 3, 101],
"erratasets": [
@@ -43,7 +43,7 @@
"code":"pc_movie",
"order": 4,
"sites":"KING",
"winAtEndOfRegroup":false,
"winAtEndOfRegroup":true,
"discardPileIsPublic":true,
"set":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 101],
"erratasets": [
@@ -64,7 +64,7 @@
"code":"pc_expanded",
"order": 6,
"sites":"SHADOWS",
"winAtEndOfRegroup":false,
"winAtEndOfRegroup":true,
"discardPileIsPublic":true,
"set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 100, 101],
"erratasets": [

5
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/actions/PlayerReconcilesAction.java
View File

@@ -88,9 +88,12 @@ public class PlayerReconcilesAction implements Action {
GameState gameState = _game.getGameState();
final Set<? extends PhysicalCard> cardsInHand = new HashSet<PhysicalCard>(gameState.getHand(_playerId));
// Formats which are set to end the game at the end of the regroup phase instead of at the start of the regroup phase
// should prematurely end the game instead of doing a true reconcile.
if(game.getFormat().winWhenShadowReconciles() && game.getGameState().getCurrentPhase() == Phase.REGROUP
&& game.getGameState().getCurrentSiteNumber() == 9) {
&& game.getGameState().getCurrentSiteNumber() == 9 && !_playerId.equals(game.getGameState().getCurrentPlayerId())) {
game.getGameState().sendMessage("End of regroup phase reached.");
_effectQueue.add(new TriggeringResultEffect(new ReconcileResult(_playerId), "Player reconciled"));
}
else {
game.getGameState().sendMessage(_playerId + " reconciles");