Adds atmos (#1389)
* Add initial atmospherics framework
* Make walls and airlocks airtight
* Add the basic atmosphere gas system
* Atmos: move CardinalToIntVec and Offset into extention methods in EntityNetworkUtils
* Optimize vending machine code a bit.
* Address feedback from Atmos PR, make code compile
Fix use of OnMove -> SnapGridComponent.OnPositionChanged.
Added pause checking to atmos simulations.
* Improvements to the existing ZAS prototype (#996)
* Rename Volume -> Quantity in GasProperty
This makes the name consistent with the rest of the code, given that
it's meant to be a mol value.
* Replace Gas enum with GasPrototype
Unused as of yet, but laying the groundwork for future changes.
* Update AtmosphereMap, improving maths
Adds a temporary default atmosphere, hardcoded in for testing. It will
be replaced eventually.
Fixed a maths mistake in the original code involving unit conversions.
Added the Take() method to IAtmosphere, for taking some volume of
mixture out of a gas mix. This will be pretty handy in the future, but
for now it's used by walls to delete air where they are built.
* Fix merging, splitting logic for zones
Removing a cell from a zone now correctly reduces its volume.
Adding a cell to a zone now correctly increases its volume.
* Improvements to atmos code, reorganising of types
Moved GasPrototype to shared, because it's going to be used by the
client later.
Split up the atmosphere code. Now zones are explicitly their own kind of
atmosphere, which should speed up some loops and also solve
inconsistencies in the volume calculation.
GasMixtures are another type of atmosphere, for more general use.
Try to fix the splitting/merging code, which was quite cryptic and not
clear at all. It *should* work now.
* Switch zones back to MapIndices
Turns out I'm an idiot who misunderstood the code. MapIndices can be
used as one-per-tile, which is what is needed for atmos. GridCoordinates
are many-per-tile, and were causing lots of problems.
* Add zone debugging overlay
This is the first example of zone information being sent to a client.
It adds the `togglezoneinfo` command, which overlays the tiles and gas
information for the zone currently occupied by the user on the screen.
This was helpful for debugging the GridCoordinates problem.
* Fix position of atmos zone debug text
* Make AirtightComponent only activate on MapInit
This should stop it splitting atmospheres in mapping.
* Doc comments improvements to AtmosphereMap
Fix some malformed comments, inherit some useful docs, document some
more functions.
* Add zone logic for changing tiles to/from space
Zones are now correctly created when all the tiles in a room are built,
and destroyed when one of the tiles is destroyed.
* update engine
* right
* Cleanup code
* Port GasMixture, further cleanup
* Fix windows not being airtight, some other stuff
* Work on atmos
* Difference between ZoneBlocked and AirBlocked
* Big GridAtmosphereManager cleanup, zones are broken now oops
* Remove zones, add excited group implementation
* Further cleanup
* Further work on atmos
* Work on gas overlay.
* PumpGasTo and ReleaseGasTo methods for GasMixture.
* Adds Tile Overlay System.
* More work on atmos
* Gasses spread, equalize and all that
* Fix a few crashes
* Gas can actually spread from room to room after opening airlocks
* Add explosive depressurization, tile prying on depressurization, gas spreading on wall break. Etc.
* More work
* Remove atmoschem, add "performant" gas overlays
* what the fuck git
* More work I guess?
* Fix stuff, create a few (empty) components for future work
* Fix temperature
* Fix tile air sharing
* Atmos optimizations
* Further atmos optimizations
* Even more optimizations!
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Address a few reviews
* Oops, forgot to remove this
* Update Content.Server/Atmos/AtmosphereMap.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Fix compile
* Improved client gas tile overlays
* Less allocations
* Even less allocations!
* some stuff dunno
* Big refactor time, oh yeah
* it truly is 1 AM
* bruh
* No idea why now it doesn't work.
Oh well! I'll fix this on thursday :relieved:
* Basic atmos serialization
* Fix bugs, add VV attributes
* Start adding stuff for gas reactions
* Add a few atmos commands
* Fill gas command
* Changes to gas opacity
* Fixes I guess
* Fixes, add space wind sound
* High pressure movement!
* Better high pressure movements.
* Fix direction, maybe?
* And now it works great
* Science!
* and this is why you don't trust people
* remove logging
* Turns out I'm fucking dumb
* Work on hotspots and reactions, add tritium gas
* IGridAtmosphereComponent interface! For future unsimulated grids.
* Makes atmos updates NoGC.
* C E A S E
* Add settemp atmos command
* Important reminder.
* Remove useless AtmosCooldown.
* More work on hotspots
* Overlays for hotspots. Fire works!
* Turns out I suck at coding
* Fire texture change
* Yeah let's make that an absolute value, hmm?
* Support for atmos after teleporting grid (more or less)
* fix attempt (doesn't actually fix it)
* Make static variable not static
* Remove magic numbers
* Stopwatch moment
* Slight cleanup.
* More cleanup.
* Atmos optimizations
* Fix build
* Remove useless ghost atmos shit
* Adds CanSeeGases component for gas overlay stuff
* Component and prototype ignores
* ExcitedGroups now dispose on being merged with others
* Some tweaking.
* Atmos now uses frame time for updates.
* Nullable boogaloo
* IExamine fix
* Fix build
* Fix restartround
* Atmos tweaking, use invalid direction
* Increase high pressure movement force
* Better sort
* Update submodule.
* NULLABILITY AAAAH
Special thanks to monster860 and all monstermos contributors!
Co-authored-by: Campbell Suter <znix@znix.xyz>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: ComicIronic <comicironic@gmail.com>
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2020-08-02 20:08:20 +02:00
|
|
|
|
#nullable enable
|
|
|
|
|
|
using System;
|
|
|
|
|
|
using Content.Server.GameObjects.Components.Atmos;
|
2020-08-25 16:14:26 +02:00
|
|
|
|
using Content.Server.GameObjects.EntitySystems;
|
2020-09-21 00:13:17 +01:00
|
|
|
|
using Content.Server.GameObjects.EntitySystems.Atmos;
|
Adds atmos (#1389)
* Add initial atmospherics framework
* Make walls and airlocks airtight
* Add the basic atmosphere gas system
* Atmos: move CardinalToIntVec and Offset into extention methods in EntityNetworkUtils
* Optimize vending machine code a bit.
* Address feedback from Atmos PR, make code compile
Fix use of OnMove -> SnapGridComponent.OnPositionChanged.
Added pause checking to atmos simulations.
* Improvements to the existing ZAS prototype (#996)
* Rename Volume -> Quantity in GasProperty
This makes the name consistent with the rest of the code, given that
it's meant to be a mol value.
* Replace Gas enum with GasPrototype
Unused as of yet, but laying the groundwork for future changes.
* Update AtmosphereMap, improving maths
Adds a temporary default atmosphere, hardcoded in for testing. It will
be replaced eventually.
Fixed a maths mistake in the original code involving unit conversions.
Added the Take() method to IAtmosphere, for taking some volume of
mixture out of a gas mix. This will be pretty handy in the future, but
for now it's used by walls to delete air where they are built.
* Fix merging, splitting logic for zones
Removing a cell from a zone now correctly reduces its volume.
Adding a cell to a zone now correctly increases its volume.
* Improvements to atmos code, reorganising of types
Moved GasPrototype to shared, because it's going to be used by the
client later.
Split up the atmosphere code. Now zones are explicitly their own kind of
atmosphere, which should speed up some loops and also solve
inconsistencies in the volume calculation.
GasMixtures are another type of atmosphere, for more general use.
Try to fix the splitting/merging code, which was quite cryptic and not
clear at all. It *should* work now.
* Switch zones back to MapIndices
Turns out I'm an idiot who misunderstood the code. MapIndices can be
used as one-per-tile, which is what is needed for atmos. GridCoordinates
are many-per-tile, and were causing lots of problems.
* Add zone debugging overlay
This is the first example of zone information being sent to a client.
It adds the `togglezoneinfo` command, which overlays the tiles and gas
information for the zone currently occupied by the user on the screen.
This was helpful for debugging the GridCoordinates problem.
* Fix position of atmos zone debug text
* Make AirtightComponent only activate on MapInit
This should stop it splitting atmospheres in mapping.
* Doc comments improvements to AtmosphereMap
Fix some malformed comments, inherit some useful docs, document some
more functions.
* Add zone logic for changing tiles to/from space
Zones are now correctly created when all the tiles in a room are built,
and destroyed when one of the tiles is destroyed.
* update engine
* right
* Cleanup code
* Port GasMixture, further cleanup
* Fix windows not being airtight, some other stuff
* Work on atmos
* Difference between ZoneBlocked and AirBlocked
* Big GridAtmosphereManager cleanup, zones are broken now oops
* Remove zones, add excited group implementation
* Further cleanup
* Further work on atmos
* Work on gas overlay.
* PumpGasTo and ReleaseGasTo methods for GasMixture.
* Adds Tile Overlay System.
* More work on atmos
* Gasses spread, equalize and all that
* Fix a few crashes
* Gas can actually spread from room to room after opening airlocks
* Add explosive depressurization, tile prying on depressurization, gas spreading on wall break. Etc.
* More work
* Remove atmoschem, add "performant" gas overlays
* what the fuck git
* More work I guess?
* Fix stuff, create a few (empty) components for future work
* Fix temperature
* Fix tile air sharing
* Atmos optimizations
* Further atmos optimizations
* Even more optimizations!
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Address a few reviews
* Oops, forgot to remove this
* Update Content.Server/Atmos/AtmosphereMap.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Fix compile
* Improved client gas tile overlays
* Less allocations
* Even less allocations!
* some stuff dunno
* Big refactor time, oh yeah
* it truly is 1 AM
* bruh
* No idea why now it doesn't work.
Oh well! I'll fix this on thursday :relieved:
* Basic atmos serialization
* Fix bugs, add VV attributes
* Start adding stuff for gas reactions
* Add a few atmos commands
* Fill gas command
* Changes to gas opacity
* Fixes I guess
* Fixes, add space wind sound
* High pressure movement!
* Better high pressure movements.
* Fix direction, maybe?
* And now it works great
* Science!
* and this is why you don't trust people
* remove logging
* Turns out I'm fucking dumb
* Work on hotspots and reactions, add tritium gas
* IGridAtmosphereComponent interface! For future unsimulated grids.
* Makes atmos updates NoGC.
* C E A S E
* Add settemp atmos command
* Important reminder.
* Remove useless AtmosCooldown.
* More work on hotspots
* Overlays for hotspots. Fire works!
* Turns out I suck at coding
* Fire texture change
* Yeah let's make that an absolute value, hmm?
* Support for atmos after teleporting grid (more or less)
* fix attempt (doesn't actually fix it)
* Make static variable not static
* Remove magic numbers
* Stopwatch moment
* Slight cleanup.
* More cleanup.
* Atmos optimizations
* Fix build
* Remove useless ghost atmos shit
* Adds CanSeeGases component for gas overlay stuff
* Component and prototype ignores
* ExcitedGroups now dispose on being merged with others
* Some tweaking.
* Atmos now uses frame time for updates.
* Nullable boogaloo
* IExamine fix
* Fix build
* Fix restartround
* Atmos tweaking, use invalid direction
* Increase high pressure movement force
* Better sort
* Update submodule.
* NULLABILITY AAAAH
Special thanks to monster860 and all monstermos contributors!
Co-authored-by: Campbell Suter <znix@znix.xyz>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: ComicIronic <comicironic@gmail.com>
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2020-08-02 20:08:20 +02:00
|
|
|
|
using Content.Shared.Atmos;
|
|
|
|
|
|
using Robust.Server.Interfaces.Console;
|
|
|
|
|
|
using Robust.Server.Interfaces.Player;
|
2020-08-25 16:14:26 +02:00
|
|
|
|
using Robust.Shared.GameObjects.Systems;
|
Adds atmos (#1389)
* Add initial atmospherics framework
* Make walls and airlocks airtight
* Add the basic atmosphere gas system
* Atmos: move CardinalToIntVec and Offset into extention methods in EntityNetworkUtils
* Optimize vending machine code a bit.
* Address feedback from Atmos PR, make code compile
Fix use of OnMove -> SnapGridComponent.OnPositionChanged.
Added pause checking to atmos simulations.
* Improvements to the existing ZAS prototype (#996)
* Rename Volume -> Quantity in GasProperty
This makes the name consistent with the rest of the code, given that
it's meant to be a mol value.
* Replace Gas enum with GasPrototype
Unused as of yet, but laying the groundwork for future changes.
* Update AtmosphereMap, improving maths
Adds a temporary default atmosphere, hardcoded in for testing. It will
be replaced eventually.
Fixed a maths mistake in the original code involving unit conversions.
Added the Take() method to IAtmosphere, for taking some volume of
mixture out of a gas mix. This will be pretty handy in the future, but
for now it's used by walls to delete air where they are built.
* Fix merging, splitting logic for zones
Removing a cell from a zone now correctly reduces its volume.
Adding a cell to a zone now correctly increases its volume.
* Improvements to atmos code, reorganising of types
Moved GasPrototype to shared, because it's going to be used by the
client later.
Split up the atmosphere code. Now zones are explicitly their own kind of
atmosphere, which should speed up some loops and also solve
inconsistencies in the volume calculation.
GasMixtures are another type of atmosphere, for more general use.
Try to fix the splitting/merging code, which was quite cryptic and not
clear at all. It *should* work now.
* Switch zones back to MapIndices
Turns out I'm an idiot who misunderstood the code. MapIndices can be
used as one-per-tile, which is what is needed for atmos. GridCoordinates
are many-per-tile, and were causing lots of problems.
* Add zone debugging overlay
This is the first example of zone information being sent to a client.
It adds the `togglezoneinfo` command, which overlays the tiles and gas
information for the zone currently occupied by the user on the screen.
This was helpful for debugging the GridCoordinates problem.
* Fix position of atmos zone debug text
* Make AirtightComponent only activate on MapInit
This should stop it splitting atmospheres in mapping.
* Doc comments improvements to AtmosphereMap
Fix some malformed comments, inherit some useful docs, document some
more functions.
* Add zone logic for changing tiles to/from space
Zones are now correctly created when all the tiles in a room are built,
and destroyed when one of the tiles is destroyed.
* update engine
* right
* Cleanup code
* Port GasMixture, further cleanup
* Fix windows not being airtight, some other stuff
* Work on atmos
* Difference between ZoneBlocked and AirBlocked
* Big GridAtmosphereManager cleanup, zones are broken now oops
* Remove zones, add excited group implementation
* Further cleanup
* Further work on atmos
* Work on gas overlay.
* PumpGasTo and ReleaseGasTo methods for GasMixture.
* Adds Tile Overlay System.
* More work on atmos
* Gasses spread, equalize and all that
* Fix a few crashes
* Gas can actually spread from room to room after opening airlocks
* Add explosive depressurization, tile prying on depressurization, gas spreading on wall break. Etc.
* More work
* Remove atmoschem, add "performant" gas overlays
* what the fuck git
* More work I guess?
* Fix stuff, create a few (empty) components for future work
* Fix temperature
* Fix tile air sharing
* Atmos optimizations
* Further atmos optimizations
* Even more optimizations!
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Address a few reviews
* Oops, forgot to remove this
* Update Content.Server/Atmos/AtmosphereMap.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Fix compile
* Improved client gas tile overlays
* Less allocations
* Even less allocations!
* some stuff dunno
* Big refactor time, oh yeah
* it truly is 1 AM
* bruh
* No idea why now it doesn't work.
Oh well! I'll fix this on thursday :relieved:
* Basic atmos serialization
* Fix bugs, add VV attributes
* Start adding stuff for gas reactions
* Add a few atmos commands
* Fill gas command
* Changes to gas opacity
* Fixes I guess
* Fixes, add space wind sound
* High pressure movement!
* Better high pressure movements.
* Fix direction, maybe?
* And now it works great
* Science!
* and this is why you don't trust people
* remove logging
* Turns out I'm fucking dumb
* Work on hotspots and reactions, add tritium gas
* IGridAtmosphereComponent interface! For future unsimulated grids.
* Makes atmos updates NoGC.
* C E A S E
* Add settemp atmos command
* Important reminder.
* Remove useless AtmosCooldown.
* More work on hotspots
* Overlays for hotspots. Fire works!
* Turns out I suck at coding
* Fire texture change
* Yeah let's make that an absolute value, hmm?
* Support for atmos after teleporting grid (more or less)
* fix attempt (doesn't actually fix it)
* Make static variable not static
* Remove magic numbers
* Stopwatch moment
* Slight cleanup.
* More cleanup.
* Atmos optimizations
* Fix build
* Remove useless ghost atmos shit
* Adds CanSeeGases component for gas overlay stuff
* Component and prototype ignores
* ExcitedGroups now dispose on being merged with others
* Some tweaking.
* Atmos now uses frame time for updates.
* Nullable boogaloo
* IExamine fix
* Fix build
* Fix restartround
* Atmos tweaking, use invalid direction
* Increase high pressure movement force
* Better sort
* Update submodule.
* NULLABILITY AAAAH
Special thanks to monster860 and all monstermos contributors!
Co-authored-by: Campbell Suter <znix@znix.xyz>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: ComicIronic <comicironic@gmail.com>
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2020-08-02 20:08:20 +02:00
|
|
|
|
using Robust.Shared.Interfaces.GameObjects;
|
|
|
|
|
|
using Robust.Shared.Interfaces.Map;
|
|
|
|
|
|
using Robust.Shared.IoC;
|
|
|
|
|
|
using Robust.Shared.Map;
|
|
|
|
|
|
|
|
|
|
|
|
namespace Content.Server.Atmos
|
|
|
|
|
|
{
|
|
|
|
|
|
public class AddAtmos : IClientCommand
|
|
|
|
|
|
{
|
|
|
|
|
|
public string Command => "addatmos";
|
|
|
|
|
|
public string Description => "Adds atmos support to a grid.";
|
2020-09-04 12:22:33 +02:00
|
|
|
|
public string Help => $"{Command} <GridId>";
|
|
|
|
|
|
|
Adds atmos (#1389)
* Add initial atmospherics framework
* Make walls and airlocks airtight
* Add the basic atmosphere gas system
* Atmos: move CardinalToIntVec and Offset into extention methods in EntityNetworkUtils
* Optimize vending machine code a bit.
* Address feedback from Atmos PR, make code compile
Fix use of OnMove -> SnapGridComponent.OnPositionChanged.
Added pause checking to atmos simulations.
* Improvements to the existing ZAS prototype (#996)
* Rename Volume -> Quantity in GasProperty
This makes the name consistent with the rest of the code, given that
it's meant to be a mol value.
* Replace Gas enum with GasPrototype
Unused as of yet, but laying the groundwork for future changes.
* Update AtmosphereMap, improving maths
Adds a temporary default atmosphere, hardcoded in for testing. It will
be replaced eventually.
Fixed a maths mistake in the original code involving unit conversions.
Added the Take() method to IAtmosphere, for taking some volume of
mixture out of a gas mix. This will be pretty handy in the future, but
for now it's used by walls to delete air where they are built.
* Fix merging, splitting logic for zones
Removing a cell from a zone now correctly reduces its volume.
Adding a cell to a zone now correctly increases its volume.
* Improvements to atmos code, reorganising of types
Moved GasPrototype to shared, because it's going to be used by the
client later.
Split up the atmosphere code. Now zones are explicitly their own kind of
atmosphere, which should speed up some loops and also solve
inconsistencies in the volume calculation.
GasMixtures are another type of atmosphere, for more general use.
Try to fix the splitting/merging code, which was quite cryptic and not
clear at all. It *should* work now.
* Switch zones back to MapIndices
Turns out I'm an idiot who misunderstood the code. MapIndices can be
used as one-per-tile, which is what is needed for atmos. GridCoordinates
are many-per-tile, and were causing lots of problems.
* Add zone debugging overlay
This is the first example of zone information being sent to a client.
It adds the `togglezoneinfo` command, which overlays the tiles and gas
information for the zone currently occupied by the user on the screen.
This was helpful for debugging the GridCoordinates problem.
* Fix position of atmos zone debug text
* Make AirtightComponent only activate on MapInit
This should stop it splitting atmospheres in mapping.
* Doc comments improvements to AtmosphereMap
Fix some malformed comments, inherit some useful docs, document some
more functions.
* Add zone logic for changing tiles to/from space
Zones are now correctly created when all the tiles in a room are built,
and destroyed when one of the tiles is destroyed.
* update engine
* right
* Cleanup code
* Port GasMixture, further cleanup
* Fix windows not being airtight, some other stuff
* Work on atmos
* Difference between ZoneBlocked and AirBlocked
* Big GridAtmosphereManager cleanup, zones are broken now oops
* Remove zones, add excited group implementation
* Further cleanup
* Further work on atmos
* Work on gas overlay.
* PumpGasTo and ReleaseGasTo methods for GasMixture.
* Adds Tile Overlay System.
* More work on atmos
* Gasses spread, equalize and all that
* Fix a few crashes
* Gas can actually spread from room to room after opening airlocks
* Add explosive depressurization, tile prying on depressurization, gas spreading on wall break. Etc.
* More work
* Remove atmoschem, add "performant" gas overlays
* what the fuck git
* More work I guess?
* Fix stuff, create a few (empty) components for future work
* Fix temperature
* Fix tile air sharing
* Atmos optimizations
* Further atmos optimizations
* Even more optimizations!
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Address a few reviews
* Oops, forgot to remove this
* Update Content.Server/Atmos/AtmosphereMap.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Fix compile
* Improved client gas tile overlays
* Less allocations
* Even less allocations!
* some stuff dunno
* Big refactor time, oh yeah
* it truly is 1 AM
* bruh
* No idea why now it doesn't work.
Oh well! I'll fix this on thursday :relieved:
* Basic atmos serialization
* Fix bugs, add VV attributes
* Start adding stuff for gas reactions
* Add a few atmos commands
* Fill gas command
* Changes to gas opacity
* Fixes I guess
* Fixes, add space wind sound
* High pressure movement!
* Better high pressure movements.
* Fix direction, maybe?
* And now it works great
* Science!
* and this is why you don't trust people
* remove logging
* Turns out I'm fucking dumb
* Work on hotspots and reactions, add tritium gas
* IGridAtmosphereComponent interface! For future unsimulated grids.
* Makes atmos updates NoGC.
* C E A S E
* Add settemp atmos command
* Important reminder.
* Remove useless AtmosCooldown.
* More work on hotspots
* Overlays for hotspots. Fire works!
* Turns out I suck at coding
* Fire texture change
* Yeah let's make that an absolute value, hmm?
* Support for atmos after teleporting grid (more or less)
* fix attempt (doesn't actually fix it)
* Make static variable not static
* Remove magic numbers
* Stopwatch moment
* Slight cleanup.
* More cleanup.
* Atmos optimizations
* Fix build
* Remove useless ghost atmos shit
* Adds CanSeeGases component for gas overlay stuff
* Component and prototype ignores
* ExcitedGroups now dispose on being merged with others
* Some tweaking.
* Atmos now uses frame time for updates.
* Nullable boogaloo
* IExamine fix
* Fix build
* Fix restartround
* Atmos tweaking, use invalid direction
* Increase high pressure movement force
* Better sort
* Update submodule.
* NULLABILITY AAAAH
Special thanks to monster860 and all monstermos contributors!
Co-authored-by: Campbell Suter <znix@znix.xyz>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: ComicIronic <comicironic@gmail.com>
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2020-08-02 20:08:20 +02:00
|
|
|
|
public void Execute(IConsoleShell shell, IPlayerSession? player, string[] args)
|
|
|
|
|
|
{
|
2020-09-04 12:22:33 +02:00
|
|
|
|
if (args.Length < 1)
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, Help);
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!int.TryParse(args[0], out var id))
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, $"{args[0]} is not a valid integer.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
Adds atmos (#1389)
* Add initial atmospherics framework
* Make walls and airlocks airtight
* Add the basic atmosphere gas system
* Atmos: move CardinalToIntVec and Offset into extention methods in EntityNetworkUtils
* Optimize vending machine code a bit.
* Address feedback from Atmos PR, make code compile
Fix use of OnMove -> SnapGridComponent.OnPositionChanged.
Added pause checking to atmos simulations.
* Improvements to the existing ZAS prototype (#996)
* Rename Volume -> Quantity in GasProperty
This makes the name consistent with the rest of the code, given that
it's meant to be a mol value.
* Replace Gas enum with GasPrototype
Unused as of yet, but laying the groundwork for future changes.
* Update AtmosphereMap, improving maths
Adds a temporary default atmosphere, hardcoded in for testing. It will
be replaced eventually.
Fixed a maths mistake in the original code involving unit conversions.
Added the Take() method to IAtmosphere, for taking some volume of
mixture out of a gas mix. This will be pretty handy in the future, but
for now it's used by walls to delete air where they are built.
* Fix merging, splitting logic for zones
Removing a cell from a zone now correctly reduces its volume.
Adding a cell to a zone now correctly increases its volume.
* Improvements to atmos code, reorganising of types
Moved GasPrototype to shared, because it's going to be used by the
client later.
Split up the atmosphere code. Now zones are explicitly their own kind of
atmosphere, which should speed up some loops and also solve
inconsistencies in the volume calculation.
GasMixtures are another type of atmosphere, for more general use.
Try to fix the splitting/merging code, which was quite cryptic and not
clear at all. It *should* work now.
* Switch zones back to MapIndices
Turns out I'm an idiot who misunderstood the code. MapIndices can be
used as one-per-tile, which is what is needed for atmos. GridCoordinates
are many-per-tile, and were causing lots of problems.
* Add zone debugging overlay
This is the first example of zone information being sent to a client.
It adds the `togglezoneinfo` command, which overlays the tiles and gas
information for the zone currently occupied by the user on the screen.
This was helpful for debugging the GridCoordinates problem.
* Fix position of atmos zone debug text
* Make AirtightComponent only activate on MapInit
This should stop it splitting atmospheres in mapping.
* Doc comments improvements to AtmosphereMap
Fix some malformed comments, inherit some useful docs, document some
more functions.
* Add zone logic for changing tiles to/from space
Zones are now correctly created when all the tiles in a room are built,
and destroyed when one of the tiles is destroyed.
* update engine
* right
* Cleanup code
* Port GasMixture, further cleanup
* Fix windows not being airtight, some other stuff
* Work on atmos
* Difference between ZoneBlocked and AirBlocked
* Big GridAtmosphereManager cleanup, zones are broken now oops
* Remove zones, add excited group implementation
* Further cleanup
* Further work on atmos
* Work on gas overlay.
* PumpGasTo and ReleaseGasTo methods for GasMixture.
* Adds Tile Overlay System.
* More work on atmos
* Gasses spread, equalize and all that
* Fix a few crashes
* Gas can actually spread from room to room after opening airlocks
* Add explosive depressurization, tile prying on depressurization, gas spreading on wall break. Etc.
* More work
* Remove atmoschem, add "performant" gas overlays
* what the fuck git
* More work I guess?
* Fix stuff, create a few (empty) components for future work
* Fix temperature
* Fix tile air sharing
* Atmos optimizations
* Further atmos optimizations
* Even more optimizations!
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Address a few reviews
* Oops, forgot to remove this
* Update Content.Server/Atmos/AtmosphereMap.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Fix compile
* Improved client gas tile overlays
* Less allocations
* Even less allocations!
* some stuff dunno
* Big refactor time, oh yeah
* it truly is 1 AM
* bruh
* No idea why now it doesn't work.
Oh well! I'll fix this on thursday :relieved:
* Basic atmos serialization
* Fix bugs, add VV attributes
* Start adding stuff for gas reactions
* Add a few atmos commands
* Fill gas command
* Changes to gas opacity
* Fixes I guess
* Fixes, add space wind sound
* High pressure movement!
* Better high pressure movements.
* Fix direction, maybe?
* And now it works great
* Science!
* and this is why you don't trust people
* remove logging
* Turns out I'm fucking dumb
* Work on hotspots and reactions, add tritium gas
* IGridAtmosphereComponent interface! For future unsimulated grids.
* Makes atmos updates NoGC.
* C E A S E
* Add settemp atmos command
* Important reminder.
* Remove useless AtmosCooldown.
* More work on hotspots
* Overlays for hotspots. Fire works!
* Turns out I suck at coding
* Fire texture change
* Yeah let's make that an absolute value, hmm?
* Support for atmos after teleporting grid (more or less)
* fix attempt (doesn't actually fix it)
* Make static variable not static
* Remove magic numbers
* Stopwatch moment
* Slight cleanup.
* More cleanup.
* Atmos optimizations
* Fix build
* Remove useless ghost atmos shit
* Adds CanSeeGases component for gas overlay stuff
* Component and prototype ignores
* ExcitedGroups now dispose on being merged with others
* Some tweaking.
* Atmos now uses frame time for updates.
* Nullable boogaloo
* IExamine fix
* Fix build
* Fix restartround
* Atmos tweaking, use invalid direction
* Increase high pressure movement force
* Better sort
* Update submodule.
* NULLABILITY AAAAH
Special thanks to monster860 and all monstermos contributors!
Co-authored-by: Campbell Suter <znix@znix.xyz>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: ComicIronic <comicironic@gmail.com>
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2020-08-02 20:08:20 +02:00
|
|
|
|
|
|
|
|
|
|
var gridId = new GridId(id);
|
|
|
|
|
|
|
|
|
|
|
|
var mapMan = IoCManager.Resolve<IMapManager>();
|
|
|
|
|
|
|
|
|
|
|
|
if (!gridId.IsValid() || !mapMan.TryGetGrid(gridId, out var gridComp))
|
|
|
|
|
|
{
|
2020-09-04 12:22:33 +02:00
|
|
|
|
shell.SendText(player, $"{gridId} is not a valid grid id.");
|
Adds atmos (#1389)
* Add initial atmospherics framework
* Make walls and airlocks airtight
* Add the basic atmosphere gas system
* Atmos: move CardinalToIntVec and Offset into extention methods in EntityNetworkUtils
* Optimize vending machine code a bit.
* Address feedback from Atmos PR, make code compile
Fix use of OnMove -> SnapGridComponent.OnPositionChanged.
Added pause checking to atmos simulations.
* Improvements to the existing ZAS prototype (#996)
* Rename Volume -> Quantity in GasProperty
This makes the name consistent with the rest of the code, given that
it's meant to be a mol value.
* Replace Gas enum with GasPrototype
Unused as of yet, but laying the groundwork for future changes.
* Update AtmosphereMap, improving maths
Adds a temporary default atmosphere, hardcoded in for testing. It will
be replaced eventually.
Fixed a maths mistake in the original code involving unit conversions.
Added the Take() method to IAtmosphere, for taking some volume of
mixture out of a gas mix. This will be pretty handy in the future, but
for now it's used by walls to delete air where they are built.
* Fix merging, splitting logic for zones
Removing a cell from a zone now correctly reduces its volume.
Adding a cell to a zone now correctly increases its volume.
* Improvements to atmos code, reorganising of types
Moved GasPrototype to shared, because it's going to be used by the
client later.
Split up the atmosphere code. Now zones are explicitly their own kind of
atmosphere, which should speed up some loops and also solve
inconsistencies in the volume calculation.
GasMixtures are another type of atmosphere, for more general use.
Try to fix the splitting/merging code, which was quite cryptic and not
clear at all. It *should* work now.
* Switch zones back to MapIndices
Turns out I'm an idiot who misunderstood the code. MapIndices can be
used as one-per-tile, which is what is needed for atmos. GridCoordinates
are many-per-tile, and were causing lots of problems.
* Add zone debugging overlay
This is the first example of zone information being sent to a client.
It adds the `togglezoneinfo` command, which overlays the tiles and gas
information for the zone currently occupied by the user on the screen.
This was helpful for debugging the GridCoordinates problem.
* Fix position of atmos zone debug text
* Make AirtightComponent only activate on MapInit
This should stop it splitting atmospheres in mapping.
* Doc comments improvements to AtmosphereMap
Fix some malformed comments, inherit some useful docs, document some
more functions.
* Add zone logic for changing tiles to/from space
Zones are now correctly created when all the tiles in a room are built,
and destroyed when one of the tiles is destroyed.
* update engine
* right
* Cleanup code
* Port GasMixture, further cleanup
* Fix windows not being airtight, some other stuff
* Work on atmos
* Difference between ZoneBlocked and AirBlocked
* Big GridAtmosphereManager cleanup, zones are broken now oops
* Remove zones, add excited group implementation
* Further cleanup
* Further work on atmos
* Work on gas overlay.
* PumpGasTo and ReleaseGasTo methods for GasMixture.
* Adds Tile Overlay System.
* More work on atmos
* Gasses spread, equalize and all that
* Fix a few crashes
* Gas can actually spread from room to room after opening airlocks
* Add explosive depressurization, tile prying on depressurization, gas spreading on wall break. Etc.
* More work
* Remove atmoschem, add "performant" gas overlays
* what the fuck git
* More work I guess?
* Fix stuff, create a few (empty) components for future work
* Fix temperature
* Fix tile air sharing
* Atmos optimizations
* Further atmos optimizations
* Even more optimizations!
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Address a few reviews
* Oops, forgot to remove this
* Update Content.Server/Atmos/AtmosphereMap.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Fix compile
* Improved client gas tile overlays
* Less allocations
* Even less allocations!
* some stuff dunno
* Big refactor time, oh yeah
* it truly is 1 AM
* bruh
* No idea why now it doesn't work.
Oh well! I'll fix this on thursday :relieved:
* Basic atmos serialization
* Fix bugs, add VV attributes
* Start adding stuff for gas reactions
* Add a few atmos commands
* Fill gas command
* Changes to gas opacity
* Fixes I guess
* Fixes, add space wind sound
* High pressure movement!
* Better high pressure movements.
* Fix direction, maybe?
* And now it works great
* Science!
* and this is why you don't trust people
* remove logging
* Turns out I'm fucking dumb
* Work on hotspots and reactions, add tritium gas
* IGridAtmosphereComponent interface! For future unsimulated grids.
* Makes atmos updates NoGC.
* C E A S E
* Add settemp atmos command
* Important reminder.
* Remove useless AtmosCooldown.
* More work on hotspots
* Overlays for hotspots. Fire works!
* Turns out I suck at coding
* Fire texture change
* Yeah let's make that an absolute value, hmm?
* Support for atmos after teleporting grid (more or less)
* fix attempt (doesn't actually fix it)
* Make static variable not static
* Remove magic numbers
* Stopwatch moment
* Slight cleanup.
* More cleanup.
* Atmos optimizations
* Fix build
* Remove useless ghost atmos shit
* Adds CanSeeGases component for gas overlay stuff
* Component and prototype ignores
* ExcitedGroups now dispose on being merged with others
* Some tweaking.
* Atmos now uses frame time for updates.
* Nullable boogaloo
* IExamine fix
* Fix build
* Fix restartround
* Atmos tweaking, use invalid direction
* Increase high pressure movement force
* Better sort
* Update submodule.
* NULLABILITY AAAAH
Special thanks to monster860 and all monstermos contributors!
Co-authored-by: Campbell Suter <znix@znix.xyz>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: ComicIronic <comicironic@gmail.com>
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2020-08-02 20:08:20 +02:00
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
var entMan = IoCManager.Resolve<IEntityManager>();
|
|
|
|
|
|
|
|
|
|
|
|
if (!entMan.TryGetEntity(gridComp.GridEntityId, out var grid))
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "Failed to get grid entity.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-09-04 12:22:33 +02:00
|
|
|
|
if (grid.HasComponent<IGridAtmosphereComponent>())
|
Adds atmos (#1389)
* Add initial atmospherics framework
* Make walls and airlocks airtight
* Add the basic atmosphere gas system
* Atmos: move CardinalToIntVec and Offset into extention methods in EntityNetworkUtils
* Optimize vending machine code a bit.
* Address feedback from Atmos PR, make code compile
Fix use of OnMove -> SnapGridComponent.OnPositionChanged.
Added pause checking to atmos simulations.
* Improvements to the existing ZAS prototype (#996)
* Rename Volume -> Quantity in GasProperty
This makes the name consistent with the rest of the code, given that
it's meant to be a mol value.
* Replace Gas enum with GasPrototype
Unused as of yet, but laying the groundwork for future changes.
* Update AtmosphereMap, improving maths
Adds a temporary default atmosphere, hardcoded in for testing. It will
be replaced eventually.
Fixed a maths mistake in the original code involving unit conversions.
Added the Take() method to IAtmosphere, for taking some volume of
mixture out of a gas mix. This will be pretty handy in the future, but
for now it's used by walls to delete air where they are built.
* Fix merging, splitting logic for zones
Removing a cell from a zone now correctly reduces its volume.
Adding a cell to a zone now correctly increases its volume.
* Improvements to atmos code, reorganising of types
Moved GasPrototype to shared, because it's going to be used by the
client later.
Split up the atmosphere code. Now zones are explicitly their own kind of
atmosphere, which should speed up some loops and also solve
inconsistencies in the volume calculation.
GasMixtures are another type of atmosphere, for more general use.
Try to fix the splitting/merging code, which was quite cryptic and not
clear at all. It *should* work now.
* Switch zones back to MapIndices
Turns out I'm an idiot who misunderstood the code. MapIndices can be
used as one-per-tile, which is what is needed for atmos. GridCoordinates
are many-per-tile, and were causing lots of problems.
* Add zone debugging overlay
This is the first example of zone information being sent to a client.
It adds the `togglezoneinfo` command, which overlays the tiles and gas
information for the zone currently occupied by the user on the screen.
This was helpful for debugging the GridCoordinates problem.
* Fix position of atmos zone debug text
* Make AirtightComponent only activate on MapInit
This should stop it splitting atmospheres in mapping.
* Doc comments improvements to AtmosphereMap
Fix some malformed comments, inherit some useful docs, document some
more functions.
* Add zone logic for changing tiles to/from space
Zones are now correctly created when all the tiles in a room are built,
and destroyed when one of the tiles is destroyed.
* update engine
* right
* Cleanup code
* Port GasMixture, further cleanup
* Fix windows not being airtight, some other stuff
* Work on atmos
* Difference between ZoneBlocked and AirBlocked
* Big GridAtmosphereManager cleanup, zones are broken now oops
* Remove zones, add excited group implementation
* Further cleanup
* Further work on atmos
* Work on gas overlay.
* PumpGasTo and ReleaseGasTo methods for GasMixture.
* Adds Tile Overlay System.
* More work on atmos
* Gasses spread, equalize and all that
* Fix a few crashes
* Gas can actually spread from room to room after opening airlocks
* Add explosive depressurization, tile prying on depressurization, gas spreading on wall break. Etc.
* More work
* Remove atmoschem, add "performant" gas overlays
* what the fuck git
* More work I guess?
* Fix stuff, create a few (empty) components for future work
* Fix temperature
* Fix tile air sharing
* Atmos optimizations
* Further atmos optimizations
* Even more optimizations!
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Address a few reviews
* Oops, forgot to remove this
* Update Content.Server/Atmos/AtmosphereMap.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Fix compile
* Improved client gas tile overlays
* Less allocations
* Even less allocations!
* some stuff dunno
* Big refactor time, oh yeah
* it truly is 1 AM
* bruh
* No idea why now it doesn't work.
Oh well! I'll fix this on thursday :relieved:
* Basic atmos serialization
* Fix bugs, add VV attributes
* Start adding stuff for gas reactions
* Add a few atmos commands
* Fill gas command
* Changes to gas opacity
* Fixes I guess
* Fixes, add space wind sound
* High pressure movement!
* Better high pressure movements.
* Fix direction, maybe?
* And now it works great
* Science!
* and this is why you don't trust people
* remove logging
* Turns out I'm fucking dumb
* Work on hotspots and reactions, add tritium gas
* IGridAtmosphereComponent interface! For future unsimulated grids.
* Makes atmos updates NoGC.
* C E A S E
* Add settemp atmos command
* Important reminder.
* Remove useless AtmosCooldown.
* More work on hotspots
* Overlays for hotspots. Fire works!
* Turns out I suck at coding
* Fire texture change
* Yeah let's make that an absolute value, hmm?
* Support for atmos after teleporting grid (more or less)
* fix attempt (doesn't actually fix it)
* Make static variable not static
* Remove magic numbers
* Stopwatch moment
* Slight cleanup.
* More cleanup.
* Atmos optimizations
* Fix build
* Remove useless ghost atmos shit
* Adds CanSeeGases component for gas overlay stuff
* Component and prototype ignores
* ExcitedGroups now dispose on being merged with others
* Some tweaking.
* Atmos now uses frame time for updates.
* Nullable boogaloo
* IExamine fix
* Fix build
* Fix restartround
* Atmos tweaking, use invalid direction
* Increase high pressure movement force
* Better sort
* Update submodule.
* NULLABILITY AAAAH
Special thanks to monster860 and all monstermos contributors!
Co-authored-by: Campbell Suter <znix@znix.xyz>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: ComicIronic <comicironic@gmail.com>
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2020-08-02 20:08:20 +02:00
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "Grid already has an atmosphere.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
grid.AddComponent<GridAtmosphereComponent>();
|
|
|
|
|
|
|
|
|
|
|
|
shell.SendText(player, $"Added atmosphere to grid {id}.");
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-09-04 12:22:33 +02:00
|
|
|
|
public class AddUnsimulatedAtmos : IClientCommand
|
|
|
|
|
|
{
|
|
|
|
|
|
public string Command => "addunsimulatedatmos";
|
|
|
|
|
|
public string Description => "Adds unimulated atmos support to a grid.";
|
|
|
|
|
|
public string Help => $"{Command} <GridId>";
|
|
|
|
|
|
|
|
|
|
|
|
public void Execute(IConsoleShell shell, IPlayerSession? player, string[] args)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (args.Length < 1)
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, Help);
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!int.TryParse(args[0], out var id))
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, $"{args[0]} is not a valid integer.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
var gridId = new GridId(id);
|
|
|
|
|
|
|
|
|
|
|
|
var mapMan = IoCManager.Resolve<IMapManager>();
|
|
|
|
|
|
|
|
|
|
|
|
if (!gridId.IsValid() || !mapMan.TryGetGrid(gridId, out var gridComp))
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, $"{gridId} is not a valid grid id.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
var entMan = IoCManager.Resolve<IEntityManager>();
|
|
|
|
|
|
|
|
|
|
|
|
if (!entMan.TryGetEntity(gridComp.GridEntityId, out var grid))
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "Failed to get grid entity.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (grid.HasComponent<IGridAtmosphereComponent>())
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "Grid already has an atmosphere.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
grid.AddComponent<UnsimulatedGridAtmosphereComponent>();
|
|
|
|
|
|
|
|
|
|
|
|
shell.SendText(player, $"Added unsimulated atmosphere to grid {id}.");
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
Adds atmos (#1389)
* Add initial atmospherics framework
* Make walls and airlocks airtight
* Add the basic atmosphere gas system
* Atmos: move CardinalToIntVec and Offset into extention methods in EntityNetworkUtils
* Optimize vending machine code a bit.
* Address feedback from Atmos PR, make code compile
Fix use of OnMove -> SnapGridComponent.OnPositionChanged.
Added pause checking to atmos simulations.
* Improvements to the existing ZAS prototype (#996)
* Rename Volume -> Quantity in GasProperty
This makes the name consistent with the rest of the code, given that
it's meant to be a mol value.
* Replace Gas enum with GasPrototype
Unused as of yet, but laying the groundwork for future changes.
* Update AtmosphereMap, improving maths
Adds a temporary default atmosphere, hardcoded in for testing. It will
be replaced eventually.
Fixed a maths mistake in the original code involving unit conversions.
Added the Take() method to IAtmosphere, for taking some volume of
mixture out of a gas mix. This will be pretty handy in the future, but
for now it's used by walls to delete air where they are built.
* Fix merging, splitting logic for zones
Removing a cell from a zone now correctly reduces its volume.
Adding a cell to a zone now correctly increases its volume.
* Improvements to atmos code, reorganising of types
Moved GasPrototype to shared, because it's going to be used by the
client later.
Split up the atmosphere code. Now zones are explicitly their own kind of
atmosphere, which should speed up some loops and also solve
inconsistencies in the volume calculation.
GasMixtures are another type of atmosphere, for more general use.
Try to fix the splitting/merging code, which was quite cryptic and not
clear at all. It *should* work now.
* Switch zones back to MapIndices
Turns out I'm an idiot who misunderstood the code. MapIndices can be
used as one-per-tile, which is what is needed for atmos. GridCoordinates
are many-per-tile, and were causing lots of problems.
* Add zone debugging overlay
This is the first example of zone information being sent to a client.
It adds the `togglezoneinfo` command, which overlays the tiles and gas
information for the zone currently occupied by the user on the screen.
This was helpful for debugging the GridCoordinates problem.
* Fix position of atmos zone debug text
* Make AirtightComponent only activate on MapInit
This should stop it splitting atmospheres in mapping.
* Doc comments improvements to AtmosphereMap
Fix some malformed comments, inherit some useful docs, document some
more functions.
* Add zone logic for changing tiles to/from space
Zones are now correctly created when all the tiles in a room are built,
and destroyed when one of the tiles is destroyed.
* update engine
* right
* Cleanup code
* Port GasMixture, further cleanup
* Fix windows not being airtight, some other stuff
* Work on atmos
* Difference between ZoneBlocked and AirBlocked
* Big GridAtmosphereManager cleanup, zones are broken now oops
* Remove zones, add excited group implementation
* Further cleanup
* Further work on atmos
* Work on gas overlay.
* PumpGasTo and ReleaseGasTo methods for GasMixture.
* Adds Tile Overlay System.
* More work on atmos
* Gasses spread, equalize and all that
* Fix a few crashes
* Gas can actually spread from room to room after opening airlocks
* Add explosive depressurization, tile prying on depressurization, gas spreading on wall break. Etc.
* More work
* Remove atmoschem, add "performant" gas overlays
* what the fuck git
* More work I guess?
* Fix stuff, create a few (empty) components for future work
* Fix temperature
* Fix tile air sharing
* Atmos optimizations
* Further atmos optimizations
* Even more optimizations!
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Address a few reviews
* Oops, forgot to remove this
* Update Content.Server/Atmos/AtmosphereMap.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Fix compile
* Improved client gas tile overlays
* Less allocations
* Even less allocations!
* some stuff dunno
* Big refactor time, oh yeah
* it truly is 1 AM
* bruh
* No idea why now it doesn't work.
Oh well! I'll fix this on thursday :relieved:
* Basic atmos serialization
* Fix bugs, add VV attributes
* Start adding stuff for gas reactions
* Add a few atmos commands
* Fill gas command
* Changes to gas opacity
* Fixes I guess
* Fixes, add space wind sound
* High pressure movement!
* Better high pressure movements.
* Fix direction, maybe?
* And now it works great
* Science!
* and this is why you don't trust people
* remove logging
* Turns out I'm fucking dumb
* Work on hotspots and reactions, add tritium gas
* IGridAtmosphereComponent interface! For future unsimulated grids.
* Makes atmos updates NoGC.
* C E A S E
* Add settemp atmos command
* Important reminder.
* Remove useless AtmosCooldown.
* More work on hotspots
* Overlays for hotspots. Fire works!
* Turns out I suck at coding
* Fire texture change
* Yeah let's make that an absolute value, hmm?
* Support for atmos after teleporting grid (more or less)
* fix attempt (doesn't actually fix it)
* Make static variable not static
* Remove magic numbers
* Stopwatch moment
* Slight cleanup.
* More cleanup.
* Atmos optimizations
* Fix build
* Remove useless ghost atmos shit
* Adds CanSeeGases component for gas overlay stuff
* Component and prototype ignores
* ExcitedGroups now dispose on being merged with others
* Some tweaking.
* Atmos now uses frame time for updates.
* Nullable boogaloo
* IExamine fix
* Fix build
* Fix restartround
* Atmos tweaking, use invalid direction
* Increase high pressure movement force
* Better sort
* Update submodule.
* NULLABILITY AAAAH
Special thanks to monster860 and all monstermos contributors!
Co-authored-by: Campbell Suter <znix@znix.xyz>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: ComicIronic <comicironic@gmail.com>
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2020-08-02 20:08:20 +02:00
|
|
|
|
public class ListGases : IClientCommand
|
|
|
|
|
|
{
|
|
|
|
|
|
public string Command => "listgases";
|
|
|
|
|
|
public string Description => "Prints a list of gases and their indices.";
|
|
|
|
|
|
public string Help => "listgases";
|
|
|
|
|
|
public void Execute(IConsoleShell shell, IPlayerSession? player, string[] args)
|
|
|
|
|
|
{
|
2020-08-25 16:14:26 +02:00
|
|
|
|
var atmosSystem = EntitySystem.Get<AtmosphereSystem>();
|
|
|
|
|
|
|
|
|
|
|
|
foreach (var gasPrototype in atmosSystem.Gases)
|
Adds atmos (#1389)
* Add initial atmospherics framework
* Make walls and airlocks airtight
* Add the basic atmosphere gas system
* Atmos: move CardinalToIntVec and Offset into extention methods in EntityNetworkUtils
* Optimize vending machine code a bit.
* Address feedback from Atmos PR, make code compile
Fix use of OnMove -> SnapGridComponent.OnPositionChanged.
Added pause checking to atmos simulations.
* Improvements to the existing ZAS prototype (#996)
* Rename Volume -> Quantity in GasProperty
This makes the name consistent with the rest of the code, given that
it's meant to be a mol value.
* Replace Gas enum with GasPrototype
Unused as of yet, but laying the groundwork for future changes.
* Update AtmosphereMap, improving maths
Adds a temporary default atmosphere, hardcoded in for testing. It will
be replaced eventually.
Fixed a maths mistake in the original code involving unit conversions.
Added the Take() method to IAtmosphere, for taking some volume of
mixture out of a gas mix. This will be pretty handy in the future, but
for now it's used by walls to delete air where they are built.
* Fix merging, splitting logic for zones
Removing a cell from a zone now correctly reduces its volume.
Adding a cell to a zone now correctly increases its volume.
* Improvements to atmos code, reorganising of types
Moved GasPrototype to shared, because it's going to be used by the
client later.
Split up the atmosphere code. Now zones are explicitly their own kind of
atmosphere, which should speed up some loops and also solve
inconsistencies in the volume calculation.
GasMixtures are another type of atmosphere, for more general use.
Try to fix the splitting/merging code, which was quite cryptic and not
clear at all. It *should* work now.
* Switch zones back to MapIndices
Turns out I'm an idiot who misunderstood the code. MapIndices can be
used as one-per-tile, which is what is needed for atmos. GridCoordinates
are many-per-tile, and were causing lots of problems.
* Add zone debugging overlay
This is the first example of zone information being sent to a client.
It adds the `togglezoneinfo` command, which overlays the tiles and gas
information for the zone currently occupied by the user on the screen.
This was helpful for debugging the GridCoordinates problem.
* Fix position of atmos zone debug text
* Make AirtightComponent only activate on MapInit
This should stop it splitting atmospheres in mapping.
* Doc comments improvements to AtmosphereMap
Fix some malformed comments, inherit some useful docs, document some
more functions.
* Add zone logic for changing tiles to/from space
Zones are now correctly created when all the tiles in a room are built,
and destroyed when one of the tiles is destroyed.
* update engine
* right
* Cleanup code
* Port GasMixture, further cleanup
* Fix windows not being airtight, some other stuff
* Work on atmos
* Difference between ZoneBlocked and AirBlocked
* Big GridAtmosphereManager cleanup, zones are broken now oops
* Remove zones, add excited group implementation
* Further cleanup
* Further work on atmos
* Work on gas overlay.
* PumpGasTo and ReleaseGasTo methods for GasMixture.
* Adds Tile Overlay System.
* More work on atmos
* Gasses spread, equalize and all that
* Fix a few crashes
* Gas can actually spread from room to room after opening airlocks
* Add explosive depressurization, tile prying on depressurization, gas spreading on wall break. Etc.
* More work
* Remove atmoschem, add "performant" gas overlays
* what the fuck git
* More work I guess?
* Fix stuff, create a few (empty) components for future work
* Fix temperature
* Fix tile air sharing
* Atmos optimizations
* Further atmos optimizations
* Even more optimizations!
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Address a few reviews
* Oops, forgot to remove this
* Update Content.Server/Atmos/AtmosphereMap.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Fix compile
* Improved client gas tile overlays
* Less allocations
* Even less allocations!
* some stuff dunno
* Big refactor time, oh yeah
* it truly is 1 AM
* bruh
* No idea why now it doesn't work.
Oh well! I'll fix this on thursday :relieved:
* Basic atmos serialization
* Fix bugs, add VV attributes
* Start adding stuff for gas reactions
* Add a few atmos commands
* Fill gas command
* Changes to gas opacity
* Fixes I guess
* Fixes, add space wind sound
* High pressure movement!
* Better high pressure movements.
* Fix direction, maybe?
* And now it works great
* Science!
* and this is why you don't trust people
* remove logging
* Turns out I'm fucking dumb
* Work on hotspots and reactions, add tritium gas
* IGridAtmosphereComponent interface! For future unsimulated grids.
* Makes atmos updates NoGC.
* C E A S E
* Add settemp atmos command
* Important reminder.
* Remove useless AtmosCooldown.
* More work on hotspots
* Overlays for hotspots. Fire works!
* Turns out I suck at coding
* Fire texture change
* Yeah let's make that an absolute value, hmm?
* Support for atmos after teleporting grid (more or less)
* fix attempt (doesn't actually fix it)
* Make static variable not static
* Remove magic numbers
* Stopwatch moment
* Slight cleanup.
* More cleanup.
* Atmos optimizations
* Fix build
* Remove useless ghost atmos shit
* Adds CanSeeGases component for gas overlay stuff
* Component and prototype ignores
* ExcitedGroups now dispose on being merged with others
* Some tweaking.
* Atmos now uses frame time for updates.
* Nullable boogaloo
* IExamine fix
* Fix build
* Fix restartround
* Atmos tweaking, use invalid direction
* Increase high pressure movement force
* Better sort
* Update submodule.
* NULLABILITY AAAAH
Special thanks to monster860 and all monstermos contributors!
Co-authored-by: Campbell Suter <znix@znix.xyz>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: ComicIronic <comicironic@gmail.com>
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2020-08-02 20:08:20 +02:00
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, $"{gasPrototype.Name} ID: {gasPrototype.ID}");
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public class AddGas : IClientCommand
|
|
|
|
|
|
{
|
|
|
|
|
|
public string Command => "addgas";
|
|
|
|
|
|
public string Description => "Adds gas at a certain position.";
|
|
|
|
|
|
public string Help => "addgas <X> <Y> <GridId> <Gas> <moles>";
|
|
|
|
|
|
public void Execute(IConsoleShell shell, IPlayerSession? player, string[] args)
|
|
|
|
|
|
{
|
|
|
|
|
|
var gasId = -1;
|
|
|
|
|
|
var gas = (Gas) (-1);
|
|
|
|
|
|
if (args.Length < 5) return;
|
|
|
|
|
|
if(!int.TryParse(args[0], out var x)
|
|
|
|
|
|
|| !int.TryParse(args[1], out var y)
|
|
|
|
|
|
|| !int.TryParse(args[2], out var id)
|
2020-08-06 15:41:17 +02:00
|
|
|
|
|| !(int.TryParse(args[3], out gasId) || Enum.TryParse(args[3], true, out gas))
|
Adds atmos (#1389)
* Add initial atmospherics framework
* Make walls and airlocks airtight
* Add the basic atmosphere gas system
* Atmos: move CardinalToIntVec and Offset into extention methods in EntityNetworkUtils
* Optimize vending machine code a bit.
* Address feedback from Atmos PR, make code compile
Fix use of OnMove -> SnapGridComponent.OnPositionChanged.
Added pause checking to atmos simulations.
* Improvements to the existing ZAS prototype (#996)
* Rename Volume -> Quantity in GasProperty
This makes the name consistent with the rest of the code, given that
it's meant to be a mol value.
* Replace Gas enum with GasPrototype
Unused as of yet, but laying the groundwork for future changes.
* Update AtmosphereMap, improving maths
Adds a temporary default atmosphere, hardcoded in for testing. It will
be replaced eventually.
Fixed a maths mistake in the original code involving unit conversions.
Added the Take() method to IAtmosphere, for taking some volume of
mixture out of a gas mix. This will be pretty handy in the future, but
for now it's used by walls to delete air where they are built.
* Fix merging, splitting logic for zones
Removing a cell from a zone now correctly reduces its volume.
Adding a cell to a zone now correctly increases its volume.
* Improvements to atmos code, reorganising of types
Moved GasPrototype to shared, because it's going to be used by the
client later.
Split up the atmosphere code. Now zones are explicitly their own kind of
atmosphere, which should speed up some loops and also solve
inconsistencies in the volume calculation.
GasMixtures are another type of atmosphere, for more general use.
Try to fix the splitting/merging code, which was quite cryptic and not
clear at all. It *should* work now.
* Switch zones back to MapIndices
Turns out I'm an idiot who misunderstood the code. MapIndices can be
used as one-per-tile, which is what is needed for atmos. GridCoordinates
are many-per-tile, and were causing lots of problems.
* Add zone debugging overlay
This is the first example of zone information being sent to a client.
It adds the `togglezoneinfo` command, which overlays the tiles and gas
information for the zone currently occupied by the user on the screen.
This was helpful for debugging the GridCoordinates problem.
* Fix position of atmos zone debug text
* Make AirtightComponent only activate on MapInit
This should stop it splitting atmospheres in mapping.
* Doc comments improvements to AtmosphereMap
Fix some malformed comments, inherit some useful docs, document some
more functions.
* Add zone logic for changing tiles to/from space
Zones are now correctly created when all the tiles in a room are built,
and destroyed when one of the tiles is destroyed.
* update engine
* right
* Cleanup code
* Port GasMixture, further cleanup
* Fix windows not being airtight, some other stuff
* Work on atmos
* Difference between ZoneBlocked and AirBlocked
* Big GridAtmosphereManager cleanup, zones are broken now oops
* Remove zones, add excited group implementation
* Further cleanup
* Further work on atmos
* Work on gas overlay.
* PumpGasTo and ReleaseGasTo methods for GasMixture.
* Adds Tile Overlay System.
* More work on atmos
* Gasses spread, equalize and all that
* Fix a few crashes
* Gas can actually spread from room to room after opening airlocks
* Add explosive depressurization, tile prying on depressurization, gas spreading on wall break. Etc.
* More work
* Remove atmoschem, add "performant" gas overlays
* what the fuck git
* More work I guess?
* Fix stuff, create a few (empty) components for future work
* Fix temperature
* Fix tile air sharing
* Atmos optimizations
* Further atmos optimizations
* Even more optimizations!
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Address a few reviews
* Oops, forgot to remove this
* Update Content.Server/Atmos/AtmosphereMap.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Fix compile
* Improved client gas tile overlays
* Less allocations
* Even less allocations!
* some stuff dunno
* Big refactor time, oh yeah
* it truly is 1 AM
* bruh
* No idea why now it doesn't work.
Oh well! I'll fix this on thursday :relieved:
* Basic atmos serialization
* Fix bugs, add VV attributes
* Start adding stuff for gas reactions
* Add a few atmos commands
* Fill gas command
* Changes to gas opacity
* Fixes I guess
* Fixes, add space wind sound
* High pressure movement!
* Better high pressure movements.
* Fix direction, maybe?
* And now it works great
* Science!
* and this is why you don't trust people
* remove logging
* Turns out I'm fucking dumb
* Work on hotspots and reactions, add tritium gas
* IGridAtmosphereComponent interface! For future unsimulated grids.
* Makes atmos updates NoGC.
* C E A S E
* Add settemp atmos command
* Important reminder.
* Remove useless AtmosCooldown.
* More work on hotspots
* Overlays for hotspots. Fire works!
* Turns out I suck at coding
* Fire texture change
* Yeah let's make that an absolute value, hmm?
* Support for atmos after teleporting grid (more or less)
* fix attempt (doesn't actually fix it)
* Make static variable not static
* Remove magic numbers
* Stopwatch moment
* Slight cleanup.
* More cleanup.
* Atmos optimizations
* Fix build
* Remove useless ghost atmos shit
* Adds CanSeeGases component for gas overlay stuff
* Component and prototype ignores
* ExcitedGroups now dispose on being merged with others
* Some tweaking.
* Atmos now uses frame time for updates.
* Nullable boogaloo
* IExamine fix
* Fix build
* Fix restartround
* Atmos tweaking, use invalid direction
* Increase high pressure movement force
* Better sort
* Update submodule.
* NULLABILITY AAAAH
Special thanks to monster860 and all monstermos contributors!
Co-authored-by: Campbell Suter <znix@znix.xyz>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: ComicIronic <comicironic@gmail.com>
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2020-08-02 20:08:20 +02:00
|
|
|
|
|| !float.TryParse(args[4], out var moles)) return;
|
|
|
|
|
|
|
2020-08-06 15:37:39 +02:00
|
|
|
|
if (gas != (Gas) (-1))
|
|
|
|
|
|
{
|
|
|
|
|
|
gasId = (int)gas;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
Adds atmos (#1389)
* Add initial atmospherics framework
* Make walls and airlocks airtight
* Add the basic atmosphere gas system
* Atmos: move CardinalToIntVec and Offset into extention methods in EntityNetworkUtils
* Optimize vending machine code a bit.
* Address feedback from Atmos PR, make code compile
Fix use of OnMove -> SnapGridComponent.OnPositionChanged.
Added pause checking to atmos simulations.
* Improvements to the existing ZAS prototype (#996)
* Rename Volume -> Quantity in GasProperty
This makes the name consistent with the rest of the code, given that
it's meant to be a mol value.
* Replace Gas enum with GasPrototype
Unused as of yet, but laying the groundwork for future changes.
* Update AtmosphereMap, improving maths
Adds a temporary default atmosphere, hardcoded in for testing. It will
be replaced eventually.
Fixed a maths mistake in the original code involving unit conversions.
Added the Take() method to IAtmosphere, for taking some volume of
mixture out of a gas mix. This will be pretty handy in the future, but
for now it's used by walls to delete air where they are built.
* Fix merging, splitting logic for zones
Removing a cell from a zone now correctly reduces its volume.
Adding a cell to a zone now correctly increases its volume.
* Improvements to atmos code, reorganising of types
Moved GasPrototype to shared, because it's going to be used by the
client later.
Split up the atmosphere code. Now zones are explicitly their own kind of
atmosphere, which should speed up some loops and also solve
inconsistencies in the volume calculation.
GasMixtures are another type of atmosphere, for more general use.
Try to fix the splitting/merging code, which was quite cryptic and not
clear at all. It *should* work now.
* Switch zones back to MapIndices
Turns out I'm an idiot who misunderstood the code. MapIndices can be
used as one-per-tile, which is what is needed for atmos. GridCoordinates
are many-per-tile, and were causing lots of problems.
* Add zone debugging overlay
This is the first example of zone information being sent to a client.
It adds the `togglezoneinfo` command, which overlays the tiles and gas
information for the zone currently occupied by the user on the screen.
This was helpful for debugging the GridCoordinates problem.
* Fix position of atmos zone debug text
* Make AirtightComponent only activate on MapInit
This should stop it splitting atmospheres in mapping.
* Doc comments improvements to AtmosphereMap
Fix some malformed comments, inherit some useful docs, document some
more functions.
* Add zone logic for changing tiles to/from space
Zones are now correctly created when all the tiles in a room are built,
and destroyed when one of the tiles is destroyed.
* update engine
* right
* Cleanup code
* Port GasMixture, further cleanup
* Fix windows not being airtight, some other stuff
* Work on atmos
* Difference between ZoneBlocked and AirBlocked
* Big GridAtmosphereManager cleanup, zones are broken now oops
* Remove zones, add excited group implementation
* Further cleanup
* Further work on atmos
* Work on gas overlay.
* PumpGasTo and ReleaseGasTo methods for GasMixture.
* Adds Tile Overlay System.
* More work on atmos
* Gasses spread, equalize and all that
* Fix a few crashes
* Gas can actually spread from room to room after opening airlocks
* Add explosive depressurization, tile prying on depressurization, gas spreading on wall break. Etc.
* More work
* Remove atmoschem, add "performant" gas overlays
* what the fuck git
* More work I guess?
* Fix stuff, create a few (empty) components for future work
* Fix temperature
* Fix tile air sharing
* Atmos optimizations
* Further atmos optimizations
* Even more optimizations!
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Address a few reviews
* Oops, forgot to remove this
* Update Content.Server/Atmos/AtmosphereMap.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Fix compile
* Improved client gas tile overlays
* Less allocations
* Even less allocations!
* some stuff dunno
* Big refactor time, oh yeah
* it truly is 1 AM
* bruh
* No idea why now it doesn't work.
Oh well! I'll fix this on thursday :relieved:
* Basic atmos serialization
* Fix bugs, add VV attributes
* Start adding stuff for gas reactions
* Add a few atmos commands
* Fill gas command
* Changes to gas opacity
* Fixes I guess
* Fixes, add space wind sound
* High pressure movement!
* Better high pressure movements.
* Fix direction, maybe?
* And now it works great
* Science!
* and this is why you don't trust people
* remove logging
* Turns out I'm fucking dumb
* Work on hotspots and reactions, add tritium gas
* IGridAtmosphereComponent interface! For future unsimulated grids.
* Makes atmos updates NoGC.
* C E A S E
* Add settemp atmos command
* Important reminder.
* Remove useless AtmosCooldown.
* More work on hotspots
* Overlays for hotspots. Fire works!
* Turns out I suck at coding
* Fire texture change
* Yeah let's make that an absolute value, hmm?
* Support for atmos after teleporting grid (more or less)
* fix attempt (doesn't actually fix it)
* Make static variable not static
* Remove magic numbers
* Stopwatch moment
* Slight cleanup.
* More cleanup.
* Atmos optimizations
* Fix build
* Remove useless ghost atmos shit
* Adds CanSeeGases component for gas overlay stuff
* Component and prototype ignores
* ExcitedGroups now dispose on being merged with others
* Some tweaking.
* Atmos now uses frame time for updates.
* Nullable boogaloo
* IExamine fix
* Fix build
* Fix restartround
* Atmos tweaking, use invalid direction
* Increase high pressure movement force
* Better sort
* Update submodule.
* NULLABILITY AAAAH
Special thanks to monster860 and all monstermos contributors!
Co-authored-by: Campbell Suter <znix@znix.xyz>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: ComicIronic <comicironic@gmail.com>
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2020-08-02 20:08:20 +02:00
|
|
|
|
var gridId = new GridId(id);
|
|
|
|
|
|
|
|
|
|
|
|
var mapMan = IoCManager.Resolve<IMapManager>();
|
|
|
|
|
|
|
|
|
|
|
|
if (!gridId.IsValid() || !mapMan.TryGetGrid(gridId, out var gridComp))
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "Invalid grid ID.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
var entMan = IoCManager.Resolve<IEntityManager>();
|
|
|
|
|
|
|
|
|
|
|
|
if (!entMan.TryGetEntity(gridComp.GridEntityId, out var grid))
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "Failed to get grid entity.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!grid.HasComponent<GridAtmosphereComponent>())
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "Grid doesn't have an atmosphere.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
var gam = grid.GetComponent<GridAtmosphereComponent>();
|
|
|
|
|
|
var indices = new MapIndices(x, y);
|
|
|
|
|
|
var tile = gam.GetTile(indices);
|
|
|
|
|
|
|
|
|
|
|
|
if (tile == null)
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "Invalid coordinates.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (tile.Air == null)
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "Can't add gas to that tile.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (gasId != -1)
|
|
|
|
|
|
{
|
|
|
|
|
|
tile.Air.AdjustMoles(gasId, moles);
|
|
|
|
|
|
gam.Invalidate(indices);
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
tile.Air.AdjustMoles(gas, moles);
|
|
|
|
|
|
gam.Invalidate(indices);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-08-17 20:45:48 +02:00
|
|
|
|
public class FillGas : IClientCommand
|
Adds atmos (#1389)
* Add initial atmospherics framework
* Make walls and airlocks airtight
* Add the basic atmosphere gas system
* Atmos: move CardinalToIntVec and Offset into extention methods in EntityNetworkUtils
* Optimize vending machine code a bit.
* Address feedback from Atmos PR, make code compile
Fix use of OnMove -> SnapGridComponent.OnPositionChanged.
Added pause checking to atmos simulations.
* Improvements to the existing ZAS prototype (#996)
* Rename Volume -> Quantity in GasProperty
This makes the name consistent with the rest of the code, given that
it's meant to be a mol value.
* Replace Gas enum with GasPrototype
Unused as of yet, but laying the groundwork for future changes.
* Update AtmosphereMap, improving maths
Adds a temporary default atmosphere, hardcoded in for testing. It will
be replaced eventually.
Fixed a maths mistake in the original code involving unit conversions.
Added the Take() method to IAtmosphere, for taking some volume of
mixture out of a gas mix. This will be pretty handy in the future, but
for now it's used by walls to delete air where they are built.
* Fix merging, splitting logic for zones
Removing a cell from a zone now correctly reduces its volume.
Adding a cell to a zone now correctly increases its volume.
* Improvements to atmos code, reorganising of types
Moved GasPrototype to shared, because it's going to be used by the
client later.
Split up the atmosphere code. Now zones are explicitly their own kind of
atmosphere, which should speed up some loops and also solve
inconsistencies in the volume calculation.
GasMixtures are another type of atmosphere, for more general use.
Try to fix the splitting/merging code, which was quite cryptic and not
clear at all. It *should* work now.
* Switch zones back to MapIndices
Turns out I'm an idiot who misunderstood the code. MapIndices can be
used as one-per-tile, which is what is needed for atmos. GridCoordinates
are many-per-tile, and were causing lots of problems.
* Add zone debugging overlay
This is the first example of zone information being sent to a client.
It adds the `togglezoneinfo` command, which overlays the tiles and gas
information for the zone currently occupied by the user on the screen.
This was helpful for debugging the GridCoordinates problem.
* Fix position of atmos zone debug text
* Make AirtightComponent only activate on MapInit
This should stop it splitting atmospheres in mapping.
* Doc comments improvements to AtmosphereMap
Fix some malformed comments, inherit some useful docs, document some
more functions.
* Add zone logic for changing tiles to/from space
Zones are now correctly created when all the tiles in a room are built,
and destroyed when one of the tiles is destroyed.
* update engine
* right
* Cleanup code
* Port GasMixture, further cleanup
* Fix windows not being airtight, some other stuff
* Work on atmos
* Difference between ZoneBlocked and AirBlocked
* Big GridAtmosphereManager cleanup, zones are broken now oops
* Remove zones, add excited group implementation
* Further cleanup
* Further work on atmos
* Work on gas overlay.
* PumpGasTo and ReleaseGasTo methods for GasMixture.
* Adds Tile Overlay System.
* More work on atmos
* Gasses spread, equalize and all that
* Fix a few crashes
* Gas can actually spread from room to room after opening airlocks
* Add explosive depressurization, tile prying on depressurization, gas spreading on wall break. Etc.
* More work
* Remove atmoschem, add "performant" gas overlays
* what the fuck git
* More work I guess?
* Fix stuff, create a few (empty) components for future work
* Fix temperature
* Fix tile air sharing
* Atmos optimizations
* Further atmos optimizations
* Even more optimizations!
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Address a few reviews
* Oops, forgot to remove this
* Update Content.Server/Atmos/AtmosphereMap.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Fix compile
* Improved client gas tile overlays
* Less allocations
* Even less allocations!
* some stuff dunno
* Big refactor time, oh yeah
* it truly is 1 AM
* bruh
* No idea why now it doesn't work.
Oh well! I'll fix this on thursday :relieved:
* Basic atmos serialization
* Fix bugs, add VV attributes
* Start adding stuff for gas reactions
* Add a few atmos commands
* Fill gas command
* Changes to gas opacity
* Fixes I guess
* Fixes, add space wind sound
* High pressure movement!
* Better high pressure movements.
* Fix direction, maybe?
* And now it works great
* Science!
* and this is why you don't trust people
* remove logging
* Turns out I'm fucking dumb
* Work on hotspots and reactions, add tritium gas
* IGridAtmosphereComponent interface! For future unsimulated grids.
* Makes atmos updates NoGC.
* C E A S E
* Add settemp atmos command
* Important reminder.
* Remove useless AtmosCooldown.
* More work on hotspots
* Overlays for hotspots. Fire works!
* Turns out I suck at coding
* Fire texture change
* Yeah let's make that an absolute value, hmm?
* Support for atmos after teleporting grid (more or less)
* fix attempt (doesn't actually fix it)
* Make static variable not static
* Remove magic numbers
* Stopwatch moment
* Slight cleanup.
* More cleanup.
* Atmos optimizations
* Fix build
* Remove useless ghost atmos shit
* Adds CanSeeGases component for gas overlay stuff
* Component and prototype ignores
* ExcitedGroups now dispose on being merged with others
* Some tweaking.
* Atmos now uses frame time for updates.
* Nullable boogaloo
* IExamine fix
* Fix build
* Fix restartround
* Atmos tweaking, use invalid direction
* Increase high pressure movement force
* Better sort
* Update submodule.
* NULLABILITY AAAAH
Special thanks to monster860 and all monstermos contributors!
Co-authored-by: Campbell Suter <znix@znix.xyz>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: ComicIronic <comicironic@gmail.com>
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2020-08-02 20:08:20 +02:00
|
|
|
|
{
|
|
|
|
|
|
public string Command => "fillgas";
|
|
|
|
|
|
public string Description => "Adds gas to all tiles in a grid.";
|
|
|
|
|
|
public string Help => "fillgas <GridId> <Gas> <moles>";
|
|
|
|
|
|
public void Execute(IConsoleShell shell, IPlayerSession? player, string[] args)
|
|
|
|
|
|
{
|
|
|
|
|
|
var gasId = -1;
|
|
|
|
|
|
var gas = (Gas) (-1);
|
|
|
|
|
|
if (args.Length < 3) return;
|
|
|
|
|
|
if(!int.TryParse(args[0], out var id)
|
2020-08-06 15:41:17 +02:00
|
|
|
|
|| !(int.TryParse(args[1], out gasId) || Enum.TryParse(args[1], true, out gas))
|
Adds atmos (#1389)
* Add initial atmospherics framework
* Make walls and airlocks airtight
* Add the basic atmosphere gas system
* Atmos: move CardinalToIntVec and Offset into extention methods in EntityNetworkUtils
* Optimize vending machine code a bit.
* Address feedback from Atmos PR, make code compile
Fix use of OnMove -> SnapGridComponent.OnPositionChanged.
Added pause checking to atmos simulations.
* Improvements to the existing ZAS prototype (#996)
* Rename Volume -> Quantity in GasProperty
This makes the name consistent with the rest of the code, given that
it's meant to be a mol value.
* Replace Gas enum with GasPrototype
Unused as of yet, but laying the groundwork for future changes.
* Update AtmosphereMap, improving maths
Adds a temporary default atmosphere, hardcoded in for testing. It will
be replaced eventually.
Fixed a maths mistake in the original code involving unit conversions.
Added the Take() method to IAtmosphere, for taking some volume of
mixture out of a gas mix. This will be pretty handy in the future, but
for now it's used by walls to delete air where they are built.
* Fix merging, splitting logic for zones
Removing a cell from a zone now correctly reduces its volume.
Adding a cell to a zone now correctly increases its volume.
* Improvements to atmos code, reorganising of types
Moved GasPrototype to shared, because it's going to be used by the
client later.
Split up the atmosphere code. Now zones are explicitly their own kind of
atmosphere, which should speed up some loops and also solve
inconsistencies in the volume calculation.
GasMixtures are another type of atmosphere, for more general use.
Try to fix the splitting/merging code, which was quite cryptic and not
clear at all. It *should* work now.
* Switch zones back to MapIndices
Turns out I'm an idiot who misunderstood the code. MapIndices can be
used as one-per-tile, which is what is needed for atmos. GridCoordinates
are many-per-tile, and were causing lots of problems.
* Add zone debugging overlay
This is the first example of zone information being sent to a client.
It adds the `togglezoneinfo` command, which overlays the tiles and gas
information for the zone currently occupied by the user on the screen.
This was helpful for debugging the GridCoordinates problem.
* Fix position of atmos zone debug text
* Make AirtightComponent only activate on MapInit
This should stop it splitting atmospheres in mapping.
* Doc comments improvements to AtmosphereMap
Fix some malformed comments, inherit some useful docs, document some
more functions.
* Add zone logic for changing tiles to/from space
Zones are now correctly created when all the tiles in a room are built,
and destroyed when one of the tiles is destroyed.
* update engine
* right
* Cleanup code
* Port GasMixture, further cleanup
* Fix windows not being airtight, some other stuff
* Work on atmos
* Difference between ZoneBlocked and AirBlocked
* Big GridAtmosphereManager cleanup, zones are broken now oops
* Remove zones, add excited group implementation
* Further cleanup
* Further work on atmos
* Work on gas overlay.
* PumpGasTo and ReleaseGasTo methods for GasMixture.
* Adds Tile Overlay System.
* More work on atmos
* Gasses spread, equalize and all that
* Fix a few crashes
* Gas can actually spread from room to room after opening airlocks
* Add explosive depressurization, tile prying on depressurization, gas spreading on wall break. Etc.
* More work
* Remove atmoschem, add "performant" gas overlays
* what the fuck git
* More work I guess?
* Fix stuff, create a few (empty) components for future work
* Fix temperature
* Fix tile air sharing
* Atmos optimizations
* Further atmos optimizations
* Even more optimizations!
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Address a few reviews
* Oops, forgot to remove this
* Update Content.Server/Atmos/AtmosphereMap.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Fix compile
* Improved client gas tile overlays
* Less allocations
* Even less allocations!
* some stuff dunno
* Big refactor time, oh yeah
* it truly is 1 AM
* bruh
* No idea why now it doesn't work.
Oh well! I'll fix this on thursday :relieved:
* Basic atmos serialization
* Fix bugs, add VV attributes
* Start adding stuff for gas reactions
* Add a few atmos commands
* Fill gas command
* Changes to gas opacity
* Fixes I guess
* Fixes, add space wind sound
* High pressure movement!
* Better high pressure movements.
* Fix direction, maybe?
* And now it works great
* Science!
* and this is why you don't trust people
* remove logging
* Turns out I'm fucking dumb
* Work on hotspots and reactions, add tritium gas
* IGridAtmosphereComponent interface! For future unsimulated grids.
* Makes atmos updates NoGC.
* C E A S E
* Add settemp atmos command
* Important reminder.
* Remove useless AtmosCooldown.
* More work on hotspots
* Overlays for hotspots. Fire works!
* Turns out I suck at coding
* Fire texture change
* Yeah let's make that an absolute value, hmm?
* Support for atmos after teleporting grid (more or less)
* fix attempt (doesn't actually fix it)
* Make static variable not static
* Remove magic numbers
* Stopwatch moment
* Slight cleanup.
* More cleanup.
* Atmos optimizations
* Fix build
* Remove useless ghost atmos shit
* Adds CanSeeGases component for gas overlay stuff
* Component and prototype ignores
* ExcitedGroups now dispose on being merged with others
* Some tweaking.
* Atmos now uses frame time for updates.
* Nullable boogaloo
* IExamine fix
* Fix build
* Fix restartround
* Atmos tweaking, use invalid direction
* Increase high pressure movement force
* Better sort
* Update submodule.
* NULLABILITY AAAAH
Special thanks to monster860 and all monstermos contributors!
Co-authored-by: Campbell Suter <znix@znix.xyz>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: ComicIronic <comicironic@gmail.com>
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2020-08-02 20:08:20 +02:00
|
|
|
|
|| !float.TryParse(args[2], out var moles)) return;
|
|
|
|
|
|
|
2020-08-06 15:41:17 +02:00
|
|
|
|
if (gas != (Gas) (-1))
|
|
|
|
|
|
gasId = (int)gas;
|
|
|
|
|
|
|
Adds atmos (#1389)
* Add initial atmospherics framework
* Make walls and airlocks airtight
* Add the basic atmosphere gas system
* Atmos: move CardinalToIntVec and Offset into extention methods in EntityNetworkUtils
* Optimize vending machine code a bit.
* Address feedback from Atmos PR, make code compile
Fix use of OnMove -> SnapGridComponent.OnPositionChanged.
Added pause checking to atmos simulations.
* Improvements to the existing ZAS prototype (#996)
* Rename Volume -> Quantity in GasProperty
This makes the name consistent with the rest of the code, given that
it's meant to be a mol value.
* Replace Gas enum with GasPrototype
Unused as of yet, but laying the groundwork for future changes.
* Update AtmosphereMap, improving maths
Adds a temporary default atmosphere, hardcoded in for testing. It will
be replaced eventually.
Fixed a maths mistake in the original code involving unit conversions.
Added the Take() method to IAtmosphere, for taking some volume of
mixture out of a gas mix. This will be pretty handy in the future, but
for now it's used by walls to delete air where they are built.
* Fix merging, splitting logic for zones
Removing a cell from a zone now correctly reduces its volume.
Adding a cell to a zone now correctly increases its volume.
* Improvements to atmos code, reorganising of types
Moved GasPrototype to shared, because it's going to be used by the
client later.
Split up the atmosphere code. Now zones are explicitly their own kind of
atmosphere, which should speed up some loops and also solve
inconsistencies in the volume calculation.
GasMixtures are another type of atmosphere, for more general use.
Try to fix the splitting/merging code, which was quite cryptic and not
clear at all. It *should* work now.
* Switch zones back to MapIndices
Turns out I'm an idiot who misunderstood the code. MapIndices can be
used as one-per-tile, which is what is needed for atmos. GridCoordinates
are many-per-tile, and were causing lots of problems.
* Add zone debugging overlay
This is the first example of zone information being sent to a client.
It adds the `togglezoneinfo` command, which overlays the tiles and gas
information for the zone currently occupied by the user on the screen.
This was helpful for debugging the GridCoordinates problem.
* Fix position of atmos zone debug text
* Make AirtightComponent only activate on MapInit
This should stop it splitting atmospheres in mapping.
* Doc comments improvements to AtmosphereMap
Fix some malformed comments, inherit some useful docs, document some
more functions.
* Add zone logic for changing tiles to/from space
Zones are now correctly created when all the tiles in a room are built,
and destroyed when one of the tiles is destroyed.
* update engine
* right
* Cleanup code
* Port GasMixture, further cleanup
* Fix windows not being airtight, some other stuff
* Work on atmos
* Difference between ZoneBlocked and AirBlocked
* Big GridAtmosphereManager cleanup, zones are broken now oops
* Remove zones, add excited group implementation
* Further cleanup
* Further work on atmos
* Work on gas overlay.
* PumpGasTo and ReleaseGasTo methods for GasMixture.
* Adds Tile Overlay System.
* More work on atmos
* Gasses spread, equalize and all that
* Fix a few crashes
* Gas can actually spread from room to room after opening airlocks
* Add explosive depressurization, tile prying on depressurization, gas spreading on wall break. Etc.
* More work
* Remove atmoschem, add "performant" gas overlays
* what the fuck git
* More work I guess?
* Fix stuff, create a few (empty) components for future work
* Fix temperature
* Fix tile air sharing
* Atmos optimizations
* Further atmos optimizations
* Even more optimizations!
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Address a few reviews
* Oops, forgot to remove this
* Update Content.Server/Atmos/AtmosphereMap.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Fix compile
* Improved client gas tile overlays
* Less allocations
* Even less allocations!
* some stuff dunno
* Big refactor time, oh yeah
* it truly is 1 AM
* bruh
* No idea why now it doesn't work.
Oh well! I'll fix this on thursday :relieved:
* Basic atmos serialization
* Fix bugs, add VV attributes
* Start adding stuff for gas reactions
* Add a few atmos commands
* Fill gas command
* Changes to gas opacity
* Fixes I guess
* Fixes, add space wind sound
* High pressure movement!
* Better high pressure movements.
* Fix direction, maybe?
* And now it works great
* Science!
* and this is why you don't trust people
* remove logging
* Turns out I'm fucking dumb
* Work on hotspots and reactions, add tritium gas
* IGridAtmosphereComponent interface! For future unsimulated grids.
* Makes atmos updates NoGC.
* C E A S E
* Add settemp atmos command
* Important reminder.
* Remove useless AtmosCooldown.
* More work on hotspots
* Overlays for hotspots. Fire works!
* Turns out I suck at coding
* Fire texture change
* Yeah let's make that an absolute value, hmm?
* Support for atmos after teleporting grid (more or less)
* fix attempt (doesn't actually fix it)
* Make static variable not static
* Remove magic numbers
* Stopwatch moment
* Slight cleanup.
* More cleanup.
* Atmos optimizations
* Fix build
* Remove useless ghost atmos shit
* Adds CanSeeGases component for gas overlay stuff
* Component and prototype ignores
* ExcitedGroups now dispose on being merged with others
* Some tweaking.
* Atmos now uses frame time for updates.
* Nullable boogaloo
* IExamine fix
* Fix build
* Fix restartround
* Atmos tweaking, use invalid direction
* Increase high pressure movement force
* Better sort
* Update submodule.
* NULLABILITY AAAAH
Special thanks to monster860 and all monstermos contributors!
Co-authored-by: Campbell Suter <znix@znix.xyz>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: ComicIronic <comicironic@gmail.com>
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2020-08-02 20:08:20 +02:00
|
|
|
|
var gridId = new GridId(id);
|
|
|
|
|
|
|
|
|
|
|
|
var mapMan = IoCManager.Resolve<IMapManager>();
|
|
|
|
|
|
|
|
|
|
|
|
if (!gridId.IsValid() || !mapMan.TryGetGrid(gridId, out var gridComp))
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "Invalid grid ID.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
var entMan = IoCManager.Resolve<IEntityManager>();
|
|
|
|
|
|
|
|
|
|
|
|
if (!entMan.TryGetEntity(gridComp.GridEntityId, out var grid))
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "Failed to get grid entity.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!grid.HasComponent<GridAtmosphereComponent>())
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "Grid doesn't have an atmosphere.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
var gam = grid.GetComponent<GridAtmosphereComponent>();
|
|
|
|
|
|
|
|
|
|
|
|
foreach (var tile in gam)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (gasId != -1)
|
|
|
|
|
|
{
|
|
|
|
|
|
tile.Air?.AdjustMoles(gasId, moles);
|
|
|
|
|
|
gam.Invalidate(tile.GridIndices);
|
|
|
|
|
|
continue;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
tile.Air?.AdjustMoles(gas, moles);
|
|
|
|
|
|
gam.Invalidate(tile.GridIndices);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public class RemoveGas : IClientCommand
|
|
|
|
|
|
{
|
|
|
|
|
|
public string Command => "removegas";
|
|
|
|
|
|
public string Description => "Removes an amount of gases.";
|
|
|
|
|
|
public string Help => "removegas <X> <Y> <GridId> <amount> <ratio>\nIf <ratio> is true, amount will be treated as the ratio of gas to be removed.";
|
|
|
|
|
|
public void Execute(IConsoleShell shell, IPlayerSession? player, string[] args)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (args.Length < 5) return;
|
|
|
|
|
|
if(!int.TryParse(args[0], out var x)
|
|
|
|
|
|
|| !int.TryParse(args[1], out var y)
|
|
|
|
|
|
|| !int.TryParse(args[2], out var id)
|
|
|
|
|
|
|| !float.TryParse(args[3], out var amount)
|
|
|
|
|
|
|| !bool.TryParse(args[4], out var ratio)) return;
|
|
|
|
|
|
|
|
|
|
|
|
var gridId = new GridId(id);
|
|
|
|
|
|
|
|
|
|
|
|
var mapMan = IoCManager.Resolve<IMapManager>();
|
|
|
|
|
|
|
|
|
|
|
|
if (!gridId.IsValid() || !mapMan.TryGetGrid(gridId, out var gridComp))
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "Invalid grid ID.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
var entMan = IoCManager.Resolve<IEntityManager>();
|
|
|
|
|
|
|
|
|
|
|
|
if (!entMan.TryGetEntity(gridComp.GridEntityId, out var grid))
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "Failed to get grid entity.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!grid.HasComponent<GridAtmosphereComponent>())
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "Grid doesn't have an atmosphere.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
var gam = grid.GetComponent<GridAtmosphereComponent>();
|
|
|
|
|
|
var indices = new MapIndices(x, y);
|
|
|
|
|
|
var tile = gam.GetTile(indices);
|
|
|
|
|
|
|
|
|
|
|
|
if (tile == null)
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "Invalid coordinates.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (tile.Air == null)
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "Can't remove gas from that tile.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (ratio)
|
|
|
|
|
|
tile.Air.RemoveRatio(amount);
|
|
|
|
|
|
else
|
|
|
|
|
|
tile.Air.Remove(amount);
|
|
|
|
|
|
|
|
|
|
|
|
gam.Invalidate(indices);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-08-09 16:52:59 +02:00
|
|
|
|
public class SetTemperature : IClientCommand
|
Adds atmos (#1389)
* Add initial atmospherics framework
* Make walls and airlocks airtight
* Add the basic atmosphere gas system
* Atmos: move CardinalToIntVec and Offset into extention methods in EntityNetworkUtils
* Optimize vending machine code a bit.
* Address feedback from Atmos PR, make code compile
Fix use of OnMove -> SnapGridComponent.OnPositionChanged.
Added pause checking to atmos simulations.
* Improvements to the existing ZAS prototype (#996)
* Rename Volume -> Quantity in GasProperty
This makes the name consistent with the rest of the code, given that
it's meant to be a mol value.
* Replace Gas enum with GasPrototype
Unused as of yet, but laying the groundwork for future changes.
* Update AtmosphereMap, improving maths
Adds a temporary default atmosphere, hardcoded in for testing. It will
be replaced eventually.
Fixed a maths mistake in the original code involving unit conversions.
Added the Take() method to IAtmosphere, for taking some volume of
mixture out of a gas mix. This will be pretty handy in the future, but
for now it's used by walls to delete air where they are built.
* Fix merging, splitting logic for zones
Removing a cell from a zone now correctly reduces its volume.
Adding a cell to a zone now correctly increases its volume.
* Improvements to atmos code, reorganising of types
Moved GasPrototype to shared, because it's going to be used by the
client later.
Split up the atmosphere code. Now zones are explicitly their own kind of
atmosphere, which should speed up some loops and also solve
inconsistencies in the volume calculation.
GasMixtures are another type of atmosphere, for more general use.
Try to fix the splitting/merging code, which was quite cryptic and not
clear at all. It *should* work now.
* Switch zones back to MapIndices
Turns out I'm an idiot who misunderstood the code. MapIndices can be
used as one-per-tile, which is what is needed for atmos. GridCoordinates
are many-per-tile, and were causing lots of problems.
* Add zone debugging overlay
This is the first example of zone information being sent to a client.
It adds the `togglezoneinfo` command, which overlays the tiles and gas
information for the zone currently occupied by the user on the screen.
This was helpful for debugging the GridCoordinates problem.
* Fix position of atmos zone debug text
* Make AirtightComponent only activate on MapInit
This should stop it splitting atmospheres in mapping.
* Doc comments improvements to AtmosphereMap
Fix some malformed comments, inherit some useful docs, document some
more functions.
* Add zone logic for changing tiles to/from space
Zones are now correctly created when all the tiles in a room are built,
and destroyed when one of the tiles is destroyed.
* update engine
* right
* Cleanup code
* Port GasMixture, further cleanup
* Fix windows not being airtight, some other stuff
* Work on atmos
* Difference between ZoneBlocked and AirBlocked
* Big GridAtmosphereManager cleanup, zones are broken now oops
* Remove zones, add excited group implementation
* Further cleanup
* Further work on atmos
* Work on gas overlay.
* PumpGasTo and ReleaseGasTo methods for GasMixture.
* Adds Tile Overlay System.
* More work on atmos
* Gasses spread, equalize and all that
* Fix a few crashes
* Gas can actually spread from room to room after opening airlocks
* Add explosive depressurization, tile prying on depressurization, gas spreading on wall break. Etc.
* More work
* Remove atmoschem, add "performant" gas overlays
* what the fuck git
* More work I guess?
* Fix stuff, create a few (empty) components for future work
* Fix temperature
* Fix tile air sharing
* Atmos optimizations
* Further atmos optimizations
* Even more optimizations!
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Address a few reviews
* Oops, forgot to remove this
* Update Content.Server/Atmos/AtmosphereMap.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Fix compile
* Improved client gas tile overlays
* Less allocations
* Even less allocations!
* some stuff dunno
* Big refactor time, oh yeah
* it truly is 1 AM
* bruh
* No idea why now it doesn't work.
Oh well! I'll fix this on thursday :relieved:
* Basic atmos serialization
* Fix bugs, add VV attributes
* Start adding stuff for gas reactions
* Add a few atmos commands
* Fill gas command
* Changes to gas opacity
* Fixes I guess
* Fixes, add space wind sound
* High pressure movement!
* Better high pressure movements.
* Fix direction, maybe?
* And now it works great
* Science!
* and this is why you don't trust people
* remove logging
* Turns out I'm fucking dumb
* Work on hotspots and reactions, add tritium gas
* IGridAtmosphereComponent interface! For future unsimulated grids.
* Makes atmos updates NoGC.
* C E A S E
* Add settemp atmos command
* Important reminder.
* Remove useless AtmosCooldown.
* More work on hotspots
* Overlays for hotspots. Fire works!
* Turns out I suck at coding
* Fire texture change
* Yeah let's make that an absolute value, hmm?
* Support for atmos after teleporting grid (more or less)
* fix attempt (doesn't actually fix it)
* Make static variable not static
* Remove magic numbers
* Stopwatch moment
* Slight cleanup.
* More cleanup.
* Atmos optimizations
* Fix build
* Remove useless ghost atmos shit
* Adds CanSeeGases component for gas overlay stuff
* Component and prototype ignores
* ExcitedGroups now dispose on being merged with others
* Some tweaking.
* Atmos now uses frame time for updates.
* Nullable boogaloo
* IExamine fix
* Fix build
* Fix restartround
* Atmos tweaking, use invalid direction
* Increase high pressure movement force
* Better sort
* Update submodule.
* NULLABILITY AAAAH
Special thanks to monster860 and all monstermos contributors!
Co-authored-by: Campbell Suter <znix@znix.xyz>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: ComicIronic <comicironic@gmail.com>
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2020-08-02 20:08:20 +02:00
|
|
|
|
{
|
|
|
|
|
|
public string Command => "settemp";
|
2020-08-09 16:52:59 +02:00
|
|
|
|
public string Description => "Sets a tile's temperature (in kelvin).";
|
2020-08-02 20:14:28 +02:00
|
|
|
|
public string Help => "Usage: settemp <X> <Y> <GridId> <Temperature>";
|
Adds atmos (#1389)
* Add initial atmospherics framework
* Make walls and airlocks airtight
* Add the basic atmosphere gas system
* Atmos: move CardinalToIntVec and Offset into extention methods in EntityNetworkUtils
* Optimize vending machine code a bit.
* Address feedback from Atmos PR, make code compile
Fix use of OnMove -> SnapGridComponent.OnPositionChanged.
Added pause checking to atmos simulations.
* Improvements to the existing ZAS prototype (#996)
* Rename Volume -> Quantity in GasProperty
This makes the name consistent with the rest of the code, given that
it's meant to be a mol value.
* Replace Gas enum with GasPrototype
Unused as of yet, but laying the groundwork for future changes.
* Update AtmosphereMap, improving maths
Adds a temporary default atmosphere, hardcoded in for testing. It will
be replaced eventually.
Fixed a maths mistake in the original code involving unit conversions.
Added the Take() method to IAtmosphere, for taking some volume of
mixture out of a gas mix. This will be pretty handy in the future, but
for now it's used by walls to delete air where they are built.
* Fix merging, splitting logic for zones
Removing a cell from a zone now correctly reduces its volume.
Adding a cell to a zone now correctly increases its volume.
* Improvements to atmos code, reorganising of types
Moved GasPrototype to shared, because it's going to be used by the
client later.
Split up the atmosphere code. Now zones are explicitly their own kind of
atmosphere, which should speed up some loops and also solve
inconsistencies in the volume calculation.
GasMixtures are another type of atmosphere, for more general use.
Try to fix the splitting/merging code, which was quite cryptic and not
clear at all. It *should* work now.
* Switch zones back to MapIndices
Turns out I'm an idiot who misunderstood the code. MapIndices can be
used as one-per-tile, which is what is needed for atmos. GridCoordinates
are many-per-tile, and were causing lots of problems.
* Add zone debugging overlay
This is the first example of zone information being sent to a client.
It adds the `togglezoneinfo` command, which overlays the tiles and gas
information for the zone currently occupied by the user on the screen.
This was helpful for debugging the GridCoordinates problem.
* Fix position of atmos zone debug text
* Make AirtightComponent only activate on MapInit
This should stop it splitting atmospheres in mapping.
* Doc comments improvements to AtmosphereMap
Fix some malformed comments, inherit some useful docs, document some
more functions.
* Add zone logic for changing tiles to/from space
Zones are now correctly created when all the tiles in a room are built,
and destroyed when one of the tiles is destroyed.
* update engine
* right
* Cleanup code
* Port GasMixture, further cleanup
* Fix windows not being airtight, some other stuff
* Work on atmos
* Difference between ZoneBlocked and AirBlocked
* Big GridAtmosphereManager cleanup, zones are broken now oops
* Remove zones, add excited group implementation
* Further cleanup
* Further work on atmos
* Work on gas overlay.
* PumpGasTo and ReleaseGasTo methods for GasMixture.
* Adds Tile Overlay System.
* More work on atmos
* Gasses spread, equalize and all that
* Fix a few crashes
* Gas can actually spread from room to room after opening airlocks
* Add explosive depressurization, tile prying on depressurization, gas spreading on wall break. Etc.
* More work
* Remove atmoschem, add "performant" gas overlays
* what the fuck git
* More work I guess?
* Fix stuff, create a few (empty) components for future work
* Fix temperature
* Fix tile air sharing
* Atmos optimizations
* Further atmos optimizations
* Even more optimizations!
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Update Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Address a few reviews
* Oops, forgot to remove this
* Update Content.Server/Atmos/AtmosphereMap.cs
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Fix compile
* Improved client gas tile overlays
* Less allocations
* Even less allocations!
* some stuff dunno
* Big refactor time, oh yeah
* it truly is 1 AM
* bruh
* No idea why now it doesn't work.
Oh well! I'll fix this on thursday :relieved:
* Basic atmos serialization
* Fix bugs, add VV attributes
* Start adding stuff for gas reactions
* Add a few atmos commands
* Fill gas command
* Changes to gas opacity
* Fixes I guess
* Fixes, add space wind sound
* High pressure movement!
* Better high pressure movements.
* Fix direction, maybe?
* And now it works great
* Science!
* and this is why you don't trust people
* remove logging
* Turns out I'm fucking dumb
* Work on hotspots and reactions, add tritium gas
* IGridAtmosphereComponent interface! For future unsimulated grids.
* Makes atmos updates NoGC.
* C E A S E
* Add settemp atmos command
* Important reminder.
* Remove useless AtmosCooldown.
* More work on hotspots
* Overlays for hotspots. Fire works!
* Turns out I suck at coding
* Fire texture change
* Yeah let's make that an absolute value, hmm?
* Support for atmos after teleporting grid (more or less)
* fix attempt (doesn't actually fix it)
* Make static variable not static
* Remove magic numbers
* Stopwatch moment
* Slight cleanup.
* More cleanup.
* Atmos optimizations
* Fix build
* Remove useless ghost atmos shit
* Adds CanSeeGases component for gas overlay stuff
* Component and prototype ignores
* ExcitedGroups now dispose on being merged with others
* Some tweaking.
* Atmos now uses frame time for updates.
* Nullable boogaloo
* IExamine fix
* Fix build
* Fix restartround
* Atmos tweaking, use invalid direction
* Increase high pressure movement force
* Better sort
* Update submodule.
* NULLABILITY AAAAH
Special thanks to monster860 and all monstermos contributors!
Co-authored-by: Campbell Suter <znix@znix.xyz>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: ComicIronic <comicironic@gmail.com>
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2020-08-02 20:08:20 +02:00
|
|
|
|
public void Execute(IConsoleShell shell, IPlayerSession? player, string[] args)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (args.Length < 4) return;
|
|
|
|
|
|
if(!int.TryParse(args[0], out var x)
|
|
|
|
|
|
|| !int.TryParse(args[1], out var y)
|
|
|
|
|
|
|| !int.TryParse(args[2], out var id)
|
|
|
|
|
|
|| !float.TryParse(args[3], out var temperature)) return;
|
|
|
|
|
|
|
|
|
|
|
|
var gridId = new GridId(id);
|
|
|
|
|
|
|
|
|
|
|
|
var mapMan = IoCManager.Resolve<IMapManager>();
|
|
|
|
|
|
|
|
|
|
|
|
if (temperature < Atmospherics.TCMB)
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "Invalid temperature.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!gridId.IsValid() || !mapMan.TryGetGrid(gridId, out var gridComp))
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "Invalid grid ID.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
var entMan = IoCManager.Resolve<IEntityManager>();
|
|
|
|
|
|
|
|
|
|
|
|
if (!entMan.TryGetEntity(gridComp.GridEntityId, out var grid))
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "Failed to get grid entity.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!grid.HasComponent<GridAtmosphereComponent>())
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "Grid doesn't have an atmosphere.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
var gam = grid.GetComponent<GridAtmosphereComponent>();
|
|
|
|
|
|
var indices = new MapIndices(x, y);
|
|
|
|
|
|
var tile = gam.GetTile(indices);
|
|
|
|
|
|
|
|
|
|
|
|
if (tile == null)
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "Invalid coordinates.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (tile.Air == null)
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "Can't change that tile's temperature.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
tile.Air.Temperature = temperature;
|
|
|
|
|
|
gam.Invalidate(indices);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2020-08-09 16:52:59 +02:00
|
|
|
|
|
|
|
|
|
|
public class SetAtmosTemperature : IClientCommand
|
|
|
|
|
|
{
|
|
|
|
|
|
public string Command => "setatmostemp";
|
|
|
|
|
|
public string Description => "Sets a grid's temperature (in kelvin).";
|
|
|
|
|
|
public string Help => "Usage: setatmostemp <GridId> <Temperature>";
|
|
|
|
|
|
public void Execute(IConsoleShell shell, IPlayerSession? player, string[] args)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (args.Length < 2) return;
|
|
|
|
|
|
if(!int.TryParse(args[0], out var id)
|
|
|
|
|
|
|| !float.TryParse(args[1], out var temperature)) return;
|
|
|
|
|
|
|
|
|
|
|
|
var gridId = new GridId(id);
|
|
|
|
|
|
|
|
|
|
|
|
var mapMan = IoCManager.Resolve<IMapManager>();
|
|
|
|
|
|
|
|
|
|
|
|
if (temperature < Atmospherics.TCMB)
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "Invalid temperature.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!gridId.IsValid() || !mapMan.TryGetGrid(gridId, out var gridComp))
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "Invalid grid ID.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
var entMan = IoCManager.Resolve<IEntityManager>();
|
|
|
|
|
|
|
|
|
|
|
|
if (!entMan.TryGetEntity(gridComp.GridEntityId, out var grid))
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "Failed to get grid entity.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!grid.HasComponent<GridAtmosphereComponent>())
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "Grid doesn't have an atmosphere.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
var gam = grid.GetComponent<GridAtmosphereComponent>();
|
|
|
|
|
|
|
|
|
|
|
|
var tiles = 0;
|
|
|
|
|
|
foreach (var tile in gam)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (tile.Air == null)
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
|
|
tiles++;
|
|
|
|
|
|
|
|
|
|
|
|
tile.Air.Temperature = temperature;
|
|
|
|
|
|
gam.Invalidate(tile.GridIndices);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
shell.SendText(player, $"Changed the temperature of {tiles} tiles.");
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2020-09-13 14:08:09 +02:00
|
|
|
|
|
|
|
|
|
|
public class DeleteGasCommand : IClientCommand
|
|
|
|
|
|
{
|
|
|
|
|
|
public string Command => "deletegas";
|
|
|
|
|
|
public string Description => "Removes all gases from a grid, or just of one type if specified.";
|
|
|
|
|
|
public string Help => $"Usage: {Command} <GridId> <Gas> / {Command} <GridId> / {Command} <Gas> / {Command}";
|
|
|
|
|
|
|
|
|
|
|
|
public void Execute(IConsoleShell shell, IPlayerSession? player, string[] args)
|
|
|
|
|
|
{
|
|
|
|
|
|
GridId gridId;
|
|
|
|
|
|
Gas? gas = null;
|
|
|
|
|
|
|
|
|
|
|
|
switch (args.Length)
|
|
|
|
|
|
{
|
|
|
|
|
|
case 0:
|
|
|
|
|
|
if (player == null)
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "A grid must be specified when the command isn't used by a player.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (player.AttachedEntity == null)
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "You have no entity to get a grid from.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
gridId = player.AttachedEntity.Transform.GridID;
|
|
|
|
|
|
|
|
|
|
|
|
if (gridId == GridId.Invalid)
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "You aren't on a grid to delete gas from.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
case 1:
|
|
|
|
|
|
{
|
|
|
|
|
|
if (!int.TryParse(args[0], out var number))
|
|
|
|
|
|
{
|
|
|
|
|
|
// Argument is a gas
|
|
|
|
|
|
if (player == null)
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "A grid id must be specified if not using this command as a player.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (player.AttachedEntity == null)
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "You have no entity from which to get a grid id.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
gridId = player.AttachedEntity.Transform.GridID;
|
|
|
|
|
|
|
|
|
|
|
|
if (gridId == GridId.Invalid)
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, "You aren't on a grid to delete gas from.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!Enum.TryParse<Gas>(args[0], true, out var parsedGas))
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, $"{args[0]} is not a valid gas name.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
gas = parsedGas;
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Argument is a grid
|
|
|
|
|
|
gridId = new GridId(number);
|
|
|
|
|
|
|
|
|
|
|
|
if (gridId == GridId.Invalid)
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, $"{gridId} is not a valid grid id.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
case 2:
|
|
|
|
|
|
{
|
|
|
|
|
|
if (!int.TryParse(args[0], out var first))
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, $"{args[0]} is not a valid integer for a grid id.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
gridId = new GridId(first);
|
|
|
|
|
|
|
|
|
|
|
|
if (gridId == GridId.Invalid)
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, $"{gridId} is not a valid grid id.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!Enum.TryParse<Gas>(args[1], true, out var parsedGas))
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, $"{args[1]} is not a valid gas.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
gas = parsedGas;
|
|
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
default:
|
|
|
|
|
|
shell.SendText(player, Help);
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
var mapManager = IoCManager.Resolve<IMapManager>();
|
|
|
|
|
|
|
|
|
|
|
|
if (!mapManager.TryGetGrid(gridId, out var grid))
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, $"No grid exists with id {gridId}");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
var entityManager = IoCManager.Resolve<IEntityManager>();
|
|
|
|
|
|
|
|
|
|
|
|
if (!entityManager.TryGetEntity(grid.GridEntityId, out var gridEntity))
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, $"Grid {gridId} has no entity.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!gridEntity.TryGetComponent(out GridAtmosphereComponent? atmosphere))
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, $"Grid {gridId} has no {nameof(GridAtmosphereComponent)}");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
var tiles = 0;
|
|
|
|
|
|
var moles = 0f;
|
|
|
|
|
|
|
|
|
|
|
|
if (gas == null)
|
|
|
|
|
|
{
|
|
|
|
|
|
foreach (var tile in atmosphere)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (tile.Air == null || tile.Air.Immutable) continue;
|
|
|
|
|
|
|
|
|
|
|
|
tiles++;
|
|
|
|
|
|
moles += tile.Air.TotalMoles;
|
|
|
|
|
|
|
|
|
|
|
|
tile.Air.Clear();
|
|
|
|
|
|
|
|
|
|
|
|
atmosphere.Invalidate(tile.GridIndices);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
foreach (var tile in atmosphere)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (tile.Air == null || tile.Air.Immutable) continue;
|
|
|
|
|
|
|
|
|
|
|
|
tiles++;
|
|
|
|
|
|
moles += tile.Air.TotalMoles;
|
|
|
|
|
|
|
|
|
|
|
|
tile.Air.SetMoles(gas.Value, 0);
|
|
|
|
|
|
|
|
|
|
|
|
atmosphere.Invalidate(tile.GridIndices);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (gas == null)
|
|
|
|
|
|
{
|
|
|
|
|
|
shell.SendText(player, $"Removed {moles} moles from {tiles} tiles.");
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
shell.SendText(player, $"Removed {moles} moles of gas {gas} from {tiles} tiles.");
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2020-09-21 00:13:17 +01:00
|
|
|
|
|
|
|
|
|
|
public class ShowAtmos : IClientCommand
|
|
|
|
|
|
{
|
|
|
|
|
|
public string Command => "showatmos";
|
|
|
|
|
|
public string Description => "Toggles seeing atmos debug overlay";
|
|
|
|
|
|
public string Help => $"Usage: {Command}";
|
|
|
|
|
|
|
|
|
|
|
|
public void Execute(IConsoleShell shell, IPlayerSession? player, string[] args)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (player == null) return;
|
|
|
|
|
|
var atmosDebug = EntitySystem.Get<AtmosDebugOverlaySystem>();
|
|
|
|
|
|
if (atmosDebug.PlayerObservers.Contains(player))
|
|
|
|
|
|
{
|
|
|
|
|
|
atmosDebug.PlayerObservers.Remove(player);
|
|
|
|
|
|
shell.SendText(player, $"Ok, disabled");
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
atmosDebug.PlayerObservers.Add(player);
|
|
|
|
|
|
shell.SendText(player, $"Ok, enabled");
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}}
|