juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

split components

Browse Source
This commit is contained in:
Ed
2024-11-15 23:25:08 +03:00
parent cb4b92a5f7
commit 6e7714d86a
6 changed files with 60 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
Content.Client/_CP14/MagicSpell/CP14ClientMagicVisionSystem.cs
View File

@@ -9,7 +9,19 @@ namespace Content.Client._CP14.MagicSpell;
public sealed class CP14ClientMagicVisionSystem : CP14SharedMagicVisionSystem
{
[Dependency] private readonly IClientGameTiming _timing = default!;
public bool MagicVisible { get; set; }
private bool _markersVisible;
public bool MarkersVisible
{
get => _markersVisible;
set
{
_markersVisible = value;
UpdateVisibilityAll();
}
}
private TimeSpan _nextUpdate = TimeSpan.Zero;
@@ -17,7 +29,15 @@ public sealed class CP14ClientMagicVisionSystem : CP14SharedMagicVisionSystem
{
base.Initialize();
SubscribeLocalEvent<CP14MagicVisionMarkerComponent, ComponentStartup>(OnStartup);
SubscribeLocalEvent<CP14MagicVisionMarkerComponent, ComponentStartup>(OnStartupMarker);
}
private void OnStartupMarker(Entity<CP14MagicVisionMarkerComponent> ent, ref ComponentStartup args)
{
if (!TryComp<SpriteComponent>(ent, out var sprite))
return;
UpdateVisibility(ent, sprite);
}
public override void Update(float frameTime)
@@ -27,8 +47,22 @@ public sealed class CP14ClientMagicVisionSystem : CP14SharedMagicVisionSystem
if (_timing.CurTime < _nextUpdate)
return;
_nextUpdate = _timing.CurTime + TimeSpan.FromSeconds(1f);
_nextUpdate = _timing.CurTime + TimeSpan.FromSeconds(0.5f);
var queryFade = EntityQueryEnumerator<CP14MagicVisionFadeComponent, SpriteComponent>();
while (queryFade.MoveNext(out var uid, out var fade, out var sprite))
{
UpdateOpaque((uid, fade), sprite);
}
}
private void UpdateVisibility(Entity<CP14MagicVisionMarkerComponent> ent, SpriteComponent sprite)
{
sprite.Visible = _markersVisible;
}
private void UpdateVisibilityAll()
{
var query = EntityQueryEnumerator<CP14MagicVisionMarkerComponent, SpriteComponent>();
while (query.MoveNext(out var uid, out var marker, out var sprite))
{
@@ -36,27 +70,10 @@ public sealed class CP14ClientMagicVisionSystem : CP14SharedMagicVisionSystem
}
}
private void OnStartup(Entity<CP14MagicVisionMarkerComponent> ent, ref ComponentStartup args)
private void UpdateOpaque(Entity<CP14MagicVisionFadeComponent> ent, SpriteComponent sprite)
{
if (!TryComp<SpriteComponent>(ent, out var sprite))
return;
ent.Comp.SpawnTime = _timing.CurTime;
ent.Comp.EndTime = _timing.CurTime + ent.Comp.VisibilityTime;
UpdateVisibility(ent, sprite);
}
private void UpdateVisibility(Entity<CP14MagicVisionMarkerComponent> ent, SpriteComponent sprite)
{
sprite.Visible = MagicVisible;
if (MagicVisible == false)
return;
var progress = Math.Clamp((_timing.CurTime.TotalSeconds - ent.Comp.SpawnTime.TotalSeconds) / (ent.Comp.EndTime.TotalSeconds - ent.Comp.SpawnTime.TotalSeconds), 0, 1);
var alpha = 1 - progress;
Log.Info($"{ent.Owner.Id} - {alpha.ToString()}");
sprite.Color = Color.White.WithAlpha((float)alpha);
}
}
@@ -71,6 +88,6 @@ internal sealed class ShowMagicCommand : LocalizedCommands
public override void Execute(IConsoleShell shell, string argStr, string[] args)
{
_entitySystemManager.GetEntitySystem<CP14ClientMagicVisionSystem>().MagicVisible ^= true;
_entitySystemManager.GetEntitySystem<CP14ClientMagicVisionSystem>().MarkersVisible ^= true;
}
}

2
Content.Server/_CP14/MagicSpell/CP14MagicVisionSystem.cs
View File

@@ -12,7 +12,7 @@ public sealed class CP14MagicVisionSystem : CP14SharedMagicVisionSystem
{
base.Update(frameTime);
var query = EntityQueryEnumerator<CP14MagicVisionMarkerComponent>();
var query = EntityQueryEnumerator<CP14MagicVisionFadeComponent>();
while (query.MoveNext(out var uid, out var marker))
{
if (_timing.CurTime < marker.EndTime)

4
Content.Shared/_CP14/MagicSpell/CP14SharedMagicVisionSystem.cs
View File

@@ -10,10 +10,10 @@ public abstract class CP14SharedMagicVisionSystem : EntitySystem
{
base.Initialize();
SubscribeLocalEvent<CP14MagicVisionMarkerComponent, MapInitEvent>(OnMapInit);
SubscribeLocalEvent<CP14MagicVisionFadeComponent, ComponentStartup>(OnStartupFade);
}
private void OnMapInit(Entity<CP14MagicVisionMarkerComponent> ent, ref MapInitEvent args)
private void OnStartupFade(Entity<CP14MagicVisionFadeComponent> ent, ref ComponentStartup args)
{
ent.Comp.SpawnTime = _timing.CurTime;
ent.Comp.EndTime = _timing.CurTime + ent.Comp.VisibilityTime;

17
Content.Shared/_CP14/MagicSpell/Components/CP14MagicVisionFadeComponent.cs Normal file
View File

@@ -0,0 +1,17 @@
namespace Content.Shared._CP14.MagicSpell.Components;
/// <summary>
/// Controls the visibility of this entity to the client, based on the length of time it has existed and the client's ability to see the magic
/// </summary>
[RegisterComponent, AutoGenerateComponentPause]
public sealed partial class CP14MagicVisionFadeComponent : Component
{
[DataField, AutoPausedField]
public TimeSpan SpawnTime = TimeSpan.Zero;
[DataField, AutoPausedField]
public TimeSpan EndTime = TimeSpan.Zero;
[DataField]
public TimeSpan VisibilityTime = TimeSpan.FromMinutes(2f);
}

8
Content.Shared/_CP14/MagicSpell/Components/CP14MagicVisionMarkerComponent.cs
View File

@@ -6,12 +6,4 @@ namespace Content.Shared._CP14.MagicSpell.Components;
[RegisterComponent, AutoGenerateComponentPause]
public sealed partial class CP14MagicVisionMarkerComponent : Component
{
[DataField, AutoPausedField]
public TimeSpan SpawnTime = TimeSpan.Zero;
[DataField, AutoPausedField]
public TimeSpan EndTime = TimeSpan.Zero;
[DataField]
public TimeSpan VisibilityTime = TimeSpan.FromMinutes(2f);
}

1
Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T1_cure_wounds.yml
View File

@@ -66,6 +66,7 @@
- state: cure_wounds
shader: unshaded
- type: CP14MagicVisionMarker
- type: CP14MagicVisionFade
visibilityTime: 20
- type: entity