Merge pull request #1702 from hivehum/new-vision-disabilities

[DV/Nyano/Frontier Port] Deuteranopia (DogVision) and Tritanopia (UltraVision) traits

Content.Client/Options/UI/OptionsMenu.xaml

@@ -1,5 +1,6 @@
 <DefaultWindow xmlns="https://spacestation14.io"
             xmlns:tabs="clr-namespace:Content.Client.Options.UI.Tabs"
+            xmlns:dtabs="clr-namespace:Content.Client._DV.Options.UI.Tabs"
             Title="{Loc 'ui-options-title'}"
             MinSize="800 450">
     <TabContainer Name="Tabs" Access="Public">

Content.Client/Options/UI/Tabs/AccessibilityTab.xaml

@@ -8,6 +8,7 @@
                 <CheckBox Name="DisableSinguloWarpingCheckBox" Text="{Loc 'ui-options-disable-singulo-warp'}" />
                 <CheckBox Name="EnableColorNameCheckBox" Text="{Loc 'ui-options-enable-color-name'}" />
                 <CheckBox Name="ColorblindFriendlyCheckBox" Text="{Loc 'ui-options-colorblind-friendly'}" />
+                <CheckBox Name="DisableFiltersCheckBox" Text="{Loc 'ui-options-no-filters'}" />
                 <ui:OptionSlider Name="ChatWindowOpacitySlider" Title="{Loc 'ui-options-chat-window-opacity'}" />
                 <ui:OptionSlider Name="ScreenShakeIntensitySlider" Title="{Loc 'ui-options-screen-shake-intensity'}" />
                 <CheckBox Name="AutoFillHighlightsCheckBox" Text="{Loc 'ui-options-auto-fill-highlights'}" />

Content.Client/Options/UI/Tabs/AccessibilityTab.xaml.cs

@@ -1,4 +1,5 @@
 using Content.Shared._Impstation.CCVar;
+using Content.Shared._DV.CCVars;
 using Content.Shared.CCVar;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
@@ -17,6 +18,7 @@ public AccessibilityTab()
         Control.AddOptionCheckBox(CCVars.AccessibilityColorblindFriendly, ColorblindFriendlyCheckBox);
         Control.AddOptionCheckBox(CCVars.ReducedMotion, ReducedMotionCheckBox);
         Control.AddOptionCheckBox(ImpCCVars.DisableSinguloWarping, DisableSinguloWarpingCheckBox);
+        Control.AddOptionCheckBox(DCCVars.NoVisionFilters, DisableFiltersCheckBox);
         Control.AddOptionPercentSlider(CCVars.ChatWindowOpacity, ChatWindowOpacitySlider);
         Control.AddOptionPercentSlider(CCVars.ScreenShakeIntensity, ScreenShakeIntensitySlider);
         Control.AddOptionCheckBox(ImpCCVars.ChatAutoFillHighlights, AutoFillHighlightsCheckBox);

Content.Client/_DV/Overlays/UltraVisionOverlay.cs

@@ -0,0 +1,52 @@
+using Robust.Client.Graphics;
+using Robust.Client.Player;
+using Robust.Shared.Enums;
+using Robust.Shared.Prototypes;
+using Content.Shared.Abilities;
+using System.Numerics;
+
+namespace Content.Client._DV.Overlays;
+
+public sealed partial class UltraVisionOverlay : Overlay
+{
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] IEntityManager _entityManager = default!;
+
+
+    public override bool RequestScreenTexture => true;
+    public override OverlaySpace Space => OverlaySpace.WorldSpace;
+    private readonly ShaderInstance _ultraVisionShader;
+
+    public UltraVisionOverlay()
+    {
+        IoCManager.InjectDependencies(this);
+        _ultraVisionShader = _prototypeManager.Index<ShaderPrototype>("UltraVision").Instance().Duplicate();
+    }
+
+    protected override bool BeforeDraw(in OverlayDrawArgs args)
+    {
+        if (_playerManager.LocalEntity is not { Valid: true } player
+            || !_entityManager.HasComponent<UltraVisionComponent>(player))
+        {
+            return false;
+        }
+
+        return base.BeforeDraw(in args);
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        if (ScreenTexture is null)
+            return;
+
+        _ultraVisionShader.SetParameter("SCREEN_TEXTURE", ScreenTexture);
+
+        var worldHandle = args.WorldHandle;
+        var viewport = args.WorldBounds;
+        worldHandle.SetTransform(Matrix3x2.Identity);
+        worldHandle.UseShader(_ultraVisionShader);
+        worldHandle.DrawRect(viewport, Color.White);
+        worldHandle.UseShader(null); // important - as of writing, construction overlay breaks without this
+    }
+}

