Better mapping editor (Part 1 - UI)

Content.Client/Commands/MappingClientSideSetupCommand.cs

@@ -24,8 +24,9 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             _entitySystemManager.GetEntitySystem<MarkerSystem>().MarkersVisible = true;
             _lightManager.Enabled = false;
-            shell.ExecuteCommand("showsubfloorforever");
-            _entitySystemManager.GetEntitySystem<ActionsSystem>().LoadActionAssignments("/mapping_actions.yml", false);
+            shell.ExecuteCommand("showsubfloor");
+            shell.ExecuteCommand("zoom 1.5");
+            shell.ExecuteCommand("scene MappingState");
         }
     }
 }

Content.Client/Mapping/MappingActionsButton.xaml

@@ -1,8 +1,8 @@
 <mapping:MappingActionsButton
     xmlns="https://spacestation14.io"
     xmlns:mapping="clr-namespace:Content.Client.Mapping"
-    StyleClasses="ButtonSquare" ToggleMode="True" SetSize="32 32" Margin="0 0 5 0"
+    StyleClasses="ButtonSquare" ToggleMode="True" SetSize="48 48" Margin="0 0 5 0"
     TooltipDelay="0">
-    <TextureRect Name="Texture" Access="Public" Stretch="Scale" SetSize="16 16"
+    <TextureRect Name="Texture" Access="Public" Stretch="KeepAspectCentered" SetSize="24 24"
                  HorizontalAlignment="Center" VerticalAlignment="Center" />
 </mapping:MappingActionsButton>

Content.Client/Mapping/MappingManager.cs

@@ -1,25 +1,35 @@
 using System.IO;
+using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Content.Shared.Decals;
 using Content.Shared.Mapping;
+using Content.Shared.Maps;
 using Robust.Client.UserInterface;
 using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Mapping;
 
 public sealed class MappingManager : IPostInjectInit
 {
     [Dependency] private readonly IFileDialogManager _file = default!;
     [Dependency] private readonly IClientNetManager _net = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
     private Stream? _saveStream;
     private MappingMapDataMessage? _mapData;
+    private List<IPrototype>? _favoritePrototypes;
+
+    public event Action<List<IPrototype>>? OnFavoritePrototypesLoaded;
 
     public void PostInject()
     {
         _net.RegisterNetMessage<MappingSaveMapMessage>();
         _net.RegisterNetMessage<MappingSaveMapErrorMessage>(OnSaveError);
         _net.RegisterNetMessage<MappingMapDataMessage>(OnMapData);
+        _net.RegisterNetMessage<MappingFavoritesDataMessage>(OnFavoritesData);
+        _net.RegisterNetMessage<MappingFavoritesSaveMessage>();
     }
 
     private void OnSaveError(MappingSaveMapErrorMessage message)
@@ -43,6 +53,23 @@ private async void OnMapData(MappingMapDataMessage message)
         _mapData = null;
     }
 
+    private void OnFavoritesData(MappingFavoritesDataMessage message)
+    {
+        _favoritePrototypes = new List<IPrototype>();
+
+        foreach (var prototype in message.PrototypeIDs)
+        {
+            if (_prototypeManager.TryIndex<EntityPrototype>(prototype, out var entity))
+                _favoritePrototypes.Add(entity);
+            else if (_prototypeManager.TryIndex<ContentTileDefinition>(prototype, out var tile))
+                _favoritePrototypes.Add(tile);
+            else if (_prototypeManager.TryIndex<DecalPrototype>(prototype, out var decal))
+                _favoritePrototypes.Add(decal);
+        }
+
+        OnFavoritePrototypesLoaded?.Invoke(_favoritePrototypes);
+    }
+
     public async Task SaveMap()
     {
         if (_saveStream != null)
@@ -66,4 +93,23 @@ public async Task SaveMap()
 
         _saveStream = stream;
     }
+
+    public void SaveFavorites(List<MappingPrototype> prototypes)
+    {
+        // TODO: that doesnt save null prototypes (mapping templates and abstract parents)
+        var msg = new MappingFavoritesSaveMessage()
+        {
+            PrototypeIDs = prototypes
+                .FindAll(p => p.Prototype != null)
+                .Select(p => p.Prototype!.ID)
+                .ToList(),
+        };
+        _net.ClientSendMessage(msg);
+    }
+
+    public void LoadFavorites()
+    {
+        var request = new MappingFavoritesLoadMessage();
+        _net.ClientSendMessage(request);
+    }
 }

Content.Client/Mapping/MappingOverlay.cs

@@ -1,8 +1,5 @@
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
-using Robust.Client.Input;
-using Robust.Client.Player;
-using Robust.Client.UserInterface;
 using Robust.Shared.Enums;
 using Robust.Shared.Prototypes;
 using static Content.Client.Mapping.MappingState;
