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

A return to foam (foam rework) (#20831)

Browse Source
This commit is contained in:
Nemanja
2023-10-26 22:52:11 -04:00
committed by GitHub
parent ddaf7ddc47
commit 0670b56205
11 changed files with 303 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Content.Server/StationEvents/Components/VentClogRuleComponent.cs
View File

@@ -12,7 +12,7 @@ public sealed partial class VentClogRuleComponent : Component
/// Somewhat safe chemicals to put in foam that probably won't instantly kill you.
/// There is a small chance of using any reagent, ignoring this.
/// </summary>
[DataField("safeishVentChemicals", customTypeSerializer: typeof(PrototypeIdListSerializer<ReagentPrototype>))]
[DataField(customTypeSerializer: typeof(PrototypeIdListSerializer<ReagentPrototype>))]
public IReadOnlyList<string> SafeishVentChemicals = new[]
{
"Water", "Blood", "Slime", "SpaceDrugs", "SpaceCleaner", "Nutriment", "Sugar", "SpaceLube", "Ephedrine", "Ale", "Beer", "SpaceGlue"
@@ -21,31 +21,31 @@ public sealed partial class VentClogRuleComponent : Component
/// <summary>
/// Sound played when foam is being created.
/// </summary>
[DataField("sound")]
[DataField]
public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Effects/extinguish.ogg");
/// <summary>
/// The standard reagent quantity to put in the foam, modfied by event severity.
/// The standard reagent quantity to put in the foam, modified by event severity.
/// </summary>
[DataField("reagentQuantity"), ViewVariables(VVAccess.ReadWrite)]
public int ReagentQuantity = 200;
[DataField, ViewVariables(VVAccess.ReadWrite)]
public int ReagentQuantity = 100;
/// <summary>
/// The standard spreading of the foam, not modfied by event severity.
/// The standard spreading of the foam, not modified by event severity.
/// </summary>
[DataField("spread"), ViewVariables(VVAccess.ReadWrite)]
public int Spread = 20;
[DataField, ViewVariables(VVAccess.ReadWrite)]
public int Spread = 16;
/// <summary>
/// How long the foam lasts for
/// </summary>
[DataField("time"), ViewVariables(VVAccess.ReadWrite)]
[DataField, ViewVariables(VVAccess.ReadWrite)]
public float Time = 20f;
/// <summary>
/// Reagents that gets the weak numbers used instead of regular ones.
/// </summary>
[DataField("weakReagents", customTypeSerializer: typeof(PrototypeIdListSerializer<ReagentPrototype>))]
[DataField(customTypeSerializer: typeof(PrototypeIdListSerializer<ReagentPrototype>))]
public IReadOnlyList<string> WeakReagents = new[]
{
"SpaceLube", "SpaceGlue"
@@ -54,12 +54,12 @@ public sealed partial class VentClogRuleComponent : Component
/// <summary>
/// Quantity of weak reagents to put in the foam.
/// </summary>
[DataField("weakReagentQuantity"), ViewVariables(VVAccess.ReadWrite)]
public int WeakReagentQuantity = 60;
[DataField, ViewVariables(VVAccess.ReadWrite)]
public int WeakReagentQuantity = 50;
/// <summary>
/// Spread of the foam for weak reagents.
/// </summary>
[DataField("weakSpread"), ViewVariables(VVAccess.ReadWrite)]
public int WeakSpread = 2;
[DataField, ViewVariables(VVAccess.ReadWrite)]
public int WeakSpread = 3;
}

7
Content.Server/StationEvents/Events/VentClogRule.cs
View File

@@ -3,10 +3,8 @@ using Content.Server.Station.Components;
using Content.Shared.Chemistry.Components;
using Content.Shared.Chemistry.Reagent;
using JetBrains.Annotations;
using Robust.Shared.Audio;
using Robust.Shared.Random;
using System.Linq;
using Content.Server.Chemistry.Components;
using Content.Server.Fluids.EntitySystems;
using Content.Server.GameTicking.Rules.Components;
using Content.Server.StationEvents.Components;
@@ -53,9 +51,8 @@ public sealed class VentClogRule : StationEventSystem<VentClogRuleComponent>
solution.AddReagent(reagent, quantity);
var foamEnt = Spawn("Foam", transform.Coordinates);
var smoke = EnsureComp<SmokeComponent>(foamEnt);
smoke.SpreadAmount = weak ? component.WeakSpread : component.Spread;
_smoke.Start(foamEnt, smoke, solution, component.Time);
var spreadAmount = weak ? component.WeakSpread : component.Spread;
_smoke.StartSmoke(foamEnt, solution, component.Time, spreadAmount);
Audio.PlayPvs(component.Sound, transform.Coordinates);
}
}