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

- add: Better cycling. (#272)

Browse Source
This commit is contained in:
Aviu00
2024-04-06 21:31:09 +09:00
committed by GitHub
parent 883623e448
commit 6f6f259e12
4 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Client/CombatMode/CombatModeIndicatorsOverlay.cs
View File

@@ -74,13 +74,22 @@ public sealed class CombatModeIndicatorsOverlay : Overlay
var isGunBolted = true;
if (_entMan.TryGetComponent(handEntity, out ChamberMagazineAmmoProviderComponent? chamber))
isGunBolted = chamber.BoltClosed ?? true;
// WD EDIT START
var isGunCycled = true;
if (_entMan.TryGetComponent(handEntity, out BallisticAmmoProviderComponent? ballistic) &&
ballistic.Entities.Count > 0)
{
var ent = ballistic.Entities[^1];
if (_entMan.TryGetComponent(ent, out CartridgeAmmoComponent? cartridge))
isGunCycled = !cartridge.Spent;
}
// WD EDIT END
var mousePos = mouseScreenPosition.Position;
var uiScale = (args.ViewportControl as Control)?.UIScale ?? 1f;
var limitedScale = uiScale > 1.25f ? 1.25f : uiScale;
var sight = isHandGunItem ? (isGunBolted ? _gunSight : _gunBoltSight) : _meleeSight;
var sight = isHandGunItem ? (isGunBolted && isGunCycled ? _gunSight : _gunBoltSight) : _meleeSight; // WD EDIT
DrawSight(sight, args.ScreenHandle, mousePos, limitedScale * Scale);
}