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

ninja stun change (#20503)

Browse Source 
* tagless fields

* add damage and paralyze instead of electrocuting

* add disable bool to RevealNinja

* raise MeleeAttackEvent on the user after swinging

* uncloak ninja after attacking

* revert RevealNinja bool

* revert meleeattack event

* revert uncloak

* validate shock prototype

* damagespecifier no validation

* ;

* :trollface:

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
This commit is contained in:
deltanedas
2023-11-06 04:08:33 +00:00
committed by GitHub
parent 525d8e3e94
commit 38904904d0
3 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Content.Shared/Ninja/Components/StunProviderComponent.cs
View File

@@ -1,3 +1,4 @@
using Content.Shared.Damage;
using Content.Shared.Ninja.Systems;
using Content.Shared.Whitelist;
using Robust.Shared.Audio;
@@ -17,49 +18,55 @@ public sealed partial class StunProviderComponent : Component
/// The powercell entity to take power from.
/// Determines whether stunning is possible.
/// </summary>
[DataField("batteryUid"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
[DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
public EntityUid? BatteryUid;
/// <summary>
/// Sound played when stunning someone.
/// </summary>
[DataField("sound"), ViewVariables(VVAccess.ReadWrite)]
[DataField, ViewVariables(VVAccess.ReadWrite)]
public SoundSpecifier Sound = new SoundCollectionSpecifier("sparks");
/// <summary>
/// Joules required in the battery to stun someone. Defaults to 10 uses on a small battery.
/// </summary>
[DataField("stunCharge"), ViewVariables(VVAccess.ReadWrite)]
public float StunCharge = 36.0f;
[DataField, ViewVariables(VVAccess.ReadWrite)]
public float StunCharge = 36f;
/// <summary>
/// Shock damage dealt when stunning someone
/// Damage dealt when stunning someone
/// </summary>
[DataField("stunDamage"), ViewVariables(VVAccess.ReadWrite)]
public int StunDamage = 5;
[DataField, ViewVariables(VVAccess.ReadWrite)]
public DamageSpecifier StunDamage = new()
{
DamageDict = new()
{
{ "Shock", 5 }
}
};
/// <summary>
/// Time that someone is stunned for, stacks if done multiple times.
/// </summary>
[DataField("stunTime"), ViewVariables(VVAccess.ReadWrite)]
[DataField, ViewVariables(VVAccess.ReadWrite)]
public TimeSpan StunTime = TimeSpan.FromSeconds(5);
/// <summary>
/// How long stunning is disabled after stunning something.
/// </summary>
[DataField("cooldown"), ViewVariables(VVAccess.ReadWrite)]
[DataField, ViewVariables(VVAccess.ReadWrite)]
public TimeSpan Cooldown = TimeSpan.FromSeconds(2);
/// <summary>
/// Locale string to popup when there is no power
/// </summary>
[DataField("noPowerPopup", required: true), ViewVariables(VVAccess.ReadWrite)]
[DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
public string NoPowerPopup = string.Empty;
/// <summary>
/// Whitelist for what counts as a mob.
/// </summary>
[DataField("whitelist")]
[DataField]
public EntityWhitelist Whitelist = new()
{
Components = new[] {"Stamina"}
@@ -69,6 +76,6 @@ public sealed partial class StunProviderComponent : Component
/// When someone can next be stunned.
/// Essentially a UseDelay unique to this component.
/// </summary>
[DataField("nextStun", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
[DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
public TimeSpan NextStun = TimeSpan.Zero;
}