diff --git a/.editorconfig b/.editorconfig
index 872a068c7c..370c3f9dee 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,6 +12,7 @@ tab_width = 4
#end_of_line = crlf
insert_final_newline = true
trim_trailing_whitespace = true
+max_line_length = 120
#### .NET Coding Conventions ####
@@ -71,7 +72,7 @@ csharp_style_expression_bodied_constructors = false:suggestion
#csharp_style_expression_bodied_indexers = true:silent
#csharp_style_expression_bodied_lambdas = true:silent
#csharp_style_expression_bodied_local_functions = false:silent
-csharp_style_expression_bodied_methods = false:suggestion
+csharp_style_expression_bodied_methods = true:suggestion
#csharp_style_expression_bodied_operators = false:silent
csharp_style_expression_bodied_properties = true:suggestion
@@ -336,7 +337,11 @@ dotnet_naming_symbols.type_parameters_symbols.applicable_kinds = type_parameter
# ReSharper properties
resharper_braces_for_ifelse = required_for_multiline
+resharper_csharp_wrap_arguments_style = chop_if_long
+resharper_csharp_wrap_parameters_style = chop_if_long
resharper_keep_existing_attribute_arrangement = true
+resharper_wrap_chained_binary_patterns = chop_if_long
+resharper_wrap_chained_method_calls = chop_if_long
[*.{csproj,xml,yml,yaml,dll.config,msbuildproj,targets,props}]
indent_size = 2
diff --git a/.envrc b/.envrc
index 5def8fd66a..7fd05db3e5 100644
--- a/.envrc
+++ b/.envrc
@@ -1,4 +1,4 @@
-if ! has nix_direnv_version || ! nix_direnv_version 2.3.0; then
- source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.3.0/direnvrc" "sha256-Dmd+j63L84wuzgyjITIfSxSD57Tx7v51DMxVZOsiUD8="
+if ! has nix_direnv_version || ! nix_direnv_version 3.0.4; then
+ source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.4/direnvrc" "sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4="
fi
use flake
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6a40012b4c..a50306f179 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,19 +4,19 @@
/Content.*/ @DEATHB4DEFEAT
-/Content.*/SimpleStation14/ @Pspritechologist @DEATHB4DEFEAT
+/Content.*/Parkstation/ @Pspritechologist @DEATHB4DEFEAT
/Resources/ @DEATHB4DEFEAT
-/Resources/Audio/SimpleStation14 @Pspritechologist @DEATHB4DEFEAT
+/Resources/Audio/Parkstation @Pspritechologist @DEATHB4DEFEAT
/Resources/Maps/ @Pspritechologist @DEATHB4DEFEAT
/Resources/Prototypes/Maps @Pspritechologist @DEATHB4DEFEAT
-/Resources/Prototypes/SimpleStation14/ @Pspritechologist @DEATHB4DEFEAT
+/Resources/Prototypes/Parkstation/ @Pspritechologist @DEATHB4DEFEAT
-/Resources/Textures/SimpleStation14/ @Pspritechologist @DEATHB4DEFEAT
+/Resources/Textures/Parkstation/ @Pspritechologist @DEATHB4DEFEAT
*.ftl @Pspritechologist @DEATHB4DEFEAT
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
deleted file mode 100644
index 09c9e76b19..0000000000
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-contact_links:
- - name: Report a Security Vulnerability
- url: https://github.com/space-wizards/space-station-14/blob/master/SECURITY.md
- about: Please report security vulnerabilities privately so we can fix them before they are publicly disclosed.
- - name: Request a Feature
- url: https://discord.gg/rGvu9hKffJ
- about: Submit feature requests on our Discord server (https://discord.gg/rGvu9hKffJ).
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
new file mode 100644
index 0000000000..aba549332f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -0,0 +1,27 @@
+---
+name: Request a Feature
+about: "Template for noting future planned features. Please ask for approval in the Discord if you aren't an organization Member before posting a feature request"
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+
+
+# Description
+
+
+I want Goldfish crackers
+
+# Media
+
+
+
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..51f9de8baf
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,27 @@
+---
+name: Request a feature
+about: "Please outline your request in Discord first if you aren't a maintainer."
+title: ''
+labels: ["Type: Feature"]
+assignees: ''
+
+---
+
+
+
+# Description
+
+
+I want Goldfish crackers
+
+# Media
+
+
+
diff --git a/.github/ISSUE_TEMPLATE/issue_report.md b/.github/ISSUE_TEMPLATE/issue_report.md
index f18221e055..c74f24554a 100644
--- a/.github/ISSUE_TEMPLATE/issue_report.md
+++ b/.github/ISSUE_TEMPLATE/issue_report.md
@@ -1,32 +1,55 @@
---
-name: Report an Issue
-about: "..."
+name: Report an issue
+about: "Any issues found in gameplay or the codebase"
title: ''
-labels: ''
+labels: 'Type: Bug'
assignees: ''
---
+
+
# Description
+Description
+
# Reproduction
-# Screenshots
+1. Open game
+2. Game doesn't open
+
+# Expected behavior
+1. Open game
+2. Game opens
+
+# Media
+
+
+
+
# Additional context
+
+There's a ghost in my computer
diff --git a/.github/ISSUE_TEMPLATE/toolshed-feature-request.md b/.github/ISSUE_TEMPLATE/toolshed-feature-request.md
deleted file mode 100644
index dae84c3e25..0000000000
--- a/.github/ISSUE_TEMPLATE/toolshed-feature-request.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-name: Toolshed feature request
-about: Suggest a feature for Toolshed (for game admins/developers)
-title: "[TOOLSHED REQUEST]"
-labels: Toolshed
-assignees: moonheart08
-
----
-
-**Is your feature request related to a problem/bug? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the command you'd like**
-A clear and concise description of what you want and what it should do.
-If you're a technical user (i.e. programmer) including type signatures is helpful.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index bb0ae5066a..5d3ce070bc 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,20 +1,46 @@
+
+
# Description
+
+
Description.
---
# TODO
+
+
- [ ] Task
- [x] Completed Task
---
+
+
Media
-
+
+ /// Uses FormatedMessage.FromMarkupPermissive which treats invalid markup as text.
+ ///
+ public static RichTextLabel SetMarkupPermissive(this RichTextLabel label, string markup)
+ {
+ label.SetMessage(FormattedMessage.FromMarkupPermissive(markup));
+ return label;
+ }
}
diff --git a/Content.Client/MouseRotator/MouseRotatorSystem.cs b/Content.Client/MouseRotator/MouseRotatorSystem.cs
index 9615862dc5..363c8248c9 100644
--- a/Content.Client/MouseRotator/MouseRotatorSystem.cs
+++ b/Content.Client/MouseRotator/MouseRotatorSystem.cs
@@ -23,7 +23,7 @@ public override void Update(float frameTime)
if (!_timing.IsFirstTimePredicted || !_input.MouseScreenPosition.IsValid)
return;
- var player = _player.LocalPlayer?.ControlledEntity;
+ var player = _player.LocalEntity;
if (player == null || !TryComp(player, out var rotator))
return;
@@ -45,13 +45,19 @@ public override void Update(float frameTime)
// only raise event if the cardinal direction has changed
if (rotator.Simple4DirMode)
{
- var angleDir = angle.GetCardinalDir();
- if (angleDir == curRot.GetCardinalDir())
+ var eyeRot = _eye.CurrentEye.Rotation; // camera rotation
+ var angleDir = (angle + eyeRot).GetCardinalDir(); // apply GetCardinalDir in the camera frame, not in the world frame
+ if (angleDir == (curRot + eyeRot).GetCardinalDir())
return;
- RaisePredictiveEvent(new RequestMouseRotatorRotationSimpleEvent()
+ var rotation = angleDir.ToAngle() - eyeRot; // convert back to world frame
+ if (rotation >= Math.PI) // convert to [-PI, +PI)
+ rotation -= 2 * Math.PI;
+ else if (rotation < -Math.PI)
+ rotation += 2 * Math.PI;
+ RaisePredictiveEvent(new RequestMouseRotatorRotationEvent
{
- Direction = angleDir,
+ Rotation = rotation
});
return;
diff --git a/Content.Client/Movement/Systems/ContentEyeSystem.cs b/Content.Client/Movement/Systems/ContentEyeSystem.cs
index d8f73b0057..182ac92ae0 100644
--- a/Content.Client/Movement/Systems/ContentEyeSystem.cs
+++ b/Content.Client/Movement/Systems/ContentEyeSystem.cs
@@ -23,7 +23,7 @@ public void RequestZoom(EntityUid uid, Vector2 zoom, bool ignoreLimit, ContentEy
public void RequestToggleFov()
{
- if (_player.LocalPlayer?.ControlledEntity is { } player)
+ if (_player.LocalEntity is { } player)
RequestToggleFov(player);
}
diff --git a/Content.Client/Movement/Systems/FloorOcclusionSystem.cs b/Content.Client/Movement/Systems/FloorOcclusionSystem.cs
index 27ba99b3aa..5c75f25ca2 100644
--- a/Content.Client/Movement/Systems/FloorOcclusionSystem.cs
+++ b/Content.Client/Movement/Systems/FloorOcclusionSystem.cs
@@ -43,9 +43,14 @@ protected override void SetEnabled(EntityUid uid, FloorOcclusionComponent compon
private void SetShader(SpriteComponent sprite, bool enabled)
{
+ var shader = _proto.Index("HorizontalCut").Instance();
+
+ if (sprite.PostShader is not null && sprite.PostShader != shader)
+ return;
+
if (enabled)
{
- sprite.PostShader = _proto.Index("HorizontalCut").Instance();
+ sprite.PostShader = shader;
}
else
{
diff --git a/Content.Client/Movement/Systems/JetpackSystem.cs b/Content.Client/Movement/Systems/JetpackSystem.cs
index f0836ee9b6..b7f5e48821 100644
--- a/Content.Client/Movement/Systems/JetpackSystem.cs
+++ b/Content.Client/Movement/Systems/JetpackSystem.cs
@@ -4,6 +4,7 @@
using Content.Shared.Movement.Systems;
using Robust.Client.GameObjects;
using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
using Robust.Shared.Physics.Components;
using Robust.Shared.Timing;
@@ -12,7 +13,6 @@ namespace Content.Client.Movement.Systems;
public sealed class JetpackSystem : SharedJetpackSystem
{
[Dependency] private readonly IGameTiming _timing = default!;
- [Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly ClothingSystem _clothing = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
@@ -75,7 +75,7 @@ private void CreateParticles(EntityUid uid)
var coordinates = uidXform.Coordinates;
var gridUid = coordinates.GetGridUid(EntityManager);
- if (_mapManager.TryGetGrid(gridUid, out var grid))
+ if (TryComp(gridUid, out var grid))
{
coordinates = new EntityCoordinates(gridUid.Value, grid.WorldToLocal(coordinates.ToMapPos(EntityManager, _transform)));
}
diff --git a/Content.Client/Movement/Systems/WaddleAnimationSystem.cs b/Content.Client/Movement/Systems/WaddleAnimationSystem.cs
new file mode 100644
index 0000000000..9555c1f6b9
--- /dev/null
+++ b/Content.Client/Movement/Systems/WaddleAnimationSystem.cs
@@ -0,0 +1,173 @@
+using System.Numerics;
+using Content.Client.Buckle;
+using Content.Client.Gravity;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Buckle.Components;
+using Content.Shared.Mobs.Systems;
+using Content.Shared.Movement.Components;
+using Content.Shared.Movement.Events;
+using Content.Shared.StatusEffect;
+using Content.Shared.Stunnable;
+using Robust.Client.Animations;
+using Robust.Client.GameObjects;
+using Robust.Shared.Animations;
+using Robust.Shared.Timing;
+
+namespace Content.Client.Movement.Systems;
+
+public sealed class WaddleAnimationSystem : EntitySystem
+{
+ [Dependency] private readonly AnimationPlayerSystem _animation = default!;
+ [Dependency] private readonly GravitySystem _gravity = default!;
+ [Dependency] private readonly IGameTiming _timing = default!;
+ [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
+ [Dependency] private readonly BuckleSystem _buckle = default!;
+ [Dependency] private readonly MobStateSystem _mobState = default!;
+
+ public override void Initialize()
+ {
+ SubscribeLocalEvent(OnMovementInput);
+ SubscribeLocalEvent(OnStartedWalking);
+ SubscribeLocalEvent(OnStoppedWalking);
+ SubscribeLocalEvent(OnAnimationCompleted);
+ SubscribeLocalEvent(OnStunned);
+ SubscribeLocalEvent(OnKnockedDown);
+ SubscribeLocalEvent(OnBuckleChange);
+ }
+
+ private void OnMovementInput(EntityUid entity, WaddleAnimationComponent component, MoveInputEvent args)
+ {
+ // Prediction mitigation. Prediction means that MoveInputEvents are spammed repeatedly, even though you'd assume
+ // they're once-only for the user actually doing something. As such do nothing if we're just repeating this FoR.
+ if (!_timing.IsFirstTimePredicted)
+ {
+ return;
+ }
+
+ if (!args.HasDirectionalMovement && component.IsCurrentlyWaddling)
+ {
+ var stopped = new StoppedWaddlingEvent(entity);
+
+ RaiseLocalEvent(entity, ref stopped);
+
+ return;
+ }
+
+ // Only start waddling if we're not currently AND we're actually moving.
+ if (component.IsCurrentlyWaddling || !args.HasDirectionalMovement)
+ return;
+
+ var started = new StartedWaddlingEvent(entity);
+
+ RaiseLocalEvent(entity, ref started);
+ }
+
+ private void OnStartedWalking(EntityUid uid, WaddleAnimationComponent component, StartedWaddlingEvent args)
+ {
+ if (_animation.HasRunningAnimation(uid, component.KeyName))
+ return;
+
+ if (!TryComp(uid, out var mover))
+ return;
+
+ if (_gravity.IsWeightless(uid))
+ return;
+
+
+ if (!_actionBlocker.CanMove(uid, mover))
+ return;
+
+ // Do nothing if buckled in
+ if (_buckle.IsBuckled(uid))
+ return;
+
+ // Do nothing if crit or dead (for obvious reasons)
+ if (_mobState.IsIncapacitated(uid))
+ return;
+
+ var tumbleIntensity = component.LastStep ? 360 - component.TumbleIntensity : component.TumbleIntensity;
+ var len = mover.Sprinting ? component.AnimationLength * component.RunAnimationLengthMultiplier : component.AnimationLength;
+
+ component.LastStep = !component.LastStep;
+ component.IsCurrentlyWaddling = true;
+
+ var anim = new Animation()
+ {
+ Length = TimeSpan.FromSeconds(len),
+ AnimationTracks =
+ {
+ new AnimationTrackComponentProperty()
+ {
+ ComponentType = typeof(SpriteComponent),
+ Property = nameof(SpriteComponent.Rotation),
+ InterpolationMode = AnimationInterpolationMode.Linear,
+ KeyFrames =
+ {
+ new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(0), 0),
+ new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(tumbleIntensity), len/2),
+ new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(0), len/2),
+ }
+ },
+ new AnimationTrackComponentProperty()
+ {
+ ComponentType = typeof(SpriteComponent),
+ Property = nameof(SpriteComponent.Offset),
+ InterpolationMode = AnimationInterpolationMode.Linear,
+ KeyFrames =
+ {
+ new AnimationTrackProperty.KeyFrame(new Vector2(), 0),
+ new AnimationTrackProperty.KeyFrame(component.HopIntensity, len/2),
+ new AnimationTrackProperty.KeyFrame(new Vector2(), len/2),
+ }
+ }
+ }
+ };
+
+ _animation.Play(uid, anim, component.KeyName);
+ }
+
+ private void OnStoppedWalking(EntityUid uid, WaddleAnimationComponent component, StoppedWaddlingEvent args)
+ {
+ StopWaddling(uid, component);
+ }
+
+ private void OnAnimationCompleted(EntityUid uid, WaddleAnimationComponent component, AnimationCompletedEvent args)
+ {
+ var started = new StartedWaddlingEvent(uid);
+
+ RaiseLocalEvent(uid, ref started);
+ }
+
+ private void OnStunned(EntityUid uid, WaddleAnimationComponent component, StunnedEvent args)
+ {
+ StopWaddling(uid, component);
+ }
+
+ private void OnKnockedDown(EntityUid uid, WaddleAnimationComponent component, KnockedDownEvent args)
+ {
+ StopWaddling(uid, component);
+ }
+
+ private void OnBuckleChange(EntityUid uid, WaddleAnimationComponent component, BuckleChangeEvent args)
+ {
+ StopWaddling(uid, component);
+ }
+
+ private void StopWaddling(EntityUid uid, WaddleAnimationComponent component)
+ {
+ if (!component.IsCurrentlyWaddling)
+ return;
+
+ _animation.Stop(uid, component.KeyName);
+
+ if (!TryComp(uid, out var sprite))
+ {
+ return;
+ }
+
+ sprite.Offset = new Vector2();
+ sprite.Rotation = Angle.FromDegrees(0);
+
+ component.IsCurrentlyWaddling = false;
+ }
+}
diff --git a/Content.Client/NPC/PathfindingSystem.cs b/Content.Client/NPC/PathfindingSystem.cs
index 548edd601c..d3ae509152 100644
--- a/Content.Client/NPC/PathfindingSystem.cs
+++ b/Content.Client/NPC/PathfindingSystem.cs
@@ -23,6 +23,7 @@ public sealed class PathfindingSystem : SharedPathfindingSystem
[Dependency] private readonly IResourceCache _cache = default!;
[Dependency] private readonly NPCSteeringSystem _steering = default!;
[Dependency] private readonly MapSystem _mapSystem = default!;
+ [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
public PathfindingDebugMode Modes
{
@@ -39,7 +40,7 @@ public PathfindingDebugMode Modes
}
else if (!overlayManager.HasOverlay())
{
- overlayManager.AddOverlay(new PathfindingOverlay(EntityManager, _eyeManager, _inputManager, _mapManager, _cache, this, _mapSystem));
+ overlayManager.AddOverlay(new PathfindingOverlay(EntityManager, _eyeManager, _inputManager, _mapManager, _cache, this, _mapSystem, _transformSystem));
}
if ((value & PathfindingDebugMode.Steering) != 0x0)
@@ -140,6 +141,7 @@ public sealed class PathfindingOverlay : Overlay
private readonly IMapManager _mapManager;
private readonly PathfindingSystem _system;
private readonly MapSystem _mapSystem;
+ private readonly SharedTransformSystem _transformSystem;
public override OverlaySpace Space => OverlaySpace.ScreenSpace | OverlaySpace.WorldSpace;
@@ -153,7 +155,8 @@ public PathfindingOverlay(
IMapManager mapManager,
IResourceCache cache,
PathfindingSystem system,
- MapSystem mapSystem)
+ MapSystem mapSystem,
+ SharedTransformSystem transformSystem)
{
_entManager = entManager;
_eyeManager = eyeManager;
@@ -161,6 +164,7 @@ public PathfindingOverlay(
_mapManager = mapManager;
_system = system;
_mapSystem = mapSystem;
+ _transformSystem = transformSystem;
_font = new VectorFont(cache.GetResource("/Fonts/NotoSans/NotoSans-Regular.ttf"), 10);
}
@@ -219,7 +223,7 @@ private void DrawScreen(OverlayDrawArgs args, DrawingHandleScreen screenHandle)
foreach (var crumb in chunk.Value)
{
- var crumbMapPos = worldMatrix.Transform(_system.GetCoordinate(chunk.Key, crumb.Coordinates));
+ var crumbMapPos = Vector2.Transform(_system.GetCoordinate(chunk.Key, crumb.Coordinates), worldMatrix);
var distance = (crumbMapPos - mouseWorldPos.Position).Length();
if (distance < nearestDistance)
@@ -285,11 +289,10 @@ private void DrawScreen(OverlayDrawArgs args, DrawingHandleScreen screenHandle)
var invGridMatrix = gridXform.InvWorldMatrix;
DebugPathPoly? nearest = null;
- var nearestDistance = float.MaxValue;
foreach (var poly in tile)
{
- if (poly.Box.Contains(invGridMatrix.Transform(mouseWorldPos.Position)))
+ if (poly.Box.Contains(Vector2.Transform(mouseWorldPos.Position, invGridMatrix)))
{
nearest = poly;
break;
@@ -480,12 +483,12 @@ private void DrawWorld(OverlayDrawArgs args, DrawingHandleWorld worldHandle)
if (neighborPoly.NetEntity != poly.GraphUid)
{
color = Color.Green;
- var neighborMap = _entManager.GetCoordinates(neighborPoly).ToMap(_entManager);
+ var neighborMap = _entManager.GetCoordinates(neighborPoly).ToMap(_entManager, _transformSystem);
if (neighborMap.MapId != args.MapId)
continue;
- neighborPos = invMatrix.Transform(neighborMap.Position);
+ neighborPos = Vector2.Transform(neighborMap.Position, invMatrix);
}
else
{
@@ -573,7 +576,7 @@ private void DrawWorld(OverlayDrawArgs args, DrawingHandleWorld worldHandle)
}
}
- worldHandle.SetTransform(Matrix3.Identity);
+ worldHandle.SetTransform(Matrix3x2.Identity);
}
}
}
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs
index 264c297b63..80c98f143b 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorBoundUserInterface.cs
@@ -88,6 +88,7 @@ protected override void Dispose(bool disposing)
base.Dispose(disposing);
if (!disposing) return;
+ _linkMenu?.Dispose();
_listMenu?.Dispose();
_configurationMenu?.Dispose();
}
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs
index 20f1fb8d7c..c04b42f249 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs
@@ -7,6 +7,7 @@
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
namespace Content.Client.NetworkConfigurator;
@@ -160,7 +161,7 @@ private enum ButtonPosition
///
private sealed class LinksRender : Control
{
- public readonly List<(string, string)> Links = new();
+ public readonly List<(ProtoId, ProtoId)> Links = new();
public readonly Dictionary SourceButtons = new();
public readonly Dictionary SinkButtons = new();
private readonly BoxContainer _leftButtonContainer;
diff --git a/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs b/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs
index 0cc090fcae..2fd4f29655 100644
--- a/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs
+++ b/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs
@@ -52,8 +52,7 @@ public bool ConfiguredListIsTracked(EntityUid uid, NetworkConfiguratorComponent?
///
public void ToggleVisualization(EntityUid uid, bool toggle, NetworkConfiguratorComponent? component = null)
{
- if (_playerManager.LocalPlayer == null
- || _playerManager.LocalPlayer.ControlledEntity == null
+ if (_playerManager.LocalEntity == null
|| !Resolve(uid, ref component)
|| component.ActiveDeviceList == null)
return;
@@ -77,7 +76,7 @@ public void ToggleVisualization(EntityUid uid, bool toggle, NetworkConfiguratorC
{
var overlay = new NetworkConfiguratorLinkOverlay();
_overlay.AddOverlay(overlay);
- var player = _playerManager.LocalPlayer.ControlledEntity.Value;
+ var player = _playerManager.LocalEntity.Value;
overlay.Action = Spawn(Action);
_actions.AddActionDirect(player, overlay.Action.Value);
}
diff --git a/Content.Client/NodeContainer/NodeVisualizationOverlay.cs b/Content.Client/NodeContainer/NodeVisualizationOverlay.cs
index f10eb9ed8b..4e8a4a10ca 100644
--- a/Content.Client/NodeContainer/NodeVisualizationOverlay.cs
+++ b/Content.Client/NodeContainer/NodeVisualizationOverlay.cs
@@ -80,7 +80,7 @@ private void DrawScreen(in OverlayDrawArgs args)
var xform = _entityManager.GetComponent(_entityManager.GetEntity(node.Entity));
- if (!_mapManager.TryGetGrid(xform.GridUid, out var grid))
+ if (!_entityManager.TryGetComponent(xform.GridUid, out var grid))
return;
var gridTile = grid.TileIndicesFor(xform.Coordinates);
@@ -145,7 +145,7 @@ private void DrawWorld(in OverlayDrawArgs overlayDrawArgs)
foreach (var (gridId, gridDict) in _gridIndex)
{
- var grid = _mapManager.GetGrid(gridId);
+ var grid = _entityManager.GetComponent(gridId);
var (_, _, worldMatrix, invMatrix) = _entityManager.GetComponent(gridId).GetWorldPositionRotationMatrixWithInv();
var lCursorBox = invMatrix.TransformBox(cursorBox);
@@ -199,7 +199,7 @@ private void DrawWorld(in OverlayDrawArgs overlayDrawArgs)
}
- handle.SetTransform(Matrix3.Identity);
+ handle.SetTransform(Matrix3x2.Identity);
_gridIndex.Clear();
}
diff --git a/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs b/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs
index 20103a9743..ec055b3240 100644
--- a/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs
+++ b/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs
@@ -3,6 +3,7 @@
using Content.Shared.NukeOps;
using JetBrains.Annotations;
using Robust.Shared.Configuration;
+using Robust.Shared.Timing;
namespace Content.Client.NukeOps;
@@ -10,6 +11,8 @@ namespace Content.Client.NukeOps;
public sealed class WarDeclaratorBoundUserInterface : BoundUserInterface
{
[Dependency] private readonly IConfigurationManager _cfg = default!;
+ [Dependency] private readonly IGameTiming _gameTiming = default!;
+ [Dependency] private readonly ILocalizationManager _localizationManager = default!;
[ViewVariables]
private WarDeclaratorWindow? _window;
@@ -20,7 +23,7 @@ protected override void Open()
{
base.Open();
- _window = new WarDeclaratorWindow();
+ _window = new WarDeclaratorWindow(_gameTiming, _localizationManager);
if (State != null)
UpdateState(State);
@@ -42,7 +45,8 @@ protected override void UpdateState(BoundUserInterfaceState state)
protected override void Dispose(bool disposing)
{
base.Dispose(disposing);
- if (disposing) _window?.Dispose();
+ if (disposing)
+ _window?.Dispose();
}
private void OnWarDeclaratorActivated(string message)
diff --git a/Content.Client/NukeOps/WarDeclaratorWindow.xaml b/Content.Client/NukeOps/WarDeclaratorWindow.xaml
index f90ed865a0..43381158a2 100644
--- a/Content.Client/NukeOps/WarDeclaratorWindow.xaml
+++ b/Content.Client/NukeOps/WarDeclaratorWindow.xaml
@@ -1,4 +1,5 @@
-
@@ -7,12 +8,16 @@
MinHeight="200"
Access="Public" />
-
-
+
+
+
+
-
+
diff --git a/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs b/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs
index 104e776daa..b4a3f1c7fa 100644
--- a/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs
+++ b/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs
@@ -1,8 +1,7 @@
using Content.Client.Stylesheets;
+using Content.Client.UserInterface.Controls;
using Content.Shared.NukeOps;
using Robust.Client.AutoGenerated;
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
@@ -10,74 +9,83 @@
namespace Content.Client.NukeOps;
[GenerateTypedNameReferences]
-public sealed partial class WarDeclaratorWindow : DefaultWindow
+public sealed partial class WarDeclaratorWindow : FancyWindow
{
private readonly IGameTiming _gameTiming;
public event Action? OnActivated;
private TimeSpan _endTime;
- private TimeSpan _timeStamp;
+ private TimeSpan _shuttleDisabledTime;
private WarConditionStatus _status;
- public WarDeclaratorWindow()
+ public WarDeclaratorWindow(IGameTiming gameTiming, ILocalizationManager localizationManager)
{
RobustXamlLoader.Load(this);
- _gameTiming = IoCManager.Resolve();
+ _gameTiming = gameTiming;
WarButton.OnPressed += (_) => OnActivated?.Invoke(Rope.Collapse(MessageEdit.TextRope));
- var loc = IoCManager.Resolve();
- MessageEdit.Placeholder = new Rope.Leaf(loc.GetString("war-declarator-message-placeholder"));
+ MessageEdit.Placeholder = new Rope.Leaf(localizationManager.GetString("war-declarator-message-placeholder"));
}
- protected override void Draw(DrawingHandleScreen handle)
+ protected override void FrameUpdate(FrameEventArgs args)
{
- base.Draw(handle);
UpdateTimer();
}
public void UpdateState(WarDeclaratorBoundUserInterfaceState state)
{
- WarButton.Disabled = state.Status != WarConditionStatus.YES_WAR;
+ if (state.Status == null)
+ return;
+
+ WarButton.Disabled = state.Status == WarConditionStatus.WarReady;
- _timeStamp = state.Delay;
_endTime = state.EndTime;
- _status = state.Status;
+ _shuttleDisabledTime = state.ShuttleDisabledTime;
+ _status = state.Status.Value;
+
+ UpdateStatus(state.Status.Value);
+
+ }
- switch(state.Status)
+ private void UpdateStatus(WarConditionStatus status)
+ {
+ switch (status)
{
- case WarConditionStatus.WAR_READY:
+ case WarConditionStatus.WarReady:
+ WarButton.Disabled = true;
StatusLabel.Text = Loc.GetString("war-declarator-boost-declared");
- InfoLabel.Text = Loc.GetString("war-declarator-conditions-ready");
- StatusLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateLow);
- break;
- case WarConditionStatus.WAR_DELAY:
- StatusLabel.Text = Loc.GetString("war-declarator-boost-declared-delay");
UpdateTimer();
StatusLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateLow);
break;
- case WarConditionStatus.YES_WAR:
+ case WarConditionStatus.YesWar:
+ WarButton.Text = Loc.GetString("war-declarator-ui-war-button");
StatusLabel.Text = Loc.GetString("war-declarator-boost-possible");
UpdateTimer();
StatusLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateGood);
break;
- case WarConditionStatus.NO_WAR_SMALL_CREW:
+ case WarConditionStatus.NoWarSmallCrew:
StatusLabel.Text = Loc.GetString("war-declarator-boost-impossible");
- InfoLabel.Text = Loc.GetString("war-declarator-conditions-small-crew", ("min", state.MinCrew));
+ InfoLabel.Text = Loc.GetString("war-declarator-conditions-small-crew");
StatusLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateNone);
break;
- case WarConditionStatus.NO_WAR_SHUTTLE_DEPARTED:
+ case WarConditionStatus.NoWarShuttleDeparted:
StatusLabel.Text = Loc.GetString("war-declarator-boost-impossible");
InfoLabel.Text = Loc.GetString("war-declarator-conditions-left-outpost");
StatusLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateNone);
break;
- case WarConditionStatus.NO_WAR_TIMEOUT:
+ case WarConditionStatus.NoWarTimeout:
StatusLabel.Text = Loc.GetString("war-declarator-boost-impossible");
InfoLabel.Text = Loc.GetString("war-declarator-conditions-time-out");
StatusLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateNone);
break;
+ case WarConditionStatus.NoWarUnknown:
+ StatusLabel.Text = Loc.GetString("war-declarator-boost-impossible");
+ InfoLabel.Text = Loc.GetString("war-declarator-conditions-unknown");
+ StatusLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateNone);
+ break;
default:
StatusLabel.Text = Loc.GetString("war-declarator-boost-impossible");
InfoLabel.Text = Loc.GetString("war-declarator-conditions-unknown");
@@ -86,43 +94,24 @@ public void UpdateState(WarDeclaratorBoundUserInterfaceState state)
}
}
- public void UpdateTimer()
+ private void UpdateTimer()
{
switch(_status)
{
- case WarConditionStatus.YES_WAR:
- var gameruleTime = _gameTiming.CurTime.Subtract(_timeStamp);
- var timeLeft = _endTime.Subtract(gameruleTime);
-
+ case WarConditionStatus.YesWar:
+ var timeLeft = _endTime.Subtract(_gameTiming.CurTime);
if (timeLeft > TimeSpan.Zero)
- {
- InfoLabel.Text = Loc.GetString("war-declarator-boost-timer", ("minutes", timeLeft.Minutes), ("seconds", timeLeft.Seconds));
- }
+ InfoLabel.Text = Loc.GetString("war-declarator-boost-timer", ("time", timeLeft.ToString("mm\\:ss")));
else
- {
- _status = WarConditionStatus.NO_WAR_TIMEOUT;
- StatusLabel.Text = Loc.GetString("war-declarator-boost-impossible");
- InfoLabel.Text = Loc.GetString("war-declarator-conditions-time-out");
- StatusLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateNone);
- WarButton.Disabled = true;
- }
+ UpdateStatus(WarConditionStatus.NoWarTimeout);
break;
- case WarConditionStatus.WAR_DELAY:
- var timeAfterDeclaration = _gameTiming.CurTime.Subtract(_timeStamp);
- var timeRemain = _endTime.Subtract(timeAfterDeclaration);
-
- if (timeRemain > TimeSpan.Zero)
- {
- InfoLabel.Text = Loc.GetString("war-declarator-boost-timer", ("minutes", timeRemain.Minutes), ("seconds", timeRemain.Seconds));
- }
+
+ case WarConditionStatus.WarReady:
+ var time = _shuttleDisabledTime.Subtract(_gameTiming.CurTime);
+ if (time > TimeSpan.Zero)
+ InfoLabel.Text = Loc.GetString("war-declarator-boost-timer", ("time", time.ToString("mm\\:ss")));
else
- {
- _status = WarConditionStatus.WAR_READY;
- StatusLabel.Text = Loc.GetString("war-declarator-boost-declared");
InfoLabel.Text = Loc.GetString("war-declarator-conditions-ready");
- StatusLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateLow);
- WarButton.Disabled = true;
- }
break;
default:
return;
diff --git a/Content.Client/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Client/Nutrition/EntitySystems/DrinkSystem.cs
new file mode 100644
index 0000000000..16dbecb793
--- /dev/null
+++ b/Content.Client/Nutrition/EntitySystems/DrinkSystem.cs
@@ -0,0 +1,7 @@
+using Content.Shared.Nutrition.EntitySystems;
+
+namespace Content.Client.Nutrition.EntitySystems;
+
+public sealed class DrinkSystem : SharedDrinkSystem
+{
+}
diff --git a/Content.Client/Nutrition/EntitySystems/FoodGuideDataSystem.cs b/Content.Client/Nutrition/EntitySystems/FoodGuideDataSystem.cs
new file mode 100644
index 0000000000..37c7a25e21
--- /dev/null
+++ b/Content.Client/Nutrition/EntitySystems/FoodGuideDataSystem.cs
@@ -0,0 +1,30 @@
+using Content.Client.Chemistry.EntitySystems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.Nutrition.EntitySystems;
+
+public sealed class FoodGuideDataSystem : SharedFoodGuideDataSystem
+{
+ public override void Initialize()
+ {
+ SubscribeNetworkEvent(OnReceiveRegistryUpdate);
+ }
+
+ private void OnReceiveRegistryUpdate(FoodGuideRegistryChangedEvent message)
+ {
+ Registry = message.Changeset;
+ }
+
+ public bool TryGetData(EntProtoId result, out FoodGuideEntry entry)
+ {
+ var index = Registry.FindIndex(it => it.Result == result);
+ if (index == -1)
+ {
+ entry = default;
+ return false;
+ }
+
+ entry = Registry[index];
+ return true;
+ }
+}
diff --git a/Content.Client/Nyanotrasen/Overlays/DogVisionOverlay.cs b/Content.Client/Nyanotrasen/Overlays/DogVisionOverlay.cs
deleted file mode 100644
index 95cfc683e0..0000000000
--- a/Content.Client/Nyanotrasen/Overlays/DogVisionOverlay.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-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("DogVision").Instance().Duplicate();
- }
-
- protected override void Draw(in OverlayDrawArgs args)
- {
- if (ScreenTexture == null)
- return;
- if (_playerManager.LocalPlayer?.ControlledEntity is not {Valid: true} player)
- return;
- if (!_entityManager.HasComponent(player))
- return;
-
- _dogVisionShader?.SetParameter("SCREEN_TEXTURE", ScreenTexture);
-
-
- var worldHandle = args.WorldHandle;
- var viewport = args.WorldBounds;
- worldHandle.SetTransform(Matrix3.Identity);
- worldHandle.UseShader(_dogVisionShader);
- worldHandle.DrawRect(viewport, Color.White);
- }
-}
diff --git a/Content.Client/Nyanotrasen/Overlays/DogVisionSystem.cs b/Content.Client/Nyanotrasen/Overlays/DogVisionSystem.cs
deleted file mode 100644
index 38dfd79cf3..0000000000
--- a/Content.Client/Nyanotrasen/Overlays/DogVisionSystem.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Content.Shared.Abilities;
-using Robust.Client.Graphics;
-
-namespace Content.Client.Nyanotrasen.Overlays;
-
-public sealed partial class DogVisionSystem : EntitySystem
-{
- [Dependency] private readonly IOverlayManager _overlayMan = default!;
-
- private DogVisionOverlay _overlay = default!;
-
- public override void Initialize()
- {
- base.Initialize();
-
- SubscribeLocalEvent(OnDogVisionInit);
- SubscribeLocalEvent(OnDogVisionShutdown);
-
- _overlay = new();
- }
-
- private void OnDogVisionInit(EntityUid uid, DogVisionComponent component, ComponentInit args)
- {
- _overlayMan.AddOverlay(_overlay);
- }
-
- private void OnDogVisionShutdown(EntityUid uid, DogVisionComponent component, ComponentShutdown args)
- {
- _overlayMan.RemoveOverlay(_overlay);
- }
-}
diff --git a/Content.Client/OfferItem/OfferItemIndicatorsOverlay.cs b/Content.Client/OfferItem/OfferItemIndicatorsOverlay.cs
new file mode 100644
index 0000000000..16a314a2cf
--- /dev/null
+++ b/Content.Client/OfferItem/OfferItemIndicatorsOverlay.cs
@@ -0,0 +1,72 @@
+using System.Numerics;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Client.Input;
+using Robust.Client.UserInterface;
+using Robust.Shared.Enums;
+using Robust.Shared.Utility;
+
+namespace Content.Client.OfferItem;
+
+public sealed class OfferItemIndicatorsOverlay : Overlay
+{
+ private readonly IInputManager _inputManager;
+ private readonly IEntityManager _entMan;
+ private readonly IEyeManager _eye;
+ private readonly OfferItemSystem _offer;
+
+ private readonly Texture _sight;
+
+ public override OverlaySpace Space => OverlaySpace.ScreenSpace;
+
+ private readonly Color _mainColor = Color.White.WithAlpha(0.3f);
+ private readonly Color _strokeColor = Color.Black.WithAlpha(0.5f);
+ private readonly float _scale = 0.6f; // 1 is a little big
+
+ public OfferItemIndicatorsOverlay(IInputManager input, IEntityManager entMan,
+ IEyeManager eye, OfferItemSystem offerSys)
+ {
+ _inputManager = input;
+ _entMan = entMan;
+ _eye = eye;
+ _offer = offerSys;
+
+ var spriteSys = _entMan.EntitySysManager.GetEntitySystem();
+ _sight = spriteSys.Frame0(new SpriteSpecifier.Rsi(new ResPath("/Textures/Interface/Misc/give_item.rsi"),
+ "give_item"));
+ }
+
+ protected override bool BeforeDraw(in OverlayDrawArgs args)
+ {
+ if (!_offer.IsInOfferMode())
+ return false;
+
+ return base.BeforeDraw(in args);
+ }
+
+ protected override void Draw(in OverlayDrawArgs args)
+ {
+ var mouseScreenPosition = _inputManager.MouseScreenPosition;
+ var mousePosMap = _eye.PixelToMap(mouseScreenPosition);
+ if (mousePosMap.MapId != args.MapId)
+ return;
+
+
+ var mousePos = mouseScreenPosition.Position;
+ var uiScale = (args.ViewportControl as Control)?.UIScale ?? 1f;
+ var limitedScale = uiScale > 1.25f ? 1.25f : uiScale;
+
+ DrawSight(_sight, args.ScreenHandle, mousePos, limitedScale * _scale);
+ }
+
+ private void DrawSight(Texture sight, DrawingHandleScreen screen, Vector2 centerPos, float scale)
+ {
+ var sightSize = sight.Size * scale;
+ var expandedSize = sightSize + new Vector2(7f, 7f);
+
+ screen.DrawTextureRect(sight,
+ UIBox2.FromDimensions(centerPos - sightSize * 0.5f, sightSize), _strokeColor);
+ screen.DrawTextureRect(sight,
+ UIBox2.FromDimensions(centerPos - expandedSize * 0.5f, expandedSize), _mainColor);
+ }
+}
diff --git a/Content.Client/OfferItem/OfferItemSystem.cs b/Content.Client/OfferItem/OfferItemSystem.cs
new file mode 100644
index 0000000000..51b8dcbc0b
--- /dev/null
+++ b/Content.Client/OfferItem/OfferItemSystem.cs
@@ -0,0 +1,51 @@
+using Content.Shared.CCVar;
+using Content.Shared.OfferItem;
+using Robust.Client.Graphics;
+using Robust.Client.Input;
+using Robust.Client.Player;
+using Robust.Shared.Configuration;
+
+namespace Content.Client.OfferItem;
+
+public sealed class OfferItemSystem : SharedOfferItemSystem
+{
+ [Dependency] private readonly IOverlayManager _overlayManager = default!;
+ [Dependency] private readonly IPlayerManager _playerManager = default!;
+ [Dependency] private readonly IConfigurationManager _cfg = default!;
+ [Dependency] private readonly IInputManager _inputManager = default!;
+ [Dependency] private readonly IEyeManager _eye = default!;
+
+ public override void Initialize()
+ {
+ Subs.CVar(_cfg, CCVars.OfferModeIndicatorsPointShow, OnShowOfferIndicatorsChanged, true);
+ }
+ public override void Shutdown()
+ {
+ _overlayManager.RemoveOverlay();
+
+ base.Shutdown();
+ }
+
+ public bool IsInOfferMode()
+ {
+ var entity = _playerManager.LocalEntity;
+
+ if (entity == null)
+ return false;
+
+ return IsInOfferMode(entity.Value);
+ }
+ private void OnShowOfferIndicatorsChanged(bool isShow)
+ {
+ if (isShow)
+ {
+ _overlayManager.AddOverlay(new OfferItemIndicatorsOverlay(
+ _inputManager,
+ EntityManager,
+ _eye,
+ this));
+ }
+ else
+ _overlayManager.RemoveOverlay();
+ }
+}
diff --git a/Content.Client/Options/OptionsVisualizerComponent.cs b/Content.Client/Options/OptionsVisualizerComponent.cs
new file mode 100644
index 0000000000..87999f381c
--- /dev/null
+++ b/Content.Client/Options/OptionsVisualizerComponent.cs
@@ -0,0 +1,84 @@
+using Content.Shared.CCVar;
+
+namespace Content.Client.Options;
+
+///
+/// Allows specifying sprite alternatives depending on the client's accessibility options.
+///
+///
+/// A list of layer mappings is given that the component applies to,
+/// and it will pick one entry to apply based on the settings configuration. Example:
+///
+///
+/// - type: Sprite
+/// sprite: Effects/optionsvisualizertest.rsi
+/// layers:
+/// - state: none
+/// map: [ "layer" ]
+/// - type: OptionsVisualizer
+/// visuals:
+/// layer:
+/// - options: Default
+/// data: { state: none }
+/// - options: Test
+/// data: { state: test }
+/// - options: ReducedMotion
+/// data: { state: motion }
+/// - options: [Test, ReducedMotion]
+/// data: { state: both }
+///
+///
+///
+///
+[RegisterComponent]
+public sealed partial class OptionsVisualizerComponent : Component
+{
+ ///
+ /// A mapping storing data about which sprite layer keys should be controlled.
+ ///
+ ///
+ /// Each layer stores an array of possible options. The last entry with a
+ /// matching the active user preferences will be picked.
+ /// This allows choosing a priority if multiple entries are matched.
+ ///
+ [DataField(required: true)]
+ public Dictionary Visuals = default!;
+
+ ///
+ /// A single option for a layer to be selected.
+ ///
+ [DataDefinition]
+ public sealed partial class LayerDatum
+ {
+ ///
+ /// Which options must be set by the user to make this datum match.
+ ///
+ [DataField]
+ public OptionVisualizerOptions Options { get; set; }
+
+ ///
+ /// The sprite layer data to set on the sprite when this datum matches.
+ ///
+ [DataField]
+ public PrototypeLayerData Data { get; set; }
+ }
+}
+
+[Flags]
+public enum OptionVisualizerOptions
+{
+ ///
+ /// Corresponds to no special options being set, can be used as a "default" state.
+ ///
+ Default = 0,
+
+ ///
+ /// Corresponds to the CVar being set.
+ ///
+ Test = 1 << 0,
+
+ ///
+ /// Corresponds to the CVar being set.
+ ///
+ ReducedMotion = 1 << 1,
+}
diff --git a/Content.Client/Options/OptionsVisualizerSystem.cs b/Content.Client/Options/OptionsVisualizerSystem.cs
new file mode 100644
index 0000000000..2a297e3802
--- /dev/null
+++ b/Content.Client/Options/OptionsVisualizerSystem.cs
@@ -0,0 +1,97 @@
+using Content.Shared.CCVar;
+using Robust.Client.GameObjects;
+using Robust.Shared.Configuration;
+using Robust.Shared.Reflection;
+
+namespace Content.Client.Options;
+
+///
+/// Implements .
+///
+public sealed class OptionsVisualizerSystem : EntitySystem
+{
+ private static readonly (OptionVisualizerOptions, CVarDef)[] OptionVars =
+ {
+ (OptionVisualizerOptions.Test, CCVars.DebugOptionVisualizerTest),
+ (OptionVisualizerOptions.ReducedMotion, CCVars.ReducedMotion),
+ };
+
+ [Dependency] private readonly IConfigurationManager _cfg = default!;
+ [Dependency] private readonly IReflectionManager _reflection = default!;
+
+ private OptionVisualizerOptions _currentOptions;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ foreach (var (_, cvar) in OptionVars)
+ {
+ Subs.CVar(_cfg, cvar, _ => CVarChanged());
+ }
+
+ UpdateActiveOptions();
+
+ SubscribeLocalEvent(OnComponentStartup);
+ }
+
+ private void CVarChanged()
+ {
+ UpdateActiveOptions();
+ UpdateAllComponents();
+ }
+
+ private void UpdateActiveOptions()
+ {
+ _currentOptions = OptionVisualizerOptions.Default;
+
+ foreach (var (value, cVar) in OptionVars)
+ {
+ if (_cfg.GetCVar(cVar))
+ _currentOptions |= value;
+ }
+ }
+
+ private void UpdateAllComponents()
+ {
+ var query = EntityQueryEnumerator();
+ while (query.MoveNext(out _, out var component, out var sprite))
+ {
+ UpdateComponent(component, sprite);
+ }
+ }
+
+ private void OnComponentStartup(EntityUid uid, OptionsVisualizerComponent component, ComponentStartup args)
+ {
+ if (!TryComp(uid, out SpriteComponent? sprite))
+ return;
+
+ UpdateComponent(component, sprite);
+ }
+
+ private void UpdateComponent(OptionsVisualizerComponent component, SpriteComponent sprite)
+ {
+ foreach (var (layerKeyRaw, layerData) in component.Visuals)
+ {
+ object layerKey = _reflection.TryParseEnumReference(layerKeyRaw, out var @enum)
+ ? @enum
+ : layerKeyRaw;
+
+ OptionsVisualizerComponent.LayerDatum? matchedDatum = null;
+ foreach (var datum in layerData)
+ {
+ if ((datum.Options & _currentOptions) != datum.Options)
+ continue;
+
+ matchedDatum = datum;
+ }
+
+ if (matchedDatum == null)
+ continue;
+
+ var layerIndex = sprite.LayerMapReserveBlank(layerKey);
+ sprite.LayerSetData(layerIndex, matchedDatum.Data);
+ }
+ }
+}
+
diff --git a/Content.Client/Options/UI/Tabs/AudioTab.xaml b/Content.Client/Options/UI/Tabs/AudioTab.xaml
index e54b0dc34e..78b0e82629 100644
--- a/Content.Client/Options/UI/Tabs/AudioTab.xaml
+++ b/Content.Client/Options/UI/Tabs/AudioTab.xaml
@@ -100,10 +100,26 @@
+
+
+
+
+
+
+
+
+
diff --git a/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs b/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
index 470ca7d799..7da80d774b 100644
--- a/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
@@ -30,90 +30,89 @@ public AudioTab()
ApplyButton.OnPressed += OnApplyButtonPressed;
ResetButton.OnPressed += OnResetButtonPressed;
- MasterVolumeSlider.OnValueChanged += OnMasterVolumeSliderChanged;
- MidiVolumeSlider.OnValueChanged += OnMidiVolumeSliderChanged;
- AmbientMusicVolumeSlider.OnValueChanged += OnAmbientMusicVolumeSliderChanged;
- AmbienceVolumeSlider.OnValueChanged += OnAmbienceVolumeSliderChanged;
- AmbienceSoundsSlider.OnValueChanged += OnAmbienceSoundsSliderChanged;
- LobbyVolumeSlider.OnValueChanged += OnLobbyVolumeSliderChanged;
- InterfaceVolumeSlider.OnValueChanged += OnInterfaceVolumeSliderChanged;
- LobbyMusicCheckBox.OnToggled += OnLobbyMusicCheckToggled;
- RestartSoundsCheckBox.OnToggled += OnRestartSoundsCheckToggled;
- EventMusicCheckBox.OnToggled += OnEventMusicCheckToggled;
- AdminSoundsCheckBox.OnToggled += OnAdminSoundsCheckToggled;
+
+ AttachUpdateChangesHandler(
+ MasterVolumeSlider,
+ MidiVolumeSlider,
+ AmbientMusicVolumeSlider,
+ AmbienceVolumeSlider,
+ AmbienceSoundsSlider,
+ LobbyVolumeSlider,
+ InterfaceVolumeSlider,
+ AnnouncerVolumeSlider,
+
+ LobbyMusicCheckBox,
+ RestartSoundsCheckBox,
+ EventMusicCheckBox,
+ AnnouncerDisableMultipleSoundsCheckBox,
+ AdminSoundsCheckBox
+ );
AmbienceSoundsSlider.MinValue = _cfg.GetCVar(CCVars.MinMaxAmbientSourcesConfigured);
AmbienceSoundsSlider.MaxValue = _cfg.GetCVar(CCVars.MaxMaxAmbientSourcesConfigured);
Reset();
+ return;
+
+ void AttachUpdateChangesHandler(params Control[] controls)
+ {
+ foreach (var control in controls)
+ {
+ switch (control)
+ {
+ case Slider slider:
+ slider.OnValueChanged += _ => UpdateChanges();
+ break;
+ case CheckBox checkBox:
+ checkBox.OnToggled += _ => UpdateChanges();
+ break;
+ }
+ }
+ }
}
protected override void Dispose(bool disposing)
{
ApplyButton.OnPressed -= OnApplyButtonPressed;
ResetButton.OnPressed -= OnResetButtonPressed;
- MasterVolumeSlider.OnValueChanged -= OnMasterVolumeSliderChanged;
- MidiVolumeSlider.OnValueChanged -= OnMidiVolumeSliderChanged;
- AmbientMusicVolumeSlider.OnValueChanged -= OnAmbientMusicVolumeSliderChanged;
- AmbienceVolumeSlider.OnValueChanged -= OnAmbienceVolumeSliderChanged;
- LobbyVolumeSlider.OnValueChanged -= OnLobbyVolumeSliderChanged;
- InterfaceVolumeSlider.OnValueChanged -= OnInterfaceVolumeSliderChanged;
- base.Dispose(disposing);
- }
-
- private void OnLobbyVolumeSliderChanged(Range obj)
- {
- UpdateChanges();
- }
-
- private void OnInterfaceVolumeSliderChanged(Range obj)
- {
- UpdateChanges();
- }
-
- private void OnAmbientMusicVolumeSliderChanged(Range obj)
- {
- UpdateChanges();
- }
-
- private void OnAmbienceVolumeSliderChanged(Range obj)
- {
- UpdateChanges();
- }
-
- private void OnAmbienceSoundsSliderChanged(Range obj)
- {
- UpdateChanges();
- }
- private void OnMasterVolumeSliderChanged(Range range)
- {
- _audio.SetMasterGain(MasterVolumeSlider.Value / 100f * ContentAudioSystem.MasterVolumeMultiplier);
- UpdateChanges();
- }
+ DetachUpdateChangesHandler(
+ MasterVolumeSlider,
+ MidiVolumeSlider,
+ AmbientMusicVolumeSlider,
+ AmbienceVolumeSlider,
+ AmbienceSoundsSlider,
+ LobbyVolumeSlider,
+ InterfaceVolumeSlider,
+ AnnouncerVolumeSlider,
+
+ LobbyMusicCheckBox,
+ RestartSoundsCheckBox,
+ EventMusicCheckBox,
+ AnnouncerDisableMultipleSoundsCheckBox,
+ AdminSoundsCheckBox
+ );
- private void OnMidiVolumeSliderChanged(Range range)
- {
- UpdateChanges();
- }
-
- private void OnLobbyMusicCheckToggled(BaseButton.ButtonEventArgs args)
- {
- UpdateChanges();
- }
- private void OnRestartSoundsCheckToggled(BaseButton.ButtonEventArgs args)
- {
- UpdateChanges();
- }
- private void OnEventMusicCheckToggled(BaseButton.ButtonEventArgs args)
- {
- UpdateChanges();
+ base.Dispose(disposing);
+ return;
+
+ void DetachUpdateChangesHandler(params Control[] controls)
+ {
+ foreach (var control in controls)
+ {
+ switch (control)
+ {
+ case Slider slider:
+ slider.OnValueChanged -= _ => UpdateChanges();
+ break;
+ case CheckBox checkBox:
+ checkBox.OnToggled -= _ => UpdateChanges();
+ break;
+ }
+ }
+ }
}
- private void OnAdminSoundsCheckToggled(BaseButton.ButtonEventArgs args)
- {
- UpdateChanges();
- }
private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
{
@@ -125,12 +124,14 @@ private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
_cfg.SetCVar(CCVars.AmbientMusicVolume, AmbientMusicVolumeSlider.Value / 100f * ContentAudioSystem.AmbientMusicMultiplier);
_cfg.SetCVar(CCVars.LobbyMusicVolume, LobbyVolumeSlider.Value / 100f * ContentAudioSystem.LobbyMultiplier);
_cfg.SetCVar(CCVars.InterfaceVolume, InterfaceVolumeSlider.Value / 100f * ContentAudioSystem.InterfaceMultiplier);
+ _cfg.SetCVar(CCVars.AnnouncerVolume, AnnouncerVolumeSlider.Value / 100f * ContentAudioSystem.AnnouncerMultiplier);
_cfg.SetCVar(CCVars.MaxAmbientSources, (int)AmbienceSoundsSlider.Value);
_cfg.SetCVar(CCVars.LobbyMusicEnabled, LobbyMusicCheckBox.Pressed);
_cfg.SetCVar(CCVars.RestartSoundsEnabled, RestartSoundsCheckBox.Pressed);
_cfg.SetCVar(CCVars.EventMusicEnabled, EventMusicCheckBox.Pressed);
+ _cfg.SetCVar(CCVars.AnnouncerDisableMultipleSounds, AnnouncerDisableMultipleSoundsCheckBox.Pressed);
_cfg.SetCVar(CCVars.AdminSoundsEnabled, AdminSoundsCheckBox.Pressed);
_cfg.SaveToFile();
UpdateChanges();
@@ -149,12 +150,14 @@ private void Reset()
AmbientMusicVolumeSlider.Value = _cfg.GetCVar(CCVars.AmbientMusicVolume) * 100f / ContentAudioSystem.AmbientMusicMultiplier;
LobbyVolumeSlider.Value = _cfg.GetCVar(CCVars.LobbyMusicVolume) * 100f / ContentAudioSystem.LobbyMultiplier;
InterfaceVolumeSlider.Value = _cfg.GetCVar(CCVars.InterfaceVolume) * 100f / ContentAudioSystem.InterfaceMultiplier;
+ AnnouncerVolumeSlider.Value = _cfg.GetCVar(CCVars.AnnouncerVolume) * 100f / ContentAudioSystem.AnnouncerMultiplier;
AmbienceSoundsSlider.Value = _cfg.GetCVar(CCVars.MaxAmbientSources);
LobbyMusicCheckBox.Pressed = _cfg.GetCVar(CCVars.LobbyMusicEnabled);
RestartSoundsCheckBox.Pressed = _cfg.GetCVar(CCVars.RestartSoundsEnabled);
EventMusicCheckBox.Pressed = _cfg.GetCVar(CCVars.EventMusicEnabled);
+ AnnouncerDisableMultipleSoundsCheckBox.Pressed = _cfg.GetCVar(CCVars.AnnouncerDisableMultipleSounds);
AdminSoundsCheckBox.Pressed = _cfg.GetCVar(CCVars.AdminSoundsEnabled);
UpdateChanges();
}
@@ -174,14 +177,19 @@ private void UpdateChanges()
Math.Abs(LobbyVolumeSlider.Value - _cfg.GetCVar(CCVars.LobbyMusicVolume) * 100f / ContentAudioSystem.LobbyMultiplier) < 0.01f;
var isInterfaceVolumeSame =
Math.Abs(InterfaceVolumeSlider.Value - _cfg.GetCVar(CCVars.InterfaceVolume) * 100f / ContentAudioSystem.InterfaceMultiplier) < 0.01f;
+ var isAnnouncerVolumeSame =
+ Math.Abs(AnnouncerVolumeSlider.Value - _cfg.GetCVar(CCVars.AnnouncerVolume) * 100f / ContentAudioSystem.AnnouncerMultiplier) < 0.01f;
var isAmbientSoundsSame = (int)AmbienceSoundsSlider.Value == _cfg.GetCVar(CCVars.MaxAmbientSources);
var isLobbySame = LobbyMusicCheckBox.Pressed == _cfg.GetCVar(CCVars.LobbyMusicEnabled);
var isRestartSoundsSame = RestartSoundsCheckBox.Pressed == _cfg.GetCVar(CCVars.RestartSoundsEnabled);
var isEventSame = EventMusicCheckBox.Pressed == _cfg.GetCVar(CCVars.EventMusicEnabled);
+ var isAnnouncerDisableMultipleSoundsSame = AnnouncerDisableMultipleSoundsCheckBox.Pressed == _cfg.GetCVar(CCVars.AnnouncerDisableMultipleSounds);
var isAdminSoundsSame = AdminSoundsCheckBox.Pressed == _cfg.GetCVar(CCVars.AdminSoundsEnabled);
- var isEverythingSame = isMasterVolumeSame && isMidiVolumeSame && isAmbientVolumeSame && isAmbientMusicVolumeSame && isAmbientSoundsSame && isLobbySame && isRestartSoundsSame && isEventSame
- && isAdminSoundsSame && isLobbyVolumeSame && isInterfaceVolumeSame;
+ var isEverythingSame = isMasterVolumeSame && isMidiVolumeSame && isAmbientVolumeSame
+ && isAmbientMusicVolumeSame && isAmbientSoundsSame && isLobbySame && isRestartSoundsSame && isEventSame
+ && isAnnouncerDisableMultipleSoundsSame && isAdminSoundsSame && isLobbyVolumeSame
+ && isInterfaceVolumeSame && isAnnouncerVolumeSame;
ApplyButton.Disabled = isEverythingSame;
ResetButton.Disabled = isEverythingSame;
MasterVolumeLabel.Text =
@@ -196,6 +204,8 @@ private void UpdateChanges()
Loc.GetString("ui-options-volume-percent", ("volume", LobbyVolumeSlider.Value / 100));
InterfaceVolumeLabel.Text =
Loc.GetString("ui-options-volume-percent", ("volume", InterfaceVolumeSlider.Value / 100));
+ AnnouncerVolumeLabel.Text =
+ Loc.GetString("ui-options-volume-percent", ("volume", AnnouncerVolumeSlider.Value / 100));
AmbienceSoundsLabel.Text = ((int)AmbienceSoundsSlider.Value).ToString();
}
}
diff --git a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml
index 118b85b87b..ec1b9aa002 100644
--- a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml
+++ b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml
@@ -36,6 +36,9 @@
+
diff --git a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs
index 3113e644ba..a22adf3e63 100644
--- a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs
@@ -67,6 +67,12 @@ public GraphicsTab()
UpdateApplyButton();
};
+ ViewportVerticalFitCheckBox.OnToggled += _ =>
+ {
+ UpdateViewportScale();
+ UpdateApplyButton();
+ };
+
IntegerScalingCheckBox.OnToggled += OnCheckBoxToggled;
ViewportLowResCheckBox.OnToggled += OnCheckBoxToggled;
ParallaxLowQualityCheckBox.OnToggled += OnCheckBoxToggled;
@@ -79,6 +85,7 @@ public GraphicsTab()
ViewportScaleSlider.Value = _cfg.GetCVar(CCVars.ViewportFixedScaleFactor);
ViewportStretchCheckBox.Pressed = _cfg.GetCVar(CCVars.ViewportStretch);
IntegerScalingCheckBox.Pressed = _cfg.GetCVar(CCVars.ViewportSnapToleranceMargin) != 0;
+ ViewportVerticalFitCheckBox.Pressed = _cfg.GetCVar(CCVars.ViewportVerticalFit);
ViewportLowResCheckBox.Pressed = !_cfg.GetCVar(CCVars.ViewportScaleRender);
ParallaxLowQualityCheckBox.Pressed = _cfg.GetCVar(CCVars.ParallaxLowQuality);
FpsCounterCheckBox.Pressed = _cfg.GetCVar(CCVars.HudFpsCounterVisible);
@@ -111,6 +118,7 @@ private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
_cfg.SetCVar(CCVars.ViewportFixedScaleFactor, (int) ViewportScaleSlider.Value);
_cfg.SetCVar(CCVars.ViewportSnapToleranceMargin,
IntegerScalingCheckBox.Pressed ? CCVars.ViewportSnapToleranceMargin.DefaultValue : 0);
+ _cfg.SetCVar(CCVars.ViewportVerticalFit, ViewportVerticalFitCheckBox.Pressed);
_cfg.SetCVar(CCVars.ViewportScaleRender, !ViewportLowResCheckBox.Pressed);
_cfg.SetCVar(CCVars.ParallaxLowQuality, ParallaxLowQualityCheckBox.Pressed);
_cfg.SetCVar(CCVars.HudFpsCounterVisible, FpsCounterCheckBox.Pressed);
@@ -140,6 +148,7 @@ private void UpdateApplyButton()
var isVPStretchSame = ViewportStretchCheckBox.Pressed == _cfg.GetCVar(CCVars.ViewportStretch);
var isVPScaleSame = (int) ViewportScaleSlider.Value == _cfg.GetCVar(CCVars.ViewportFixedScaleFactor);
var isIntegerScalingSame = IntegerScalingCheckBox.Pressed == (_cfg.GetCVar(CCVars.ViewportSnapToleranceMargin) != 0);
+ var isVPVerticalFitSame = ViewportVerticalFitCheckBox.Pressed == _cfg.GetCVar(CCVars.ViewportVerticalFit);
var isVPResSame = ViewportLowResCheckBox.Pressed == !_cfg.GetCVar(CCVars.ViewportScaleRender);
var isPLQSame = ParallaxLowQualityCheckBox.Pressed == _cfg.GetCVar(CCVars.ParallaxLowQuality);
var isFpsCounterVisibleSame = FpsCounterCheckBox.Pressed == _cfg.GetCVar(CCVars.HudFpsCounterVisible);
@@ -152,6 +161,7 @@ private void UpdateApplyButton()
isVPStretchSame &&
isVPScaleSame &&
isIntegerScalingSame &&
+ isVPVerticalFitSame &&
isVPResSame &&
isPLQSame &&
isFpsCounterVisibleSame &&
@@ -235,6 +245,8 @@ private void UpdateViewportScale()
{
ViewportScaleBox.Visible = !ViewportStretchCheckBox.Pressed;
IntegerScalingCheckBox.Visible = ViewportStretchCheckBox.Pressed;
+ ViewportVerticalFitCheckBox.Visible = ViewportStretchCheckBox.Pressed;
+ ViewportWidthSlider.Visible = ViewportWidthSliderDisplay.Visible = !ViewportStretchCheckBox.Pressed || ViewportStretchCheckBox.Pressed && !ViewportVerticalFitCheckBox.Pressed;
ViewportScaleText.Text = Loc.GetString("ui-options-vp-scale", ("scale", ViewportScaleSlider.Value));
}
diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
index ce5cf421ae..c89659c3ab 100644
--- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
@@ -97,12 +97,30 @@ private void HandleToggleWalk(BaseButton.ButtonToggledEventArgs args)
_deferCommands.Add(_inputManager.SaveToUserData);
}
+ private void HandleHoldLookUp(BaseButton.ButtonToggledEventArgs args)
+ {
+ _cfg.SetCVar(CCVars.HoldLookUp, args.Pressed);
+ _cfg.SaveToFile();
+ }
+
+ private void HandleDefaultWalk(BaseButton.ButtonToggledEventArgs args)
+ {
+ _cfg.SetCVar(CCVars.DefaultWalk, args.Pressed);
+ _cfg.SaveToFile();
+ }
+
private void HandleStaticStorageUI(BaseButton.ButtonToggledEventArgs args)
{
_cfg.SetCVar(CCVars.StaticStorageUI, args.Pressed);
_cfg.SaveToFile();
}
+ private void HandleToggleAutoGetUp(BaseButton.ButtonToggledEventArgs args)
+ {
+ _cfg.SetCVar(CCVars.AutoGetUp, args.Pressed);
+ _cfg.SaveToFile();
+ }
+
public KeyRebindTab()
{
IoCManager.InjectDependencies(this);
@@ -161,6 +179,7 @@ void AddCheckBox(string checkBoxName, bool currentState, Action
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
diff --git a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
index b5dcf6477b..9696537176 100644
--- a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
@@ -3,11 +3,14 @@
using Content.Shared.CCVar;
using Content.Shared.HUD;
using Robust.Client.AutoGenerated;
+using Robust.Client.Player;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;
using Robust.Shared;
using Robust.Shared.Configuration;
+using Robust.Shared.Network;
+using Robust.Shared.Player;
using Robust.Shared.Prototypes;
using Range = Robust.Client.UserInterface.Controls.Range;
@@ -16,6 +19,7 @@ namespace Content.Client.Options.UI.Tabs
[GenerateTypedNameReferences]
public sealed partial class MiscTab : Control
{
+ [Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IConfigurationManager _cfg = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
@@ -55,31 +59,47 @@ public MiscTab()
UpdateApplyButton();
};
+ // Channel can be null in replays so.
+ // ReSharper disable once ConditionalAccessQualifierIsNonNullableAccordingToAPIContract
+ ShowOocPatronColor.Visible = _playerManager.LocalSession?.Channel?.UserData.PatronTier is { };
+
HudThemeOption.OnItemSelected += OnHudThemeChanged;
DiscordRich.OnToggled += OnCheckBoxToggled;
+ ShowOocPatronColor.OnToggled += OnCheckBoxToggled;
ShowLoocAboveHeadCheckBox.OnToggled += OnCheckBoxToggled;
ShowHeldItemCheckBox.OnToggled += OnCheckBoxToggled;
ShowCombatModeIndicatorsCheckBox.OnToggled += OnCheckBoxToggled;
+ ShowOfferModeIndicatorsCheckBox.OnToggled += OnCheckBoxToggled;
OpaqueStorageWindowCheckBox.OnToggled += OnCheckBoxToggled;
FancySpeechBubblesCheckBox.OnToggled += OnCheckBoxToggled;
FancyNameBackgroundsCheckBox.OnToggled += OnCheckBoxToggled;
+ EnableColorNameCheckBox.OnToggled += OnCheckBoxToggled;
+ ColorblindFriendlyCheckBox.OnToggled += OnCheckBoxToggled;
ReducedMotionCheckBox.OnToggled += OnCheckBoxToggled;
+ ChatWindowOpacitySlider.OnValueChanged += OnChatWindowOpacitySliderChanged;
ScreenShakeIntensitySlider.OnValueChanged += OnScreenShakeIntensitySliderChanged;
// ToggleWalk.OnToggled += OnCheckBoxToggled;
StaticStorageUI.OnToggled += OnCheckBoxToggled;
+ DisableFiltersCheckBox.OnToggled += OnCheckBoxToggled;
HudThemeOption.SelectId(_hudThemeIdToIndex.GetValueOrDefault(_cfg.GetCVar(CVars.InterfaceTheme), 0));
DiscordRich.Pressed = _cfg.GetCVar(CVars.DiscordEnabled);
+ ShowOocPatronColor.Pressed = _cfg.GetCVar(CCVars.ShowOocPatronColor);
ShowLoocAboveHeadCheckBox.Pressed = _cfg.GetCVar(CCVars.LoocAboveHeadShow);
ShowHeldItemCheckBox.Pressed = _cfg.GetCVar(CCVars.HudHeldItemShow);
ShowCombatModeIndicatorsCheckBox.Pressed = _cfg.GetCVar(CCVars.CombatModeIndicatorsPointShow);
+ ShowOfferModeIndicatorsCheckBox.Pressed = _cfg.GetCVar(CCVars.OfferModeIndicatorsPointShow);
OpaqueStorageWindowCheckBox.Pressed = _cfg.GetCVar(CCVars.OpaqueStorageWindow);
FancySpeechBubblesCheckBox.Pressed = _cfg.GetCVar(CCVars.ChatEnableFancyBubbles);
FancyNameBackgroundsCheckBox.Pressed = _cfg.GetCVar(CCVars.ChatFancyNameBackground);
+ EnableColorNameCheckBox.Pressed = _cfg.GetCVar(CCVars.ChatEnableColorName);
+ ColorblindFriendlyCheckBox.Pressed = _cfg.GetCVar(CCVars.AccessibilityColorblindFriendly);
ReducedMotionCheckBox.Pressed = _cfg.GetCVar(CCVars.ReducedMotion);
+ ChatWindowOpacitySlider.Value = _cfg.GetCVar(CCVars.ChatWindowOpacity);
ScreenShakeIntensitySlider.Value = _cfg.GetCVar(CCVars.ScreenShakeIntensity) * 100f;
// ToggleWalk.Pressed = _cfg.GetCVar(CCVars.ToggleWalk);
StaticStorageUI.Pressed = _cfg.GetCVar(CCVars.StaticStorageUI);
+ DisableFiltersCheckBox.Pressed = _cfg.GetCVar(CCVars.NoVisionFilters);
ApplyButton.OnPressed += OnApplyButtonPressed;
@@ -97,6 +117,13 @@ private void OnHudThemeChanged(OptionButton.ItemSelectedEventArgs args)
UpdateApplyButton();
}
+ private void OnChatWindowOpacitySliderChanged(Range range)
+ {
+ ChatWindowOpacityLabel.Text = Loc.GetString("ui-options-chat-window-opacity-percent",
+ ("opacity", range.Value));
+ UpdateApplyButton();
+ }
+
private void OnScreenShakeIntensitySliderChanged(Range obj)
{
ScreenShakeIntensityLabel.Text = Loc.GetString("ui-options-screen-shake-percent", ("intensity", ScreenShakeIntensitySlider.Value / 100f));
@@ -116,14 +143,20 @@ private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
_cfg.SetCVar(CVars.DiscordEnabled, DiscordRich.Pressed);
_cfg.SetCVar(CCVars.HudHeldItemShow, ShowHeldItemCheckBox.Pressed);
_cfg.SetCVar(CCVars.CombatModeIndicatorsPointShow, ShowCombatModeIndicatorsCheckBox.Pressed);
+ _cfg.SetCVar(CCVars.OfferModeIndicatorsPointShow, ShowOfferModeIndicatorsCheckBox.Pressed);
_cfg.SetCVar(CCVars.OpaqueStorageWindow, OpaqueStorageWindowCheckBox.Pressed);
+ _cfg.SetCVar(CCVars.ShowOocPatronColor, ShowOocPatronColor.Pressed);
_cfg.SetCVar(CCVars.LoocAboveHeadShow, ShowLoocAboveHeadCheckBox.Pressed);
_cfg.SetCVar(CCVars.ChatEnableFancyBubbles, FancySpeechBubblesCheckBox.Pressed);
_cfg.SetCVar(CCVars.ChatFancyNameBackground, FancyNameBackgroundsCheckBox.Pressed);
+ _cfg.SetCVar(CCVars.ChatEnableColorName, EnableColorNameCheckBox.Pressed);
+ _cfg.SetCVar(CCVars.AccessibilityColorblindFriendly, ColorblindFriendlyCheckBox.Pressed);
_cfg.SetCVar(CCVars.ReducedMotion, ReducedMotionCheckBox.Pressed);
+ _cfg.SetCVar(CCVars.ChatWindowOpacity, ChatWindowOpacitySlider.Value);
_cfg.SetCVar(CCVars.ScreenShakeIntensity, ScreenShakeIntensitySlider.Value / 100f);
// _cfg.SetCVar(CCVars.ToggleWalk, ToggleWalk.Pressed);
_cfg.SetCVar(CCVars.StaticStorageUI, StaticStorageUI.Pressed);
+ _cfg.SetCVar(CCVars.NoVisionFilters, DisableFiltersCheckBox.Pressed);
if (HudLayoutOption.SelectedMetadata is string opt)
{
@@ -141,28 +174,40 @@ private void UpdateApplyButton()
var isDiscordSame = DiscordRich.Pressed == _cfg.GetCVar(CVars.DiscordEnabled);
var isShowHeldItemSame = ShowHeldItemCheckBox.Pressed == _cfg.GetCVar(CCVars.HudHeldItemShow);
var isCombatModeIndicatorsSame = ShowCombatModeIndicatorsCheckBox.Pressed == _cfg.GetCVar(CCVars.CombatModeIndicatorsPointShow);
+ var isOfferModeIndicatorsSame = ShowOfferModeIndicatorsCheckBox.Pressed == _cfg.GetCVar(CCVars.OfferModeIndicatorsPointShow);
var isOpaqueStorageWindow = OpaqueStorageWindowCheckBox.Pressed == _cfg.GetCVar(CCVars.OpaqueStorageWindow);
+ var isOocPatronColorShowSame = ShowOocPatronColor.Pressed == _cfg.GetCVar(CCVars.ShowOocPatronColor);
var isLoocShowSame = ShowLoocAboveHeadCheckBox.Pressed == _cfg.GetCVar(CCVars.LoocAboveHeadShow);
var isFancyChatSame = FancySpeechBubblesCheckBox.Pressed == _cfg.GetCVar(CCVars.ChatEnableFancyBubbles);
var isFancyBackgroundSame = FancyNameBackgroundsCheckBox.Pressed == _cfg.GetCVar(CCVars.ChatFancyNameBackground);
+ var isEnableColorNameSame = EnableColorNameCheckBox.Pressed == _cfg.GetCVar(CCVars.ChatEnableColorName);
+ var isColorblindFriendly = ColorblindFriendlyCheckBox.Pressed == _cfg.GetCVar(CCVars.AccessibilityColorblindFriendly);
var isReducedMotionSame = ReducedMotionCheckBox.Pressed == _cfg.GetCVar(CCVars.ReducedMotion);
+ var isChatWindowOpacitySame = Math.Abs(ChatWindowOpacitySlider.Value - _cfg.GetCVar(CCVars.ChatWindowOpacity)) < 0.01f;
var isScreenShakeIntensitySame = Math.Abs(ScreenShakeIntensitySlider.Value / 100f - _cfg.GetCVar(CCVars.ScreenShakeIntensity)) < 0.01f;
// var isToggleWalkSame = ToggleWalk.Pressed == _cfg.GetCVar(CCVars.ToggleWalk);
var isStaticStorageUISame = StaticStorageUI.Pressed == _cfg.GetCVar(CCVars.StaticStorageUI);
+ var isNoVisionFiltersSame = DisableFiltersCheckBox.Pressed == _cfg.GetCVar(CCVars.NoVisionFilters);
ApplyButton.Disabled = isHudThemeSame &&
isLayoutSame &&
isDiscordSame &&
isShowHeldItemSame &&
isCombatModeIndicatorsSame &&
+ isOfferModeIndicatorsSame &&
isOpaqueStorageWindow &&
+ isOocPatronColorShowSame &&
isLoocShowSame &&
isFancyChatSame &&
isFancyBackgroundSame &&
+ isEnableColorNameSame &&
+ isColorblindFriendly &&
isReducedMotionSame &&
+ isChatWindowOpacitySame &&
isScreenShakeIntensitySame &&
// isToggleWalkSame &&
- isStaticStorageUISame;
+ isStaticStorageUISame &&
+ isNoVisionFiltersSame;
}
}
diff --git a/Content.Client/Outline/InteractionOutlineSystem.cs b/Content.Client/Outline/InteractionOutlineSystem.cs
index bb341785d0..3dbbafbcaa 100644
--- a/Content.Client/Outline/InteractionOutlineSystem.cs
+++ b/Content.Client/Outline/InteractionOutlineSystem.cs
@@ -40,17 +40,10 @@ public override void Initialize()
{
base.Initialize();
- _configManager.OnValueChanged(CCVars.OutlineEnabled, SetCvarEnabled);
+ Subs.CVar(_configManager, CCVars.OutlineEnabled, SetCvarEnabled);
UpdatesAfter.Add(typeof(SharedEyeSystem));
}
- public override void Shutdown()
- {
- base.Shutdown();
-
- _configManager.UnsubValueChanged(CCVars.OutlineEnabled, SetCvarEnabled);
- }
-
public void SetCvarEnabled(bool cvarEnabled)
{
_cvarEnabled = cvarEnabled;
@@ -94,8 +87,8 @@ public override void FrameUpdate(float frameTime)
return;
// If there is no local player, there is no session, and therefore nothing to do here.
- var localPlayer = _playerManager.LocalPlayer;
- if (localPlayer == null)
+ var localSession = _playerManager.LocalSession;
+ if (localSession == null)
return;
// TODO InteractionOutlineComponent
@@ -135,9 +128,9 @@ public override void FrameUpdate(float frameTime)
}
var inRange = false;
- if (localPlayer.ControlledEntity != null && !Deleted(entityToClick))
+ if (localSession.AttachedEntity != null && !Deleted(entityToClick))
{
- inRange = _interactionSystem.InRangeUnobstructed(localPlayer.ControlledEntity.Value, entityToClick.Value);
+ inRange = _interactionSystem.InRangeUnobstructed(localSession.AttachedEntity.Value, entityToClick.Value);
}
InteractionOutlineComponent? outline;
diff --git a/Content.Client/Outline/TargetOutlineSystem.cs b/Content.Client/Outline/TargetOutlineSystem.cs
index 1c396585b3..2a6867f51f 100644
--- a/Content.Client/Outline/TargetOutlineSystem.cs
+++ b/Content.Client/Outline/TargetOutlineSystem.cs
@@ -114,7 +114,7 @@ public override void Update(float frameTime)
private void HighlightTargets()
{
- if (_playerManager.LocalPlayer?.ControlledEntity is not { Valid: true } player)
+ if (_playerManager.LocalEntity is not { Valid: true } player)
return;
// remove current highlights
diff --git a/Content.Client/Overlays/ColorTintOverlay.cs b/Content.Client/Overlays/ColorTintOverlay.cs
new file mode 100644
index 0000000000..fc47b82789
--- /dev/null
+++ b/Content.Client/Overlays/ColorTintOverlay.cs
@@ -0,0 +1,64 @@
+using System.Numerics;
+using Robust.Client.Graphics;
+using Robust.Client.Player;
+using Robust.Shared.Enums;
+using Robust.Shared.Prototypes;
+using Content.Shared.Shadowkin;
+
+namespace Content.Client.Overlays;
+
+///
+/// A simple overlay that applies a colored tint to the screen.
+///
+public sealed class ColorTintOverlay : Overlay
+{
+ [Dependency] private readonly IPrototypeManager _prototype = default!;
+ [Dependency] private readonly IPlayerManager _player = default!;
+ [Dependency] IEntityManager _entityManager = default!;
+
+ public override bool RequestScreenTexture => true;
+ public override OverlaySpace Space => OverlaySpace.WorldSpace;
+ private readonly ShaderInstance _shader;
+
+ ///
+ /// The color to tint the screen to as RGB on a scale of 0-1.
+ ///
+ public Robust.Shared.Maths.Vector3? TintColor = null;
+ ///
+ /// The percent to tint the screen by on a scale of 0-1.
+ ///
+ public float? TintAmount = null;
+
+ public ColorTintOverlay()
+ {
+ IoCManager.InjectDependencies(this);
+ _shader = _prototype.Index("ColorTint").InstanceUnique();
+ }
+
+ protected override bool BeforeDraw(in OverlayDrawArgs args)
+ {
+ if (_player.LocalEntity is not { Valid: true } player
+ || !_entityManager.HasComponent(player))
+ return false;
+
+ return base.BeforeDraw(in args);
+ }
+ protected override void Draw(in OverlayDrawArgs args)
+ {
+ if (ScreenTexture is null)
+ return;
+
+ _shader.SetParameter("SCREEN_TEXTURE", ScreenTexture);
+ if (TintColor != null)
+ _shader.SetParameter("tint_color", (Robust.Shared.Maths.Vector3) TintColor);
+ if (TintAmount != null)
+ _shader.SetParameter("tint_amount", (float) TintAmount);
+
+ var worldHandle = args.WorldHandle;
+ var viewport = args.WorldBounds;
+ worldHandle.SetTransform(Matrix3x2.Identity);
+ worldHandle.UseShader(_shader);
+ worldHandle.DrawRect(viewport, Color.White);
+ worldHandle.UseShader(null);
+ }
+}
diff --git a/Content.Client/Overlays/DogVisionOverlay.cs b/Content.Client/Overlays/DogVisionOverlay.cs
new file mode 100644
index 0000000000..022a31d696
--- /dev/null
+++ b/Content.Client/Overlays/DogVisionOverlay.cs
@@ -0,0 +1,50 @@
+using System.Numerics;
+using Robust.Client.Graphics;
+using Robust.Client.Player;
+using Robust.Shared.Enums;
+using Robust.Shared.Prototypes;
+using Content.Shared.Traits.Assorted.Components;
+
+namespace Content.Client.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("DogVision").Instance().Duplicate();
+ }
+
+ protected override bool BeforeDraw(in OverlayDrawArgs args)
+ {
+ if (_playerManager.LocalEntity is not { Valid: true } player
+ || !_entityManager.HasComponent(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);
+ }
+}
diff --git a/Content.Client/Overlays/DogVisionSystem.cs b/Content.Client/Overlays/DogVisionSystem.cs
new file mode 100644
index 0000000000..5c80c307cb
--- /dev/null
+++ b/Content.Client/Overlays/DogVisionSystem.cs
@@ -0,0 +1,66 @@
+using Content.Shared.Traits.Assorted.Components;
+using Content.Shared.CCVar;
+using Robust.Client.Graphics;
+using Robust.Shared.Configuration;
+using Robust.Shared.Player;
+
+namespace Content.Client.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(OnDogVisionInit);
+ SubscribeLocalEvent(OnDogVisionShutdown);
+ SubscribeLocalEvent(OnPlayerAttached);
+ SubscribeLocalEvent(OnPlayerDetached);
+
+ Subs.CVar(_cfg, CCVars.NoVisionFilters, OnNoVisionFiltersChanged);
+
+ _overlay = new();
+ }
+
+ private void OnDogVisionInit(EntityUid uid, DogVisionComponent component, ComponentInit args)
+ {
+ if (uid != _playerMan.LocalEntity)
+ return;
+
+ if (!_cfg.GetCVar(CCVars.NoVisionFilters))
+ _overlayMan.AddOverlay(_overlay);
+ }
+
+ private void OnDogVisionShutdown(EntityUid uid, DogVisionComponent component, ComponentShutdown args)
+ {
+ if (uid != _playerMan.LocalEntity)
+ return;
+
+ _overlayMan.RemoveOverlay(_overlay);
+ }
+
+ private void OnPlayerAttached(EntityUid uid, DogVisionComponent component, LocalPlayerAttachedEvent args)
+ {
+ if (!_cfg.GetCVar(CCVars.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);
+ }
+}
diff --git a/Content.Client/Overlays/EntityHealthBarOverlay.cs b/Content.Client/Overlays/EntityHealthBarOverlay.cs
index 11bec13539..c96225c0c6 100644
--- a/Content.Client/Overlays/EntityHealthBarOverlay.cs
+++ b/Content.Client/Overlays/EntityHealthBarOverlay.cs
@@ -8,6 +8,8 @@
using Robust.Shared.Enums;
using System.Numerics;
using Content.Shared.StatusIcon.Components;
+using Content.Client.UserInterface.Systems;
+using Robust.Shared.Prototypes;
using static Robust.Shared.Maths.Color;
namespace Content.Client.Overlays;
@@ -21,15 +23,17 @@ public sealed class EntityHealthBarOverlay : Overlay
private readonly SharedTransformSystem _transform;
private readonly MobStateSystem _mobStateSystem;
private readonly MobThresholdSystem _mobThresholdSystem;
+ private readonly ProgressColorSystem _progressColor;
public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowFOV;
public HashSet DamageContainers = new();
public EntityHealthBarOverlay(IEntityManager entManager)
{
_entManager = entManager;
- _transform = _entManager.EntitySysManager.GetEntitySystem();
- _mobStateSystem = _entManager.EntitySysManager.GetEntitySystem();
- _mobThresholdSystem = _entManager.EntitySysManager.GetEntitySystem();
+ _transform = _entManager.System();
+ _mobStateSystem = _entManager.System();
+ _mobThresholdSystem = _entManager.System();
+ _progressColor = _entManager.System();
}
protected override void Draw(in OverlayDrawArgs args)
@@ -39,8 +43,8 @@ protected override void Draw(in OverlayDrawArgs args)
var xformQuery = _entManager.GetEntityQuery();
const float scale = 1f;
- var scaleMatrix = Matrix3.CreateScale(new Vector2(scale, scale));
- var rotationMatrix = Matrix3.CreateRotation(-rotation);
+ var scaleMatrix = Matrix3Helpers.CreateScale(new Vector2(scale, scale));
+ var rotationMatrix = Matrix3Helpers.CreateRotation(-rotation);
var query = _entManager.AllEntityQueryEnumerator();
while (query.MoveNext(out var uid,
@@ -76,10 +80,10 @@ protected override void Draw(in OverlayDrawArgs args)
}
var worldPosition = _transform.GetWorldPosition(xform);
- var worldMatrix = Matrix3.CreateTranslation(worldPosition);
+ var worldMatrix = Matrix3Helpers.CreateTranslation(worldPosition);
- Matrix3.Multiply(scaleMatrix, worldMatrix, out var scaledWorld);
- Matrix3.Multiply(rotationMatrix, scaledWorld, out var matty);
+ var scaledWorld = Matrix3x2.Multiply(scaleMatrix, worldMatrix);
+ var matty = Matrix3x2.Multiply(rotationMatrix, scaledWorld);
handle.SetTransform(matty);
@@ -112,8 +116,7 @@ protected override void Draw(in OverlayDrawArgs args)
handle.DrawRect(pixelDarken, Black.WithAlpha(128));
}
- handle.UseShader(null);
- handle.SetTransform(Matrix3.Identity);
+ handle.SetTransform(Matrix3x2.Identity);
}
///
@@ -147,26 +150,11 @@ protected override void Draw(in OverlayDrawArgs args)
return (0, true);
}
- public static Color GetProgressColor(float progress, bool crit)
+ public Color GetProgressColor(float progress, bool crit)
{
- if (progress >= 1.0f)
- {
- return SeaBlue;
- }
-
- if (!crit)
- {
- switch (progress)
- {
- case > 0.90F:
- return SeaBlue;
- case > 0.50F:
- return Violet;
- case > 0.15F:
- return Ruber;
- }
- }
+ if (crit)
+ progress = 0;
- return VividGamboge;
+ return _progressColor.GetProgressColor(progress);
}
}
diff --git a/Content.Client/Overlays/EtherealOverlay.cs b/Content.Client/Overlays/EtherealOverlay.cs
new file mode 100644
index 0000000000..594a3656c8
--- /dev/null
+++ b/Content.Client/Overlays/EtherealOverlay.cs
@@ -0,0 +1,49 @@
+using System.Numerics;
+using Robust.Client.Graphics;
+using Robust.Client.Player;
+using Robust.Shared.Enums;
+using Robust.Shared.Prototypes;
+using Content.Shared.Shadowkin;
+
+namespace Content.Client.Overlays;
+
+public sealed class EtherealOverlay : Overlay
+{
+ [Dependency] private readonly IPrototypeManager _prototype = default!;
+ [Dependency] private readonly IPlayerManager _player = default!;
+ [Dependency] IEntityManager _entityManager = default!;
+
+ public override bool RequestScreenTexture => true;
+ public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowFOV;
+ private readonly ShaderInstance _shader;
+
+ public EtherealOverlay()
+ {
+ IoCManager.InjectDependencies(this);
+ _shader = _prototype.Index("Ethereal").InstanceUnique();
+ }
+
+ protected override bool BeforeDraw(in OverlayDrawArgs args)
+ {
+ if (_player.LocalEntity is not { Valid: true } player
+ || !_entityManager.HasComponent(player))
+ return false;
+
+ return base.BeforeDraw(in args);
+ }
+
+ protected override void Draw(in OverlayDrawArgs args)
+ {
+ if (ScreenTexture is null)
+ return;
+
+ _shader.SetParameter("SCREEN_TEXTURE", ScreenTexture);
+
+ var worldHandle = args.WorldHandle;
+ var viewport = args.WorldBounds;
+ worldHandle.SetTransform(Matrix3x2.Identity);
+ worldHandle.UseShader(_shader);
+ worldHandle.DrawRect(viewport, Color.White);
+ worldHandle.UseShader(null);
+ }
+}
diff --git a/Content.Client/Overlays/SaturationScaleOverlay.cs b/Content.Client/Overlays/SaturationScaleOverlay.cs
new file mode 100644
index 0000000000..d3a27a9724
--- /dev/null
+++ b/Content.Client/Overlays/SaturationScaleOverlay.cs
@@ -0,0 +1,54 @@
+using System.Numerics;
+using Robust.Client.Graphics;
+using Robust.Client.Player;
+using Robust.Shared.Enums;
+using Robust.Shared.Prototypes;
+using Content.Shared.Mood;
+using Content.Shared.Overlays;
+
+namespace Content.Client.Overlays;
+
+public sealed class SaturationScaleOverlay : 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 _shader;
+ private const float Saturation = 0.5f;
+
+
+ public SaturationScaleOverlay()
+ {
+ IoCManager.InjectDependencies(this);
+
+ _shader = _prototypeManager.Index("SaturationScale").Instance().Duplicate();
+ }
+
+ protected override bool BeforeDraw(in OverlayDrawArgs args)
+ {
+ if (_playerManager.LocalEntity is not { Valid: true } player
+ || !_entityManager.HasComponent(player))
+ return false;
+
+ return base.BeforeDraw(in args);
+ }
+
+
+ protected override void Draw(in OverlayDrawArgs args)
+ {
+ if (ScreenTexture is null)
+ return;
+
+ _shader.SetParameter("SCREEN_TEXTURE", ScreenTexture);
+ _shader.SetParameter("saturation", Saturation);
+
+ var handle = args.WorldHandle;
+ handle.SetTransform(Matrix3x2.Identity);
+ handle.UseShader(_shader);
+ handle.DrawRect(args.WorldBounds, Color.White);
+ handle.UseShader(null);
+ }
+}
diff --git a/Content.Client/Overlays/SaturationScaleSystem.cs b/Content.Client/Overlays/SaturationScaleSystem.cs
new file mode 100644
index 0000000000..b5932e3a49
--- /dev/null
+++ b/Content.Client/Overlays/SaturationScaleSystem.cs
@@ -0,0 +1,63 @@
+using Content.Shared.GameTicking;
+using Content.Shared.Mood;
+using Content.Shared.Overlays;
+using Robust.Client.Graphics;
+using Robust.Shared.Player;
+
+namespace Content.Client.Overlays;
+
+public sealed class SaturationScaleSystem : EntitySystem
+{
+ [Dependency] private readonly IOverlayManager _overlayMan = default!;
+ [Dependency] private readonly ISharedPlayerManager _playerMan = default!;
+
+ private SaturationScaleOverlay _overlay = default!;
+
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ _overlay = new();
+
+ SubscribeLocalEvent(OnInit);
+ SubscribeLocalEvent(OnShutdown);
+
+ SubscribeLocalEvent(OnPlayerAttached);
+ SubscribeLocalEvent(OnPlayerDetached);
+
+ SubscribeNetworkEvent(RoundRestartCleanup);
+ }
+
+
+ private void RoundRestartCleanup(RoundRestartCleanupEvent ev)
+ {
+ _overlayMan.RemoveOverlay(_overlay);
+ }
+
+ private void OnPlayerDetached(EntityUid uid, SaturationScaleOverlayComponent component, PlayerDetachedEvent args)
+ {
+ _overlayMan.RemoveOverlay(_overlay);
+ }
+
+ private void OnPlayerAttached(EntityUid uid, SaturationScaleOverlayComponent component, PlayerAttachedEvent args)
+ {
+ _overlayMan.AddOverlay(_overlay);
+ }
+
+ private void OnShutdown(EntityUid uid, SaturationScaleOverlayComponent component, ComponentShutdown args)
+ {
+ if (uid != _playerMan.LocalEntity)
+ return;
+
+ _overlayMan.RemoveOverlay(_overlay);
+ }
+
+ private void OnInit(EntityUid uid, SaturationScaleOverlayComponent component, ComponentInit args)
+ {
+ if (uid != _playerMan.LocalEntity)
+ return;
+
+ _overlayMan.AddOverlay(_overlay);
+ }
+}
diff --git a/Content.Client/Overlays/ShowCriminalRecordIconsSystem.cs b/Content.Client/Overlays/ShowCriminalRecordIconsSystem.cs
new file mode 100644
index 0000000000..8f23cd510c
--- /dev/null
+++ b/Content.Client/Overlays/ShowCriminalRecordIconsSystem.cs
@@ -0,0 +1,28 @@
+using Content.Shared.Overlays;
+using Content.Shared.Security.Components;
+using Content.Shared.StatusIcon;
+using Content.Shared.StatusIcon.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.Overlays;
+
+public sealed class ShowCriminalRecordIconsSystem : EquipmentHudSystem
+{
+ [Dependency] private readonly IPrototypeManager _prototype = default!;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnGetStatusIconsEvent);
+ }
+
+ private void OnGetStatusIconsEvent(EntityUid uid, CriminalRecordComponent component, ref GetStatusIconsEvent ev)
+ {
+ if (!IsActive || ev.InContainer)
+ return;
+
+ if (_prototype.TryIndex(component.StatusIcon.Id, out var iconPrototype))
+ ev.StatusIcons.Add(iconPrototype);
+ }
+}
diff --git a/Content.Client/Overlays/ShowHealthIconsSystem.cs b/Content.Client/Overlays/ShowHealthIconsSystem.cs
index 6ed9d6a41d..a546cf4d82 100644
--- a/Content.Client/Overlays/ShowHealthIconsSystem.cs
+++ b/Content.Client/Overlays/ShowHealthIconsSystem.cs
@@ -1,5 +1,7 @@
+using Content.Shared.Atmos.Rotting;
using Content.Shared.Damage;
using Content.Shared.Inventory.Events;
+using Content.Shared.Mobs.Components;
using Content.Shared.Overlays;
using Content.Shared.StatusIcon;
using Content.Shared.StatusIcon.Components;
@@ -17,9 +19,6 @@ public sealed class ShowHealthIconsSystem : EquipmentHudSystem DamageContainers = new();
- [ValidatePrototypeId]
- private const string HealthIconFine = "HealthIconFine";
-
public override void Initialize()
{
base.Initialize();
@@ -45,18 +44,20 @@ protected override void DeactivateInternal()
DamageContainers.Clear();
}
- private void OnGetStatusIconsEvent(EntityUid uid, DamageableComponent damageableComponent, ref GetStatusIconsEvent args)
+ private void OnGetStatusIconsEvent(Entity entity, ref GetStatusIconsEvent args)
{
if (!IsActive || args.InContainer)
return;
- var healthIcons = DecideHealthIcons(damageableComponent);
+ var healthIcons = DecideHealthIcons(entity);
args.StatusIcons.AddRange(healthIcons);
}
- private IReadOnlyList DecideHealthIcons(DamageableComponent damageableComponent)
+ private IReadOnlyList DecideHealthIcons(Entity entity)
{
+ var damageableComponent = entity.Comp;
+
if (damageableComponent.DamageContainerID == null ||
!DamageContainers.Contains(damageableComponent.DamageContainerID))
{
@@ -66,10 +67,16 @@ private IReadOnlyList DecideHealthIcons(DamageableComponent
var result = new List();
// Here you could check health status, diseases, mind status, etc. and pick a good icon, or multiple depending on whatever.
- if (damageableComponent?.DamageContainerID == "Biological" &&
- _prototypeMan.TryIndex(HealthIconFine, out var healthyIcon))
+ if (damageableComponent?.DamageContainerID == "Biological")
{
- result.Add(healthyIcon);
+ if (TryComp(entity, out var state))
+ {
+ // Since there is no MobState for a rotting mob, we have to deal with this case first.
+ if (HasComp(entity) && _prototypeMan.TryIndex(damageableComponent.RottingIcon, out var rottingIcon))
+ result.Add(rottingIcon);
+ else if (damageableComponent.HealthIcons.TryGetValue(state.CurrentState, out var value) && _prototypeMan.TryIndex(value, out var icon))
+ result.Add(icon);
+ }
}
return result;
diff --git a/Content.Client/Overlays/ShowHungerIconsSystem.cs b/Content.Client/Overlays/ShowHungerIconsSystem.cs
index 58551b30c2..b1c0f3a1a0 100644
--- a/Content.Client/Overlays/ShowHungerIconsSystem.cs
+++ b/Content.Client/Overlays/ShowHungerIconsSystem.cs
@@ -1,14 +1,13 @@
+using Content.Shared.Nutrition.EntitySystems;
using Content.Shared.Nutrition.Components;
using Content.Shared.Overlays;
-using Content.Shared.StatusIcon;
using Content.Shared.StatusIcon.Components;
-using Robust.Shared.Prototypes;
namespace Content.Client.Overlays;
public sealed class ShowHungerIconsSystem : EquipmentHudSystem
{
- [Dependency] private readonly IPrototypeManager _prototypeMan = default!;
+ [Dependency] private readonly HungerSystem _hunger = default!;
public override void Initialize()
{
@@ -17,42 +16,12 @@ public override void Initialize()
SubscribeLocalEvent(OnGetStatusIconsEvent);
}
- private void OnGetStatusIconsEvent(EntityUid uid, HungerComponent hungerComponent, ref GetStatusIconsEvent args)
+ private void OnGetStatusIconsEvent(EntityUid uid, HungerComponent component, ref GetStatusIconsEvent ev)
{
- if (!IsActive || args.InContainer)
+ if (!IsActive || ev.InContainer)
return;
- var hungerIcons = DecideHungerIcon(uid, hungerComponent);
-
- args.StatusIcons.AddRange(hungerIcons);
- }
-
- private IReadOnlyList DecideHungerIcon(EntityUid uid, HungerComponent hungerComponent)
- {
- var result = new List();
-
- switch (hungerComponent.CurrentThreshold)
- {
- case HungerThreshold.Overfed:
- if (_prototypeMan.TryIndex("HungerIconOverfed", out var overfed))
- {
- result.Add(overfed);
- }
- break;
- case HungerThreshold.Peckish:
- if (_prototypeMan.TryIndex("HungerIconPeckish", out var peckish))
- {
- result.Add(peckish);
- }
- break;
- case HungerThreshold.Starving:
- if (_prototypeMan.TryIndex("HungerIconStarving", out var starving))
- {
- result.Add(starving);
- }
- break;
- }
-
- return result;
+ if (_hunger.TryGetStatusIconPrototype(component, out var iconPrototype))
+ ev.StatusIcons.Add(iconPrototype);
}
}
diff --git a/Content.Client/Overlays/ShowJobIconsSystem.cs b/Content.Client/Overlays/ShowJobIconsSystem.cs
new file mode 100644
index 0000000000..e24b99f3e8
--- /dev/null
+++ b/Content.Client/Overlays/ShowJobIconsSystem.cs
@@ -0,0 +1,60 @@
+using Content.Shared.Access.Components;
+using Content.Shared.Access.Systems;
+using Content.Shared.Overlays;
+using Content.Shared.PDA;
+using Content.Shared.StatusIcon;
+using Content.Shared.StatusIcon.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.Overlays;
+
+public sealed class ShowJobIconsSystem : EquipmentHudSystem
+{
+ [Dependency] private readonly IPrototypeManager _prototype = default!;
+ [Dependency] private readonly AccessReaderSystem _accessReader = default!;
+
+ [ValidatePrototypeId]
+ private const string JobIconForNoId = "JobIconNoId";
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnGetStatusIconsEvent);
+ }
+
+ private void OnGetStatusIconsEvent(EntityUid uid, StatusIconComponent _, ref GetStatusIconsEvent ev)
+ {
+ if (!IsActive || ev.InContainer)
+ return;
+
+ var iconId = JobIconForNoId;
+
+ if (_accessReader.FindAccessItemsInventory(uid, out var items))
+ {
+ foreach (var item in items)
+ {
+ // ID Card
+ if (TryComp(item, out var id))
+ {
+ iconId = id.JobIcon;
+ break;
+ }
+
+ // PDA
+ if (TryComp(item, out var pda)
+ && pda.ContainedId != null
+ && TryComp(pda.ContainedId, out id))
+ {
+ iconId = id.JobIcon;
+ break;
+ }
+ }
+ }
+
+ if (_prototype.TryIndex(iconId, out var iconPrototype))
+ ev.StatusIcons.Add(iconPrototype);
+ else
+ Log.Error($"Invalid job icon prototype: {iconPrototype}");
+ }
+}
diff --git a/Content.Client/Overlays/ShowMindShieldIconsSystem.cs b/Content.Client/Overlays/ShowMindShieldIconsSystem.cs
new file mode 100644
index 0000000000..8bf39b875f
--- /dev/null
+++ b/Content.Client/Overlays/ShowMindShieldIconsSystem.cs
@@ -0,0 +1,28 @@
+using Content.Shared.Mindshield.Components;
+using Content.Shared.Overlays;
+using Content.Shared.StatusIcon;
+using Content.Shared.StatusIcon.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.Overlays;
+
+public sealed class ShowMindShieldIconsSystem : EquipmentHudSystem
+{
+ [Dependency] private readonly IPrototypeManager _prototype = default!;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnGetStatusIconsEvent);
+ }
+
+ private void OnGetStatusIconsEvent(EntityUid uid, MindShieldComponent component, ref GetStatusIconsEvent ev)
+ {
+ if (!IsActive || ev.InContainer)
+ return;
+
+ if (_prototype.TryIndex(component.MindShieldStatusIcon.Id, out var iconPrototype))
+ ev.StatusIcons.Add(iconPrototype);
+ }
+}
diff --git a/Content.Client/Overlays/ShowSecurityIconsSystem.cs b/Content.Client/Overlays/ShowSecurityIconsSystem.cs
deleted file mode 100644
index 77c14c5ef0..0000000000
--- a/Content.Client/Overlays/ShowSecurityIconsSystem.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using Content.Shared.Access.Components;
-using Content.Shared.Access.Systems;
-using Content.Shared.Mindshield.Components;
-using Content.Shared.Overlays;
-using Content.Shared.PDA;
-using Content.Shared.StatusIcon;
-using Content.Shared.StatusIcon.Components;
-using Robust.Shared.Prototypes;
-
-namespace Content.Client.Overlays;
-
-public sealed class ShowSecurityIconsSystem : EquipmentHudSystem
-{
- [Dependency] private readonly IPrototypeManager _prototypeMan = default!;
- [Dependency] private readonly AccessReaderSystem _accessReader = default!;
-
- [ValidatePrototypeId]
- private const string JobIconForNoId = "JobIconNoId";
-
- public override void Initialize()
- {
- base.Initialize();
-
- SubscribeLocalEvent(OnGetStatusIconsEvent);
- }
-
- private void OnGetStatusIconsEvent(EntityUid uid, StatusIconComponent _, ref GetStatusIconsEvent @event)
- {
- if (!IsActive || @event.InContainer)
- {
- return;
- }
-
- var securityIcons = DecideSecurityIcon(uid);
-
- @event.StatusIcons.AddRange(securityIcons);
- }
-
- private IReadOnlyList DecideSecurityIcon(EntityUid uid)
- {
- var result = new List();
-
- var jobIconToGet = JobIconForNoId;
- if (_accessReader.FindAccessItemsInventory(uid, out var items))
- {
- foreach (var item in items)
- {
- // ID Card
- if (TryComp(item, out IdCardComponent? id))
- {
- jobIconToGet = id.JobIcon;
- break;
- }
-
- // PDA
- if (TryComp(item, out PdaComponent? pda)
- && pda.ContainedId != null
- && TryComp(pda.ContainedId, out id))
- {
- jobIconToGet = id.JobIcon;
- break;
- }
- }
- }
-
- if (_prototypeMan.TryIndex(jobIconToGet, out var jobIcon))
- result.Add(jobIcon);
- else
- Log.Error($"Invalid job icon prototype: {jobIcon}");
-
- if (TryComp(uid, out var comp))
- {
- if (_prototypeMan.TryIndex(comp.MindShieldStatusIcon.Id, out var icon))
- result.Add(icon);
- }
-
- // Add arrest icons here, WYCI.
-
- return result;
- }
-}
diff --git a/Content.Client/Overlays/ShowSyndicateIconsSystem.cs b/Content.Client/Overlays/ShowSyndicateIconsSystem.cs
index a640726685..660ef198e1 100644
--- a/Content.Client/Overlays/ShowSyndicateIconsSystem.cs
+++ b/Content.Client/Overlays/ShowSyndicateIconsSystem.cs
@@ -1,10 +1,11 @@
using Content.Shared.Overlays;
-using Content.Shared.StatusIcon.Components;
using Content.Shared.NukeOps;
using Content.Shared.StatusIcon;
+using Content.Shared.StatusIcon.Components;
using Robust.Shared.Prototypes;
namespace Content.Client.Overlays;
+
public sealed class ShowSyndicateIconsSystem : EquipmentHudSystem
{
[Dependency] private readonly IPrototypeManager _prototype = default!;
@@ -16,28 +17,13 @@ public override void Initialize()
SubscribeLocalEvent(OnGetStatusIconsEvent);
}
- private void OnGetStatusIconsEvent(EntityUid uid, NukeOperativeComponent nukeOperativeComponent, ref GetStatusIconsEvent args)
+ private void OnGetStatusIconsEvent(EntityUid uid, NukeOperativeComponent component, ref GetStatusIconsEvent ev)
{
- if (!IsActive || args.InContainer)
- {
+ if (!IsActive || ev.InContainer)
return;
- }
-
- var syndicateIcons = SyndicateIcon(uid, nukeOperativeComponent);
-
- args.StatusIcons.AddRange(syndicateIcons);
- }
-
- private IReadOnlyList SyndicateIcon(EntityUid uid, NukeOperativeComponent nukeOperativeComponent)
- {
- var result = new List();
-
- if (_prototype.TryIndex(nukeOperativeComponent.SyndStatusIcon, out var syndicateicon))
- {
- result.Add(syndicateicon);
- }
- return result;
+ if (_prototype.TryIndex(component.SyndStatusIcon, out var iconPrototype))
+ ev.StatusIcons.Add(iconPrototype);
}
}
diff --git a/Content.Client/Overlays/ShowThirstIconsSystem.cs b/Content.Client/Overlays/ShowThirstIconsSystem.cs
index f9d6d0ab25..b08aa4340b 100644
--- a/Content.Client/Overlays/ShowThirstIconsSystem.cs
+++ b/Content.Client/Overlays/ShowThirstIconsSystem.cs
@@ -1,14 +1,13 @@
+using Content.Shared.Nutrition.EntitySystems;
using Content.Shared.Nutrition.Components;
using Content.Shared.Overlays;
-using Content.Shared.StatusIcon;
using Content.Shared.StatusIcon.Components;
-using Robust.Shared.Prototypes;
namespace Content.Client.Overlays;
public sealed class ShowThirstIconsSystem : EquipmentHudSystem
{
- [Dependency] private readonly IPrototypeManager _prototypeMan = default!;
+ [Dependency] private readonly ThirstSystem _thirst = default!;
public override void Initialize()
{
@@ -17,42 +16,12 @@ public override void Initialize()
SubscribeLocalEvent(OnGetStatusIconsEvent);
}
- private void OnGetStatusIconsEvent(EntityUid uid, ThirstComponent thirstComponent, ref GetStatusIconsEvent args)
+ private void OnGetStatusIconsEvent(EntityUid uid, ThirstComponent component, ref GetStatusIconsEvent ev)
{
- if (!IsActive || args.InContainer)
+ if (!IsActive || ev.InContainer)
return;
- var thirstIcons = DecideThirstIcon(uid, thirstComponent);
-
- args.StatusIcons.AddRange(thirstIcons);
- }
-
- private IReadOnlyList DecideThirstIcon(EntityUid uid, ThirstComponent thirstComponent)
- {
- var result = new List();
-
- switch (thirstComponent.CurrentThirstThreshold)
- {
- case ThirstThreshold.OverHydrated:
- if (_prototypeMan.TryIndex("ThirstIconOverhydrated", out var overhydrated))
- {
- result.Add(overhydrated);
- }
- break;
- case ThirstThreshold.Thirsty:
- if (_prototypeMan.TryIndex("ThirstIconThirsty", out var thirsty))
- {
- result.Add(thirsty);
- }
- break;
- case ThirstThreshold.Parched:
- if (_prototypeMan.TryIndex("ThirstIconParched", out var parched))
- {
- result.Add(parched);
- }
- break;
- }
-
- return result;
+ if (_thirst.TryGetStatusIconPrototype(component, out var iconPrototype))
+ ev.StatusIcons.Add(iconPrototype!);
}
}
diff --git a/Content.Client/Overlays/StencilOverlay.RestrictedRange.cs b/Content.Client/Overlays/StencilOverlay.RestrictedRange.cs
index 9581fec37b..d29564caa9 100644
--- a/Content.Client/Overlays/StencilOverlay.RestrictedRange.cs
+++ b/Content.Client/Overlays/StencilOverlay.RestrictedRange.cs
@@ -7,7 +7,7 @@ namespace Content.Client.Overlays;
public sealed partial class StencilOverlay
{
- private void DrawRestrictedRange(in OverlayDrawArgs args, RestrictedRangeComponent rangeComp, Matrix3 invMatrix)
+ private void DrawRestrictedRange(in OverlayDrawArgs args, RestrictedRangeComponent rangeComp, Matrix3x2 invMatrix)
{
var worldHandle = args.WorldHandle;
var renderScale = args.Viewport.RenderScale.X;
@@ -16,7 +16,7 @@ private void DrawRestrictedRange(in OverlayDrawArgs args, RestrictedRangeCompone
var length = zoom.X;
var bufferRange = MathF.Min(10f, rangeComp.Range);
- var pixelCenter = invMatrix.Transform(rangeComp.Origin);
+ var pixelCenter = Vector2.Transform(rangeComp.Origin, invMatrix);
// Something something offset?
var vertical = args.Viewport.Size.Y;
@@ -44,7 +44,7 @@ private void DrawRestrictedRange(in OverlayDrawArgs args, RestrictedRangeCompone
worldHandle.DrawRect(localAABB, Color.White);
}, Color.Transparent);
- worldHandle.SetTransform(Matrix3.Identity);
+ worldHandle.SetTransform(Matrix3x2.Identity);
worldHandle.UseShader(_protoManager.Index