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

Crime fixas (#169)

Browse Source 
* фиксы

* fixs
This commit is contained in:
DocNight
2023-06-18 03:53:02 +03:00
committed by Aviu00
parent 496cf5975a
commit 184cd637f4
5 changed files with 41 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Content.Client/White/EntityCrimeRecords/EntityCrimeRecordsOverlay.cs
View File

@@ -71,28 +71,16 @@ public sealed class EntityCrimeRecordsOverlay : Overlay
if (GetRecord(hum.Owner, args.MapId, out var criminalType))
{
var icon = "released";
switch (criminalType)
var icon = criminalType switch
{
case EnumCriminalRecordType.Released:
icon = "released";
break;
case EnumCriminalRecordType.Discharged:
icon = "discharged";
break;
case EnumCriminalRecordType.Parolled:
icon = "parolled";
break;
case EnumCriminalRecordType.Suspected:
icon = "suspected";
break;
case EnumCriminalRecordType.Wanted:
icon = "wanted";
break;
case EnumCriminalRecordType.Incarcerated:
icon = "incarcerated";
break;
}
EnumCriminalRecordType.Released => "released",
EnumCriminalRecordType.Discharged => "discharged",
EnumCriminalRecordType.Parolled => "parolled",
EnumCriminalRecordType.Suspected => "suspected",
EnumCriminalRecordType.Wanted => "wanted",
EnumCriminalRecordType.Incarcerated => "incarcerated",
_ => "released"
};
var sprite_icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/White/Interface/records.rsi"), icon);
var _iconTexture = _entManager.EntitySysManager.GetEntitySystem<SpriteSystem>().Frame0(sprite_icon);

2
Content.Client/White/EntityHealthBar/EntityHealthBarOverlay.cs
View File

@@ -62,7 +62,7 @@ public sealed class EntityHealthBarOverlay : Overlay
var scaleMatrix = Matrix3.CreateScale(new Vector2(scale, scale));
var rotationMatrix = Matrix3.CreateRotation(-rotation);
foreach (var (mob, dmg) in _entManager.EntityQuery<MobStateComponent, DamageableComponent>(true))
foreach (var (mob, dmg, threasholds) in _entManager.EntityQuery<MobStateComponent, DamageableComponent, MobThresholdsComponent>(true))
{
if (!xformQuery.TryGetComponent(mob.Owner, out var xform) ||
xform.MapID != args.MapId)