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

Remove Explicit GridId References (#8315)

Browse Source 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
Acruid
2022-06-11 18:54:41 -07:00
committed by GitHub
parent 846321cebb
commit 4f9be42f40
131 changed files with 531 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Chemistry/Components/SolutionAreaEffectComponent.cs
View File

@@ -69,7 +69,7 @@ namespace Content.Server.Chemistry.Components
var xform = _entities.GetComponent<TransformComponent>(Owner);
var solSys = _systems.GetEntitySystem<SolutionContainerSystem>();
var grid = MapManager.GetGrid(xform.GridID);
var grid = MapManager.GetGrid(xform.GridEntityId);
var origin = grid.TileIndicesFor(xform.Coordinates);
DebugTools.Assert(xform.Anchored, "Area effect entity prototypes must be anchored.");
@@ -146,7 +146,7 @@ namespace Content.Server.Chemistry.Components
var chemistry = EntitySystem.Get<ReactiveSystem>();
var xform = _entities.GetComponent<TransformComponent>(Owner);
var mapGrid = MapManager.GetGrid(xform.GridID);
var mapGrid = MapManager.GetGrid(xform.GridEntityId);
var tile = mapGrid.GetTileRef(xform.Coordinates.ToVector2i(_entities, MapManager));
var lookup = EntitySystem.Get<EntityLookupSystem>();

6
Content.Server/Chemistry/EntitySystems/VaporSystem.cs
View File

@@ -1,4 +1,4 @@
using Content.Server.Chemistry.Components;
using Content.Server.Chemistry.Components;
using Content.Server.Chemistry.Components.SolutionManager;
using Content.Shared.Chemistry.Components;
using Content.Shared.Chemistry.Reagent;
@@ -94,10 +94,10 @@ namespace Content.Server.Chemistry.EntitySystems
vapor.Timer += frameTime;
vapor.ReactTimer += frameTime;
if (vapor.ReactTimer >= ReactTime && EntityManager.GetComponent<TransformComponent>(vapor.Owner).GridID.IsValid())
if (vapor.ReactTimer >= ReactTime && EntityManager.GetComponent<TransformComponent>(vapor.Owner).GridEntityId.IsValid())
{
vapor.ReactTimer = 0;
var mapGrid = _mapManager.GetGrid(EntityManager.GetComponent<TransformComponent>(entity).GridID);
var mapGrid = _mapManager.GetGrid(EntityManager.GetComponent<TransformComponent>(entity).GridEntityId);
var tile = mapGrid.GetTileRef(EntityManager.GetComponent<TransformComponent>(entity).Coordinates.ToVector2i(EntityManager, _mapManager));
foreach (var reagentQuantity in contents.Contents.ToArray())

6
Content.Server/Chemistry/TileReactions/CleanTileReaction.cs
View File

@@ -1,4 +1,4 @@
using System.Linq;
using System.Linq;
using Content.Server.Cleanable;
using Content.Server.Decals;
using Content.Shared.Chemistry.Reaction;
@@ -39,9 +39,9 @@ namespace Content.Server.Chemistry.TileReactions
}
var decalSystem = EntitySystem.Get<DecalSystem>();
foreach (var (uid, _) in decalSystem.GetDecalsInRange(tile.GridIndex, tile.GridIndices+new Vector2(0.5f, 0.5f), validDelegate: x => x.Cleanable))
foreach (var (uid, _) in decalSystem.GetDecalsInRange(tile.GridUid, tile.GridIndices+new Vector2(0.5f, 0.5f), validDelegate: x => x.Cleanable))
{
decalSystem.RemoveDecal(tile.GridIndex, uid);
decalSystem.RemoveDecal(tile.GridUid, uid);
}
return amount;

10
Content.Server/Chemistry/TileReactions/ExtinguishTileReaction.cs
View File

@@ -1,4 +1,4 @@
using Content.Server.Atmos.EntitySystems;
using Content.Server.Atmos.EntitySystems;
using Content.Shared.Atmos;
using Content.Shared.Chemistry.Reaction;
using Content.Shared.Chemistry.Reagent;
@@ -21,17 +21,17 @@ namespace Content.Server.Chemistry.TileReactions
var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
var environment = atmosphereSystem.GetTileMixture(tile.GridIndex, tile.GridIndices, true);
var environment = atmosphereSystem.GetTileMixture(tile.GridUid, tile.GridIndices, true);
if (environment == null || !atmosphereSystem.IsHotspotActive(tile.GridIndex, tile.GridIndices))
if (environment == null || !atmosphereSystem.IsHotspotActive(tile.GridUid, tile.GridIndices))
return FixedPoint2.Zero;
environment.Temperature =
MathF.Max(MathF.Min(environment.Temperature - (_coolingTemperature * 1000f),
environment.Temperature / _coolingTemperature), Atmospherics.TCMB);
atmosphereSystem.React(tile.GridIndex, tile.GridIndices);
atmosphereSystem.HotspotExtinguish(tile.GridIndex, tile.GridIndices);
atmosphereSystem.React(tile.GridUid, tile.GridIndices);
atmosphereSystem.HotspotExtinguish(tile.GridUid, tile.GridIndices);
return FixedPoint2.Zero;
}

8
Content.Server/Chemistry/TileReactions/FlammableTileReaction.cs
View File

@@ -1,4 +1,4 @@
using Content.Server.Atmos.EntitySystems;
using Content.Server.Atmos.EntitySystems;
using Content.Shared.Chemistry.Reaction;
using Content.Shared.Chemistry.Reagent;
using Content.Shared.FixedPoint;
@@ -20,12 +20,12 @@ namespace Content.Server.Chemistry.TileReactions
var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>();
var environment = atmosphereSystem.GetTileMixture(tile.GridIndex, tile.GridIndices, true);
if (environment == null || !atmosphereSystem.IsHotspotActive(tile.GridIndex, tile.GridIndices))
var environment = atmosphereSystem.GetTileMixture(tile.GridUid, tile.GridIndices, true);
if (environment == null || !atmosphereSystem.IsHotspotActive(tile.GridUid, tile.GridIndices))
return FixedPoint2.Zero;
environment.Temperature *= MathF.Max(_temperatureMultiplier * reactVolume.Float(), 1f);
atmosphereSystem.React(tile.GridIndex, tile.GridIndices);
atmosphereSystem.React(tile.GridUid, tile.GridIndices);
return reactVolume;
}