Settings Menu descriptions

Encore/Assets/ui/splashes.txt

@@ -1,5 +1,4 @@
-
-It's Encore-ing time!
+It's Encore-ing time!
 Do NOT drink the Among Us potion at 3 AM!
 What's better? Encore Raylib or Encore Unity?
 Player player = new Player;!
@@ -55,7 +54,6 @@ Kimicake was here!
 Jaydenz was here!
 YOUR JORDANS ARE FAKE, SOLDIER!!
 tposejank was here!
-Also try FNLookup!
 and multiplayer is being worked on as well!
 No practice mode; it's cheating!
 Do not do that!

Encore/src/menus/SettingsAudioVideo.cpp

@@ -73,52 +73,52 @@ void SettingsAudioVideo::Draw() {
         // Volume
         {
             "Volume Settings",
-            "Placeholder"
+            "Configurable settings:\n- Master Volume\n- Active Instrument Volume\n- Inactive Instrument Volume\n- Muted Instrument Volume\n- Menu Music Volume\n- Sound Effect Volume"
         },
-        // Main Output
+        // Master Volume
         {
-            "Main Output Volume",
-            "Placeholder"
+            "Master Volume",
+            "Adjusts the volume of the game\nitself."
         },
         // Active Instrument
         {
             "Active Instrument Volume",
-            "Placeholder"
+            "Adjusts the volume of player\ninstruments."
         },
         // Inactive Instrument
         {
             "Inactive Instrument Volume",
-            "Placeholder"
+            "Adjusts the volume of non-player\ninstruments."
         },
         // Mute Instrument
         {
-            "Mute Instrument Volume",
-            "Placeholder"
+            "Muted Instrument Volume",
+            "Adjusts how loud the instrument\ntrack stays when a player misses."
         },
         // Menu Music
         {
             "Menu Music Volume",
-            "Placeholder"
+            "Adjusts the volume of music inside\nthe menus."
         },
         // Sound Effects
         {
             "Sound Effects Volume",
-            "Placeholder"
+            "Adjusts the volume of sound effects."
         },
         // Background Beat Flash
         {
             "Background Beat Flash",
-            "Placeholder"
+            "Toggles the background flashing on\nbeat if the player has a active combo."
         },
         // Framerate
         {
-            "Framerate",
-            "Placeholder"
+            "Framerate Limit",
+            "Adjusts the maximum framerate of the\ngame."
         },
         // V-Sync
         {
             "V-Sync",
-            "Placeholder"
+            "Toggles forcing the game's framerate\nto the display's refresh rate to\nreduce screen tearing."
         }
     };
 
