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

Фиксы педальных фич (#210)

Browse Source 
* Aghost invisibility fixes

* Fix naming and bwoink volume on load
This commit is contained in:
Aviu00
2023-07-18 14:58:29 +03:00
committed by Aviu00
parent 3f8ff32206
commit 3acd057756
9 changed files with 60 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
View File

@@ -51,8 +51,8 @@ public sealed class AHelpUIController: UIController, IOnSystemChanged<BwoinkSyst
private bool _hasUnreadAHelp;
private string? _aHelpSound;
private float defaultBwoinkVolume;
private float adminBwoinkVolume;
private float _defaultBwoinkVolume;
private float _adminBwoinkVolume;
public override void Initialize()
{
@@ -60,9 +60,8 @@ public sealed class AHelpUIController: UIController, IOnSystemChanged<BwoinkSyst
SubscribeNetworkEvent<BwoinkDiscordRelayUpdated>(DiscordRelayUpdated);
SubscribeNetworkEvent<BwoinkPlayerTypingUpdated>(PeopleTypingUpdated);
defaultBwoinkVolume = WhiteCVars.BwoinkVolume.DefaultValue;
_cfg.OnValueChanged(WhiteCVars.BwoinkVolume, volume => adminBwoinkVolume = volume);
_defaultBwoinkVolume = WhiteCVars.BwoinkVolume.DefaultValue;
_cfg.OnValueChanged(WhiteCVars.BwoinkVolume, volume => _adminBwoinkVolume = volume, true);
_adminManager.AdminStatusUpdated += OnAdminStatusUpdated;
_config.OnValueChanged(CCVars.AHelpSound, v => _aHelpSound = v, true);
}
@@ -145,7 +144,7 @@ public sealed class AHelpUIController: UIController, IOnSystemChanged<BwoinkSyst
var isAdmin = _adminManager.IsActive();
var notify = !isAdmin || !message.IsAdmin;
float bwoinkVolume = isAdmin ? adminBwoinkVolume : defaultBwoinkVolume;
var bwoinkVolume = isAdmin ? _adminBwoinkVolume : _defaultBwoinkVolume;
var audioParams = new AudioParams()
{

6
Content.Client/White/Administration/InvisibilitySystem.cs
View File

@@ -28,7 +28,11 @@ public sealed class InvisibilitySystem : SharedInvisibilitySystem
if (!EntityManager.TryGetComponent(ev.Uid, out SpriteComponent? sprite))
return;
var newAlpha = Math.Clamp(ev.Invisible ? sprite.Color.A / 3f : sprite.Color.A * 3f, 0f, 1f);
var component = EntityManager.EnsureComponent<InvisibilityComponent>(ev.Uid);
component.Invisible = ev.Invisible;
component.DefaultAlpha ??= sprite.Color.A;
var newAlpha = ev.Invisible ? component.DefaultAlpha.Value / 3f : component.DefaultAlpha.Value;
sprite.Color = sprite.Color.WithAlpha(newAlpha);
}