@@ -12,13 +9,8 @@ namespace Content.Client.Mapping;
 public sealed class MappingOverlay : Overlay
 {
     [Dependency] private readonly IEntityManager _entities = default!;
-    [Dependency] private readonly IPlayerManager _player = default!;
     [Dependency] private readonly IPrototypeManager _prototypes = default!;
 
-    // 1 off in case something else uses these colors since we use them to compare
-    private static readonly Color PickColor = new(1, 255, 0);
-    private static readonly Color DeleteColor = new(255, 1, 0);
-
     private readonly Dictionary<EntityUid, Color> _oldColors = new();
 
     private readonly MappingState _state;
@@ -38,41 +30,46 @@ protected override void Draw(in OverlayDrawArgs args)
     {
         foreach (var (id, color) in _oldColors)
         {
-            if (!_entities.TryGetComponent(id, out SpriteComponent? sprite))
-                continue;
-
-            if (sprite.Color == DeleteColor || sprite.Color == PickColor)
+            if (_entities.TryGetComponent(id, out SpriteComponent? sprite))
                 sprite.Color = color;
         }
 
         _oldColors.Clear();
 
-        if (_player.LocalEntity == null)
-            return;
-
         var handle = args.WorldHandle;
         handle.UseShader(_shader);
 
-        switch (_state.State)
+        switch (_state.Meta.State)
         {
-            case CursorState.Pick:
+            case CursorState.Tile:
+            {
+                if (_state.GetHoveredTileBox2() is { } box)
+                    args.WorldHandle.DrawRect(box, _state.Meta.Color);
+
+                break;
+            }
+            case CursorState.Entity:
             {
                 if (_state.GetHoveredEntity() is { } entity &&
                     _entities.TryGetComponent(entity, out SpriteComponent? sprite))
                 {
                     _oldColors[entity] = sprite.Color;
-                    sprite.Color = PickColor;
+                    sprite.Color = _state.Meta.Color;
                 }
 
                 break;
             }
-            case CursorState.Delete:
+            case CursorState.EntityOrTile:
             {
                 if (_state.GetHoveredEntity() is { } entity &&
                     _entities.TryGetComponent(entity, out SpriteComponent? sprite))
                 {
                     _oldColors[entity] = sprite.Color;
-                    sprite.Color = DeleteColor;
+                    sprite.Color = _state.Meta.Color;
+                }
+                else if (_state.GetHoveredTileBox2() is { } box)
+                {
+                    args.WorldHandle.DrawRect(box, _state.Meta.SecondColor ?? _state.Meta.Color);
                 }
 
                 break;

Content.Client/Mapping/MappingPrototype.cs

@@ -21,6 +21,11 @@ public sealed class MappingPrototype
     /// </summary>
     public readonly string Name;
 
+    /// <summary>
+    ///     Whether the prototype is in the “Favorites” list.
+    /// </summary>
+    public bool Favorite;
+
     /// <summary>
     ///     Which other prototypes (buttons) this one is nested inside of.
     /// </summary>

Content.Client/Mapping/MappingPrototypeList.xaml

@@ -1,13 +1,16 @@
-<mapping:MappingPrototypeList
+<mapping:MappingPrototypeList
     xmlns="https://spacestation14.io"
     xmlns:mapping="clr-namespace:Content.Client.Mapping">
     <BoxContainer Orientation="Vertical">
-        <BoxContainer Orientation="Horizontal">
-            <Button Name="CollapseAllButton" Access="Public" Text="-" SetSize="48 48"
-                    StyleClasses="ButtonSquare" ToolTip="Collapse All" TooltipDelay="0" />
-            <LineEdit Name="SearchBar" SetHeight="48" HorizontalExpand="True" Access="Public" />
-            <Button Name="ClearSearchButton" Access="Public" Text="X" SetSize="48 48"
-                    StyleClasses="ButtonSquare" />
+        <BoxContainer Orientation="Horizontal" Margin="2 1 1 5">
+            <mapping:MappingActionsButton Name="CollapseAllButton" Access="Public"
+                                          ToolTip="{Loc 'mapping-collapse-all-tooltip'}"
+                                          TooltipDelay="0" ToggleMode="False" />
+            <LineEdit Name="SearchBar" SetHeight="48" HorizontalExpand="True" Access="Public"
+                      PlaceHolder="{Loc 'mapping-search'}" />
+            <mapping:MappingActionsButton Name="ClearSearchButton" Access="Public"
+                                          ToolTip="{Loc 'mapping-clear-search-tooltip'}"
+                                          TooltipDelay="0" ToggleMode="False" />
         </BoxContainer>
         <ScrollContainer Name="ScrollContainer" Access="Public" VerticalExpand="True"
                          ReserveScrollbarSpace="True">