tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup warnings in TippyUIController (#37378)

Browse Source 
Cleanup warnings in TippyUIController
This commit is contained in:
Tayrtahn
2025-05-12 16:21:52 -04:00
committed by GitHub
parent 95d73a4019
commit a464c5dd99
1 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
Content.Client/Tips/TippyUIController.cs
View File

@@ -22,6 +22,7 @@ public sealed class TippyUIController : UIController
[Dependency] private readonly IConfigurationManager _cfg = default!; [Dependency] private readonly IConfigurationManager _cfg = default!;
[Dependency] private readonly IResourceCache _resCache = default!; [Dependency] private readonly IResourceCache _resCache = default!;
[UISystemDependency] private readonly AudioSystem _audio = default!; [UISystemDependency] private readonly AudioSystem _audio = default!;
[UISystemDependency] private readonly SpriteSystem _sprite = default!;
public const float Padding = 50; public const float Padding = 50;
public static Angle WaddleRotation = Angle.FromDegrees(10); public static Angle WaddleRotation = Angle.FromDegrees(10);
@@ -93,16 +94,17 @@ public sealed class TippyUIController : UIController
return new Vector2(screenSize.X - offset * (tippy.DesiredSize.X + Padding), (screenSize.Y - tippy.DesiredSize.Y) / 2); return new Vector2(screenSize.X - offset * (tippy.DesiredSize.X + Padding), (screenSize.Y - tippy.DesiredSize.Y) / 2);
} }
var numSteps = (int) Math.Ceiling(slideTime / waddle); var numSteps = (int)Math.Ceiling(slideTime / waddle);
var curStep = (int) Math.Floor(numSteps * offset); var curStep = (int)Math.Floor(numSteps * offset);
var stepSize = (tippy.DesiredSize.X + Padding) / numSteps; var stepSize = (tippy.DesiredSize.X + Padding) / numSteps;
if (curStep != _previousStep) if (curStep != _previousStep)
{ {
_previousStep = curStep; _previousStep = curStep;
sprite.Rotation = sprite.Rotation > 0 _sprite.SetRotation((_entity, sprite),
? -WaddleRotation sprite.Rotation > 0
: WaddleRotation; ? -WaddleRotation
: WaddleRotation);
if (EntityManager.TryGetComponent(_entity, out FootstepModifierComponent? step) && step.FootstepSoundCollection != null) if (EntityManager.TryGetComponent(_entity, out FootstepModifierComponent? step) && step.FootstepSoundCollection != null)
{ {
@@ -150,11 +152,11 @@ public sealed class TippyUIController : UIController
var scale = sprite.Scale; var scale = sprite.Scale;
if (tippy.ModifyLayers) if (tippy.ModifyLayers)
{ {
sprite.Scale = Vector2.One; _sprite.SetScale((_entity, sprite), Vector2.One);
} }
else else
{ {
sprite.Scale = new Vector2(3, 3); _sprite.SetScale((_entity, sprite), new Vector2(3, 3));
} }
tippy.Entity.SetEntity(_entity); tippy.Entity.SetEntity(_entity);
tippy.Entity.Scale = scale; tippy.Entity.Scale = scale;
@@ -165,31 +167,31 @@ public sealed class TippyUIController : UIController
_previousStep = 0; _previousStep = 0;
if (tippy.ModifyLayers) if (tippy.ModifyLayers)
{ {
sprite.LayerSetAnimationTime("revealing", 0); _sprite.LayerSetAnimationTime((_entity, sprite), "revealing", 0);
sprite.LayerSetVisible("revealing", true); _sprite.LayerSetVisible((_entity, sprite), "revealing", true);
sprite.LayerSetVisible("speaking", false); _sprite.LayerSetVisible((_entity, sprite), "speaking", false);
sprite.LayerSetVisible("hiding", false); _sprite.LayerSetVisible((_entity, sprite), "hiding", false);
} }
sprite.Rotation = 0; _sprite.SetRotation((_entity, sprite), 0);
tippy.Label.SetMarkupPermissive(_currentMessage.Msg); tippy.Label.SetMarkupPermissive(_currentMessage.Msg);
tippy.Label.Visible = false; tippy.Label.Visible = false;
tippy.LabelPanel.Visible = false; tippy.LabelPanel.Visible = false;
tippy.Visible = true; tippy.Visible = true;
sprite.Visible = true; _sprite.SetVisible((_entity, sprite), true);
break; break;
case TippyState.Revealing: case TippyState.Revealing:
tippy.State = TippyState.Speaking; tippy.State = TippyState.Speaking;
if (!EntityManager.TryGetComponent(_entity, out sprite)) if (!EntityManager.TryGetComponent(_entity, out sprite))
return; return;
sprite.Rotation = 0; _sprite.SetRotation((_entity, sprite), 0);
_previousStep = 0; _previousStep = 0;
if (tippy.ModifyLayers) if (tippy.ModifyLayers)
{ {
sprite.LayerSetAnimationTime("speaking", 0); _sprite.LayerSetAnimationTime((_entity, sprite), "speaking", 0);
sprite.LayerSetVisible("revealing", false); _sprite.LayerSetVisible((_entity, sprite), "revealing", false);
sprite.LayerSetVisible("speaking", true); _sprite.LayerSetVisible((_entity, sprite), "speaking", true);
sprite.LayerSetVisible("hiding", false); _sprite.LayerSetVisible((_entity, sprite), "hiding", false);
} }
tippy.Label.Visible = true; tippy.Label.Visible = true;
tippy.LabelPanel.Visible = true; tippy.LabelPanel.Visible = true;
@@ -206,10 +208,10 @@ public sealed class TippyUIController : UIController
return; return;
if (tippy.ModifyLayers) if (tippy.ModifyLayers)
{ {
sprite.LayerSetAnimationTime("hiding", 0); _sprite.LayerSetAnimationTime((_entity, sprite), "hiding", 0);
sprite.LayerSetVisible("revealing", false); _sprite.LayerSetVisible((_entity, sprite), "revealing", false);
sprite.LayerSetVisible("speaking", false); _sprite.LayerSetVisible((_entity, sprite), "speaking", false);
sprite.LayerSetVisible("hiding", true); _sprite.LayerSetVisible((_entity, sprite), "hiding", true);
} }
tippy.LabelPanel.Visible = false; tippy.LabelPanel.Visible = false;
if (_currentMessage != null) if (_currentMessage != null)