diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java index e11a00d41..f3354efb3 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java @@ -78,7 +78,7 @@ public class HallServer extends AbstractServer { _collectionsManager = collectionsManager; _adminService = adminService; - tableHolder = new TableHolder(leagueService, ignoreDAO); + tableHolder = new TableHolder(leagueService, tournamentService, ignoreDAO); _hallChat = _chatServer.createChatRoom("Game Hall", true, 300, true, "You're now in the Game Hall, use /help to get a list of available commands.
Don't forget to check out the new Discord chat integration! Click the 'Switch to Discord' button in the lower right ---->", diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/TableHolder.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/TableHolder.java index 50ed16f7a..f63a85ce0 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/TableHolder.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/TableHolder.java @@ -8,11 +8,14 @@ import com.gempukku.lotro.game.Player; import com.gempukku.lotro.league.LeagueSerieInfo; import com.gempukku.lotro.league.LeagueService; import com.gempukku.lotro.logic.vo.LotroDeck; +import com.gempukku.lotro.tournament.Tournament; +import com.gempukku.lotro.tournament.TournamentService; import java.util.*; public class TableHolder { private final LeagueService leagueService; + private final TournamentService tournamentService; private final IgnoreDAO ignoreDAO; private final Map awaitingTables = new LinkedHashMap<>(); @@ -20,8 +23,9 @@ public class TableHolder { private int _nextTableId = 1; - public TableHolder(LeagueService leagueService, IgnoreDAO ignoreDAO) { + public TableHolder(LeagueService leagueService, TournamentService tournamentService, IgnoreDAO ignoreDAO) { this.leagueService = leagueService; + this.tournamentService = tournamentService; this.ignoreDAO = ignoreDAO; } @@ -247,10 +251,18 @@ public class TableHolder { private String getTournamentName(GameTable table) { final League league = table.getGameSettings().league(); - if (league != null) + final Tournament tournament = tournamentService.getTournamentById(table.getGameSettings().tournamentId()); + if (league != null) { return league.getName() + " - " + table.getGameSettings().leagueSerie().getName(); - else + } else if (tournament != null) { + String tournamentTableDescription = tournament.getTableDescription(); + if (tournamentTableDescription == null || tournamentTableDescription.isEmpty()) { + return "Casual - " + table.getGameSettings().timeSettings().name(); + } + return tournamentTableDescription; + } else { return "Casual - " + table.getGameSettings().timeSettings().name(); + } } public List getTournamentTables(String tournamentId) { diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/BaseTournament.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/BaseTournament.java index 0279db830..e7d84faa6 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/BaseTournament.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/BaseTournament.java @@ -531,4 +531,9 @@ public abstract class BaseTournament implements Tournament { public long getSecondsRemaining() throws IllegalStateException{ throw new IllegalStateException(); } + + @Override + public String getTableDescription() { + return null; + } } diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SealedTournament.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SealedTournament.java index cfb3522af..9dcc466be 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SealedTournament.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SealedTournament.java @@ -267,4 +267,13 @@ public class SealedTournament extends BaseTournament implements Tournament { throw new IllegalStateException(); } } + + @Override + public String getTableDescription() { + if (_sealedInfo._params.prizes == PrizeType.NONE && _sealedInfo._params.cost == 0) { + return "Casual - " + _sealedInfo.SealedDefinition.GetName(); + } else { + return "Competitive - " + _sealedInfo.SealedDefinition.GetName(); + } + } } diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SoloDraftTournament.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SoloDraftTournament.java index 343c2ba63..321e6a796 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SoloDraftTournament.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SoloDraftTournament.java @@ -282,4 +282,13 @@ public class SoloDraftTournament extends BaseTournament implements Tournament { throw new IllegalStateException(); } } + + @Override + public String getTableDescription() { + if (_soloDraftInfo._params.prizes == PrizeType.NONE && _soloDraftInfo._params.cost == 0) { + return "Casual - " + _soloDraftLibrary.getSoloDraft(_soloDraftInfo._soloDraftParams.soloDraftFormatCode).getCode(); + } else { + return "Competitive - " + _soloDraftLibrary.getSoloDraft(_soloDraftInfo._soloDraftParams.soloDraftFormatCode).getCode(); + } + } } diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SoloTableDraftTournament.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SoloTableDraftTournament.java index d8ddea439..8d8292e35 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SoloTableDraftTournament.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SoloTableDraftTournament.java @@ -265,4 +265,13 @@ public class SoloTableDraftTournament extends BaseTournament implements Tourname throw new IllegalStateException(); } } + + @Override + public String getTableDescription() { + if (soloTableDraftInfo._params.prizes == PrizeType.NONE && soloTableDraftInfo._params.cost == 0) { + return "Casual - " + _tableDraftLibrary.getTableDraftDefinition(soloTableDraftInfo.soloTableDraftParams.soloTableDraftFormatCode).getName(); + } else { + return "Competitive - " + _tableDraftLibrary.getTableDraftDefinition(soloTableDraftInfo.soloTableDraftParams.soloTableDraftFormatCode).getName(); + } + } } diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/TableDraftTournament.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/TableDraftTournament.java index f20621ce4..330a118e3 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/TableDraftTournament.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/TableDraftTournament.java @@ -278,4 +278,13 @@ public class TableDraftTournament extends BaseTournament implements Tournament { throw new IllegalStateException(); } } + + @Override + public String getTableDescription() { + if (tableDraftInfo._params.prizes == PrizeType.NONE && tableDraftInfo._params.cost == 0) { + return "Casual - " + _tableDraftLibrary.getTableDraftDefinition(tableDraftInfo.tableDraftParams.tableDraftFormatCode).getName(); + } else { + return "Competitive - " + _tableDraftLibrary.getTableDraftDefinition(tableDraftInfo.tableDraftParams.tableDraftFormatCode).getName(); + } + } } diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/Tournament.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/Tournament.java index a4a559a95..863188b82 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/Tournament.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/Tournament.java @@ -207,4 +207,5 @@ public interface Tournament { boolean isJoinable(); long getSecondsRemaining() throws IllegalStateException; + String getTableDescription(); }