tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds Spray Bottles (#1522)

Browse Source 
* Spray Bottle

* -"Proper" wall detection
-Removed some using
-Fixed sound

* Just don't add it

* -Removed spill sound
-Added sound parameter to SpillHelper.SpillAt

* Now spawns Vapor instead of Puddles instantly

* -Review
-Nullable

* Reworkkkk

* AABB shittery

Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
This commit is contained in:
Exp
2020-08-08 14:33:36 +02:00
committed by GitHub
parent 322c2261b6
commit b4f08811eb
10 changed files with 312 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/GameObjects/Components/Fluids/SpillHelper.cs
View File

@@ -18,10 +18,11 @@ namespace Content.Server.GameObjects.Components.Fluids
/// <param name="entity">Entity location to spill at</param>
/// <param name="solution">Initial solution for the prototype</param>
/// <param name="prototype">Prototype to use</param>
internal static void SpillAt(IEntity entity, Solution solution, string prototype)
/// <param name="sound">Play the spill sound</param>
internal static void SpillAt(IEntity entity, Solution solution, string prototype, bool sound = true)
{
var entityLocation = entity.Transform.GridPosition;
SpillAt(entityLocation, solution, prototype);
SpillAt(entityLocation, solution, prototype, sound);
}
// Other functions will be calling this one
@@ -32,7 +33,8 @@ namespace Content.Server.GameObjects.Components.Fluids
/// <param name="gridCoordinates"></param>
/// <param name="solution">Initial solution for the prototype</param>
/// <param name="prototype">Prototype to use</param>
internal static PuddleComponent? SpillAt(GridCoordinates gridCoordinates, Solution solution, string prototype)
/// <param name="sound">Play the spill sound</param>
internal static PuddleComponent? SpillAt(GridCoordinates gridCoordinates, Solution solution, string prototype, bool sound = true)
{
if (solution.TotalVolume == 0)
{
@@ -67,7 +69,7 @@ namespace Content.Server.GameObjects.Components.Fluids
continue;
}
if (!puddleComponent.TryAddSolution(solution))
if (!puddleComponent.TryAddSolution(solution, sound))
{
continue;
}
@@ -84,7 +86,7 @@ namespace Content.Server.GameObjects.Components.Fluids
var puddle = serverEntityManager.SpawnEntity(prototype, spillGridCoords);
var newPuddleComponent = puddle.GetComponent<PuddleComponent>();
newPuddleComponent.TryAddSolution(solution);
newPuddleComponent.TryAddSolution(solution, sound);
return newPuddleComponent;
}