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

Cluster grenades for uplink and security (#22029)

Browse Source 
* clustergrenades go boom

* Small tweaks

* Some tweaks and soaplet

* clustergrenadesystem changes and launcher types

* small tweaks

* typo

* whitespace

* rsi edit

* another typo

* add containers

* Some changes related to merge

* Forgot to change name

* Made changes based on review

* Removed new china lake ammo based on feedback in other PR

* Unneeded nested loop moment

* Nested loop needed after all moment
This commit is contained in:
Arendian
2023-12-14 04:30:42 +01:00
committed by GitHub
parent 286af5dcb1
commit 3e766402b9
36 changed files with 727 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
Content.Server/Explosion/Components/ClusterGrenadeComponent.cs
View File

@@ -1,7 +1,6 @@
using Content.Server.Explosion.EntitySystems;
using Robust.Shared.Containers;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
namespace Content.Server.Explosion.Components
{
@@ -13,8 +12,8 @@ namespace Content.Server.Explosion.Components
/// <summary>
/// What we fill our prototype with if we want to pre-spawn with grenades.
/// </summary>
[DataField("fillPrototype", customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
public string? FillPrototype;
[DataField("fillPrototype")]
public EntProtoId? FillPrototype;
/// <summary>
/// If we have a pre-fill how many more can we spawn.
@@ -28,20 +27,91 @@ namespace Content.Server.Explosion.Components
public int MaxGrenades = 3;
/// <summary>
/// How long until our grenades are shot out and armed.
/// Maximum delay in seconds between individual grenade triggers
/// </summary>
[ViewVariables(VVAccess.ReadWrite)] [DataField("delay")]
public float Delay = 1;
[ViewVariables(VVAccess.ReadWrite)]
[DataField("grenadeTriggerIntervalMax")]
public float GrenadeTriggerIntervalMax = 0f;
/// <summary>
/// Max distance grenades can be thrown.
/// Minimum delay in seconds between individual grenade triggers
/// </summary>
[ViewVariables(VVAccess.ReadWrite)] [DataField("distance")]
public float ThrowDistance = 50;
[ViewVariables(VVAccess.ReadWrite)]
[DataField("grenadeTriggerIntervalMin")]
public float GrenadeTriggerIntervalMin = 0f;
/// <summary>
/// Minimum delay in seconds before any grenades start to be triggered.
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("baseTriggerDelay")]
public float BaseTriggerDelay = 1.0f;
/// <summary>
/// Decides if grenades trigger after getting launched
/// </summary>
[DataField("triggerGrenades")]
public bool TriggerGrenades = true;
/// <summary>
/// Does the cluster grenade shoot or throw
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("grenadeType")]
public Enum GrenadeType = Components.GrenadeType.Throw;
/// <summary>
/// The speed at which grenades get thrown
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("velocity")]
public float Velocity = 5;
/// <summary>
/// Should the spread be random
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("randomSpread")]
public bool RandomSpread = false;
/// <summary>
/// Should the angle be random
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("randomAngle")]
public bool RandomAngle = false;
/// <summary>
/// Static distance grenades will be thrown to.
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("distance")]
public float Distance = 1f;
/// <summary>
/// Max distance grenades should randomly be thrown to.
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("maxSpreadDistance")]
public float MaxSpreadDistance = 2.5f;
/// <summary>
/// Minimal distance grenades should randomly be thrown to.
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("minSpreadDistance")]
public float MinSpreadDistance = 0f;
/// <summary>
/// This is the end.
/// </summary>
public bool CountDown;
}
public enum GrenadeType
{
Throw,
Shoot
}
}