Content.Client/_DV/Overlays/UltraVisionSystem.cs

@@ -0,0 +1,61 @@
+using Content.Shared.Abilities;
+using Content.Shared._DV.CCVars;
+using Robust.Client.Graphics;
+using Robust.Shared.Configuration;
+using Robust.Shared.Player;
+
+namespace Content.Client._DV.Overlays;
+
+public sealed partial class UltraVisionSystem : EntitySystem
+{
+    [Dependency] private readonly IOverlayManager _overlayMan = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly ISharedPlayerManager _playerMan = default!;
+
+    private UltraVisionOverlay _overlay = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<UltraVisionComponent, ComponentInit>(OnUltraVisionInit);
+        SubscribeLocalEvent<UltraVisionComponent, ComponentShutdown>(OnUltraVisionShutdown);
+        SubscribeLocalEvent<UltraVisionComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
+        SubscribeLocalEvent<UltraVisionComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
+
+        Subs.CVar(_cfg, DCCVars.NoVisionFilters, OnNoVisionFiltersChanged);
+
+        _overlay = new();
+    }
+
+    private void OnUltraVisionInit(EntityUid uid, UltraVisionComponent component, ComponentInit args)
+    {
+        if (uid == _playerMan.LocalEntity && !_cfg.GetCVar(DCCVars.NoVisionFilters))
+            _overlayMan.AddOverlay(_overlay);
+    }
+
+    private void OnUltraVisionShutdown(EntityUid uid, UltraVisionComponent component, ComponentShutdown args)
+    {
+        if (uid == _playerMan.LocalEntity)
+            _overlayMan.RemoveOverlay(_overlay);
+    }
+
+    private void OnPlayerAttached(EntityUid uid, UltraVisionComponent component, LocalPlayerAttachedEvent args)
+    {
+        if (!_cfg.GetCVar(DCCVars.NoVisionFilters))
+            _overlayMan.AddOverlay(_overlay);
+    }
+
+    private void OnPlayerDetached(EntityUid uid, UltraVisionComponent component, LocalPlayerDetachedEvent args)
+    {
+        _overlayMan.RemoveOverlay(_overlay);
+    }
+
+    private void OnNoVisionFiltersChanged(bool enabled)
+    {
+        if (enabled)
+            _overlayMan.RemoveOverlay(_overlay);
+        else
+            _overlayMan.AddOverlay(_overlay);
+    }
+}

Content.Client/_Nyanotrasen/Overlays/DogVisionOverlay.cs

