Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Status Effect Tooltip & Notify on click (#1943)

Browse Source 
* -Show tooltip on hover
-Show notify on click

* -Status Effects now get removed instead of going invisible
-Removed empty textures for that

* Revert break in HungerComponent
This commit is contained in:
Exp
2020-08-29 13:33:38 +02:00
committed by GitHub
parent 1ecf8aad1a
commit b993ebb30a
13 changed files with 61 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs
View File

@@ -68,15 +68,12 @@ namespace Content.Server.GameObjects.Components.Nutrition
serializer.DataField(ref _baseDecayRate, "base_decay_rate", 0.1f);
}
// for shared string dict, since we don't define these anywhere in content
[UsedImplicitly]
public static readonly string[] _hungerThresholdImages =
public static readonly Dictionary<HungerThreshold, string> HungerThresholdImages = new Dictionary<HungerThreshold, string>
{
"/Textures/Interface/StatusEffects/Hunger/Overfed.png",
"/Textures/Interface/StatusEffects/Hunger/Okay.png",
"/Textures/Interface/StatusEffects/Hunger/Peckish.png",
"/Textures/Interface/StatusEffects/Hunger/Starving.png",
"/Textures/Interface/StatusEffects/Hunger/Dead.png",
{ HungerThreshold.Overfed, "/Textures/Interface/StatusEffects/Hunger/Overfed.png" },
{ HungerThreshold.Peckish, "/Textures/Interface/StatusEffects/Hunger/Peckish.png" },
{ HungerThreshold.Starving, "/Textures/Interface/StatusEffects/Hunger/Starving.png" },
};
public void HungerThresholdEffect(bool force = false)
@@ -92,7 +89,16 @@ namespace Content.Server.GameObjects.Components.Nutrition
// Update UI
Owner.TryGetComponent(out ServerStatusEffectsComponent statusEffectsComponent);
statusEffectsComponent?.ChangeStatusEffectIcon(StatusEffect.Hunger, _hungerThresholdImages[ (int)_currentHungerThreshold ]);
if (HungerThresholdImages.TryGetValue(_currentHungerThreshold, out var statusTexture))
{
statusEffectsComponent?.ChangeStatusEffectIcon(StatusEffect.Hunger, statusTexture);
}
else
{
statusEffectsComponent?.RemoveStatusEffect(StatusEffect.Hunger);
}
switch (_currentHungerThreshold)
{
case HungerThreshold.Overfed: