Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

18
Content.Server/Gravity/EntitySystems/GravityGeneratorSystem.cs
View File

@@ -126,7 +126,7 @@ namespace Content.Server.Gravity.EntitySystems
ApcPowerReceiverComponent powerReceiver,
float chargeRate)
{
if (!_uiSystem.IsUiOpen(component.Owner.Uid, SharedGravityGeneratorComponent.GravityGeneratorUiKey.Key))
if (!_uiSystem.IsUiOpen(component.Owner, SharedGravityGeneratorComponent.GravityGeneratorUiKey.Key))
return;
var chargeTarget = chargeRate < 0 ? 0 : 1;
@@ -162,7 +162,7 @@ namespace Content.Server.Gravity.EntitySystems
);
_uiSystem.TrySetUiState(
component.Owner.Uid,
component.Owner,
SharedGravityGeneratorComponent.GravityGeneratorUiKey.Key,
state);
@@ -184,7 +184,7 @@ namespace Content.Server.Gravity.EntitySystems
private void UpdateGravityActive(GravityGeneratorComponent grav, bool shake)
{
var gridId = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(grav.Owner.Uid).GridID;
var gridId = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(grav.Owner).GridID;
if (gridId == GridId.Invalid)
return;
@@ -202,7 +202,7 @@ namespace Content.Server.Gravity.EntitySystems
private void OnInteractHand(EntityUid uid, GravityGeneratorComponent component, InteractHandEvent args)
{
if (!EntityManager.TryGetComponent(args.User.Uid, out ActorComponent? actor))
if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
return;
ApcPowerReceiverComponent? powerReceiver = default!;
@@ -219,7 +219,7 @@ namespace Content.Server.Gravity.EntitySystems
public void UpdateState(GravityGeneratorComponent grav, ApcPowerReceiverComponent powerReceiver)
{
var uid = grav.Owner.Uid;
var uid = (EntityUid) grav.Owner;
var appearance = EntityManager.GetComponentOrNull<AppearanceComponent>(uid);
appearance?.SetData(GravityGeneratorVisuals.Charge, grav.Charge);
@@ -249,28 +249,28 @@ namespace Content.Server.Gravity.EntitySystems
private void MakeBroken(GravityGeneratorComponent component, AppearanceComponent? appearance)
{
_ambientSoundSystem.SetAmbience(component.Owner.Uid, false);
_ambientSoundSystem.SetAmbience(component.Owner, false);
appearance?.SetData(GravityGeneratorVisuals.State, GravityGeneratorStatus.Broken);
}
private void MakeUnpowered(GravityGeneratorComponent component, AppearanceComponent? appearance)
{
_ambientSoundSystem.SetAmbience(component.Owner.Uid, false);
_ambientSoundSystem.SetAmbience(component.Owner, false);
appearance?.SetData(GravityGeneratorVisuals.State, GravityGeneratorStatus.Unpowered);
}
private void MakeOff(GravityGeneratorComponent component, AppearanceComponent? appearance)
{
_ambientSoundSystem.SetAmbience(component.Owner.Uid, false);
_ambientSoundSystem.SetAmbience(component.Owner, false);
appearance?.SetData(GravityGeneratorVisuals.State, GravityGeneratorStatus.Off);
}
private void MakeOn(GravityGeneratorComponent component, AppearanceComponent? appearance)
{
_ambientSoundSystem.SetAmbience(component.Owner.Uid, true);
_ambientSoundSystem.SetAmbience(component.Owner, true);
appearance?.SetData(GravityGeneratorVisuals.State, GravityGeneratorStatus.On);
}

4
Content.Server/Gravity/EntitySystems/GravityShakeSystem.cs
View File

@@ -80,8 +80,8 @@ namespace Content.Server.Gravity.EntitySystems
foreach (var player in _playerManager.Sessions)
{
if (player.AttachedEntity == null
|| IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(player.AttachedEntity.Uid).GridID != gridId
|| !IoCManager.Resolve<IEntityManager>().TryGetComponent(player.AttachedEntity.Uid, out CameraRecoilComponent? recoil))
|| IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(player.AttachedEntity).GridID != gridId
|| !IoCManager.Resolve<IEntityManager>().TryGetComponent(player.AttachedEntity, out CameraRecoilComponent? recoil))
{
continue;
}

8
Content.Server/Gravity/EntitySystems/GravitySystem.cs
View File

@@ -17,12 +17,12 @@ namespace Content.Server.Gravity.EntitySystems
private void HandleGravityInitialize(EntityUid uid, GravityComponent component, ComponentInit args)
{
// Incase there's already a generator on the grid we'll just set it now.
var gridId = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner.Uid).GridID;
var gridId = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(component.Owner).GridID;
GravityChangedMessage message;
foreach (var generator in EntityManager.EntityQuery<GravityGeneratorComponent>())
{
if (IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(generator.Owner.Uid).GridID == gridId && generator.GravityActive)
if (IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(generator.Owner).GridID == gridId && generator.GravityActive)
{
component.Enabled = true;
message = new GravityChangedMessage(gridId, true);
@@ -41,7 +41,7 @@ namespace Content.Server.Gravity.EntitySystems
if (comp.Enabled) return;
comp.Enabled = true;
var gridId = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(comp.Owner.Uid).GridID;
var gridId = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(comp.Owner).GridID;
var message = new GravityChangedMessage(gridId, true);
RaiseLocalEvent(message);
}
@@ -51,7 +51,7 @@ namespace Content.Server.Gravity.EntitySystems
if (!comp.Enabled) return;
comp.Enabled = false;
var gridId = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(comp.Owner.Uid).GridID;
var gridId = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(comp.Owner).GridID;
var message = new GravityChangedMessage(gridId, false);
RaiseLocalEvent(message);
}

14
Content.Server/Gravity/EntitySystems/WeightlessSystem.cs
View File

@@ -34,15 +34,15 @@ namespace Content.Server.Gravity.EntitySystems
public void AddAlert(ServerAlertsComponent status)
{
var gridId = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(status.Owner.Uid).GridID;
var gridId = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(status.Owner).GridID;
var alerts = _alerts.GetOrNew(gridId);
alerts.Add(status);
if (_mapManager.TryGetGrid(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(status.Owner.Uid).GridID, out var grid))
if (_mapManager.TryGetGrid(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(status.Owner).GridID, out var grid))
{
var gridEntity = EntityManager.GetEntity(grid.GridEntityId);
if (IoCManager.Resolve<IEntityManager>().GetComponent<GravityComponent>(gridEntity.Uid).Enabled)
if (IoCManager.Resolve<IEntityManager>().GetComponent<GravityComponent>(gridEntity).Enabled)
{
RemoveWeightless(status);
}
@@ -55,7 +55,7 @@ namespace Content.Server.Gravity.EntitySystems
public void RemoveAlert(ServerAlertsComponent status)
{
var grid = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(status.Owner.Uid).GridID;
var grid = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(status.Owner).GridID;
if (!_alerts.TryGetValue(grid, out var statuses))
{
return;
@@ -99,13 +99,13 @@ namespace Content.Server.Gravity.EntitySystems
private void EntParentChanged(ref EntParentChangedMessage ev)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(ev.Entity.Uid, out ServerAlertsComponent? status))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(ev.Entity, out ServerAlertsComponent? status))
{
return;
}
if (ev.OldParent != null &&
IoCManager.Resolve<IEntityManager>().TryGetComponent(ev.OldParent.Uid, out IMapGridComponent? mapGrid))
IoCManager.Resolve<IEntityManager>().TryGetComponent(ev.OldParent, out IMapGridComponent? mapGrid))
{
var oldGrid = mapGrid.GridIndex;
@@ -115,7 +115,7 @@ namespace Content.Server.Gravity.EntitySystems
}
}
var newGrid = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(ev.Entity.Uid).GridID;
var newGrid = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(ev.Entity).GridID;
var newStatuses = _alerts.GetOrNew(newGrid);
newStatuses.Add(status);