Index: binaries/data/mods/public/gui/common/settings.js
===================================================================
--- binaries/data/mods/public/gui/common/settings.js
+++ binaries/data/mods/public/gui/common/settings.js
@@ -343,11 +343,6 @@
return deepfreeze(settings);
}
-function getGameSpeedChoices(allowFastForward)
-{
- return prepareForDropdown(g_Settings.GameSpeeds.filter(speed => !speed.FastForward || allowFastForward));
-}
-
/**
* Returns title or placeholder.
*
Index: binaries/data/mods/public/gui/gamesetup/gamesetup.js
===================================================================
--- binaries/data/mods/public/gui/gamesetup/gamesetup.js
+++ binaries/data/mods/public/gui/gamesetup/gamesetup.js
@@ -1909,6 +1909,11 @@
updateGUIDropdown("triggerDifficulty");
}
+function getGameSpeedChoices(allowFastForward)
+{
+ return prepareForDropdown(g_Settings.GameSpeeds.filter(speed => !speed.FastForward || allowFastForward));
+}
+
function reloadGameSpeedChoices()
{
g_GameSpeeds = getGameSpeedChoices(Object.keys(g_PlayerAssignments).every(guid => g_PlayerAssignments[guid].player == -1));
Index: binaries/data/mods/public/gui/session/DiplomacyColors.js
===================================================================
--- binaries/data/mods/public/gui/session/DiplomacyColors.js
+++ binaries/data/mods/public/gui/session/DiplomacyColors.js
@@ -12,9 +12,18 @@
// The array of displayed player colors (either the diplomacy color or regular color for each player).
this.displayedPlayerColors = undefined;
+
+ this.diplomacyColorsChangeHandlers = [];
+
+ registerPlayersInitHandler(this.onPlayersInit.bind(this));
+ }
+
+ registerDiplomacyColorsChangeHandler(handler)
+ {
+ this.diplomacyColorsChangeHandlers.push(handler);
}
- onPlayerInit()
+ onPlayersInit()
{
this.computeTeamColors();
}
@@ -61,7 +70,8 @@
"selected": g_Selection.toList()
});
- updateGUIObjects();
+ for (let handler of this.diplomacyColorsChangeHandlers)
+ handler(this.enabled);
}
computeTeamColors()
Index: binaries/data/mods/public/gui/session/GameSpeedControl.js
===================================================================
--- /dev/null
+++ binaries/data/mods/public/gui/session/GameSpeedControl.js
@@ -0,0 +1,43 @@
+class GameSpeedControl
+{
+ constructor(playerViewControl)
+ {
+ this.gameSpeed = Engine.GetGUIObjectByName("gameSpeed");
+ this.gameSpeed.onSelectionChange = this.onSelectionChange.bind(this);
+
+ registerPlayersInitHandler(this.rebuild.bind(this));
+ registerPlayersFinishedHandler(this.rebuild.bind(this));
+ playerViewControl.registerViewedPlayerChangeHandler(this.rebuild.bind(this));
+ }
+
+ rebuild()
+ {
+ let player = g_Players[Engine.GetPlayerID()];
+
+ let gameSpeeds = prepareForDropdown(g_Settings.GameSpeeds.filter(speed =>
+ !speed.FastForward || !player || player.state != "active"));
+
+ this.gameSpeed.list = gameSpeeds.Title;
+ this.gameSpeed.list_data = gameSpeeds.Speed;
+
+ let simRate = Engine.GetSimRate();
+
+ // If the gamespeed is something like 0.100001 from the gamesetup, set it to 0.1
+ let gameSpeedIdx = gameSpeeds.Speed.indexOf(+simRate.toFixed(2));
+ if (gameSpeedIdx == -1)
+ warn("Unknown gamespeed:" + simRate);
+
+ this.gameSpeed.selected = gameSpeedIdx != -1 ? gameSpeedIdx : gameSpeeds.Default;
+ }
+
+ toggle()
+ {
+ this.gameSpeed.hidden = !this.gameSpeed.hidden;
+ }
+
+ onSelectionChange()
+ {
+ if (!g_IsNetworked)
+ Engine.SetSimRate(+this.gameSpeed.list_data[this.gameSpeed.selected]);
+ }
+}
Index: binaries/data/mods/public/gui/session/PauseControl.js
===================================================================
--- /dev/null
+++ binaries/data/mods/public/gui/session/PauseControl.js
@@ -0,0 +1,68 @@
+class PauseControl
+{
+ constructor()
+ {
+ this.isPaused = false;
+
+ // List of GUIDs of players who have currently paused the game, if the game is networked.
+ this.pausingClients = [];
+
+ // Functions called when someone pauses
+ this.pauseHandlers = [];
+ }
+
+ registerPauseHandler(handler)
+ {
+ this.pauseHandlers.push(handler);
+ }
+
+ sendPauseChange()
+ {
+ for (let handler of this.pauseHandlers)
+ handler();
+ }
+
+ /**
+ * Pause or resume the game.
+ *
+ * If the current player ordered a pause manually, it is called explicit pause.
+ * If the player opened a dialog and is playing in singleplayer mode, it is called implicit.
+ */
+ setPaused(pause = true, explicit = false)
+ {
+ // The NetServer only supports pausing after all clients finished loading the game.
+ if (g_IsNetworked && (!explicit || !g_IsNetworkedActive))
+ return;
+
+ if (explicit)
+ this.isPaused = pause;
+
+ Engine.SetPaused(this.isPaused || pause, explicit);
+
+ if (g_IsNetworked)
+ {
+ this.setClientPauseState(Engine.GetPlayerGUID(), this.isPaused);
+ return;
+ }
+
+ this.sendPauseChange();
+ }
+
+ /**
+ * Called when a client pauses or resumes in a multiplayer game.
+ */
+ setClientPauseState(guid, paused)
+ {
+ // Update the list of pausing clients.
+ let index = this.pausingClients.indexOf(guid);
+ if (paused && index == -1)
+ this.pausingClients.push(guid);
+ else if (!paused && index != -1)
+ this.pausingClients.splice(index, 1);
+
+ Engine.SetPaused(!!this.pausingClients.length, false);
+
+ this.sendPauseChange();
+ }
+}
+
Index: binaries/data/mods/public/gui/session/PauseOverlay.js
===================================================================
--- /dev/null
+++ binaries/data/mods/public/gui/session/PauseOverlay.js
@@ -0,0 +1,40 @@
+class PauseOverlay
+{
+ constructor(pauseControl)
+ {
+ this.pauseControl = pauseControl;
+
+ this.pausedByText = Engine.GetGUIObjectByName("pausedByText");
+ this.pausedByText.hidden = !g_IsNetworked;
+
+ this.pauseOverlay = Engine.GetGUIObjectByName("pauseOverlay");
+ this.pauseOverlay.onPress = this.onPress.bind(this);
+
+ this.resumeMessage = Engine.GetGUIObjectByName("resumeMessage");
+
+ pauseControl.registerPauseHandler(this.onPauseChange.bind(this));
+ }
+
+ onPress()
+ {
+ if (this.pauseControl.isPaused)
+ this.pauseControl.setPaused(false, true);
+ }
+
+ onPauseChange()
+ {
+ let hidden = !this.pauseControl.isPaused && !this.pauseControl.pausingClients.length;
+ this.pauseOverlay.hidden = hidden;
+ if (hidden)
+ return;
+
+ this.resumeMessage.hidden = !this.pauseControl.isPaused;
+
+ this.pausedByText.caption = sprintf(translate(this.PausedByCaption), {
+ "players": this.pauseControl.pausingClients.map(guid =>
+ colorizePlayernameByGUID(guid)).join(translateWithContext("Separator for a list of players", ", "))
+ });
+ }
+}
+
+PauseOverlay.prototype.PausedByCaption = markForTranslation("Paused by %(players)s");
Index: binaries/data/mods/public/gui/session/PauseOverlay.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/gui/session/PauseOverlay.xml
@@ -0,0 +1,16 @@
+
+
Index: binaries/data/mods/public/gui/session/TopPanel.js
===================================================================
--- /dev/null
+++ binaries/data/mods/public/gui/session/TopPanel.js
@@ -0,0 +1,19 @@
+/**
+ * This class owns all classes that are part of the top panel.
+ */
+class TopPanel
+{
+ constructor(playerViewControl, diplomacyDialog, tradeDialog, objectivesDialog, gameSpeedControl)
+ {
+ this.counterManager = new CounterManager(playerViewControl);
+ this.civIcon = new CivIcon(playerViewControl);
+ this.buildLabel = new BuildLabel(playerViewControl);
+
+ this.followPlayer = new FollowPlayer(playerViewControl);
+
+ this.diplomacyDialogButton = new DiplomacyDialogButton(playerViewControl, diplomacyDialog);
+ this.gameSpeedButton = new GameSpeedButton(gameSpeedControl);
+ this.objectivesDialogButton = new ObjectivesDialogButton(objectivesDialog);
+ this.tradeDialogButton = new TradeDialogButton(playerViewControl, tradeDialog);
+ }
+}
Index: binaries/data/mods/public/gui/session/TopPanel.xml
===================================================================
--- binaries/data/mods/public/gui/session/TopPanel.xml
+++ binaries/data/mods/public/gui/session/TopPanel.xml
@@ -4,54 +4,6 @@
sprite="topPanel"
size="-3 0 100%+3 36"
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Index: binaries/data/mods/public/gui/session/chat/Chat.js
===================================================================
--- binaries/data/mods/public/gui/session/chat/Chat.js
+++ binaries/data/mods/public/gui/session/chat/Chat.js
@@ -4,7 +4,7 @@
*/
class Chat
{
- constructor()
+ constructor(playerViewControl)
{
this.ChatWindow = new ChatWindow();
this.ChatOverlay = new ChatOverlay();
@@ -35,6 +35,9 @@
this.ChatHistory.displayChatHistory();
});
+ registerPlayersFinishedHandler(this.onUpdatePlayers.bind(this));
+ playerViewControl.registerViewedPlayerChangeHandler(this.onUpdatePlayers.bind(this));
+
Engine.SetGlobalHotkey("chat", this.openPage.bind(this));
Engine.SetGlobalHotkey("privatechat", this.openPage.bind(this));
Engine.SetGlobalHotkey("teamchat", () => { this.openPage(g_IsObserver ? "/observers" : "/allies"); });
Index: binaries/data/mods/public/gui/session/chat/ChatWindow.js
===================================================================
--- binaries/data/mods/public/gui/session/chat/ChatWindow.js
+++ binaries/data/mods/public/gui/session/chat/ChatWindow.js
@@ -35,6 +35,7 @@
this.extendedChat.checked = Engine.ConfigDB_GetValue("user", "chat.session.extended") == "true";
+ this.chatDialogPanel.onWindowResized = this.resizeChatWindow.bind(this);
this.resizeChatWindow();
}
Index: binaries/data/mods/public/gui/session/developer_overlay.js
===================================================================
--- binaries/data/mods/public/gui/session/developer_overlay.js
+++ binaries/data/mods/public/gui/session/developer_overlay.js
@@ -1,13 +1,15 @@
-function DeveloperOverlay()
+function DeveloperOverlay(playerViewControl)
{
this.commandHeight = 20;
this.displayState = false;
this.timeWarp = false;
- this.changePerspective = false;
this.controlAll = false;
-
+ this.playerViewControl = playerViewControl;
Engine.GetGUIObjectByName("devCommandsOverlay").onPress = this.toggle;
this.layout();
+
+ registerSimulationUpdateHandler(this.update.bind(this));
+ registerEntitySelectionChangeHandler(this.update.bind(this));
}
DeveloperOverlay.prototype.getCommands = function() {
@@ -25,13 +27,14 @@
{
"label": translate("Change perspective"),
"onPress": checked => {
- this.setChangePerspective(checked);
+ this.playerViewControl.setChangePerspective(checked);
},
},
{
"label": translate("Display selection state"),
"onPress": checked => {
this.displayState = checked;
+ this.update();
},
},
{
@@ -173,19 +176,11 @@
DeveloperOverlay.prototype.updateValues = function()
{
- let commands = this.getCommands();
- for (let i = 0; i < commands.length; ++i)
- {
- let command = commands[i];
-
- let body = Engine.GetGUIObjectByName("dev_command[" + i + "]");
- if (body.hidden)
- continue;
-
+ this.getCommands().forEach((command, i) => {
let checkbox = Engine.GetGUIObjectByName("dev_command_checkbox[" + i + "]");
if (command.checked)
checkbox.checked = command.checked();
- }
+ });
};
DeveloperOverlay.prototype.toggle = function()
@@ -215,8 +210,15 @@
DeveloperOverlay.prototype.update = function()
{
+ let playerState = g_SimState.players[g_ViewedPlayer];
+ this.controlAll = playerState ? playerState.controlsAll : false;
+
this.updateValues();
+ this.updateEntityState();
+}
+DeveloperOverlay.prototype.updateEntityState = function()
+{
let debug = Engine.GetGUIObjectByName("debugEntityState");
if (!this.displayState)
@@ -252,19 +254,6 @@
return this.timeWarp;
};
-DeveloperOverlay.prototype.isChangePerspective = function() {
- return this.changePerspective;
-};
-
-DeveloperOverlay.prototype.setChangePerspective = function(value) {
- this.changePerspective = value;
- selectViewPlayer(g_ViewedPlayer);
-};
-
DeveloperOverlay.prototype.isControlAll = function() {
return this.controlAll;
};
-
-DeveloperOverlay.prototype.setControlAll = function(value) {
- this.controlAll = value;
-};
Index: binaries/data/mods/public/gui/session/diplomacy/DiplomacyDialog.js
===================================================================
--- binaries/data/mods/public/gui/session/diplomacy/DiplomacyDialog.js
+++ binaries/data/mods/public/gui/session/diplomacy/DiplomacyDialog.js
@@ -4,7 +4,7 @@
*/
class DiplomacyDialog
{
- constructor(diplomacyColors)
+ constructor(playerViewControl, diplomacyColors)
{
this.diplomacyDialogCeasefireCounter = new DiplomacyDialogCeasefireCounter();
this.diplomacyDialogColorsButton = new DiplomacyDialogColorsButton(diplomacyColors);
@@ -12,6 +12,10 @@
this.diplomacyDialogPanel = Engine.GetGUIObjectByName("diplomacyDialogPanel");
Engine.GetGUIObjectByName("diplomacyClose").onPress = this.close.bind(this);
+
+ registerPlayersInitHandler(this.onPlayerInit.bind(this));
+ registerSimulationUpdateHandler(this.onViewedPlayerChange.bind(this));
+ playerViewControl.registerViewedPlayerChangeHandler(this.updateIfOpen.bind(this));
}
onPlayerInit()
@@ -20,26 +24,28 @@
this.resize();
}
+ onViewedPlayerChange()
+ {
+ if (g_ViewedPlayer >= 1)
+ this.updateIfOpen();
+ else
+ this.close();
+ }
+
onSpyResponse(notification, player)
{
this.diplomacyDialogPlayerControlManager.onSpyResponse(notification, player);
}
- update()
+ updateIfOpen()
{
- if (!this.isOpen())
- return;
-
- if (g_ViewedPlayer >= 1)
+ if (this.isOpen())
this.updatePanels();
- else
- this.close();
}
updatePanels()
{
this.diplomacyDialogCeasefireCounter.update();
- this.diplomacyDialogColorsButton.update();
this.diplomacyDialogPlayerControlManager.update();
}
Index: binaries/data/mods/public/gui/session/diplomacy/DiplomacyDialogColorsButton.js
===================================================================
--- binaries/data/mods/public/gui/session/diplomacy/DiplomacyDialogColorsButton.js
+++ binaries/data/mods/public/gui/session/diplomacy/DiplomacyDialogColorsButton.js
@@ -5,22 +5,25 @@
{
constructor(diplomacyColors)
{
- this.diplomacyColors = diplomacyColors;
-
this.diplomacyColorsWindowButton = Engine.GetGUIObjectByName("diplomacyColorsWindowButton");
this.diplomacyColorsWindowButtonIcon = Engine.GetGUIObjectByName("diplomacyColorsWindowButtonIcon");
this.diplomacyColorsWindowButton.onPress = diplomacyColors.toggle.bind(diplomacyColors);
+ registerHotkeyChangeHandler(this.onHotkeyChange.bind(this));
+ diplomacyColors.registerDiplomacyColorsChangeHandler(this.onDiplomacyColorsChange.bind(this))
}
- update()
+ onHotkeyChange()
{
this.diplomacyColorsWindowButton.tooltip =
colorizeHotkey("%(hotkey)s" + " ", "session.diplomacycolors") +
translate(this.Tooltip);
+ }
+ onDiplomacyColorsChange(enabled)
+ {
this.diplomacyColorsWindowButtonIcon.sprite =
"stretched:" +
- (this.diplomacyColors.isEnabled() ? this.SpriteEnabled : this.SpriteDisabled);
+ (enabled ? this.SpriteEnabled : this.SpriteDisabled);
}
}
Index: binaries/data/mods/public/gui/session/hotkeys/misc.xml
===================================================================
--- binaries/data/mods/public/gui/session/hotkeys/misc.xml
+++ binaries/data/mods/public/gui/session/hotkeys/misc.xml
@@ -39,10 +39,6 @@
-
-
Index: binaries/data/mods/public/gui/session/menu.js
===================================================================
--- binaries/data/mods/public/gui/session/menu.js
+++ binaries/data/mods/public/gui/session/menu.js
@@ -29,19 +29,21 @@
var g_IsMenuOpen = false;
-var g_IsObjectivesOpen = false;
-
/**
* Remember last viewed summary panel and charts.
*/
var g_SummarySelectedData;
-function initMenu()
+function initMenu(playerViewControl, pauseControl)
{
Engine.GetGUIObjectByName("menu").size = "100%-164 " + MENU_TOP + " 100% " + MENU_BOTTOM;
+ Engine.GetGUIObjectByName("lobbyButton").enabled = Engine.HasXmppClient();
+ playerViewControl.registerViewedPlayerChangeHandler(updateResignButton);
+ updatePauseButton();
+ pauseControl.registerPauseHandler(updatePauseButton);
// TODO: Atlas should pass g_GameAttributes.settings
- for (let button of ["menuExitButton", "summaryButton", "objectivesButton"])
+ for (let button of ["menuExitButton", "summaryButton"])
Engine.GetGUIObjectByName(button).enabled = !Engine.IsAtlasRunning();
}
@@ -81,6 +83,22 @@
g_IsMenuOpen = !g_IsMenuOpen;
}
+function updatePauseButton()
+{
+ let pauseButton = Engine.GetGUIObjectByName("pauseButton");
+ pauseButton.caption = g_PauseControl.isPaused ? translate("Resume") : translate("Pause");
+ pauseButton.enabled = !g_IsObserver || !g_IsNetworked || g_IsController;
+ pauseButton.onPress = () => {
+ closeMenu();
+ g_PauseControl.setPaused(!g_PauseControl.isPaused, true);
+ };
+}
+
+function updateResignButton()
+{
+ Engine.GetGUIObjectByName("menuResignButton").enabled = !g_IsObserver;
+}
+
function optionsMenuButton()
{
closeOpenDialogs();
@@ -104,7 +122,7 @@
function resignMenuButton()
{
closeOpenDialogs();
- pauseGame();
+ g_PauseControl.setPaused();
messageBox(
400, 200,
@@ -118,7 +136,7 @@
function exitMenuButton()
{
closeOpenDialogs();
- pauseGame();
+ g_PauseControl.setPaused();
let messageTypes = {
"host": {
@@ -162,6 +180,7 @@
function openDeleteDialog(selection)
{
closeOpenDialogs();
+ g_PauseControl.setPaused();
let deleteSelectedEntities = function(selectionArg)
{
@@ -184,7 +203,7 @@
function openSave()
{
closeOpenDialogs();
- pauseGame();
+ g_PauseControl.setPaused();
Engine.PushGuiPage(
"page_loadgame.xml",
@@ -195,7 +214,7 @@
function openOptions()
{
closeOpenDialogs();
- pauseGame();
+ g_PauseControl.setPaused();
Engine.PushGuiPage(
"page_options.xml",
@@ -216,73 +235,6 @@
!Engine.GetGUIObjectByName("tutorialText").caption;
}
-function updateGameSpeedControl()
-{
- Engine.GetGUIObjectByName("gameSpeedButton").hidden = g_IsNetworked;
-
- let player = g_Players[Engine.GetPlayerID()];
- g_GameSpeeds = getGameSpeedChoices(!player || player.state != "active");
-
- let gameSpeed = Engine.GetGUIObjectByName("gameSpeed");
- gameSpeed.list = g_GameSpeeds.Title;
- gameSpeed.list_data = g_GameSpeeds.Speed;
-
- let simRate = Engine.GetSimRate();
-
- let gameSpeedIdx = g_GameSpeeds.Speed.indexOf(+simRate.toFixed(2));
- if (gameSpeedIdx == -1)
- warn("Unknown gamespeed:" + simRate);
-
- gameSpeed.selected = gameSpeedIdx != -1 ? gameSpeedIdx : g_GameSpeeds.Default;
- gameSpeed.onSelectionChange = function() {
- changeGameSpeed(+this.list_data[this.selected]);
- };
-}
-
-function toggleGameSpeed()
-{
- let gameSpeed = Engine.GetGUIObjectByName("gameSpeed");
- gameSpeed.hidden = !gameSpeed.hidden;
-}
-
-function toggleObjectives()
-{
- let open = g_IsObjectivesOpen;
- closeOpenDialogs();
-
- if (!open)
- openObjectives();
-}
-
-function openObjectives()
-{
- g_IsObjectivesOpen = true;
-
- let player = g_Players[Engine.GetPlayerID()];
- let playerState = player && player.state;
- let isActive = !playerState || playerState == "active";
-
- Engine.GetGUIObjectByName("gameDescriptionText").caption = getGameDescription();
-
- let objectivesPlayerstate = Engine.GetGUIObjectByName("objectivesPlayerstate");
- objectivesPlayerstate.hidden = isActive;
- objectivesPlayerstate.caption = g_PlayerStateMessages[playerState] || "";
-
- let gameDescription = Engine.GetGUIObjectByName("gameDescription");
- let gameDescriptionSize = gameDescription.size;
- gameDescriptionSize.top = Engine.GetGUIObjectByName(
- isActive ? "objectivesTitle" : "objectivesPlayerstate").size.bottom;
- gameDescription.size = gameDescriptionSize;
-
- Engine.GetGUIObjectByName("objectivesPanel").hidden = false;
-}
-
-function closeObjectives()
-{
- g_IsObjectivesOpen = false;
- Engine.GetGUIObjectByName("objectivesPanel").hidden = true;
-}
-
/**
* Allows players to see their own summary.
* If they have shared ally vision researched, they are able to see the summary of there allies too.
@@ -290,7 +242,7 @@
function openGameSummary()
{
closeOpenDialogs();
- pauseGame();
+ g_PauseControl.setPaused();
let extendedSimState = Engine.GuiInterfaceCall("GetExtendedSimulationState");
Engine.PushGuiPage(
@@ -309,13 +261,22 @@
},
"selectedData": g_SummarySelectedData
},
- resumeGameAndSaveSummarySelectedData);
+ data =>
+ {
+ g_SummarySelectedData = data.summarySelectedData;
+
+ if (data.explicitResume)
+ resumeGame(data.explicitResume);
+ else
+ resumeGame();
+ g_PauseControl.setPaused(false, false);
+ });
}
function openStrucTree(page)
{
closeOpenDialogs();
- pauseGame();
+ g_PauseControl.setPaused();
Engine.PushGuiPage(
page,
@@ -340,103 +301,23 @@
}
}
-/**
- * Pause or resume the game.
- *
- * @param explicit - true if the player explicitly wants to pause or resume.
- * If this argument isn't set, a multiplayer game won't be paused and the pause overlay
- * won't be shown in single player.
- */
-function pauseGame(pause = true, explicit = false)
-{
- // The NetServer only supports pausing after all clients finished loading the game.
- if (g_IsNetworked && (!explicit || !g_IsNetworkedActive))
- return;
-
- if (explicit)
- g_Paused = pause;
-
- Engine.SetPaused(g_Paused || pause, !!explicit);
-
- if (g_IsNetworked)
- {
- setClientPauseState(Engine.GetPlayerGUID(), g_Paused);
- return;
- }
-
- updatePauseOverlay();
-}
-
-function resumeGame(explicit = false)
-{
- pauseGame(false, explicit);
-}
-
-function resumeGameAndSaveSummarySelectedData(data)
+function resumeGame()
{
- g_SummarySelectedData = data.summarySelectedData;
- resumeGame(data.explicitResume);
-}
-
-/**
- * Called when the current player toggles a pause button.
- */
-function togglePause()
-{
- if (!Engine.GetGUIObjectByName("pauseButton").enabled)
- return;
-
- closeOpenDialogs();
-
- pauseGame(!g_Paused, true);
-}
-
-/**
- * Called when a client pauses or resumes in a multiplayer game.
- */
-function setClientPauseState(guid, paused)
-{
- // Update the list of pausing clients.
- let index = g_PausingClients.indexOf(guid);
- if (paused && index == -1)
- g_PausingClients.push(guid);
- else if (!paused && index != -1)
- g_PausingClients.splice(index, 1);
-
- updatePauseOverlay();
-
- Engine.SetPaused(!!g_PausingClients.length, false);
-}
-
-/**
- * Update the pause overlay.
- */
-function updatePauseOverlay()
-{
- Engine.GetGUIObjectByName("pauseButton").caption = g_Paused ? translate("Resume") : translate("Pause");
- Engine.GetGUIObjectByName("resumeMessage").hidden = !g_Paused;
-
- Engine.GetGUIObjectByName("pausedByText").hidden = !g_IsNetworked;
- Engine.GetGUIObjectByName("pausedByText").caption = sprintf(translate("Paused by %(players)s"),
- { "players": g_PausingClients.map(guid => colorizePlayernameByGUID(guid)).join(translateWithContext("Separator for a list of players", ", ")) });
-
- Engine.GetGUIObjectByName("pauseOverlay").hidden = !(g_Paused || g_PausingClients.length);
- Engine.GetGUIObjectByName("pauseOverlay").onPress = g_Paused ? togglePause : function() {};
+ g_PauseControl.setPaused(false, false);
}
function openManual()
{
closeOpenDialogs();
- pauseGame();
+ g_PauseControl.setPaused();
Engine.PushGuiPage("page_manual.xml", {}, resumeGame);
}
function closeOpenDialogs()
{
closeMenu();
- closeObjectives();
-
g_Chat.closePage();
g_DiplomacyDialog.close();
+ g_ObjectivesDialog.close();
g_TradeDialog.close();
}
Index: binaries/data/mods/public/gui/session/menu.xml
===================================================================
--- binaries/data/mods/public/gui/session/menu.xml
+++ binaries/data/mods/public/gui/session/menu.xml
@@ -79,13 +79,11 @@
+ />
-
Index: binaries/data/mods/public/gui/session/objectives_window.xml
===================================================================
--- binaries/data/mods/public/gui/session/objectives_window.xml
+++ binaries/data/mods/public/gui/session/objectives_window.xml
@@ -1,48 +0,0 @@
-
-
-
Index: binaries/data/mods/public/gui/session/selection_panels.js
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels.js
+++ binaries/data/mods/public/gui/session/selection_panels.js
@@ -1147,7 +1147,7 @@
*/
function showTemplateDetails(templateName, civCode)
{
- pauseGame();
+ g_PauseControl.setPaused();
Engine.PushGuiPage(
"page_viewer.xml",
Index: binaries/data/mods/public/gui/session/session.js
===================================================================
--- binaries/data/mods/public/gui/session/session.js
+++ binaries/data/mods/public/gui/session/session.js
@@ -11,25 +11,16 @@
const g_VictoryConditions = g_Settings && g_Settings.VictoryConditions;
var g_Chat;
-var g_DiplomacyButton;
var g_DiplomacyColors;
var g_DiplomacyDialog;
+var g_GameSpeedControl;
var g_MiniMapPanel;
+var g_ObjectivesDialog;
+var g_PauseControl;
+var g_PauseOverlay;
+var g_PlayerViewControl;
var g_TradeDialog;
-var g_TradeDialogButton;
-
-var g_GameSpeeds;
-
-/**
- * Colors to flash when pop limit reached.
- */
-var g_DefaultPopulationColor = "white";
-var g_PopulationAlertColor = "orange";
-
-/**
- * Seen in the tooltip of the top panel.
- */
-var g_ResourceTitleFont = "sans-bold-16";
+var g_TopPanel;
/**
* A random file will be played. TODO: more variety
@@ -78,16 +69,6 @@
var g_ConfirmExit = false;
/**
- * True if the current player has paused the game explicitly.
- */
-var g_Paused = false;
-
-/**
- * The list of GUIDs of players who have currently paused the game, if the game is networked.
- */
-var g_PausingClients = [];
-
-/**
* The playerID selected in the change perspective tool.
*/
var g_ViewedPlayer = Engine.GetPlayerID();
@@ -139,11 +120,6 @@
var g_ShowAllStatusBars = false;
/**
- * Blink the population counter if the player can't train more units.
- */
-var g_IsTrainingBlocked = false;
-
-/**
* Cache of simulation state and template data (apart from TechnologyData, updated on every simulation update).
*/
var g_SimState;
@@ -154,6 +130,33 @@
var g_ResourceData = new Resources();
/**
+ * These handlers are called each time a new turn was simulated.
+ * Use this as sparely as possible.
+ */
+var g_SimulationUpdateHandlers = [];
+
+/**
+ * These handlers are called after the player states have been initialized.
+ */
+var g_PlayersInitHandlers = [];
+
+/**
+ * These handlers are called when a player has been defeated or won the game.
+ */
+var g_PlayerFinishedHandlers = [];
+
+/**
+ * These events are fired whenever the player added or removed entities from the selection.
+ */
+var g_EntitySelectionChangeHandlers = [];
+
+/**
+ * These events are fired when the user has performed a hotkey assignment change.
+ * Currently only fired on init, but to be fired from any hotkey editor dialog.
+ */
+var g_HotkeyChangeHandlers = [];
+
+/**
* Top coordinate of the research list.
* Changes depending on the number of displayed counters.
*/
@@ -267,20 +270,40 @@
restoreSavedGameData(initData.savedGUIData);
}
- g_Chat = new Chat();
- g_DeveloperOverlay = new DeveloperOverlay();
g_DiplomacyColors = new DiplomacyColors();
- g_DiplomacyDialog = new DiplomacyDialog(g_DiplomacyColors);
- g_DiplomacyButton = new DiplomacyButton(g_DiplomacyDialog);
- g_MiniMapPanel = new MiniMapPanel(g_DiplomacyColors, g_WorkerTypes);
- g_TradeDialog = new TradeDialog();
- g_TradeDialogButton = new TradeDialogButton(g_TradeDialog);
+
+ g_PlayerViewControl = new PlayerViewControl();
+ g_PlayerViewControl.registerViewedPlayerChangeHandler(g_DiplomacyColors.updateDisplayedPlayerColors.bind(g_DiplomacyColors));
+ g_DiplomacyColors.registerDiplomacyColorsChangeHandler(g_PlayerViewControl.rebuild.bind(g_PlayerViewControl));
+ g_DiplomacyColors.registerDiplomacyColorsChangeHandler(updateGUIObjects);
+ g_PlayerViewControl.registerPrePlayerChangeHandler(removeStatusBarDisplay);
+ g_PlayerViewControl.registerViewedPlayerChangeHandler(resetTemplates);
+
+ g_Chat = new Chat(g_PlayerViewControl);
+ g_DeveloperOverlay = new DeveloperOverlay(g_PlayerViewControl);
+ g_DiplomacyDialog = new DiplomacyDialog(g_PlayerViewControl, g_DiplomacyColors);
+ g_GameSpeedControl = new GameSpeedControl(g_PlayerViewControl);
+ g_MiniMapPanel = new MiniMapPanel(g_PlayerViewControl, g_DiplomacyColors, g_WorkerTypes);
+ g_ObjectivesDialog = new ObjectivesDialog(g_PlayerViewControl);
+ g_PauseControl = new PauseControl();
+ g_PauseOverlay = new PauseOverlay(g_PauseControl);
+ g_TradeDialog = new TradeDialog(g_PlayerViewControl);
+ g_TopPanel = new TopPanel(g_PlayerViewControl, g_DiplomacyDialog, g_TradeDialog, g_ObjectivesDialog, g_GameSpeedControl);
initSelectionPanels();
LoadModificationTemplates();
updatePlayerData();
initializeMusic(); // before changing the perspective
- initGUIObjects();
+ initMenu(g_PlayerViewControl, g_PauseControl);
+ initPanelEntities();
+ Engine.SetBoundingBoxDebugOverlay(false);
+ updateEnabledRangeOverlayTypes();
+
+ for (let handler of g_PlayersInitHandlers)
+ handler();
+
+ for (let handler of g_HotkeyChangeHandlers)
+ handler();
if (hotloadData)
{
@@ -290,21 +313,36 @@
}
sendLobbyPlayerlistUpdate();
+
+ // TODO: use event instead
onSimulationUpdate();
+
setTimeout(displayGamestateNotifications, 1000);
}
-function initGUIObjects()
+function registerPlayersInitHandler(handler)
{
- initMenu();
- updateGameSpeedControl();
- g_TradeDialog.resize();
- initPanelEntities();
- g_DiplomacyColors.onPlayerInit();
- initViewedPlayerDropdown();
- Engine.SetBoundingBoxDebugOverlay(false);
- updateEnabledRangeOverlayTypes();
- g_DiplomacyDialog.onPlayerInit();
+ g_PlayersInitHandlers.push(handler);
+}
+
+function registerPlayersFinishedHandler(handler)
+{
+ g_PlayerFinishedHandlers.push(handler);
+}
+
+function registerSimulationUpdateHandler(handler)
+{
+ g_SimulationUpdateHandlers.push(handler);
+}
+
+function registerEntitySelectionChangeHandler(handler)
+{
+ g_EntitySelectionChangeHandlers.push(handler);
+}
+
+function registerHotkeyChangeHandler(handler)
+{
+ g_HotkeyChangeHandlers.push(handler);
}
function updatePlayerData()
@@ -364,16 +402,6 @@
g_DiplomacyColors.updateDisplayedPlayerColors();
}
-/**
- * Depends on the current player (g_IsObserver).
- */
-function updateHotkeyTooltips()
-{
- Engine.GetGUIObjectByName("objectivesButton").tooltip =
- colorizeHotkey("%(hotkey)s" + " ", "session.gui.objectives.toggle") +
- translate("Objectives");
-}
-
function initPanelEntities()
{
Engine.GetGUIObjectByName("panelEntityPanel").children.forEach((button, slot) => {
@@ -419,64 +447,14 @@
playAmbient();
}
-function initViewedPlayerDropdown()
-{
- updateViewedPlayerDropdown();
-
- // Select "observer" in the view player dropdown when rejoining as a defeated player
- let player = g_Players[Engine.GetPlayerID()];
- Engine.GetGUIObjectByName("viewPlayer").selected = player && player.state == "defeated" ? 0 : Engine.GetPlayerID() + 1;
-}
-
-function updateViewedPlayerDropdown()
-{
- let viewPlayer = Engine.GetGUIObjectByName("viewPlayer");
- viewPlayer.list_data = [-1].concat(g_Players.map((player, i) => i));
- viewPlayer.list = [translate("Observer")].concat(g_Players.map(
- (player, i) => colorizePlayernameHelper("■", i) + " " + player.name
- ));
-}
-
-/**
- * Change perspective tool.
- * Shown to observers or when enabling the developers option.
- */
-function selectViewPlayer(playerID)
+function resetTemplates()
{
- if (playerID < -1 || playerID > g_Players.length - 1)
- return;
-
- if (g_ShowAllStatusBars)
- recalculateStatusBarDisplay(true);
-
- g_IsObserver = isPlayerObserver(Engine.GetPlayerID());
-
- if (g_IsObserver || g_DeveloperOverlay.isChangePerspective())
- {
- if (g_ViewedPlayer != playerID)
- clearSelection();
- g_ViewedPlayer = playerID;
- }
-
- if (g_DeveloperOverlay.isChangePerspective())
- {
- Engine.SetPlayerID(g_ViewedPlayer);
- g_IsObserver = isPlayerObserver(g_ViewedPlayer);
- }
-
- Engine.SetViewedPlayer(g_ViewedPlayer);
- g_DiplomacyColors.updateDisplayedPlayerColors();
- updateTopPanel();
- g_Chat.onUpdatePlayers();
- updateHotkeyTooltips();
-
// Update GUI and clear player-dependent cache
g_TemplateData = {};
Engine.GuiInterfaceCall("ResetTemplateModified");
- onSimulationUpdate();
- g_DiplomacyDialog.update();
- g_TradeDialog.update();
+ // TODO: do this more selectively
+ onSimulationUpdate();
}
/**
@@ -523,14 +501,16 @@
sendLobbyPlayerlistUpdate();
updatePlayerData();
- g_Chat.onUpdatePlayers();
- updateGameSpeedControl();
+
+ // TODO: The other calls in this function should move too
+ for (let handler of g_PlayerFinishedHandlers)
+ handler();
if (players.indexOf(g_ViewedPlayer) == -1)
return;
// Select "observer" item on loss. On win enable observermode without changing perspective
- Engine.GetGUIObjectByName("viewPlayer").selected = won ? g_ViewedPlayer + 1 : 0;
+ g_PlayerViewControl.selectViewPlayer(won ? g_ViewedPlayer + 1 : 0);
if (players.indexOf(Engine.GetPlayerID()) == -1 || Engine.IsAtlasRunning())
return;
@@ -545,74 +525,6 @@
}
/**
- * Sets civ icon for the currently viewed player.
- * Hides most gui objects for observers.
- */
-function updateTopPanel()
-{
- let isPlayer = g_ViewedPlayer > 0;
-
- let civIcon = Engine.GetGUIObjectByName("civIcon");
- civIcon.hidden = !isPlayer;
- if (isPlayer)
- {
- civIcon.sprite = "stretched:" + g_CivData[g_Players[g_ViewedPlayer].civ].Emblem;
- Engine.GetGUIObjectByName("civIconOverlay").tooltip =
- sprintf(
- translate("%(civ)s\n%(hotkey_civinfo)s / %(hotkey_structree)s: View History / Structure Tree\nLast opened will be reopened on click."), {
- "civ": setStringTags(g_CivData[g_Players[g_ViewedPlayer].civ].Name, { "font": "sans-bold-stroke-14" }),
- "hotkey_civinfo": colorizeHotkey("%(hotkey)s", "civinfo"),
- "hotkey_structree": colorizeHotkey("%(hotkey)s", "structree")
- });
- }
-
- // Following gaia can be interesting on scripted maps
- Engine.GetGUIObjectByName("optionFollowPlayer").hidden = !g_IsObserver || g_ViewedPlayer == -1;
-
- let viewPlayer = Engine.GetGUIObjectByName("viewPlayer");
- viewPlayer.hidden = !g_IsObserver && !g_DeveloperOverlay.isChangePerspective();
-
- let followPlayerLabel = Engine.GetGUIObjectByName("followPlayerLabel");
- followPlayerLabel.hidden = Engine.GetTextWidth(followPlayerLabel.font, followPlayerLabel.caption + " ") +
- followPlayerLabel.getComputedSize().left > viewPlayer.getComputedSize().left;
-
- let resCodes = g_ResourceData.GetCodes();
- let r = 0;
- for (let res of resCodes)
- {
- if (!Engine.GetGUIObjectByName("resource[" + r + "]"))
- {
- warn("Current GUI limits prevent displaying more than " + r + " resources in the top panel!");
- break;
- }
- Engine.GetGUIObjectByName("resource[" + r + "]_icon").sprite = "stretched:session/icons/resources/" + res + ".png";
- Engine.GetGUIObjectByName("resource[" + r + "]").hidden = !isPlayer;
- ++r;
- }
- horizontallySpaceObjects("resourceCounts", 5);
- hideRemaining("resourceCounts", r);
-
- let resPop = Engine.GetGUIObjectByName("population");
- let resPopSize = resPop.size;
- resPopSize.left = Engine.GetGUIObjectByName("resource[" + (r - 1) + "]").size.right;
- resPop.size = resPopSize;
-
- Engine.GetGUIObjectByName("population").hidden = !isPlayer;
- g_DiplomacyButton.update();
- g_TradeDialogButton.update();
-
- Engine.GetGUIObjectByName("observerText").hidden = isPlayer;
-
- let alphaLabel = Engine.GetGUIObjectByName("alphaLabel");
- alphaLabel.hidden = isPlayer && !viewPlayer.hidden;
- alphaLabel.size = isPlayer ? "50%+44 0 100%-283 100%" : "155 0 85%-279 100%";
-
- Engine.GetGUIObjectByName("pauseButton").enabled = !g_IsObserver || !g_IsNetworked || g_IsController;
- Engine.GetGUIObjectByName("menuResignButton").enabled = !g_IsObserver;
- Engine.GetGUIObjectByName("lobbyButton").enabled = Engine.HasXmppClient();
-}
-
-/**
* Resign a player.
* @param leaveGameAfterResign If player is quitting after resignation.
*/
@@ -724,6 +636,9 @@
// When selection changed, get the entityStates of new entities
GetMultipleEntityStates(g_Selection.toList().filter(entId => !g_EntityStates[entId]));
+ for (let handler of g_EntitySelectionChangeHandlers)
+ handler();
+
updateGUIObjects();
// Display rally points for selected buildings
@@ -734,29 +649,10 @@
recalculateStatusBarDisplay();
updateTimers();
-
updateMenuPosition(tickLength);
-
- // When training is blocked, flash population (alternates color every 500msec)
- Engine.GetGUIObjectByName("resourcePop").textcolor = g_IsTrainingBlocked && now % 1000 < 500 ? g_PopulationAlertColor : g_DefaultPopulationColor;
-
Engine.GuiInterfaceCall("ClearRenamedEntities");
}
-function onWindowResized()
-{
- // Update followPlayerLabel
- updateTopPanel();
-
- g_Chat.ChatWindow.resizeChatWindow();
-}
-
-function changeGameSpeed(speed)
-{
- if (!g_IsNetworked)
- Engine.SetSimRate(speed);
-}
-
function onSimulationUpdate()
{
// Templates change depending on technologies and auras, so they have to be reloaded after such a change.
@@ -774,6 +670,10 @@
GetMultipleEntityStates(g_Selection.toList());
+ for (let handler of g_SimulationUpdateHandlers)
+ handler();
+
+ // TODO: Move to handlers
updateCinemaPath();
handleNotifications();
updateGUIObjects();
@@ -829,6 +729,7 @@
Engine.Renderer_SetSilhouettesEnabled(!isPlayingCinemaPath && Engine.ConfigDB_GetValue("user", "silhouettes") == "true");
}
+// TODO: Use event subscription onSimulationUpdate, onEntitySelectionChange, onPlayerViewChange, ... instead
function updateGUIObjects()
{
g_Selection.update();
@@ -843,18 +744,11 @@
displayPanelEntities();
updateGroups();
- updatePlayerDisplay();
updateResearchDisplay();
updateSelectionDetails();
updateBuildingPlacementPreview();
updateTimeNotifications();
- if (g_ViewedPlayer > 0)
- {
- let playerState = GetSimState().players[g_ViewedPlayer];
- g_DeveloperOverlay.setControlAll(playerState && playerState.controlsAll);
- }
-
if (!g_IsObserver)
{
// Update music state on basis of battle state.
@@ -862,23 +756,12 @@
if (battleState)
global.music.setState(global.music.states[battleState]);
}
-
- updateViewedPlayerDropdown();
- g_DeveloperOverlay.update();
- g_DiplomacyDialog.update();
- g_MiniMapPanel.update();
- g_TradeDialog.update();
-}
-
-function saveResPopTooltipSort()
-{
- Engine.ConfigDB_CreateAndWriteValueToFile("user", "gui.session.respoptooltipsort", String((+Engine.ConfigDB_GetValue("user", "gui.session.respoptooltipsort") + 2) % 3 - 1), "config/user.cfg");
}
function onReplayFinished()
{
closeOpenDialogs();
- pauseGame();
+ g_PauseControl.setPaused();
messageBox(400, 200,
translateWithContext("replayFinished", "The replay has finished. Do you want to quit?"),
@@ -1065,88 +948,6 @@
}
}
-/**
- * Create ally player stat tooltip.
- * @param {string} resource - Resource type, on which values will be sorted.
- * @param {object} playerStates - Playerstates from players whos stats are viewed in the tooltip.
- * @param {number} sort - 0 no order, -1 descending, 1 ascending order.
- * @returns {string} Tooltip string.
- */
-function getAllyStatTooltip(resource, playerStates, sort)
-{
- let tooltip = [];
-
- for (let player in playerStates)
- tooltip.push({
- "playername": colorizePlayernameHelper("■", player) + " " + g_Players[player].name,
- "statValue": resource == "pop" ?
- sprintf(translate("%(popCount)s/%(popLimit)s/%(popMax)s"), playerStates[player]) :
- Math.round(playerStates[player].resourceCounts[resource]),
- "orderValue": resource == "pop" ? playerStates[player].popCount :
- Math.round(playerStates[player].resourceCounts[resource])
- });
- if (sort)
- tooltip.sort((a, b) => sort * (b.orderValue - a.orderValue));
- return "\n" + tooltip.map(stat => sprintf(translate("%(playername)s: %(statValue)s"), stat)).join("\n");
-}
-
-function updatePlayerDisplay()
-{
- let allPlayerStates = GetSimState().players;
- let viewedPlayerState = allPlayerStates[g_ViewedPlayer];
- let viewablePlayerStates = {};
- for (let player in allPlayerStates)
- if (player != 0 &&
- player != g_ViewedPlayer &&
- g_Players[player].state != "defeated" &&
- (g_IsObserver ||
- viewedPlayerState.hasSharedLos &&
- g_Players[player].isMutualAlly[g_ViewedPlayer]))
- viewablePlayerStates[player] = allPlayerStates[player];
-
- if (!viewedPlayerState)
- return;
-
- let tooltipSort = +Engine.ConfigDB_GetValue("user", "gui.session.respoptooltipsort");
-
- let orderHotkeyTooltip = Object.keys(viewablePlayerStates).length <= 1 ? "" :
- "\n" + sprintf(translate("%(order)s: %(hotkey)s to change order."), {
- "hotkey": setStringTags("\\[Click]", g_HotkeyTags),
- "order": tooltipSort == 0 ? translate("Unordered") : tooltipSort == 1 ? translate("Descending") : translate("Ascending")
- });
-
- let resCodes = g_ResourceData.GetCodes();
- for (let r = 0; r < resCodes.length; ++r)
- {
- let resourceObj = Engine.GetGUIObjectByName("resource[" + r + "]");
- if (!resourceObj)
- break;
-
- let res = resCodes[r];
-
- let tooltip = '[font="' + g_ResourceTitleFont + '"]' +
- resourceNameFirstWord(res) + '[/font]';
-
- let descr = g_ResourceData.GetResource(res).description;
- if (descr)
- tooltip += "\n" + translate(descr);
-
- tooltip += orderHotkeyTooltip + getAllyStatTooltip(res, viewablePlayerStates, tooltipSort);
-
- resourceObj.tooltip = tooltip;
-
- Engine.GetGUIObjectByName("resource[" + r + "]_count").caption = Math.floor(viewedPlayerState.resourceCounts[res]);
- }
-
- Engine.GetGUIObjectByName("resourcePop").caption = sprintf(translate("%(popCount)s/%(popLimit)s"), viewedPlayerState);
- Engine.GetGUIObjectByName("population").tooltip = translate("Population (current / limit)") + "\n" +
- sprintf(translate("Maximum population: %(popCap)s"), { "popCap": viewedPlayerState.popMax }) +
- orderHotkeyTooltip +
- getAllyStatTooltip("pop", viewablePlayerStates, tooltipSort);
-
- g_IsTrainingBlocked = viewedPlayerState.trainingBlocked;
-}
-
function selectAndMoveTo(ent)
{
let entState = GetEntityState(ent);
@@ -1243,6 +1044,12 @@
});
}
+function removeStatusBarDisplay()
+{
+ if (g_ShowAllStatusBars)
+ recalculateStatusBarDisplay(true);
+}
+
/**
* Inverts the given configuration boolean and returns the current state.
* For example "silhouettes".
Index: binaries/data/mods/public/gui/session/session.xml
===================================================================
--- binaries/data/mods/public/gui/session/session.xml
+++ binaries/data/mods/public/gui/session/session.xml
@@ -9,7 +9,9 @@
+
+
-
-
+