Merge branch 'starlight-dev' into crystal-edge-nature

Author: Conflee

Content.Client/Construction/ConstructionSystem.cs

@@ -317,6 +317,7 @@ public bool TrySpawnGhost(
                 var targetSprite = EnsureComp<SpriteComponent>(dummy);
                 EntityManager.System<AppearanceSystem>().OnChangeData(dummy, targetSprite);
 
+                var destIndex = 0; // Starlight: Track how many layers we've actually added
                 for (var i = 0; i < targetSprite.AllLayers.Count(); i++)
                 {
                     if (!targetSprite[i].Visible || !targetSprite[i].RsiState.IsValid)
@@ -327,12 +328,21 @@ public bool TrySpawnGhost(
                         state.StateId.Name is null)
                         continue;
 
-                    _sprite.AddBlankLayer((ghost.Value, sprite), i);
-                    _sprite.LayerSetSprite((ghost.Value, sprite), i, new SpriteSpecifier.Rsi(rsi.Path, state.StateId.Name));
-                    sprite.LayerSetShader(i, "unshaded");
-                    _sprite.LayerSetVisible((ghost.Value, sprite), i, true);
-                    _sprite.LayerSetOffset((ghost.Value, sprite), i, // Starlight: Fix offset not being copied
-                        targetSprite.Offset + ((SpriteComponent.Layer)targetSprite[i]).Offset); // Starlight
+                    // Starlight START
+                    // Most of these lines only changed i => destIndex. By counting how many layers we add we prevent
+                    // empty layers since empty/missing layer indices causes bugs *elsewhere*. Yay.
+                    _sprite.AddBlankLayer((ghost.Value, sprite), destIndex);
+                    _sprite.LayerSetSprite((ghost.Value, sprite), destIndex, new SpriteSpecifier.Rsi(rsi.Path, state.StateId.Name));
+                    sprite.LayerSetShader(destIndex, "unshaded");
+                    _sprite.LayerSetVisible((ghost.Value, sprite), destIndex, true);
+
+                    // This is new: Fix offset not being copied
+                    _sprite.LayerSetOffset((ghost.Value, sprite), destIndex,
+                        targetSprite.Offset + ((SpriteComponent.Layer)targetSprite[i]).Offset);
+
+                    // Count the added layer
+                    destIndex++;
+                    // Starlight END
                 }
 
                 sprite.NoRotation = targetSprite.NoRotation; // Starlight: Fix NoRotation also being ignored.

Content.Client/Drunk/DrunkOverlay.cs

@@ -1,27 +1,33 @@
 using Content.Shared.Drunk;
-using Content.Shared.StatusEffect;
 using Content.Shared.StatusEffectNew;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
 using Robust.Shared.Enums;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
+using Content.Shared._Starlight.CCVar;
+using Robust.Shared.Configuration;
 
 namespace Content.Client.Drunk;
 
 public sealed partial class DrunkOverlay : Overlay
 {
     private static readonly ProtoId<ShaderPrototype> Shader = "Drunk";
+    private static readonly TimeSpan _screenCaptureInterval = TimeSpan.FromSeconds(1.0 / 30.0); // Starlight
 
     [Dependency] private IEntityManager _entityManager = default!;
     [Dependency] private IPrototypeManager _prototypeManager = default!;
     [Dependency] private IPlayerManager _playerManager = default!;
     [Dependency] private IEntitySystemManager _sysMan = default!;
     [Dependency] private IGameTiming _timing = default!;
+    [Dependency] private IConfigurationManager _cfg = default!; // Starlight
 
     public override OverlaySpace Space => OverlaySpace.WorldSpace;
     public override bool RequestScreenTexture => true;
+    // Starlight Start
     private readonly ShaderInstance _drunkShader;
+    private readonly StatusEffectsSystem _statusEffects;
+    // Starlight End
 
     public float CurrentBoozePower = 0.0f;
 
@@ -39,11 +45,33 @@ public sealed partial class DrunkOverlay : Overlay
 
     private float _visualScale = 0;
 
+    // Starlight Start
+    private bool _drunkRenderFix;
+    private TimeSpan _nextScreenCapture;
+    private Texture? _cachedScreenTexture;
+    // Starlight End
+
     public DrunkOverlay()
     {
         IoCManager.InjectDependencies(this);
         _drunkShader = _prototypeManager.Index(Shader).InstanceUnique();
+        // Starlight Start: cache status effect system and register cvar listener
+        _statusEffects = _sysMan.GetEntitySystem<StatusEffectsSystem>();
+        _cfg.OnValueChanged(StarlightCCVars.DrunkRenderFix, OnDrunkRenderFixChanged, invokeImmediately: true);
+        // Starlight End
+    }
+
+    // Starlight Start
+    private void OnDrunkRenderFixChanged(bool enabled)
+    {
+        _drunkRenderFix = enabled;
+
+        if (!enabled)
+        {
+            _cachedScreenTexture = null;
+        }
     }
+    // Starlight End
 
     protected override void FrameUpdate(FrameEventArgs args)
     {
@@ -53,8 +81,7 @@ protected override void FrameUpdate(FrameEventArgs args)
         if (playerEntity == null)
             return;
 
-        var statusSys = _sysMan.GetEntitySystem<Shared.StatusEffectNew.StatusEffectsSystem>();
-        if (!statusSys.TryGetMaxTime<DrunkStatusEffectComponent>(playerEntity.Value, out var status))
+        if (!_statusEffects.TryGetMaxTime<DrunkStatusEffectComponent>(playerEntity.Value, out var status)) // Starlight Edit: use cached status system
             return;
 
         var time = status.Item2;
@@ -78,11 +105,26 @@ protected override bool BeforeDraw(in OverlayDrawArgs args)
 
     protected override void Draw(in OverlayDrawArgs args)
     {
-        if (ScreenTexture == null)
+        // Starlight edit Start: capture frame update every 30Hz if render fix on, otherwise everyframe
+        var screen = ScreenTexture;
+
+        if (_drunkRenderFix)
+        {
+            if (_cachedScreenTexture == null || _timing.RealTime >= _nextScreenCapture)
+            {
+                _cachedScreenTexture = ScreenTexture;
+                _nextScreenCapture = _timing.RealTime + _screenCaptureInterval;
+            }
+
+            screen = _cachedScreenTexture;
+        }
+
+        if (screen == null)
+        // Starlight edit End
             return;
 
         var handle = args.WorldHandle;
-        _drunkShader.SetParameter("SCREEN_TEXTURE", ScreenTexture);
+        _drunkShader.SetParameter("SCREEN_TEXTURE", screen); // Starlight Edit: ScreenTexture -> screen
         _drunkShader.SetParameter("boozePower", _visualScale);
         handle.UseShader(_drunkShader);
         handle.DrawRect(args.WorldBounds, Color.White);

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/_Funkystation/ContentWarning/ContentWarningPopup.xaml

@@ -1,8 +1,8 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
                       xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                       Title="{Loc 'content-warning-title'}"
-                      MinSize="520 750"
-                      MaxSize="520 750">
+                      MinSize="520 775"
+                      MaxSize="520 775"><!-- Starlight: Changed size -->
     <BoxContainer Orientation="Vertical" Margin="20">
         <Label Name="TitleLabel1"
                StyleClasses="LabelBig"

Content.Client/_Moffstation/Antags/UI/AntagEntry.xaml

@@ -26,8 +26,9 @@
                          HorizontalAlignment="Center"
                          SetSize="20 20"
                          Stretch="KeepAspectCentered"
+                         MouseFilter="Stop"
                          TexturePath="/Textures/Interface/VerbIcons/lock.svg.192dpi.png"
-                         Visible="False"/>
+                         Visible="False"/> <!-- Starlight, enable unlock requirements again -->
         </BoxContainer>
 
         <!-- Trait Info -->

Content.Client/_Moffstation/Antags/UI/AntagEntry.xaml.cs

@@ -7,6 +7,7 @@
 using Content.Shared.Roles;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
 
@@ -63,9 +64,19 @@ private void SetupRequirements(HumanoidCharacterProfile? profile) // Starlight
         AntagCheckbox.Visible = !locked;
         AntagCheckbox.Disabled = locked;
         LockIcon.Visible = locked;
-        LockIcon.TooltipSupplier = reason != null
+        #region Starlight
+        /*LockIcon.TooltipSupplier = reason != null
             ? _ => new RichTextLabel { Text = reason.ToString() }
-            : null;
+            : null;*/
+
+        if (!reason.IsEmpty)
+        {
+            var tooltip = new Tooltip();
+            tooltip.SetMessage(reason);
+            AntagCheckbox.TooltipSupplier = _ => tooltip;
+            LockIcon.TooltipSupplier = _ => tooltip;
+        }
+        #endregion
 
         if (locked)
         {

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);
         }
     }
 }