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

Disarm 1984 (#8872)

Browse Source
This commit is contained in:
Rane
2022-06-17 01:37:07 -04:00
committed by GitHub
parent 01189a5590
commit b44ec9554a
10 changed files with 96 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Weapon/Melee/EnergySword/Components/EnergySwordComponent.cs
View File

@@ -36,5 +36,8 @@ namespace Content.Server.Weapon.Melee.EnergySword
[DataField("litDamageBonus", required: true)]
public DamageSpecifier LitDamageBonus = default!;
[DataField("litDisarmMalus", required: true)]
public float litDisarmMalus = 0.6f;
}
}

11
Content.Server/Weapon/Melee/EnergySword/EnergySwordSystem.cs
View File

@@ -5,6 +5,7 @@ using Content.Shared.Light;
using Content.Shared.Light.Component;
using Content.Shared.Toggleable;
using Content.Shared.Tools.Components;
using Content.Server.CombatMode.Disarm;
using Robust.Shared.Audio;
using Robust.Shared.Player;
using Robust.Shared.Random;
@@ -68,6 +69,11 @@ namespace Content.Server.Weapon.Melee.EnergySword
item.Size = 5;
}
if (TryComp<DisarmMalusComponent>(comp.Owner, out var malus))
{
malus.Malus -= comp.litDisarmMalus;
}
SoundSystem.Play(comp.DeActivateSound.GetSound(), Filter.Pvs(comp.Owner, entityManager: EntityManager), comp.Owner);
comp.Activated = false;
@@ -85,6 +91,11 @@ namespace Content.Server.Weapon.Melee.EnergySword
SoundSystem.Play(comp.ActivateSound.GetSound(), Filter.Pvs(comp.Owner, entityManager: EntityManager), comp.Owner);
if (TryComp<DisarmMalusComponent>(comp.Owner, out var malus))
{
malus.Malus += comp.litDisarmMalus;
}
comp.Activated = true;
}