mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-17 21:48:58 +03:00
# Description Picked 400 commits (and skipped many, many more) from WizDen since #540. Stopped at commit 332f54a3aebe669f6e50d26e7b047f0bdc28e0fb (Lobby Refactor). --- # TODO - [x] Pick - [x] Compile - [x] Fix runtime errors - [ ] Fix up humanoid profile editor - [ ] Test everything --- # Changelog 🆑 - add: Merged 400 WizDen PRs. Happy testing! --------- Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> Co-authored-by: FungiFellow <151778459+FungiFellow@users.noreply.github.com> Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com> Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com> Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: Magnus Larsen <i.am.larsenml@gmail.com> Co-authored-by: Hanz <41141796+Hanzdegloker@users.noreply.github.com> Co-authored-by: Kukutis96513 <146854220+Kukutis96513@users.noreply.github.com> Co-authored-by: potato1234_x <79580518+potato1234x@users.noreply.github.com> Co-authored-by: Gotimanga <127038462+Gotimanga@users.noreply.github.com> Co-authored-by: Mangohydra <156087924+Mangohydra@users.noreply.github.com> Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Co-authored-by: Morb <14136326+Morb0@users.noreply.github.com> Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com> Co-authored-by: KrasnoshchekovPavel <119816022+KrasnoshchekovPavel@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: KittenColony <149278380+KittenColony@users.noreply.github.com> Co-authored-by: ShadowCommander <shadowjjt@gmail.com> Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com> Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com> Co-authored-by: ERROR404 <100093430+ERORR404V1@users.noreply.github.com> Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> Co-authored-by: Jezithyr <jezithyr@gmail.com> Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com> Co-authored-by: no <165581243+pissdemon@users.noreply.github.com> Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Co-authored-by: Ciac32 <aknoxlor@gmail.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: NotSoDana <75203942+NotSoDana@users.noreply.github.com> Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com> Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com> Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: nao fujiwara <awkwarddryad@gmail.com> Co-authored-by: Michael <107807667+Doc-Michael@users.noreply.github.com> Co-authored-by: Vasilis <vasilis@pikachu.systems> Co-authored-by: Lamrr <96937466+Lamrr@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: Jay <67732946+DuskyJay@users.noreply.github.com> Co-authored-by: Just-a-Unity-Dev <67359748+Just-a-Unity-Dev@users.noreply.github.com> Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com> Co-authored-by: Tyzemol <85772526+Tyzemol@users.noreply.github.com> Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com> Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> Co-authored-by: RumiTiger <154005209+RumiTiger@users.noreply.github.com> Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com> Co-authored-by: Ty Ashley <42426760+TyAshley@users.noreply.github.com> Co-authored-by: exincore <me@exin.xyz> Co-authored-by: 0x6273 <0x40@keemail.me> Co-authored-by: Kara <lunarautomaton6@gmail.com> Co-authored-by: Ygg01 <y.laughing.man.y@gmail.com> Co-authored-by: Łukasz Mędrek <lukasz@lukaszm.xyz> Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com> Co-authored-by: TurboTracker <130304754+TurboTrackerss14@users.noreply.github.com> Co-authored-by: OnsenCapy <101037138+LGRuthes@users.noreply.github.com> Co-authored-by: pigeonpeas <147350443+pigeonpeas@users.noreply.github.com> Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com> Co-authored-by: Rio <110139251+Riolume@users.noreply.github.com> Co-authored-by: vorkathbruh <152932728+vorkathbruh@users.noreply.github.com> Co-authored-by: Sphiral <145869023+SphiraI@users.noreply.github.com> Co-authored-by: PrPleGoo <PrPleGoo@users.noreply.github.com> Co-authored-by: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com> Co-authored-by: username <113782077+whateverusername0@users.noreply.github.com> Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Co-authored-by: Джексон Миссиссиппи <tripwiregamer@gmail.com> Co-authored-by: Brandon Li <48413902+aspiringLich@users.noreply.github.com> Co-authored-by: Jajsha <101492056+Zap527@users.noreply.github.com> Co-authored-by: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com> Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Co-authored-by: youtissoum <51883137+youtissoum@users.noreply.github.com> Co-authored-by: ike709 <ike709@users.noreply.github.com> Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com> Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Geekyhobo <66805063+Geekyhobo@users.noreply.github.com> Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> # Conflicts: # Content.Client/Input/ContentContexts.cs # Content.Client/Lobby/LobbyState.cs # Content.Client/Lobby/UI/HumanoidProfileEditor.xaml # Content.Client/Lobby/UI/LobbyGui.xaml # Content.Client/Lobby/UI/LobbyGui.xaml.cs # Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs # Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml # Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs # Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Shared/Alert/AlertType.cs # Content.Shared/Input/ContentKeyFunctions.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs # Resources/ConfigPresets/EinsteinEngines/default.toml # Resources/Prototypes/Alerts/alerts.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml # Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml # Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/keybinds.yml
344 lines
13 KiB
C#
344 lines
13 KiB
C#
using Content.Server.Atmos.Components;
|
|
using Content.Server.Atmos.Reactions;
|
|
using Content.Shared.Atmos;
|
|
using Content.Shared.Atmos.Components;
|
|
using Content.Shared.Atmos.Reactions;
|
|
using Robust.Shared.Map;
|
|
using Robust.Shared.Map.Components;
|
|
using Robust.Shared.Utility;
|
|
|
|
namespace Content.Server.Atmos.EntitySystems;
|
|
|
|
public sealed partial class AtmosphereSystem
|
|
{
|
|
private void InitializeGridAtmosphere()
|
|
{
|
|
SubscribeLocalEvent<GridAtmosphereComponent, ComponentInit>(OnGridAtmosphereInit);
|
|
SubscribeLocalEvent<GridAtmosphereComponent, ComponentStartup>(OnGridAtmosphereStartup);
|
|
SubscribeLocalEvent<GridAtmosphereComponent, ComponentRemove>(OnAtmosphereRemove);
|
|
SubscribeLocalEvent<GridAtmosphereComponent, GridSplitEvent>(OnGridSplit);
|
|
|
|
#region Atmos API Subscriptions
|
|
|
|
SubscribeLocalEvent<GridAtmosphereComponent, IsSimulatedGridMethodEvent>(GridIsSimulated);
|
|
SubscribeLocalEvent<GridAtmosphereComponent, GetAllMixturesMethodEvent>(GridGetAllMixtures);
|
|
SubscribeLocalEvent<GridAtmosphereComponent, ReactTileMethodEvent>(GridReactTile);
|
|
SubscribeLocalEvent<GridAtmosphereComponent, HotspotExtinguishMethodEvent>(GridHotspotExtinguish);
|
|
SubscribeLocalEvent<GridAtmosphereComponent, IsHotspotActiveMethodEvent>(GridIsHotspotActive);
|
|
|
|
#endregion
|
|
}
|
|
|
|
private void OnAtmosphereRemove(EntityUid uid, GridAtmosphereComponent component, ComponentRemove args)
|
|
{
|
|
for (var i = 0; i < _currentRunAtmosphere.Count; i++)
|
|
{
|
|
if (_currentRunAtmosphere[i].Owner != uid)
|
|
continue;
|
|
|
|
_currentRunAtmosphere.RemoveAt(i);
|
|
if (_currentRunAtmosphereIndex > i)
|
|
_currentRunAtmosphereIndex--;
|
|
}
|
|
}
|
|
|
|
private void OnGridAtmosphereInit(EntityUid uid, GridAtmosphereComponent component, ComponentInit args)
|
|
{
|
|
base.Initialize();
|
|
|
|
EnsureComp<GasTileOverlayComponent>(uid);
|
|
foreach (var tile in component.Tiles.Values)
|
|
{
|
|
tile.GridIndex = uid;
|
|
}
|
|
}
|
|
|
|
private void OnGridAtmosphereStartup(EntityUid uid, GridAtmosphereComponent component, ComponentStartup args)
|
|
{
|
|
if (!TryComp(uid, out MapGridComponent? mapGrid))
|
|
return;
|
|
|
|
InvalidateAllTiles((uid, mapGrid, component));
|
|
}
|
|
|
|
private void OnGridSplit(EntityUid uid, GridAtmosphereComponent originalGridAtmos, ref GridSplitEvent args)
|
|
{
|
|
foreach (var newGrid in args.NewGrids)
|
|
{
|
|
// Make extra sure this is a valid grid.
|
|
if (!TryComp(newGrid, out MapGridComponent? mapGrid))
|
|
continue;
|
|
|
|
// If the new split grid has an atmosphere already somehow, use that. Otherwise, add a new one.
|
|
if (!TryComp(newGrid, out GridAtmosphereComponent? newGridAtmos))
|
|
newGridAtmos = AddComp<GridAtmosphereComponent>(newGrid);
|
|
|
|
// We assume the tiles on the new grid have the same coordinates as they did on the old grid...
|
|
var enumerator = mapGrid.GetAllTilesEnumerator();
|
|
|
|
while (enumerator.MoveNext(out var tile))
|
|
{
|
|
var indices = tile.Value.GridIndices;
|
|
|
|
// This split event happens *before* the spaced tiles have been invalidated, therefore we can still
|
|
// access their gas data. On the next atmos update tick, these tiles will be spaced. Poof!
|
|
if (!originalGridAtmos.Tiles.TryGetValue(indices, out var tileAtmosphere))
|
|
continue;
|
|
|
|
// The new grid atmosphere has been initialized, meaning it has all the needed TileAtmospheres...
|
|
if (!newGridAtmos.Tiles.TryGetValue(indices, out var newTileAtmosphere))
|
|
// Let's be honest, this is really not gonna happen, but just in case...!
|
|
continue;
|
|
|
|
// Copy a bunch of data over... Not great, maybe put this in TileAtmosphere?
|
|
newTileAtmosphere.Air = tileAtmosphere.Air?.Clone();
|
|
newTileAtmosphere.Hotspot = tileAtmosphere.Hotspot;
|
|
newTileAtmosphere.HeatCapacity = tileAtmosphere.HeatCapacity;
|
|
newTileAtmosphere.Temperature = tileAtmosphere.Temperature;
|
|
newTileAtmosphere.PressureDifference = tileAtmosphere.PressureDifference;
|
|
newTileAtmosphere.PressureDirection = tileAtmosphere.PressureDirection;
|
|
|
|
// TODO ATMOS: Somehow force GasTileOverlaySystem to perform an update *right now, right here.*
|
|
// The reason why is that right now, gas will flicker until the next GasTileOverlay update.
|
|
// That looks bad, of course. We want to avoid that! Anyway that's a bit more complicated so out of scope.
|
|
|
|
// Invalidate the tile, it's redundant but redundancy is good! Also HashSet so really, no duplicates.
|
|
originalGridAtmos.InvalidatedCoords.Add(indices);
|
|
newGridAtmos.InvalidatedCoords.Add(indices);
|
|
}
|
|
}
|
|
}
|
|
|
|
private void GridIsSimulated(EntityUid uid, GridAtmosphereComponent component, ref IsSimulatedGridMethodEvent args)
|
|
{
|
|
if (args.Handled)
|
|
return;
|
|
|
|
args.Simulated = component.Simulated;
|
|
args.Handled = true;
|
|
}
|
|
|
|
private void GridGetAllMixtures(EntityUid uid, GridAtmosphereComponent component,
|
|
ref GetAllMixturesMethodEvent args)
|
|
{
|
|
if (args.Handled)
|
|
return;
|
|
|
|
IEnumerable<GasMixture> EnumerateMixtures(EntityUid gridUid, GridAtmosphereComponent grid, bool invalidate)
|
|
{
|
|
foreach (var (indices, tile) in grid.Tiles)
|
|
{
|
|
if (tile.Air == null)
|
|
continue;
|
|
|
|
if (invalidate)
|
|
{
|
|
//var ev = new InvalidateTileMethodEvent(gridUid, indices);
|
|
//GridInvalidateTile(gridUid, grid, ref ev);
|
|
AddActiveTile(grid, tile);
|
|
}
|
|
|
|
yield return tile.Air;
|
|
}
|
|
}
|
|
|
|
// Return the enumeration over all the tiles in the atmosphere.
|
|
args.Mixtures = EnumerateMixtures(uid, component, args.Excite);
|
|
args.Handled = true;
|
|
}
|
|
|
|
private void GridReactTile(EntityUid uid, GridAtmosphereComponent component, ref ReactTileMethodEvent args)
|
|
{
|
|
if (args.Handled)
|
|
return;
|
|
|
|
if (!component.Tiles.TryGetValue(args.Tile, out var tile))
|
|
return;
|
|
|
|
args.Result = tile.Air is { } air ? React(air, tile) : ReactionResult.NoReaction;
|
|
args.Handled = true;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Update array of adjacent tiles and the adjacency flags.
|
|
/// </summary>
|
|
private void UpdateAdjacentTiles(
|
|
Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent> ent,
|
|
TileAtmosphere tile,
|
|
bool activate = false)
|
|
{
|
|
var uid = ent.Owner;
|
|
var atmos = ent.Comp1;
|
|
var blockedDirs = tile.AirtightData.BlockedDirections;
|
|
if (activate)
|
|
AddActiveTile(atmos, tile);
|
|
|
|
tile.AdjacentBits = AtmosDirection.Invalid;
|
|
for (var i = 0; i < Atmospherics.Directions; i++)
|
|
{
|
|
var direction = (AtmosDirection) (1 << i);
|
|
var adjacentIndices = tile.GridIndices.Offset(direction);
|
|
|
|
TileAtmosphere? adjacent;
|
|
if (!tile.NoGridTile)
|
|
{
|
|
adjacent = GetOrNewTile(uid, atmos, adjacentIndices);
|
|
}
|
|
else if (!atmos.Tiles.TryGetValue(adjacentIndices, out adjacent))
|
|
{
|
|
tile.AdjacentBits &= ~direction;
|
|
tile.AdjacentTiles[i] = null;
|
|
continue;
|
|
}
|
|
|
|
var adjBlockDirs = adjacent.AirtightData.BlockedDirections;
|
|
if (activate)
|
|
AddActiveTile(atmos, adjacent);
|
|
|
|
var oppositeIndex = i.ToOppositeIndex();
|
|
var oppositeDirection = (AtmosDirection) (1 << oppositeIndex);
|
|
|
|
if (adjBlockDirs.IsFlagSet(oppositeDirection) || blockedDirs.IsFlagSet(direction))
|
|
{
|
|
// Adjacency is blocked by some airtight entity.
|
|
tile.AdjacentBits &= ~direction;
|
|
adjacent.AdjacentBits &= ~oppositeDirection;
|
|
tile.AdjacentTiles[i] = null;
|
|
adjacent.AdjacentTiles[oppositeIndex] = null;
|
|
}
|
|
else
|
|
{
|
|
// No airtight entity in the way.
|
|
tile.AdjacentBits |= direction;
|
|
adjacent.AdjacentBits |= oppositeDirection;
|
|
tile.AdjacentTiles[i] = adjacent;
|
|
adjacent.AdjacentTiles[oppositeIndex] = tile;
|
|
}
|
|
|
|
DebugTools.Assert(!(tile.AdjacentBits.IsFlagSet(direction) ^
|
|
adjacent.AdjacentBits.IsFlagSet(oppositeDirection)));
|
|
|
|
if (!adjacent.AdjacentBits.IsFlagSet(adjacent.MonstermosInfo.CurrentTransferDirection))
|
|
adjacent.MonstermosInfo.CurrentTransferDirection = AtmosDirection.Invalid;
|
|
}
|
|
|
|
if (!tile.AdjacentBits.IsFlagSet(tile.MonstermosInfo.CurrentTransferDirection))
|
|
tile.MonstermosInfo.CurrentTransferDirection = AtmosDirection.Invalid;
|
|
}
|
|
|
|
private (GasMixture Air, bool IsSpace) GetDefaultMapAtmosphere(MapAtmosphereComponent? map)
|
|
{
|
|
if (map == null)
|
|
return (GasMixture.SpaceGas, true);
|
|
|
|
var air = map.Mixture;
|
|
DebugTools.Assert(air.Immutable);
|
|
return (air, map.Space);
|
|
}
|
|
|
|
private void GridHotspotExtinguish(EntityUid uid, GridAtmosphereComponent component,
|
|
ref HotspotExtinguishMethodEvent args)
|
|
{
|
|
if (args.Handled)
|
|
return;
|
|
|
|
if (!component.Tiles.TryGetValue(args.Tile, out var tile))
|
|
return;
|
|
|
|
tile.Hotspot = new Hotspot();
|
|
args.Handled = true;
|
|
|
|
//var ev = new InvalidateTileMethodEvent(uid, args.Tile);
|
|
//GridInvalidateTile(uid, component, ref ev);
|
|
AddActiveTile(component, tile);
|
|
}
|
|
|
|
private void GridIsHotspotActive(EntityUid uid, GridAtmosphereComponent component,
|
|
ref IsHotspotActiveMethodEvent args)
|
|
{
|
|
if (args.Handled)
|
|
return;
|
|
|
|
if (!component.Tiles.TryGetValue(args.Tile, out var tile))
|
|
return;
|
|
|
|
args.Result = tile.Hotspot.Valid;
|
|
args.Handled = true;
|
|
}
|
|
|
|
private void GridFixTileVacuum(TileAtmosphere tile)
|
|
{
|
|
DebugTools.AssertNotNull(tile.Air);
|
|
DebugTools.Assert(tile.Air?.Immutable == false );
|
|
Array.Clear(tile.MolesArchived);
|
|
tile.ArchivedCycle = 0;
|
|
|
|
var count = 0;
|
|
foreach (var adj in tile.AdjacentTiles)
|
|
{
|
|
if (adj?.Air != null)
|
|
count++;
|
|
}
|
|
|
|
if (count == 0)
|
|
return;
|
|
|
|
var ratio = 1f / count;
|
|
var totalTemperature = 0f;
|
|
|
|
foreach (var adj in tile.AdjacentTiles)
|
|
{
|
|
if (adj?.Air == null)
|
|
continue;
|
|
|
|
totalTemperature += adj.Temperature;
|
|
|
|
// TODO ATMOS. Why is this removing and then re-adding air to the neighbouring tiles?
|
|
// Is it some rounding issue to do with Atmospherics.GasMinMoles? because otherwise this is just unnecessary.
|
|
// if we get rid of this, then this could also just add moles and then multiply by ratio at the end, rather
|
|
// than having to iterate over adjacent tiles twice.
|
|
|
|
// Remove a bit of gas from the adjacent ratio...
|
|
var mix = adj.Air.RemoveRatio(ratio);
|
|
|
|
// And merge it to the new tile air.
|
|
Merge(tile.Air, mix);
|
|
|
|
// Return removed gas to its original mixture.
|
|
Merge(adj.Air, mix);
|
|
}
|
|
|
|
// New temperature is the arithmetic mean of the sum of the adjacent temperatures...
|
|
tile.Air.Temperature = totalTemperature / count;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Repopulates all tiles on a grid atmosphere.
|
|
/// </summary>
|
|
public void InvalidateAllTiles(Entity<MapGridComponent?, GridAtmosphereComponent?> entity)
|
|
{
|
|
var (uid, grid, atmos) = entity;
|
|
if (!Resolve(uid, ref grid, ref atmos))
|
|
return;
|
|
|
|
foreach (var indices in atmos.Tiles.Keys)
|
|
{
|
|
atmos.InvalidatedCoords.Add(indices);
|
|
}
|
|
|
|
var enumerator = _map.GetAllTilesEnumerator(uid, grid);
|
|
while (enumerator.MoveNext(out var tile))
|
|
{
|
|
atmos.InvalidatedCoords.Add(tile.Value.GridIndices);
|
|
}
|
|
}
|
|
|
|
public TileRef GetTileRef(TileAtmosphere tile)
|
|
{
|
|
if (!TryComp(tile.GridIndex, out MapGridComponent? grid))
|
|
return default;
|
|
_map.TryGetTileRef(tile.GridIndex, grid, tile.GridIndices, out var tileRef);
|
|
return tileRef;
|
|
}
|
|
}
|