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

Cooldown for status effects (#1109)

Browse Source
This commit is contained in:
Víctor Aguilera Puerto
2020-06-12 16:22:36 +02:00
committed by GitHub
parent 1587efbe29
commit cb5acf7cd3
9 changed files with 163 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
Content.Client/GameObjects/Components/Mobs/ClientStatusEffectsComponent.cs
View File

@@ -7,12 +7,15 @@ using Robust.Client.GameObjects;
using Robust.Client.Interfaces.ResourceManagement;
using Robust.Client.Interfaces.UserInterface;
using Robust.Client.Player;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.Interfaces.Timing;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Maths;
using Robust.Shared.Players;
namespace Content.Client.GameObjects.Components.Mobs
@@ -25,10 +28,12 @@ namespace Content.Client.GameObjects.Components.Mobs
[Dependency] private readonly IPlayerManager _playerManager;
[Dependency] private readonly IResourceCache _resourceCache;
[Dependency] private readonly IUserInterfaceManager _userInterfaceManager;
[Dependency] private readonly IGameTiming _gameTiming;
#pragma warning restore 649
private StatusEffectsUI _ui;
private IDictionary<StatusEffect, string> _icons = new Dictionary<StatusEffect, string>();
private Dictionary<StatusEffect, StatusEffectStatus> _status = new Dictionary<StatusEffect, StatusEffectStatus>();
private Dictionary<StatusEffect, CooldownGraphic> _cooldown = new Dictionary<StatusEffect, CooldownGraphic>();
/// <summary>
/// Allows calculating if we need to act due to this component being controlled by the current mob
@@ -58,9 +63,9 @@ namespace Content.Client.GameObjects.Components.Mobs
public override void HandleComponentState(ComponentState curState, ComponentState nextState)
{
base.HandleComponentState(curState, nextState);
if (!(curState is StatusEffectComponentState state) || _icons == state.StatusEffects) return;
_icons = state.StatusEffects;
UpdateIcons();
if (!(curState is StatusEffectComponentState state) || _status == state.StatusEffects) return;
_status = state.StatusEffects;
UpdateStatusEffects();
}
private void PlayerAttached()
@@ -71,7 +76,7 @@ namespace Content.Client.GameObjects.Components.Mobs
}
_ui = new StatusEffectsUI();
_userInterfaceManager.StateRoot.AddChild(_ui);
UpdateIcons();
UpdateStatusEffects();
}
private void PlayerDetached()
@@ -80,32 +85,68 @@ namespace Content.Client.GameObjects.Components.Mobs
_ui = null;
}
public void UpdateIcons()
public void UpdateStatusEffects()
{
if (!CurrentlyControlled || _ui == null)
{
return;
}
_cooldown.Clear();
_ui.VBox.DisposeAllChildren();
foreach (var effect in _icons.OrderBy(x => (int) x.Key))
foreach (var (key, statusEffect) in _status.OrderBy(x => (int) x.Key))
{
TextureRect newIcon = new TextureRect
var status = new Control()
{
TextureScale = (2, 2),
Texture = _resourceCache.GetTexture(effect.Value)
Children =
{
new TextureRect
{
TextureScale = (2, 2),
Texture = _resourceCache.GetTexture(statusEffect.Icon)
},
}
};
newIcon.Texture = _resourceCache.GetTexture(effect.Value);
_ui.VBox.AddChild(newIcon);
if (statusEffect.Cooldown.HasValue)
{
var cooldown = new CooldownGraphic();
status.Children.Add(cooldown);
_cooldown[key] = cooldown;
}
_ui.VBox.AddChild(status);
}
}
public void RemoveIcon(StatusEffect name)
public void RemoveStatusEffect(StatusEffect name)
{
_icons.Remove(name);
UpdateIcons();
Logger.InfoS("statuseffects", $"Removed icon {name}");
_status.Remove(name);
UpdateStatusEffects();
}
public void FrameUpdate(float frameTime)
{
foreach (var (effect, cooldownGraphic) in _cooldown)
{
var status = _status[effect];
if (!status.Cooldown.HasValue)
{
cooldownGraphic.Progress = 0;
cooldownGraphic.Visible = false;
continue;
}
var start = status.Cooldown.Value.Item1;
var end = status.Cooldown.Value.Item2;
var length = (end - start).TotalSeconds;
var progress = (_gameTiming.CurTime - start).TotalSeconds / length;
var ratio = (progress <= 1 ? (1 - progress) : (_gameTiming.CurTime - end).TotalSeconds * -5);
cooldownGraphic.Progress = (float)ratio.Clamp(-1, 1);
cooldownGraphic.Visible = ratio > -1f;
}
}
}
}