@@ -0,0 +1,52 @@
+using System.Numerics;
+using Robust.Client.Graphics;
+using Robust.Client.Player;
+using Robust.Shared.Enums;
+using Robust.Shared.Prototypes;
+using Content.Shared.Abilities;
+
+namespace Content.Client._Nyanotrasen.Overlays;
+
+public sealed partial class DogVisionOverlay : Overlay
+{
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] IEntityManager _entityManager = default!;
+
+
+    public override bool RequestScreenTexture => true;
+    public override OverlaySpace Space => OverlaySpace.WorldSpace;
+    private readonly ShaderInstance _dogVisionShader;
+
+    public DogVisionOverlay()
+    {
+        IoCManager.InjectDependencies(this);
+        _dogVisionShader = _prototypeManager.Index<ShaderPrototype>("DogVision").Instance().Duplicate();
+    }
+
+    protected override bool BeforeDraw(in OverlayDrawArgs args)
+    {
+        if (_playerManager.LocalEntity is not { Valid: true } player
+            || !_entityManager.HasComponent<DogVisionComponent>(player))
+        {
+            return false;
+        }
+
+        return base.BeforeDraw(in args);
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        if (ScreenTexture is null)
+            return;
+
+        _dogVisionShader.SetParameter("SCREEN_TEXTURE", ScreenTexture);
+
+        var worldHandle = args.WorldHandle;
+        var viewport = args.WorldBounds;
+        worldHandle.SetTransform(Matrix3x2.Identity);
+        worldHandle.UseShader(_dogVisionShader);
+        worldHandle.DrawRect(viewport, Color.White);
+        worldHandle.UseShader(null); // important - as of writing, construction overlay breaks without this
+    }
+}

Content.Client/_Nyanotrasen/Overlays/DogVisionSystem.cs

@@ -0,0 +1,61 @@
+using Content.Shared.Abilities;
+using Content.Shared._DV.CCVars;
+using Robust.Client.Graphics;
+using Robust.Shared.Configuration;
+using Robust.Shared.Player;
+
+namespace Content.Client._Nyanotrasen.Overlays;
+
+public sealed partial class DogVisionSystem : EntitySystem
+{
+    [Dependency] private readonly IOverlayManager _overlayMan = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly ISharedPlayerManager _playerMan = default!;
+
+    private DogVisionOverlay _overlay = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DogVisionComponent, ComponentInit>(OnDogVisionInit);
+        SubscribeLocalEvent<DogVisionComponent, ComponentShutdown>(OnDogVisionShutdown);
+        SubscribeLocalEvent<DogVisionComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
+        SubscribeLocalEvent<DogVisionComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
+
+        Subs.CVar(_cfg, DCCVars.NoVisionFilters, OnNoVisionFiltersChanged);
+
+        _overlay = new();
+    }
+
+    private void OnDogVisionInit(EntityUid uid, DogVisionComponent component, ComponentInit args)
+    {
+        if (uid == _playerMan.LocalEntity && !_cfg.GetCVar(DCCVars.NoVisionFilters))
+            _overlayMan.AddOverlay(_overlay);
+    }
+
+    private void OnDogVisionShutdown(EntityUid uid, DogVisionComponent component, ComponentShutdown args)
+    {
+        if (uid == _playerMan.LocalEntity)
+            _overlayMan.RemoveOverlay(_overlay);
+    }
+
+    private void OnPlayerAttached(EntityUid uid, DogVisionComponent component, LocalPlayerAttachedEvent args)
+    {
+        if (!_cfg.GetCVar(DCCVars.NoVisionFilters))
+            _overlayMan.AddOverlay(_overlay);
+    }
+
+    private void OnPlayerDetached(EntityUid uid, DogVisionComponent component, LocalPlayerDetachedEvent args)
+    {
+        _overlayMan.RemoveOverlay(_overlay);
+    }
+
+    private void OnNoVisionFiltersChanged(bool enabled)
+    {
+        if (enabled)
+            _overlayMan.RemoveOverlay(_overlay);
+        else
+            _overlayMan.AddOverlay(_overlay);
+    }
+}

Content.Shared/_DV/Abilities/UltraVisionComponent.cs

@@ -0,0 +1,8 @@
+using Robust.Shared.GameStates;
+namespace Content.Shared.Abilities;
+
+[RegisterComponent]
+[NetworkedComponent]
+
+public sealed partial class UltraVisionComponent : Component
+{}

Content.Shared/_DV/CCVars/DCCVars.cs

@@ -111,4 +111,9 @@ public sealed class DCCVars
     public static readonly CVarDef<int> MailLargeMalus =
         CVarDef.Create("mail.largemalus", -250, CVar.SERVERONLY);
 
