forked from space-wizards/space-station-14
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Cluster grenade refactor and contra markings (space-wizards#31108)
* Cluster grenade refactor * oopsies on the name * Solve client-side errors * reviews addressed * filling scattering grenades is now predicted * reviews addressed
- Loading branch information
1 parent
38367c6
commit 888e5a9
Showing
14 changed files
with
757 additions
and
558 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
using Content.Shared.Explosion.EntitySystems; | ||
|
||
namespace Content.Client.Explosion; | ||
|
||
public sealed class ScatteringGrenadeSystem : SharedScatteringGrenadeSystem | ||
{ | ||
|
||
} |
117 changes: 0 additions & 117 deletions
117
Content.Server/Explosion/Components/ClusterGrenadeComponent.cs
This file was deleted.
Oops, something went wrong.
48 changes: 48 additions & 0 deletions
48
Content.Server/Explosion/Components/ProjectileGrenadeComponent.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
using Content.Server.Explosion.EntitySystems; | ||
using Robust.Shared.Containers; | ||
using Robust.Shared.Prototypes; | ||
|
||
namespace Content.Server.Explosion.Components; | ||
/// <summary> | ||
/// Grenades that, when triggered, explode into projectiles | ||
/// </summary> | ||
[RegisterComponent, Access(typeof(ProjectileGrenadeSystem))] | ||
public sealed partial class ProjectileGrenadeComponent : Component | ||
{ | ||
public Container Container = default!; | ||
|
||
/// <summary> | ||
/// The kind of projectile that the prototype is filled with. | ||
/// </summary> | ||
[DataField] | ||
public EntProtoId? FillPrototype; | ||
|
||
/// <summary> | ||
/// If we have a pre-fill how many more can we spawn. | ||
/// </summary> | ||
public int UnspawnedCount; | ||
|
||
/// <summary> | ||
/// Total amount of projectiles | ||
/// </summary> | ||
[DataField] | ||
public int Capacity = 3; | ||
|
||
/// <summary> | ||
/// Should the angle of the projectiles be uneven? | ||
/// </summary> | ||
[DataField] | ||
public bool RandomAngle = false; | ||
|
||
/// <summary> | ||
/// The minimum speed the projectiles may come out at | ||
/// </summary> | ||
[DataField] | ||
public float MinVelocity = 2f; | ||
|
||
/// <summary> | ||
/// The maximum speed the projectiles may come out at | ||
/// </summary> | ||
[DataField] | ||
public float MaxVelocity = 6f; | ||
} |
177 changes: 0 additions & 177 deletions
177
Content.Server/Explosion/EntitySystems/ClusterGrenadeSystem.cs
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.