Release 1.1.7

Author: nnnextra

.gitignore

@@ -118,6 +118,9 @@ ipch/
 *.vspx
 *.sap
 
+# GMCM build artifact created by mod build config.
+StarControl.Gmcm/*Undefined*StarControl/
+
 # Visual Studio Trace Files
 *.e2e
 

CHANGELOG.md

@@ -4,23 +4,27 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.1.7-experimental.5] - 2025-12-23
+## [1.1.7] - 2025-12-23
 
 ### Added
 
 - PlayStation button icon set and selector (Controls tab).
-- New UI sprite variants: `UI.Xbox.png` and `UI.PlayStation.png`.
-- Button icon set config option with a restart notice.
+- Instant Actions menu item in the mod wheel with visibility toggle.
+- PlayStation button spritemap and sprite sheet variants.
 
 ### Changed
 
-- Button icon selection now swaps and reloads the UI sprite sheet in-game.
-- Updated attributions for PlayStation button icons.
-- Tooltip popups removed from the Defaults/Cancel/Save buttons to prevent overlap.
+- Button icon selector moved to the Controls tab.
+- Button icon switching now reloads UI sprites in-game (close and reopen the menu if needed).
+- Control prompts and mod-menu keybind editor respect the selected icon set.
+- Quick action menu slot content scaled up while keeping the menu size the same.
+- Instant Actions (remapping) menu layout adjusted to better fit smaller screens; middle list now scrolls with a visible scrollbar.
 
 ### Fixed
 
-- Button icon swaps now invalidate all UI sprites so switching back works reliably.
+- Button icon switching now reliably toggles back and forth.
+- Controls tab button mapping labels wrap cleanly.
+- Defaults/Cancel/Save tooltips removed to avoid overlap on smaller screens.
 
 ---
 

StarControl/Config/ItemsConfiguration.cs

@@ -54,12 +54,30 @@ public class ItemsConfiguration : IConfigEquatable<ItemsConfiguration>
     /// </remarks>
     public bool ShowSettingsItem { get; set; } = true;
 
+    /// <summary>
+    /// Whether to display the Instant Actions item on page
+    /// <see cref="InstantActionsItemPageIndex"/> and at position
+    /// <see cref="InstantActionsItemPositionIndex"/>.
+    /// </summary>
+    /// <remarks>
+    /// The Instant Actions item always exists and always has a specific location, but can be
+    /// suppressed from the Mod Menu during gameplay. It will still appear in the configuration
+    /// menu when editing the menu items.
+    /// </remarks>
+    public bool ShowInstantActionsItem { get; set; } = true;
+
     /// <summary>
     /// The zero-based page number on which to show the Star Control Settings item, which brings up
     /// the configuration menu.
     /// </summary>
     public int SettingsItemPageIndex { get; set; }
 
+    /// <summary>
+    /// The zero-based page number on which to show the Instant Actions item, which brings up the
+    /// remapping (instant actions) menu.
+    /// </summary>
+    public int InstantActionsItemPageIndex { get; set; }
+
     /// <summary>
     /// The zero-based position within the specific Mod Menu Page identified by
     /// <see cref="SettingsItemPageIndex"/> where the Star Control Settings item should be shown.
@@ -70,6 +88,16 @@ public class ItemsConfiguration : IConfigEquatable<ItemsConfiguration>
     /// </remarks>
     public int SettingsItemPositionIndex { get; set; }
 
+    /// <summary>
+    /// The zero-based position within the specific Mod Menu Page identified by
+    /// <see cref="InstantActionsItemPageIndex"/> where the Instant Actions item should be shown.
+    /// </summary>
+    /// <remarks>
+    /// The item will be inserted <em>before</em> the specified index, so an index of <c>0</c> means
+    /// it will be the first item on that page.
+    /// </remarks>
+    public int InstantActionsItemPositionIndex { get; set; }
+
     /// <summary>
     /// Map of all quick-slot buttons to the corresponding quick slot item (if any).
     /// </summary>
@@ -164,8 +192,11 @@ public bool Equals(ItemsConfiguration? other)
                 (page1, page2) => page1.SequenceEqual(page2, (item1, item2) => item1.Equals(item2))
             )
             && ShowSettingsItem == other.ShowSettingsItem
+            && ShowInstantActionsItem == other.ShowInstantActionsItem
             && SettingsItemPageIndex == other.SettingsItemPageIndex
+            && InstantActionsItemPageIndex == other.InstantActionsItemPageIndex
             && SettingsItemPositionIndex == other.SettingsItemPositionIndex
+            && InstantActionsItemPositionIndex == other.InstantActionsItemPositionIndex
             && QuickSlots.Count == other.QuickSlots.Count
             && QuickSlots.IsEquivalentTo(other.QuickSlots, (slot1, slot2) => slot1.Equals(slot2));
     }

StarControl/Graphics/Sprites.cs

@@ -9,12 +9,19 @@ public static class Sprites
     /// Asset path for the mod's own UI tile sheet.
     /// </summary>
     public const string UI_TEXTURE_PATH = "Mods/focustense.StarControl/Sprites/UI";
+    public const string UI_PLAYSTATION_TEXTURE_PATH =
+        "Mods/focustense.StarControl/Sprites/UI.PlayStation";
 
     /// <summary>
     /// Sprite of a book, used for the built-in journal item.
     /// </summary>
     public static Sprite? Book() => Sprite.TryLoad(UI_TEXTURE_PATH, new(32, 64, 15, 16));
 
+    /// <summary>
+    /// Sprite of a gamepad, used for the Instant Actions menu item.
+    /// </summary>
+    public static Sprite? Gamepad() => Sprite.TryLoad(UI_TEXTURE_PATH, new(0, 0, 16, 16));
+
     /// <summary>
     /// Gets the default error item sprite used for missing items.
     /// </summary>
@@ -25,6 +32,11 @@ public static class Sprites
     /// </summary>
     public static Sprite? Hammer() => Sprite.TryLoad(UI_TEXTURE_PATH, new(0, 64, 16, 16));
 
+    /// <summary>
+    /// Sprite of a bug net, used for the Instant Actions menu item.
+    /// </summary>
+    public static Sprite? BugNet() => Sprite.TryLoad(UI_TEXTURE_PATH, new(64, 0, 16, 16));
+
     /// <summary>
     /// Sprite of a letter (envelope), used for the built-in mailbox item.
     /// </summary>

StarControl/Menus/ModMenu.cs

@@ -11,6 +11,7 @@ internal class ModMenu(
     IMenuToggle toggle,
     ModConfig config,
     ModMenuItem settingsItem,
+    ModMenuItem instantActionsItem,
     Action<ModMenuItemConfiguration> shortcutActivator,
     IInvalidatableList<IRadialMenuPage> additionalPages,
     Func<int> userPageIndexSelector,
@@ -98,16 +99,23 @@ private IReadOnlyList<IRadialMenuPage> GetCombinedPages()
                     pageConfig,
                     standaloneItems,
                     shortcutActivator,
-                    config.Items.ShowSettingsItem && pageIndex == config.Items.SettingsItemPageIndex
-                        ? InsertSettingsItem
+                    pageIndex == config.Items.SettingsItemPageIndex && config.Items.ShowSettingsItem
+                    || pageIndex == config.Items.InstantActionsItemPageIndex
+                        && config.Items.ShowInstantActionsItem
+                        ? items => InsertBuiltInItems(items, pageIndex)
                         : null
                 )
             );
             pageIndex++;
         }
-        if (userPages.Count == 0 && config.Items.ShowSettingsItem)
+        if (
+            userPages.Count == 0
+            && (config.Items.ShowSettingsItem || config.Items.ShowInstantActionsItem)
+        )
         {
-            userPages.Add(new MenuPage<IRadialMenuItem>([settingsItem], _ => false));
+            var pageItems = new List<IRadialMenuItem>();
+            InsertBuiltInItems(pageItems, pageIndex: 0);
+            userPages.Add(new MenuPage<IRadialMenuItem>(pageItems, _ => false));
         }
         var pages = new List<IRadialMenuPage>(additionalPages);
         pages.InsertRange(userPageIndexSelector(), userPages);
@@ -118,14 +126,39 @@ private IReadOnlyList<IRadialMenuPage> GetCombinedPages()
         );
         return pages;
 
-        void InsertSettingsItem(List<IRadialMenuItem> items)
+        void InsertBuiltInItems(List<IRadialMenuItem> items, int pageIndex)
         {
-            var index = Math.Clamp(config.Items.SettingsItemPositionIndex, 0, items.Count - 1);
-            items.Insert(index, settingsItem);
-            Logger.Log(
-                LogCategory.Menus,
-                $"Inserted built-in Mod Settings item at position {index}."
-            );
+            var inserts = new List<(int Index, IRadialMenuItem Item, string LogName)>();
+            if (config.Items.ShowSettingsItem && pageIndex == config.Items.SettingsItemPageIndex)
+            {
+                inserts.Add((config.Items.SettingsItemPositionIndex, settingsItem, "Mod Settings"));
+            }
+            if (
+                config.Items.ShowInstantActionsItem
+                && pageIndex == config.Items.InstantActionsItemPageIndex
+            )
+            {
+                inserts.Add(
+                    (
+                        config.Items.InstantActionsItemPositionIndex,
+                        instantActionsItem,
+                        "Instant Actions"
+                    )
+                );
+            }
+            if (inserts.Count == 0)
+            {
+                return;
+            }
+            foreach (var insert in inserts.OrderBy(entry => entry.Index))
+            {
+                var index = Math.Clamp(insert.Index, 0, items.Count);
+                items.Insert(index, insert.Item);
+                Logger.Log(
+                    LogCategory.Menus,
+                    $"Inserted built-in {insert.LogName} item at position {index}."
+                );
+            }
         }
     }
 }

StarControl/Menus/QuickSlotRenderer.cs

@@ -8,6 +8,7 @@ namespace StarControl.Menus;
 internal class QuickSlotRenderer(GraphicsDevice graphicsDevice, ModConfig config)
 {
     private const float MENU_SCALE = 0.7f; // scales the entire quick action menu
+    private const float SLOT_CONTENT_SCALE = 1.2f; // scales slot visuals without moving the menu
 
     private record ButtonFlash(FlashType Type, float DurationMs, float ElapsedMs = 0);
 
@@ -53,7 +54,6 @@ private enum PromptPosition
     private readonly Dictionary<SButton, ButtonFlash> flashes = [];
     private readonly HashSet<SButton> enabledSlots = [];
     private readonly Dictionary<SButton, Sprite> slotSprites = [];
-    private readonly Texture2D uiTexture = Game1.content.Load<Texture2D>(Sprites.UI_TEXTURE_PATH);
     private readonly GraphicsDevice graphicsDevice = graphicsDevice;
 
     private Color disabledBackgroundColor = Color.Transparent;
@@ -62,6 +62,8 @@ private enum PromptPosition
     private float quickSlotScale = 1f;
     private Texture2D outerBackground = null!;
     private Texture2D slotBackground = null!;
+    private Texture2D? uiTexture;
+    private ButtonIconSet? uiTextureIconSet;
 
     public void Draw(SpriteBatch b, Rectangle viewport)
     {
@@ -277,7 +279,7 @@ private void DrawSlot(
         }
 
         var isEnabled = enabledSlots.Contains(button);
-        var backgroundRect = GetCircleRect(origin, Scale(SLOT_SIZE / 2f));
+        var backgroundRect = GetCircleRect(origin, Scale(SLOT_SIZE * SLOT_CONTENT_SCALE / 2f));
         if (darken)
         {
             var darkenRect = backgroundRect;
@@ -291,7 +293,10 @@ private void DrawSlot(
 
         if (isAssigned)
         {
-            var spriteRect = GetCircleRect(origin, Scale(IMAGE_SIZE * 1f * MENU_SCALE / 2f));
+            var spriteRect = GetCircleRect(
+                origin,
+                Scale(IMAGE_SIZE * MENU_SCALE * SLOT_CONTENT_SCALE / 2f)
+            );
             if (SlotItems.TryGetValue(button, out var item) && item.Texture is not null)
             {
                 ItemRenderer.Draw(
@@ -315,7 +320,7 @@ private void DrawSlot(
 
         if (GetPromptSprite(button) is { } promptSprite)
         {
-            var promptOffset = Scale(PROMPT_OFFSET);
+            var promptOffset = Scale(PROMPT_OFFSET * SLOT_CONTENT_SCALE);
             var promptOrigin = promptPosition switch
             {
                 PromptPosition.Above => origin.AddY(-promptOffset),
@@ -327,7 +332,10 @@ private void DrawSlot(
                     nameof(promptPosition)
                 ),
             };
-            var promptRect = GetCircleRect(promptOrigin, Scale(PROMPT_SIZE / 2f));
+            var promptRect = GetCircleRect(
+                promptOrigin,
+                Scale(PROMPT_SIZE * SLOT_CONTENT_SCALE / 2f)
+            );
             b.Draw(
                 promptSprite.Texture,
                 promptRect,
@@ -404,7 +412,23 @@ private static Sprite GetIconSprite(IconConfig icon)
         {
             return null;
         }
-        return new(uiTexture, new(columnIndex * 16, rowIndex * 16, 16, 16));
+        var texture = GetUiTexture();
+        return new(texture, new(columnIndex * 16, rowIndex * 16, 16, 16));
+    }
+
+    private Texture2D GetUiTexture()
+    {
+        var desiredSet = config.Style.ButtonIconSet;
+        if (uiTexture is null || uiTextureIconSet != desiredSet)
+        {
+            var assetPath =
+                desiredSet == ButtonIconSet.PlayStation
+                    ? Sprites.UI_PLAYSTATION_TEXTURE_PATH
+                    : Sprites.UI_TEXTURE_PATH;
+            uiTexture = Game1.content.Load<Texture2D>(assetPath);
+            uiTextureIconSet = desiredSet;
+        }
+        return uiTexture;
     }
 
     private Sprite? GetSlotSprite(IItemLookup itemLookup)

StarControl/Menus/RadialMenuController.cs

@@ -164,9 +164,15 @@ public void Update(TimeSpan elapsed)
             activeMenu = menu;
             if (previousActiveMenu is null && activeMenu is not null)
             {
+                InputPatches.RightStickCursorDeadZone = Math.Clamp(
+                    config.Input.ThumbstickDeadZone + 0.05f,
+                    0.1f,
+                    0.6f
+                );
                 InputPatches.AwaitRightStickMoveForCursor();
                 InputPatches.ForceHideCursor = true;
                 ResetMouseToPlayer();
+                InputPatches.NotifyMousePositionReset();
                 AnimateMenuOpen(elapsed); // Skip "zero" frame
             }
         }
@@ -352,6 +358,8 @@ private void Reset(bool fromActivation = false)
             ResetMouseToPlayer();
             InputPatches.SuppressRightStickFor(InputPatches.RightStickSuppressionDuration);
         }
+        InputPatches.AwaitRightStickMoveForCursor();
+        InputPatches.NotifyMousePositionReset();
         usedRightStickInMenu = false;
         if (fromActivation)
         {