Merge branch 'starlight-dev' into WIZARD

Author: Littlemen07

Content.Client/Toggleable/ToggleableVisualsComponent.cs

@@ -27,4 +27,26 @@ public sealed partial class ToggleableVisualsComponent : Component
     /// </summary>
     [DataField]
     public Dictionary<string, List<PrototypeLayerData>> ClothingVisuals = new();
+
+    #region Starlight
+
+    /// <summary>
+    /// Additional layers to toggle.
+    /// </summary>
+    /// <remarks>
+    /// Added to avoid needing to alter several dozen prototypes.
+    /// </remarks>
+    [DataField] public List<string> AdditionalLayers = [];
+
+    /// <summary>
+    /// List of layers to ignore when modulating color with appearance data.
+    /// </summary>
+    [DataField] public List<string> ModulateIgnoreLayers = [];
+
+    /// <summary>
+    /// Toggleable visuals for when wielding item.
+    /// </summary>
+    [DataField] public Dictionary<HandLocation, List<PrototypeLayerData>> WieldingVisuals = [];
+
+    #endregion
 }

Content.Client/Toggleable/ToggleableVisualsSystem.cs

@@ -7,6 +7,8 @@
 using Content.Shared.Item;
 using Content.Shared.Light.Components;
 using Content.Shared.Toggleable;
+using Content.Shared.Wieldable;
+using Content.Shared.Wieldable.Components;
 using Robust.Client.GameObjects;
 using Robust.Shared.Utility;
 
@@ -30,6 +32,10 @@ public override void Initialize()
             after: [typeof(ItemSystem)]);
         SubscribeLocalEvent<ToggleableVisualsComponent, GetEquipmentVisualsEvent>(OnGetEquipmentVisuals,
             after: [typeof(ClientClothingSystem)]);
+        // Starlight begin
+        SubscribeLocalEvent<ToggleableVisualsComponent, ItemWieldedEvent>(OnItemWielded);
+        SubscribeLocalEvent<ToggleableVisualsComponent, ItemUnwieldedEvent>(OnItemUnwielded);
+        // Starlight end
     }
 
     protected override void OnAppearanceChange(EntityUid uid,
@@ -47,10 +53,20 @@ protected override void OnAppearanceChange(EntityUid uid,
             SpriteSystem.LayerMapTryGet((uid, args.Sprite), component.SpriteLayer, out var layer, false))
         {
             SpriteSystem.LayerSetVisible((uid, args.Sprite), layer, enabled);
-            if (modulateColor)
+            if (modulateColor && !component.ModulateIgnoreLayers.Contains(component.SpriteLayer)) // Starlight edit
                 SpriteSystem.LayerSetColor((uid, args.Sprite), component.SpriteLayer, color);
         }
 
+        // Starlight begin
+        foreach (var spriteLayer in component.AdditionalLayers)
+            if (SpriteSystem.LayerMapTryGet((uid, args.Sprite), spriteLayer, out var idx, false))
+            {
+                SpriteSystem.LayerSetVisible((uid, args.Sprite), idx, enabled);
+                if (modulateColor && !component.ModulateIgnoreLayers.Contains(spriteLayer))
+                    SpriteSystem.LayerSetColor((uid, args.Sprite), idx, color);
+            }
+        // Starlight end
+
         // If there's a `ItemTogglePointLightComponent` that says to apply the color to attached lights, do so.
         if (TryComp<ItemTogglePointLightComponent>(uid, out var toggleLights) &&
             TryComp(uid, out PointLightComponent? light))
@@ -101,7 +117,7 @@ private void OnGetEquipmentVisuals(EntityUid uid,
                 i++;
             }
 
-            if (modulateColor)
+            if (modulateColor && !component.ModulateIgnoreLayers.Contains(key)) // Starlight edit
                 layer.Color = color;
 
             args.Layers.Add((key, layer));
@@ -115,8 +131,22 @@ private void OnGetHeldVisuals(EntityUid uid, ToggleableVisualsComponent componen
             || !enabled)
             return;
 
-        if (!component.InhandVisuals.TryGetValue(args.Location, out var layers))
+        // Starlight begin
+        List<PrototypeLayerData>? layers;
+
+        if (TryComp<WieldableComponent>(uid, out var wieldable))
+        {
+            if (wieldable.Wielded && component.WieldingVisuals.Count > 0)
+            {
+                if (!component.WieldingVisuals.TryGetValue(args.Location, out layers))
+                    return;
+            }
+            else if (!component.InhandVisuals.TryGetValue(args.Location, out layers))
+                    return;
+        }
+        else if (!component.InhandVisuals.TryGetValue(args.Location, out layers))
             return;
+        // Starlight end
 
         var modulateColor = AppearanceSystem.TryGetData<Color>(uid, ToggleableVisuals.Color, out var color, appearance);
 
@@ -131,10 +161,20 @@ private void OnGetHeldVisuals(EntityUid uid, ToggleableVisualsComponent componen
                 i++;
             }
 
-            if (modulateColor)
+            if (modulateColor && !component.ModulateIgnoreLayers.Contains(key)) // Starlight edit
                 layer.Color = color;
 
             args.Layers.Add((key, layer));
         }
     }
