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

Reverted the regroup thing for PC formats. Fixed games timing out during preparation causing stuck matches in the hall.

Browse Source
This commit is contained in:
Christian 'ketura' McCarty
2023-05-14 18:40:38 -05:00
parent 29aae48572
commit 997fb83173
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/gameUi.js
View File

@@ -465,6 +465,9 @@ var GempLotrGameUI = Class.extend({
processGameEnd: function() { processGameEnd: function() {
var that = this; var that = this;
if(this.allPlayerIds == null)
return;
$("#deck" + this.getPlayerIndex(this.bottomPlayerId)).addClass("clickable").click( $("#deck" + this.getPlayerIndex(this.bottomPlayerId)).addClass("clickable").click(
(function (index) { (function (index) {
return function () { return function () {

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

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

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

@@ -123,6 +123,9 @@ public class GameState {
listener.endGame(); listener.endGame();
} }
if(_playerOrder == null || _playerOrder.getAllPlayers() == null)
return;
for (String playerId : _playerOrder.getAllPlayers()) { for (String playerId : _playerOrder.getAllPlayers()) {
for(var card : getDeck(playerId)) { for(var card : getDeck(playerId)) {
for (GameStateListener listener : getAllGameStateListeners()) { for (GameStateListener listener : getAllGameStateListeners()) {