@@ -277,8 +277,8 @@ void SettingsAudioVideo::Draw() {
         Rectangle mainVolBoxRect = {volumeBoxLeft - borderWidth, mainVolTop - borderWidth, volumeBoxWidth + 2 * borderWidth, EntryHeight + 2 * borderWidth};
         DrawRectangle(volumeBoxLeft - borderWidth, mainVolTop - borderWidth, volumeBoxWidth + 2 * borderWidth, EntryHeight + 2 * borderWidth, boxBorder);
         DrawRectangle(volumeBoxLeft, mainVolTop, volumeBoxWidth, EntryHeight, boxBackground);
-        Vector2 mainVolTextSize = MeasureTextEx(assets.rubikBold, "Main Output", EntryFontSize, 0);
-        DrawTextEx(assets.rubikBold, "Main Output", {volumeBoxLeft + u.winpct(0.01f), mainVolTop + (EntryHeight - mainVolTextSize.y) / 2}, EntryFontSize, 0, WHITE);
+        Vector2 mainVolTextSize = MeasureTextEx(assets.rubikBold, "Master Volume", EntryFontSize, 0);
+        DrawTextEx(assets.rubikBold, "Master Volume", {volumeBoxLeft + u.winpct(0.01f), mainVolTop + (EntryHeight - mainVolTextSize.y) / 2}, EntryFontSize, 0, WHITE);
         Rectangle mainVolSliderRect = {volumeOptionLeft + maxTextWidth + volumeShift, mainVolTop, adjustedVolumeSliderWidth, buttonHeight};
         if (CheckCollisionPointRec(mousePos, mainVolSliderRect)) {
             selectedIndex = 2;
@@ -352,8 +352,8 @@ void SettingsAudioVideo::Draw() {
         Rectangle muteVolBoxRect = {volumeBoxLeft - borderWidth, muteVolTop - borderWidth, volumeBoxWidth + 2 * borderWidth, EntryHeight + 2 * borderWidth};
         DrawRectangle(volumeBoxLeft - borderWidth, muteVolTop - borderWidth, volumeBoxWidth + 2 * borderWidth, EntryHeight + 2 * borderWidth, boxBorder);
         DrawRectangle(volumeBoxLeft, muteVolTop, volumeBoxWidth, EntryHeight, boxBackground);
-        Vector2 muteVolTextSize = MeasureTextEx(assets.rubikBold, "Mute Instrument", EntryFontSize, 0);
-        DrawTextEx(assets.rubikBold, "Mute Instrument", {volumeBoxLeft + u.winpct(0.01f), muteVolTop + (EntryHeight - muteVolTextSize.y) / 2}, EntryFontSize, 0, WHITE);
+        Vector2 muteVolTextSize = MeasureTextEx(assets.rubikBold, "Muted Instrument", EntryFontSize, 0);
+        DrawTextEx(assets.rubikBold, "Muted Instrument", {volumeBoxLeft + u.winpct(0.01f), muteVolTop + (EntryHeight - muteVolTextSize.y) / 2}, EntryFontSize, 0, WHITE);
         Rectangle muteVolSliderRect = {volumeOptionLeft + maxTextWidth + volumeShift, muteVolTop, adjustedVolumeSliderWidth, buttonHeight};
         if (CheckCollisionPointRec(mousePos, muteVolSliderRect)) {
             selectedIndex = 5;
@@ -464,8 +464,8 @@ void SettingsAudioVideo::Draw() {
     Rectangle framerateBoxRect = {boxLeft - borderWidth, framerateTop - borderWidth, boxWidth + 2 * borderWidth, EntryHeight + 2 * borderWidth};
     DrawRectangle(boxLeft - borderWidth, framerateTop - borderWidth, boxWidth + 2 * borderWidth, EntryHeight + 2 * borderWidth, boxBorder);
     DrawRectangle(boxLeft, framerateTop, boxWidth, EntryHeight, boxBackground);
-    Vector2 framerateTextSize = MeasureTextEx(assets.rubikBold, "Framerate", EntryFontSize, 0);
-    DrawTextEx(assets.rubikBold, "Framerate", {boxLeft + u.winpct(0.01f), framerateTop + (EntryHeight - framerateTextSize.y) / 2}, EntryFontSize, 0, WHITE);
+    Vector2 framerateTextSize = MeasureTextEx(assets.rubikBold, "Framerate Limit", EntryFontSize, 0);
+    DrawTextEx(assets.rubikBold, "Framerate Limit", {boxLeft + u.winpct(0.01f), framerateTop + (EntryHeight - framerateTextSize.y) / 2}, EntryFontSize, 0, WHITE);
     Rectangle frDecButtonRect = {OptionLeft + OptionWidth - sliderTotalWidth, framerateTop, buttonWidth15, buttonHeight};
     Rectangle frSliderRect = {frDecButtonRect.x + buttonWidth15, framerateTop, adjustedSliderWidth, buttonHeight};
     Rectangle frIncButtonRect = {frSliderRect.x + frSliderRect.width, framerateTop, buttonWidth15Inc, buttonHeight};

Encore/src/menus/SettingsGameplay.cpp

@@ -73,12 +73,12 @@ void SettingsGameplay::Draw() {
         // fullscreen
         {
             "Fullscreen",
-            "TBD"
+            "Toggles if the game should be in\nfullscreen, albeit scuffed."
         },
         // scan Songs
         {
             "Scan Songs",
-            "TBD"
+            "Manually scans song folders for any\nchanges or new songs and updates the\nsong cache."
         }
     };
 

Encore/src/menus/SettingsMenu.cpp

@@ -62,7 +62,7 @@ void SettingsMenu::Draw() {
         // Audio / Visual
         {
             "Configure audio and video\nsettings",
-            "Configurable settings:\n- Audio calibration\n- Game volume\n- Background beat flash\n- Framerate\n- V-Sync\n"
+            "Configurable settings:\n- Audio Calibration\n- Volume Settings\n- Background Beat Flash\n- Framerate Limit\n- V-Sync"
         },
         // Gameplay
         {
@@ -72,17 +72,17 @@ void SettingsMenu::Draw() {
         // Controller Bindings
         {
             "Configure controller\nbindings",
-            "TBA"
+            "Configurable settings:\n- 4 Lane Gamepad Bindings\n- 5 Lane Gamepad Bindings\n- Overdrive Button\n- Pause Button"
         },
         // Keyboard Bindings
         {
             "Configure keyboard\nbindings",
-            "TBA"
+            "Configurable settings:\n- 4 Lane Gamepad Bindings\n- 5 Lane Gamepad Bindings\n- Overdrive Key\n- Pause Key"
         },
         // Credits
         {
             "Coming Soon",
-            "TBA"
+            "View everyone that\ncontributed to Encore!"
         }
     };
 

Encore/src/menus/gameMenu.cpp

@@ -406,7 +406,7 @@ void MainMenu::MainMenuScreen() {
         GuiSetStyle(BUTTON, BASE_COLOR_NORMAL, 0x181827FF);
     }
     if (GuiButton(
-            { u.wpct(0.02f), u.hpct(0.39f), u.winpct(0.5), u.hinpct(0.08f) }, "Options"
+            { u.wpct(0.02f), u.hpct(0.39f), u.winpct(0.5), u.hinpct(0.08f) }, "Settings"
         )) {
         // glfwSetGamepadStateCallback(gamepadStateCallbackSetControls);
         TheMenuManager.SwitchScreen(SETTINGS);