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

Weapon Random Fixes (documented and removed hardcoded cluwnecomp) (#22352)

Browse Source 
Weapon Random Fixes
This commit is contained in:
brainfood1183
2023-12-18 19:42:57 +00:00
committed by GitHub
parent 8958c64e6c
commit 2d04e89007
2 changed files with 11 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Server/Weapons/Melee/WeaponRandom/WeaponRandomComponent.cs
View File

@@ -14,25 +14,13 @@ internal sealed partial class WeaponRandomComponent : Component
public DamageSpecifier DamageBonus = new(); public DamageSpecifier DamageBonus = new();
/// <summary> /// <summary>
/// Chance for the damage bonus to occur. /// Chance for the damage bonus to occur (1 = 100%).
/// </summary> /// </summary>
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
public float RandomDamageChance = 0.00001f; public float RandomDamageChance = 0.00001f;
/// <summary> /// <summary>
/// If this is true then the random damage will occur. /// Sound effect to play when the damage bonus occurs.
/// </summary>
[DataField("randomDamage")]
public bool RandomDamage = true;
/// <summary>
/// If this is true then the weapon will have a unique interaction with cluwnes.
/// </summary>
[DataField("antiCluwne")]
public bool AntiCluwne = true;
/// <summary>
/// Noise to play when the damage bonus occurs.
/// </summary> /// </summary>
[DataField("damageSound")] [DataField("damageSound")]
public SoundSpecifier DamageSound = new SoundPathSpecifier("/Audio/Items/bikehorn.ogg"); public SoundSpecifier DamageSound = new SoundPathSpecifier("/Audio/Items/bikehorn.ogg");

20
Content.Server/Weapons/Melee/WeaponRandom/WeaponRandomSystem.cs
View File

@@ -1,11 +1,12 @@
using Content.Shared.Weapons.Melee.Events; using Content.Shared.Weapons.Melee.Events;
using Robust.Shared.Random; using Robust.Shared.Random;
using Content.Shared.Cluwne;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems; using Robust.Shared.Audio.Systems;
namespace Content.Server.Weapons.Melee.WeaponRandom; namespace Content.Server.Weapons.Melee.WeaponRandom;
/// <summary>
/// This adds a random damage bonus to melee attacks based on damage bonus amount and probability.
/// </summary>
public sealed class WeaponRandomSystem : EntitySystem public sealed class WeaponRandomSystem : EntitySystem
{ {
[Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly IRobustRandom _random = default!;
@@ -17,22 +18,15 @@ public sealed class WeaponRandomSystem : EntitySystem
SubscribeLocalEvent<WeaponRandomComponent, MeleeHitEvent>(OnMeleeHit); SubscribeLocalEvent<WeaponRandomComponent, MeleeHitEvent>(OnMeleeHit);
} }
/// <summary>
/// On Melee hit there is a possible chance of additional bonus damage occuring.
/// </summary>
private void OnMeleeHit(EntityUid uid, WeaponRandomComponent component, MeleeHitEvent args) private void OnMeleeHit(EntityUid uid, WeaponRandomComponent component, MeleeHitEvent args)
{ {
foreach (var entity in args.HitEntities) if (_random.Prob(component.RandomDamageChance))
{
if (HasComp<CluwneComponent>(entity) && component.AntiCluwne)
{ {
_audio.PlayPvs(component.DamageSound, uid); _audio.PlayPvs(component.DamageSound, uid);
args.BonusDamage = component.DamageBonus; args.BonusDamage = component.DamageBonus;
} }
else if (_random.Prob(component.RandomDamageChance) && component.RandomDamage)
{
_audio.PlayPvs(component.DamageSound, uid);
args.BonusDamage = component.DamageBonus;
}
}
} }
} }