+
+    #region Starlight
+
+    private void OnItemWielded(Entity<ToggleableVisualsComponent> ent, ref ItemWieldedEvent args) =>
+        _item.VisualsChanged(ent);
+
+    private void OnItemUnwielded(Entity<ToggleableVisualsComponent> ent, ref ItemUnwieldedEvent args) =>
+        _item.VisualsChanged(ent);
+
+    #endregion
 }

Content.Client/_Starlight/Overlay/Trail/TrailOverlay.cs

@@ -39,13 +39,13 @@ protected override void Draw(in OverlayDrawArgs args)
 
         var drawn = 0;
         var query = _entMan.EntityQueryEnumerator<TrailComponent, SpriteComponent>();
-        while (query.MoveNext(out var comp, out var sprite))
+        while (query.MoveNext(out var uid, out var comp, out var sprite))
         {
             if (comp.Mode == TrailMode.SpriteGhost)
             {
                 if (comp.Samples.Count < 2)
                     continue;
-                DrawGhostTrail(handle, comp, sprite, args);
+                DrawGhostTrail(handle, (uid, comp, sprite), args);
             }
             else
             {
@@ -171,39 +171,37 @@ private void DrawTrail(DrawingHandleWorld handle, TrailComponent comp, in Overla
             handle.UseShader(null);
     }
 
-    private void DrawGhostTrail(DrawingHandleWorld handle, TrailComponent comp, SpriteComponent sprite, in OverlayDrawArgs args)
+    private void DrawGhostTrail(DrawingHandleWorld handle, Entity<TrailComponent, SpriteComponent> ent, in OverlayDrawArgs args)
     {
-        var samples = comp.Samples;
+        var samples = ent.Comp1.Samples;
         var count = samples.Count;
 
-        var oldColor = sprite.Color;
+        var oldColor = ent.Comp2.Color;
 
-        if (sprite.Icon == null || count == 0)
+        if (ent.Comp2.Icon == null || count == 0)
             return;
 
-        for (int i = 0; i < count; i++)
+        for (var i = 0; i < count; i++)
         {
-            if (comp.SkipSamples > 0 && (i % (comp.SkipSamples + 1)) != 0)
+            if (ent.Comp1.SkipSamples > 0 && (i % (ent.Comp1.SkipSamples + 1)) != 0)
                 continue;
 
             var sample = samples[i];
-            float t = i / (float)(count - 1);
+            var t = i / (float)(count - 1);
 
-            float alpha = t * t * (3f - 2f * t);
-            alpha *= comp.TrailColor.A;
+            var alpha = t * t * (3f - 2f * t);
+            alpha *= ent.Comp1.TrailColor.A;
 
             if (alpha < 0.05f)
                 continue;
 
-            var color = Color.InterpolateBetween(comp.FadeColor, comp.TrailColor, t).WithAlpha(alpha);
+            var color = Color.InterpolateBetween(ent.Comp1.FadeColor, ent.Comp1.TrailColor, t).WithAlpha(alpha);
 
-            var ent = (sprite.Owner, sprite);
+            _spriteSys.SetColor((ent, ent.Comp2), color);
 
-            ent.sprite.Color = color;
+            _spriteSys.RenderSprite((ent, ent.Comp2), handle, sample.EyeRotation, sample.Rotation, sample.Position, null);
 
-            _spriteSys.RenderSprite(ent, handle, sample.EyeRotation, sample.Rotation, sample.Position, null);
-
-            ent.sprite.Color = oldColor;
+            _spriteSys.SetColor((ent, ent.Comp2), oldColor);
         }
     }
 }

Content.Server/Shuttles/Events/DockEvent.cs

@@ -7,8 +7,10 @@ namespace Content.Server.Shuttles.Events;
 /// </summary>
 public sealed class DockEvent : EntityEventArgs
 {
-    public DockingComponent DockA = default!;
-    public DockingComponent DockB = default!;
+    // Starlight-start
+    public Entity<DockingComponent> DockA = default!;
+    public Entity<DockingComponent> DockB = default!;
+    // Starlight-end
 
     public EntityUid GridAUid = default!;
     public EntityUid GridBUid = default!;

Content.Server/Shuttles/Events/UndockEvent.cs

@@ -7,8 +7,10 @@ namespace Content.Server.Shuttles.Events;
 /// </summary>
 public sealed class UndockEvent : EntityEventArgs
 {
-    public DockingComponent DockA = default!;
-    public DockingComponent DockB = default!;
+    // Starlight-start
+    public Entity<DockingComponent> DockA = default!;
+    public Entity<DockingComponent> DockB = default!;
+    // Starlight-end
 
     public EntityUid GridAUid = default!;
     public EntityUid GridBUid = default!;

Content.Server/Shuttles/Systems/DockingSystem.cs

@@ -142,8 +142,10 @@ private void Cleanup(EntityUid dockAUid, DockingComponent dockA)
 
             var msg = new UndockEvent
             {
-                DockA = dockA,
-                DockB = dockB,
+                // Starlight-start
+                DockA = (dockAUid, dockA),
+                DockB = (dockBUid.Value, dockB),
+                // Starlight-end
                 GridAUid = gridAUid!.Value,
                 GridBUid = gridBUid!.Value,
             };

Content.Server/Store/Systems/StoreSystem.Listings.cs

@@ -13,10 +13,10 @@ public sealed partial class StoreSystem
     /// Refreshes all listings on a store.
     /// Do not use if you don't know what you're doing.
     /// </summary>
-    /// <param name="component">The store to refresh</param>
-    public void RefreshAllListings(StoreComponent component)
+    /// <param name="ent">The store to refresh</param>
+    public void RefreshAllListings(Entity<StoreComponent> ent)
     {
-        var previousState = component.FullListingsCatalog;
+        var previousState = ent.Comp.FullListingsCatalog;
         var newState = GetAllListings();
         // if we refresh list with existing cost modifiers - they will be removed,
         // need to restore them
@@ -37,11 +37,13 @@ public void RefreshAllListings(StoreComponent component)
             }
         }
 
-        component.FullListingsCatalog = newState;
+        // Starlight-start
+        ent.Comp.FullListingsCatalog = newState;
 
         // STARLIGHT: Check if a rift has been destroyed and update the listing accordingly
         // This ensures the rift listing remains unavailable even after reopening the uplink
-        _revSupplyRift.CheckRiftDestroyedAndUpdateListing(component);
+        _revSupplyRift.CheckRiftDestroyedAndUpdateListing(ent);
+        // Starlight-end
     }
 
     /// <summary>

Content.Server/Store/Systems/StoreSystem.Ui.cs

@@ -110,7 +110,7 @@ public void UpdateUserInterface(EntityUid? user, EntityUid store, StoreComponent
 
         // STARLIGHT: Check if a rift has been destroyed and update the listing accordingly
         // This ensures the rift listing remains unavailable even when the UI is refreshed
-        _revSupplyRift.CheckRiftDestroyedAndUpdateListing(component);
+        _revSupplyRift.CheckRiftDestroyedAndUpdateListing((store, component));
 
         //this is the person who will be passed into logic for all listing filtering.
         if (user != null) //if we have no "buyer" for this update, then don't update the listings
@@ -391,7 +391,9 @@ public void UpdateAllUSSPUplinkUIs()
                 continue;
 
             // Refresh all listings to ensure they have the latest stock count and last purchaser information
-            RefreshAllListings(storeComp);
+            // Starlight-start
+            RefreshAllListings((uid, storeComp));
+            // Starlight-end
 
             // Force a refresh of the available listings
             if (storeComp.AccountOwner != null)
@@ -543,7 +545,9 @@ private void OnRequestRefund(EntityUid uid, StoreComponent component, StoreReque
         }
 
         // Reset store back to its original state
-        RefreshAllListings(component);
+        // Starlight-start
+        RefreshAllListings((uid, component));
+        // Starlight-end
         component.BalanceSpent = new();
         UpdateUserInterface(buyer, uid, component);
     }

Content.Server/Store/Systems/StoreSystem.cs

@@ -60,10 +60,11 @@ private void OnStoreOpenAttempt(Entity<AccessReaderComponent> ent, ref Activatab
 
     private void OnMapInit(EntityUid uid, StoreComponent component, MapInitEvent args)
     {
-        // STARLIGHT: Ensure the store has a StockLimitedProcessingComponent
+        // Starlight-start: Ensure the store has a StockLimitedProcessingComponent
         EnsureComp<StockLimitedProcessingComponent>(uid);
 
-        RefreshAllListings(component);
+        RefreshAllListings((uid, component));
+        // Starlight-end
         component.StartingMap = Transform(uid).MapUid;
     }
 
@@ -72,7 +73,9 @@ private void OnStartup(EntityUid uid, StoreComponent component, ComponentStartup
         // for traitors, because the StoreComponent for the PDA can be added at any time.
         if (MetaData(uid).EntityLifeStage == EntityLifeStage.MapInitialized)
         {
-            RefreshAllListings(component);
+            // Starlight-start
+            RefreshAllListings((uid, component));
+            // Starlight-end
         }
 
         var ev = new StoreAddedEvent();

Content.Server/_Starlight/Antags/Vampires/Systems/VampireSystem.cs

@@ -784,8 +784,7 @@ private void OnVampireClassChosen(EntityUid uid, VampireComponent comp, VampireC
         var classComp = _componentFactory.GetComponent(reg.Type);
         EntityManager.AddComponent(uid, classComp);
 
-        if (classProto.ID == "Umbrae")
-            EnsureComp<NightVisionComponent>(uid);
+        EnsureComp<NightVisionComponent>(uid);
 
         comp.ChosenClassId = classProto.ID;
         _vampireClasses.WithLabels(classProto.ID).Inc();