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

Inline UID

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 15:53:09 +01:00
parent 2654775bf0
commit 5cd42c9ad6
803 changed files with 3613 additions and 3577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer.cs
View File

@@ -12,14 +12,14 @@ namespace Content.Client.Weapons.Ranged.Barrels.Visualizers
public override void InitializeEntity(IEntity entity)
{
base.InitializeEntity(entity);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(entity.Uid);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(entity);
sprite.LayerSetState(RangedBarrelVisualLayers.Bolt, "bolt-open");
}
public override void OnChangeData(AppearanceComponent component)
{
base.OnChangeData(component);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner);
if (!component.TryGetData(BarrelBoltVisuals.BoltOpen, out bool boltOpen))
{

4
Content.Client/Weapons/Ranged/Barrels/Visualizers/MagVisualizer.cs
View File

@@ -22,7 +22,7 @@ namespace Content.Client.Weapons.Ranged.Barrels.Visualizers
public override void InitializeEntity(IEntity entity)
{
base.InitializeEntity(entity);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(entity.Uid);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(entity);
if (sprite.LayerMapTryGet(RangedBarrelVisualLayers.Mag, out _))
{
@@ -45,7 +45,7 @@ namespace Content.Client.Weapons.Ranged.Barrels.Visualizers
// 1.If no mag then hide it OR
// 2. If step 0 isn't visible then hide it (mag or unshaded)
// 3. Otherwise just do mag / unshaded as is
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner);
component.TryGetData(MagazineBarrelVisuals.MagLoaded, out _magLoaded);

2
Content.Client/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer.cs
View File

@@ -12,7 +12,7 @@ namespace Content.Client.Weapons.Ranged.Barrels.Visualizers
public override void OnChangeData(AppearanceComponent component)
{
base.OnChangeData(component);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner.Uid);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<ISpriteComponent>(component.Owner);
if (!component.TryGetData(AmmoVisuals.Spent, out bool spent))
{

4
Content.Client/Weapons/Ranged/RangedWeaponSystem.cs
View File

@@ -48,12 +48,12 @@ namespace Content.Client.Weapons.Ranged
}
var entity = _playerManager.LocalPlayer?.ControlledEntity;
if (entity == null || !IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out SharedHandsComponent? hands))
if (entity == null || !IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out SharedHandsComponent? hands))
{
return;
}
if (!hands.TryGetActiveHeldEntity(out var held) || !IoCManager.Resolve<IEntityManager>().TryGetComponent(held.Uid, out ClientRangedWeaponComponent? weapon))
if (!hands.TryGetActiveHeldEntity(out var held) || !IoCManager.Resolve<IEntityManager>().TryGetComponent(held, out ClientRangedWeaponComponent? weapon))
{
_blocked = true;
return;