diff --git a/layout/components/player-card.xml b/layout/components/player-card.xml
index 57216dae..d11ff604 100644
--- a/layout/components/player-card.xml
+++ b/layout/components/player-card.xml
@@ -10,7 +10,7 @@
-
+
diff --git a/layout/components/settings/enum-dropdown.xml b/layout/components/settings/enum-dropdown.xml
index fb6ee3f8..adb0b7e1 100644
--- a/layout/components/settings/enum-dropdown.xml
+++ b/layout/components/settings/enum-dropdown.xml
@@ -3,12 +3,12 @@
-
+
-
+
diff --git a/layout/components/settings/enum.xml b/layout/components/settings/enum.xml
index fdf3a099..f0fdc27d 100644
--- a/layout/components/settings/enum.xml
+++ b/layout/components/settings/enum.xml
@@ -3,10 +3,10 @@
-
+
-
+
diff --git a/layout/components/settings/keybinder.xml b/layout/components/settings/keybinder.xml
index 050207a0..acd9dbb8 100644
--- a/layout/components/settings/keybinder.xml
+++ b/layout/components/settings/keybinder.xml
@@ -3,7 +3,7 @@
-
+
@@ -13,5 +13,5 @@
-
+
diff --git a/layout/components/settings/slider.xml b/layout/components/settings/slider.xml
index 3a53bf55..88d48455 100644
--- a/layout/components/settings/slider.xml
+++ b/layout/components/settings/slider.xml
@@ -4,7 +4,7 @@
-
+
@@ -15,5 +15,5 @@
-
+
diff --git a/layout/components/settings/toggle.xml b/layout/components/settings/toggle.xml
index db3421cd..45e39d19 100644
--- a/layout/components/settings/toggle.xml
+++ b/layout/components/settings/toggle.xml
@@ -5,13 +5,13 @@
-
+
-
+
diff --git a/layout/components/show-fps.xml b/layout/components/show-fps.xml
index d4a5598a..97f0ab4b 100644
--- a/layout/components/show-fps.xml
+++ b/layout/components/show-fps.xml
@@ -3,7 +3,7 @@
-
+
-
+
diff --git a/layout/hud/bone-counts.xml b/layout/hud/bone-counts.xml
index 8d93573e..2ff53f22 100644
--- a/layout/hud/bone-counts.xml
+++ b/layout/hud/bone-counts.xml
@@ -3,8 +3,8 @@
-
+
-
+
diff --git a/layout/hud/ghost-entities.xml b/layout/hud/ghost-entities.xml
index c956c6eb..8077041e 100644
--- a/layout/hud/ghost-entities.xml
+++ b/layout/hud/ghost-entities.xml
@@ -9,7 +9,7 @@
-
+
diff --git a/layout/hud/hint-text.xml b/layout/hud/hint-text.xml
index ea1b4bbb..df34b207 100644
--- a/layout/hud/hint-text.xml
+++ b/layout/hud/hint-text.xml
@@ -1,5 +1,5 @@
@@ -39,7 +39,7 @@
-
+
@@ -63,9 +63,9 @@
-
-
-
+
+
+
-
-
+
+
@@ -89,13 +89,13 @@
-
+
-
+
-
+
diff --git a/layout/hud/replay-controls.xml b/layout/hud/replay-controls.xml
index 162de317..45811afa 100644
--- a/layout/hud/replay-controls.xml
+++ b/layout/hud/replay-controls.xml
@@ -21,7 +21,7 @@
-
+
-
-
+
+
diff --git a/layout/modals/toasts/custom-layout-example.xml b/layout/modals/toasts/custom-layout-example.xml
index e3c21cc7..7ab8735c 100644
--- a/layout/modals/toasts/custom-layout-example.xml
+++ b/layout/modals/toasts/custom-layout-example.xml
@@ -8,7 +8,7 @@
-
+
diff --git a/layout/pages/controls-library.xml b/layout/pages/controls-library.xml
index a446e33b..e21a1a99 100644
--- a/layout/pages/controls-library.xml
+++ b/layout/pages/controls-library.xml
@@ -747,15 +747,15 @@
-
+
-
-
+
+
-
-
+
+
diff --git a/layout/pages/drawer/lobby.xml b/layout/pages/drawer/lobby.xml
index 058dab7f..33b5e795 100644
--- a/layout/pages/drawer/lobby.xml
+++ b/layout/pages/drawer/lobby.xml
@@ -10,7 +10,7 @@
-
+
@@ -24,7 +24,7 @@
-
+
diff --git a/layout/pages/intro-movie.xml b/layout/pages/intro-movie.xml
index 8b1b0b05..113bbc39 100644
--- a/layout/pages/intro-movie.xml
+++ b/layout/pages/intro-movie.xml
@@ -6,8 +6,8 @@
-
+
-
+
diff --git a/layout/pages/leaderboards/entry.xml b/layout/pages/leaderboards/entry.xml
index d49cdde9..9ad6d1a4 100644
--- a/layout/pages/leaderboards/entry.xml
+++ b/layout/pages/leaderboards/entry.xml
@@ -10,7 +10,7 @@
-
+
diff --git a/layout/pages/main-menu/main-menu.xml b/layout/pages/main-menu/main-menu.xml
index e4b4e0b1..3b80ae25 100644
--- a/layout/pages/main-menu/main-menu.xml
+++ b/layout/pages/main-menu/main-menu.xml
@@ -21,7 +21,7 @@
-
+
@@ -115,7 +115,7 @@
-
+
@@ -174,12 +174,12 @@
-
+
-
+
-
+
diff --git a/layout/pages/settings/audio.xml b/layout/pages/settings/audio.xml
index 20523442..50bb5b99 100644
--- a/layout/pages/settings/audio.xml
+++ b/layout/pages/settings/audio.xml
@@ -31,19 +31,19 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -59,14 +59,14 @@
-
+
-
+
-
+
@@ -76,17 +76,17 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/layout/pages/settings/gameplay.xml b/layout/pages/settings/gameplay.xml
index 1e18d167..1a529457 100644
--- a/layout/pages/settings/gameplay.xml
+++ b/layout/pages/settings/gameplay.xml
@@ -30,32 +30,32 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -83,22 +83,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -122,50 +122,50 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -187,44 +187,44 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -245,43 +245,43 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -301,65 +301,65 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -379,50 +379,50 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -443,62 +443,62 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -508,19 +508,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -529,27 +529,27 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -557,10 +557,10 @@
-
+
-
+
@@ -568,10 +568,10 @@
-
+
-
+
@@ -580,43 +580,43 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -626,42 +626,42 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -670,41 +670,41 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -714,39 +714,39 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -755,35 +755,35 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/layout/pages/settings/input.xml b/layout/pages/settings/input.xml
index eaa0798f..29961c55 100644
--- a/layout/pages/settings/input.xml
+++ b/layout/pages/settings/input.xml
@@ -32,7 +32,7 @@
-
+
@@ -47,31 +47,31 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -90,66 +90,66 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
diff --git a/layout/pages/settings/interface.xml b/layout/pages/settings/interface.xml
index dc82a07d..5e044b9b 100644
--- a/layout/pages/settings/interface.xml
+++ b/layout/pages/settings/interface.xml
@@ -116,20 +116,20 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -326,10 +326,10 @@
-
+
-
+
@@ -344,10 +344,10 @@
-
+
-
+
@@ -362,10 +362,10 @@
-
+
-
+
@@ -386,22 +386,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -421,72 +421,72 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -507,26 +507,26 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -552,28 +552,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -595,49 +595,49 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -659,37 +659,37 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/layout/pages/settings/online.xml b/layout/pages/settings/online.xml
index 487f0072..8804e68c 100644
--- a/layout/pages/settings/online.xml
+++ b/layout/pages/settings/online.xml
@@ -31,35 +31,35 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -95,7 +95,7 @@
-
+
@@ -111,18 +111,18 @@
-
+
-
+
-
+
-
+
@@ -141,15 +141,15 @@
-
+
-
+
-
+
-
+
diff --git a/layout/pages/settings/video.xml b/layout/pages/settings/video.xml
index 8dd2fc52..06eb998f 100644
--- a/layout/pages/settings/video.xml
+++ b/layout/pages/settings/video.xml
@@ -25,53 +25,53 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -81,52 +81,52 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -134,33 +134,33 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -178,28 +178,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
diff --git a/layout/util/global-popups.xml b/layout/util/global-popups.xml
index a1425f86..b5b597bb 100644
--- a/layout/util/global-popups.xml
+++ b/layout/util/global-popups.xml
@@ -3,13 +3,13 @@
-
+
-
+
-
+
-
+
diff --git a/layout/util/popup-manager.xml b/layout/util/popup-manager.xml
index cdaa3deb..58236f70 100644
--- a/layout/util/popup-manager.xml
+++ b/layout/util/popup-manager.xml
@@ -3,10 +3,10 @@
-
+
-
+
diff --git a/scripts/hud/cgaz.js b/scripts/hud/cgaz.js
index 647efd61..29d3129d 100644
--- a/scripts/hud/cgaz.js
+++ b/scripts/hud/cgaz.js
@@ -126,7 +126,7 @@ class Cgaz {
static onLoad() {
if (GameModeAPI.GetCurrentGameMode() === GameMode.DEFRAG) {
this.updateHandle = $.RegisterEventHandler(
- 'ChaosHudProcessInput',
+ 'HudProcessInput',
$.GetContextPanel(),
this.onUpdate.bind(this)
);
@@ -140,7 +140,7 @@ class Cgaz {
this.onWindicatorConfigChange();
this.onCompassConfigChange();
} else if (this.updateHandle) {
- $.UnregisterEventHandler('ChaosHudProcessInput', $.GetContextPanel(), this.updateHandle);
+ $.UnregisterEventHandler('HudProcessInput', $.GetContextPanel(), this.updateHandle);
this.updateHandle = null;
}
}
@@ -1344,7 +1344,7 @@ class Cgaz {
}
static {
- $.RegisterForUnhandledEvent('ChaosLevelInitPostEntity', this.onLoad.bind(this));
+ $.RegisterForUnhandledEvent('LevelInitPostEntity', this.onLoad.bind(this));
$.RegisterForUnhandledEvent('OnDefragHUDProjectionChange', this.onProjectionChange.bind(this));
$.RegisterForUnhandledEvent('OnDefragHUDFOVChange', this.onHudFovChange.bind(this));
$.RegisterForUnhandledEvent('OnDefragHUDAccelChange', this.onAccelConfigChange.bind(this));
diff --git a/scripts/hud/df-jump.js b/scripts/hud/df-jump.js
index 534c0015..aabb2419 100644
--- a/scripts/hud/df-jump.js
+++ b/scripts/hud/df-jump.js
@@ -51,7 +51,7 @@ class DFJump {
static {
$.RegisterEventHandler('DFJumpDataUpdate', this.container, this.onDFJumpUpdate.bind(this));
- $.RegisterForUnhandledEvent('ChaosLevelInitPostEntity', this.onLoad.bind(this));
+ $.RegisterForUnhandledEvent('LevelInitPostEntity', this.onLoad.bind(this));
$.RegisterForUnhandledEvent('DFJumpMaxDelayChanged', this.setMaxDelay.bind(this));
}
}
diff --git a/scripts/hud/ground-boost.js b/scripts/hud/ground-boost.js
index fa1594d6..fd79dc51 100644
--- a/scripts/hud/ground-boost.js
+++ b/scripts/hud/ground-boost.js
@@ -172,8 +172,8 @@ class Groundboost {
}
static {
- $.RegisterEventHandler('ChaosHudProcessInput', $.GetContextPanel(), this.onUpdate.bind(this));
- $.RegisterForUnhandledEvent('ChaosLevelInitPostEntity', this.onLoad.bind(this));
+ $.RegisterEventHandler('HudProcessInput', $.GetContextPanel(), this.onUpdate.bind(this));
+ $.RegisterForUnhandledEvent('LevelInitPostEntity', this.onLoad.bind(this));
$.RegisterForUnhandledEvent('OnDefragHUDGroundboostChange', this.onConfigChange.bind(this));
}
}
diff --git a/scripts/hud/jump-stats.js b/scripts/hud/jump-stats.js
index 700e4af3..3d9a18ac 100644
--- a/scripts/hud/jump-stats.js
+++ b/scripts/hud/jump-stats.js
@@ -132,7 +132,7 @@ class JumpStats {
static {
$.RegisterEventHandler('OnJumpStarted', this.container, this.onJump.bind(this));
- $.RegisterForUnhandledEvent('ChaosLevelInitPostEntity', this.onLoad.bind(this));
+ $.RegisterForUnhandledEvent('LevelInitPostEntity', this.onLoad.bind(this));
$.RegisterForUnhandledEvent('OnJumpStatsCFGChange', this.onConfigChange.bind(this));
}
}
diff --git a/scripts/hud/replay-controls.js b/scripts/hud/replay-controls.js
index a570f7e3..16120d5d 100644
--- a/scripts/hud/replay-controls.js
+++ b/scripts/hud/replay-controls.js
@@ -37,7 +37,7 @@ class ReplayControls {
}
static {
- $.RegisterEventHandler('ChaosHudProcessInput', $.GetContextPanel(), this.onProcessInput.bind(this));
+ $.RegisterEventHandler('HudProcessInput', $.GetContextPanel(), this.onProcessInput.bind(this));
$.RegisterEventHandler('SliderValueChanged', $.GetContextPanel(), this.onSliderValueChanged.bind(this));
}
}
diff --git a/scripts/hud/strafe-sync.js b/scripts/hud/strafe-sync.js
index 9be2cb25..d60c3f03 100644
--- a/scripts/hud/strafe-sync.js
+++ b/scripts/hud/strafe-sync.js
@@ -60,7 +60,7 @@ class StrafeSync {
}
static {
- $.RegisterEventHandler('ChaosHudProcessInput', $.GetContextPanel(), this.onUpdate.bind(this));
+ $.RegisterEventHandler('HudProcessInput', $.GetContextPanel(), this.onUpdate.bind(this));
/** @type {ProgressBar} @static */
this.bar = $('#SyncProgressBar');
diff --git a/scripts/hud/synchronizer.js b/scripts/hud/synchronizer.js
index c8aa9749..018d2cf1 100644
--- a/scripts/hud/synchronizer.js
+++ b/scripts/hud/synchronizer.js
@@ -309,7 +309,7 @@ class Synchronizer {
}
static {
- $.RegisterEventHandler('ChaosHudProcessInput', $.GetContextPanel(), this.onUpdate.bind(this));
+ $.RegisterEventHandler('HudProcessInput', $.GetContextPanel(), this.onUpdate.bind(this));
$.RegisterForUnhandledEvent('OnSynchroModeChanged', this.setDisplayMode.bind(this));
$.RegisterForUnhandledEvent('OnSynchroColorModeChanged', this.setColorMode.bind(this));
@@ -320,6 +320,6 @@ class Synchronizer {
$.RegisterForUnhandledEvent('OnSynchroStatModeChanged', this.setStatMode.bind(this));
$.RegisterForUnhandledEvent('OnSynchroStatColorModeChanged', this.setStatColorMode.bind(this));
$.RegisterForUnhandledEvent('OnJumpStarted', this.onJump.bind(this));
- $.RegisterForUnhandledEvent('ChaosLevelInitPostEntity', this.onLoad.bind(this));
+ $.RegisterForUnhandledEvent('LevelInitPostEntity', this.onLoad.bind(this));
}
}
diff --git a/scripts/hud/timer.js b/scripts/hud/timer.js
index 75d3450a..63c7c9e7 100644
--- a/scripts/hud/timer.js
+++ b/scripts/hud/timer.js
@@ -146,7 +146,7 @@ class HudTimer {
}
static {
- $.RegisterEventHandler('ChaosHudProcessInput', $.GetContextPanel(), this.onUpdate.bind(this));
+ $.RegisterEventHandler('HudProcessInput', $.GetContextPanel(), this.onUpdate.bind(this));
$.RegisterForUnhandledEvent('OnMomentumTimerStateChange', this.onTimerEvent.bind(this));
$.RegisterForUnhandledEvent('OnMomentumZoneChange', this.onZoneChange.bind(this));
$.RegisterForUnhandledEvent('OnSaveStateUpdate', this.onSaveStateChange.bind(this));
diff --git a/scripts/pages/intro-movie.js b/scripts/pages/intro-movie.js
index b2c04f2c..eafec315 100644
--- a/scripts/pages/intro-movie.js
+++ b/scripts/pages/intro-movie.js
@@ -1,9 +1,9 @@
class IntroMovie {
static {
- $.RegisterForUnhandledEvent('ChaosShowIntroMovie', this.showIntroMovie.bind(this));
+ $.RegisterForUnhandledEvent('ShowIntroMovie', this.showIntroMovie.bind(this));
}
static showIntroMovie() {
- $.DispatchEvent('ChaosHideIntroMovie'); // Disable intro movie for Momentum
+ $.DispatchEvent('HideIntroMovie'); // Disable intro movie for Momentum
}
}
diff --git a/scripts/pages/learn.js b/scripts/pages/learn.js
index 408d3c23..a39db4ed 100644
--- a/scripts/pages/learn.js
+++ b/scripts/pages/learn.js
@@ -156,7 +156,7 @@ class Learn {
static launchMapThenTeleport() {
const onMapLoad = () => {
- $.UnregisterForUnhandledEvent('ChaosLevelInitPostEntity', onLoadHandle);
+ $.UnregisterForUnhandledEvent('LevelInitPostEntity', onLoadHandle);
if (MapCacheAPI.GetMapName() !== this.currentLessonData['Map'])
$.Warning(
@@ -167,7 +167,7 @@ class Learn {
else this.teleportToLessonStart();
};
- const onLoadHandle = $.RegisterForUnhandledEvent('ChaosLevelInitPostEntity', onMapLoad);
+ const onLoadHandle = $.RegisterForUnhandledEvent('LevelInitPostEntity', onMapLoad);
const map = this.currentLessonData['Map'];
diff --git a/scripts/pages/main-menu/main-menu.js b/scripts/pages/main-menu/main-menu.js
index 1e08bff6..f4ba8412 100644
--- a/scripts/pages/main-menu/main-menu.js
+++ b/scripts/pages/main-menu/main-menu.js
@@ -29,10 +29,10 @@ class MainMenu {
static activeTab = '';
static {
- $.RegisterForUnhandledEvent('ChaosShowMainMenu', this.onShowMainMenu.bind(this));
- $.RegisterForUnhandledEvent('ChaosHideMainMenu', this.onHideMainMenu.bind(this));
- $.RegisterForUnhandledEvent('ChaosShowPauseMenu', this.onShowPauseMenu.bind(this));
- $.RegisterForUnhandledEvent('ChaosHidePauseMenu', this.onHidePauseMenu.bind(this));
+ $.RegisterForUnhandledEvent('ShowMainMenu', this.onShowMainMenu.bind(this));
+ $.RegisterForUnhandledEvent('HideMainMenu', this.onHideMainMenu.bind(this));
+ $.RegisterForUnhandledEvent('ShowPauseMenu', this.onShowPauseMenu.bind(this));
+ $.RegisterForUnhandledEvent('HidePauseMenu', this.onHidePauseMenu.bind(this));
$.RegisterForUnhandledEvent('MapSelector_OnLoaded', this.onMapSelectorLoaded.bind(this));
$.RegisterForUnhandledEvent('Safeguard_Disconnect', this.onSafeguardDisconnect.bind(this));
$.RegisterForUnhandledEvent('Safeguard_Quit', this.onSafeguardQuit.bind(this));
@@ -47,12 +47,12 @@ class MainMenu {
(outcome) => outcome && this.onHomeButtonPressed()
);
- $.DispatchEvent('ChaosHideIntroMovie');
+ $.DispatchEvent('HideIntroMovie');
}
/**
* General onLoad initialisations.
- * Fired when ChaosMainMenu fires its onload event.
+ * Fired when MainMenu fires its onload event.
*/
static onMainMenuLoaded() {
// These aren't accessible until the page has loaded fully, find them now
@@ -344,7 +344,7 @@ class MainMenu {
static onQuitPrompt(toDesktop = true) {
if (!toDesktop) return; // currently don't handle disconnect prompts
- $.DispatchEvent('ChaosMainMenuPauseGame'); // make sure game is paused so we can see the popup if hit from a keybind in-game
+ $.DispatchEvent('MainMenuPauseGame'); // make sure game is paused so we can see the popup if hit from a keybind in-game
UiToolkitAPI.ShowGenericPopupTwoOptionsBgStyle(
$.Localize('#Action_Quit'),
@@ -411,7 +411,7 @@ class MainMenu {
static onEscapeKeyPressed(_eSource, _nRepeats, _focusPanel) {
// Resume game in pause menu mode, OTHERWISE close the active menu menu page
if (GameInterfaceAPI.GetGameUIState() === GameUIState.PAUSEMENU) {
- $.DispatchEvent('ChaosMainMenuResumeGame');
+ $.DispatchEvent('MainMenuResumeGame');
} else {
this.onHomeButtonPressed();
}
diff --git a/scripts/pages/settings/page.js b/scripts/pages/settings/page.js
index 6461ec07..0287bdb6 100644
--- a/scripts/pages/settings/page.js
+++ b/scripts/pages/settings/page.js
@@ -18,7 +18,7 @@ class SettingsShared {
discardVideoSettingsButton.enabled = false;
// Tell C++ to init controls from convars
- $.DispatchEvent('ChaosVideoSettingsInit');
+ $.DispatchEvent('VideoSettingsInit');
this.initTextureReplacementDropdown();
@@ -51,9 +51,9 @@ class SettingsShared {
static resetSettingsRecursive(panel) {
// TODO: Add support for Enums and Colours here, then include
- if (panel.paneltype === 'ChaosSettingsSlider' || panel.paneltype === 'ChaosSettingsEnumDropDown') {
+ if (panel.paneltype === 'SettingsSlider' || panel.paneltype === 'SettingsEnumDropDown') {
panel.RestoreCVarDefault();
- } else if (panel.paneltype === 'ChaosSettingsKeyBinder') {
+ } else if (panel.paneltype === 'SettingsKeyBinder') {
// OptionsMenuAPI has already handled this, just refresh
panel.OnShow?.();
} else {
@@ -80,7 +80,7 @@ class SettingsShared {
static resetVideoSettings() {
// For future: use same localisation string as above
this.showConfirmResetSettings($.Localize('#Settings_General_ResetSomething'), () => {
- $.DispatchEvent('ChaosVideoSettingsResetDefault');
+ $.DispatchEvent('VideoSettingsResetDefault');
this.resetSettingsRecursive($.GetContextPanel());
this.videoSettingsOnUserInputSubmit();
});
@@ -118,13 +118,13 @@ class SettingsShared {
static videoSettingsDiscardChanges() {
// Discard dialogue seems unnecessary here
// this.showConfirmResetSettings('Are you sure you want to discard your changes to video settings?', () => {
- $.DispatchEvent('ChaosVideoSettingsInit');
+ $.DispatchEvent('VideoSettingsInit');
this.videoSettingsResetUserInput();
// });
}
static videoSettingsApplyChanges() {
- $.DispatchEvent('ChaosApplyVideoSettings');
+ $.DispatchEvent('ApplyVideoSettings');
this.videoSettingsResetUserInput();
}
@@ -263,11 +263,11 @@ class SettingsShared {
static isSettingsPanel(panel) {
return [
- 'ChaosSettingsEnum',
- 'ChaosSettingsSlider',
- 'ChaosSettingsEnumDropDown',
- 'ChaosSettingsKeyBinder',
- 'ChaosSettingsToggle',
+ 'SettingsEnum',
+ 'SettingsSlider',
+ 'SettingsEnumDropDown',
+ 'SettingsKeyBinder',
+ 'SettingsToggle',
'ConVarColorDisplay'
].includes(panel.paneltype);
}
diff --git a/scripts/pages/settings/settings.js b/scripts/pages/settings/settings.js
index 8e7e0f2d..4f3ed864 100644
--- a/scripts/pages/settings/settings.js
+++ b/scripts/pages/settings/settings.js
@@ -252,9 +252,9 @@ class MainMenuSettings {
// Only Enum and EnumDropDown are currently supported, others can be added when/if needed
const psVar = panel.GetAttributeString('psvar', '');
if (psVar) {
- if (panel.paneltype === 'ChaosSettingsEnum') {
+ if (panel.paneltype === 'SettingsEnum') {
this.initPersistentStorageEnum(panel, psVar);
- } else if (panel.paneltype === 'ChaosSettingsEnumDropDown') {
+ } else if (panel.paneltype === 'SettingsEnumDropDown') {
this.initPersistentStorageEnumDropdown(panel, psVar);
}
}
@@ -337,7 +337,7 @@ class MainMenuSettings {
// Get convar display option from PS
const showConvar = Boolean(convar);
- const isKeybinder = paneltype === 'ChaosSettingsKeyBinder';
+ const isKeybinder = paneltype === 'SettingsKeyBinder';
// If the panel has a message OR a convar and the convar display option is on, show the info panel
if (message || showConvar) {
@@ -430,11 +430,11 @@ class MainMenuSettings {
static isSettingsPanel(panel) {
return [
- 'ChaosSettingsEnum',
- 'ChaosSettingsSlider',
- 'ChaosSettingsEnumDropDown',
- 'ChaosSettingsKeyBinder',
- 'ChaosSettingsToggle',
+ 'SettingsEnum',
+ 'SettingsSlider',
+ 'SettingsEnumDropDown',
+ 'SettingsKeyBinder',
+ 'SettingsToggle',
'ConVarColorDisplay'
].includes(panel.paneltype);
}
diff --git a/styles/components/settings.scss b/styles/components/settings.scss
index ba57ee5c..0533655d 100644
--- a/styles/components/settings.scss
+++ b/styles/components/settings.scss
@@ -224,7 +224,7 @@ ConVarEnabler > .colordisplay {
// Toggle - I don't know where this is from or how it's supposed
// to work so not going to style it
-// ChaosSettingsToggle {
+// SettingsToggle {
// height: 48px;
// flow-children: right;
// padding: 0 4px 0 12px;
@@ -232,18 +232,18 @@ ConVarEnabler > .colordisplay {
// vertical-align: middle;
// }
-// ChaosSettingsToggle #TitleContainer {
+// SettingsToggle #TitleContainer {
// vertical-align: middle;
// width: 35%;
// padding-right: 50px;
// }
-// ChaosSettingsToggle #Title {
+// SettingsToggle #Title {
// vertical-align: middle;
// horizontal-align: left;
// }
-// ChaosSettingsToggle #Toggle {
+// SettingsToggle #Toggle {
// vertical-align: middle;
// horizontal-align: right;
// }
diff --git a/styles/hud/hud.scss b/styles/hud/hud.scss
index 006615b9..ad427d0c 100644
--- a/styles/hud/hud.scss
+++ b/styles/hud/hud.scss
@@ -1,6 +1,6 @@
/* styles for the Chaos Hud */
-ChaosHud,
+Hud,
#PopupManager,
#TooltipManager,
#ContextMenuManager {
diff --git a/styles/pages/intro-movie.scss b/styles/pages/intro-movie.scss
index 3b86039c..a473f4ef 100644
--- a/styles/pages/intro-movie.scss
+++ b/styles/pages/intro-movie.scss
@@ -1,4 +1,4 @@
-ChaosIntroMovie {
+IntroMovie {
width: 100%;
height: 100%;
}