+    /// <summary>
+    /// Disables all vision filters for species like Vulpkanin or Harpies. There are good reasons someone might want to disable these.
+    /// </summary>
+    public static readonly CVarDef<bool> NoVisionFilters =
+        CVarDef.Create("accessibility.no_vision_filters", false, CVar.CLIENTONLY | CVar.ARCHIVE);
 }

Content.Shared/_Nyanotrasen/Abilities/DogVisionComponent.cs

@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Abilities
+{
+    [RegisterComponent]
+    [NetworkedComponent]
+
+    public sealed partial class DogVisionComponent : Component
+    {}
+}

Resources/Locale/en-US/_DV/escape-menu/options-menu.ftl

@@ -0,0 +1,4 @@
+ui-options-tab-extra = Extra
+ui-options-general-forknotice = Note: These settings are fork-specific and might not apply on other servers.
+
+ui-options-no-filters = Disable trait-specific shaders

Resources/Locale/en-US/_DV/traits/traits.ftl

@@ -24,3 +24,13 @@ trait-estradiol-sensitive-desc = Your body is capable of taking on Nanotrasen's
 
 trait-testosterone-sensitive-name = Testosterone sensitive
 trait-testosterone-sensitive-desc = Your body is capable of taking on Nanotrasen's special masculinization medicines.
+
+# impstation edit - removing mentions of unimplemented species
+
+trait-ultravision-name = Ultraviolet vision
+trait-ultravision-desc = Whether through custom bionic eyes, random mutation,
+                         or something else, you perceive the world with ultraviolet light.
+
+trait-deuteranopia-name = Deuteranopia
+trait-deuteranopia-desc = Whether through custom bionic eyes, random mutation,
+                          or something else, you have red-green colour blindness.

Resources/Prototypes/_DV/Shaders/birdvision.yml

@@ -0,0 +1,4 @@
+- type: shader
+  id: UltraVision
+  kind: source
+  path: "/Textures/_DV/Shaders/ultravision.swsl"

Resources/Prototypes/_DV/Traits/disabilities.yml

@@ -0,0 +1,15 @@
+- type: trait
+  id: UltraVision
+  name: trait-ultravision-name
+  description: trait-ultravision-desc
+  category: Disabilities
+  components:
+    - type: UltraVision
+
+- type: trait
+  id: DogVision
+  name: trait-deuteranopia-name
+  description: trait-deuteranopia-desc
+  category: Disabilities
+  components:
+    - type: DogVision

Resources/Prototypes/_Nyanotrasen/Shaders/dogvision.yml

@@ -0,0 +1,4 @@
+- type: shader
+  id: DogVision
+  kind: source
+  path: "/Textures/_Nyanotrasen/Shaders/dogvision.swsl"

Resources/Textures/_DV/Shaders/ultravision.swsl

@@ -0,0 +1,14 @@
+uniform sampler2D SCREEN_TEXTURE;
+
+void fragment() {
+    highp vec4 color = zTextureSpec(SCREEN_TEXTURE, UV);
+
+    highp mat3 m = mat3(
+        vec3(0.000,1.000,0.000),
+        vec3(0.000,0.000,1.000),
+        vec3(-0.165,0.165,1.000)
+    );
+    highp vec3 result = color.rgb * m;
+
+    COLOR = vec4(result, 1);
+}

Resources/Textures/_Nyanotrasen/Shaders/dogvision.swsl

@@ -0,0 +1,14 @@
+uniform sampler2D SCREEN_TEXTURE;
+
+void fragment() {
+    highp vec4 color = zTextureSpec(SCREEN_TEXTURE, UV);
+
+    highp mat3 m = mat3(
+        vec3(0.625,0.375,0.000),
+        vec3(0.700,0.300,0.000),
+        vec3(0.000,0.300,0.700)
+    );
+    highp vec3 result = color.rgb * m;
+
+    COLOR = vec4(result, 1);
+}