cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Widen Ammo UI (#40570)

This commit is contained in:
Sir Warock 2025-10-29 03:54:42 +01:00 committed by Vanessa
parent b49f9adc86
commit d1f545a047
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Client/Weapons/Ranged/ItemStatus/BulletRender.cs
View File

@ -149,6 +149,15 @@ public sealed class BulletRender : BaseBulletRenderer
public const int BulletHeight = 12;
public const int VerticalSeparation = 2;
private static readonly LayoutParameters LayoutLarge = new LayoutParameters
{
ItemHeight = BulletHeight,
ItemSeparation = 6,
ItemWidth = 5,
VerticalSeparation = VerticalSeparation,
MinCountPerRow = MinCountPerRow
};
private static readonly LayoutParameters LayoutNormal = new LayoutParameters
{
ItemHeight = BulletHeight,
@ -185,8 +194,9 @@ public sealed class BulletRender : BaseBulletRenderer
if (_type == value)
return;
Parameters = _type switch
Parameters = value switch
{
BulletType.Large => LayoutLarge,
BulletType.Normal => LayoutNormal,
BulletType.Tiny => LayoutTiny,
_ => throw new ArgumentOutOfRangeException()
@ -218,6 +228,7 @@ public sealed class BulletRender : BaseBulletRenderer
public enum BulletType
{
Large,
Normal,
Tiny
}

14
Content.Client/Weapons/Ranged/Systems/GunSystem.AmmoCounter.cs
View File

@ -110,7 +110,12 @@ public sealed partial class GunSystem
_bulletRender.Count = count;
_bulletRender.Capacity = capacity;
_bulletRender.Type = capacity > 50 ? BulletRender.BulletType.Tiny : BulletRender.BulletType.Normal;
_bulletRender.Type = capacity switch
{
> 50 => BulletRender.BulletType.Tiny,
> 15 => BulletRender.BulletType.Normal,
_ => BulletRender.BulletType.Large
};
}
}
@ -236,7 +241,12 @@ public sealed partial class GunSystem
_bulletRender.Count = count;
_bulletRender.Capacity = capacity;
_bulletRender.Type = capacity > 50 ? BulletRender.BulletType.Tiny : BulletRender.BulletType.Normal;
_bulletRender.Type = capacity switch
{
> 50 => BulletRender.BulletType.Tiny,
> 15 => BulletRender.BulletType.Normal,
_ => BulletRender.BulletType.Large
};
_ammoCount.Text = $"x{count:00}";
}