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

Remove esword unneeded property

Browse Source
This commit is contained in:
metalgearsloth
2022-05-16 15:50:11 +10:00
parent 9d2a395be0
commit 527eabc677
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,9 +18,6 @@ namespace Content.Server.Weapon.Melee.EnergySword
[DataField("cycleRate")] [DataField("cycleRate")]
public float CycleRate = 1f; public float CycleRate = 1f;
[DataField("hitSound")]
public SoundSpecifier HitSound { get; set; } = new SoundPathSpecifier("/Audio/Weapons/eblade1.ogg");
[DataField("activateSound")] [DataField("activateSound")]
public SoundSpecifier ActivateSound { get; set; } = new SoundPathSpecifier("/Audio/Weapons/ebladeon.ogg"); public SoundSpecifier ActivateSound { get; set; } = new SoundPathSpecifier("/Audio/Weapons/ebladeon.ogg");

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

@@ -38,7 +38,6 @@ namespace Content.Server.Weapon.Melee.EnergySword
// Overrides basic blunt damage with burn+slash as set in yaml // Overrides basic blunt damage with burn+slash as set in yaml
args.BonusDamage = comp.LitDamageBonus; args.BonusDamage = comp.LitDamageBonus;
args.HitSoundOverride = comp.HitSound;
} }
private void OnUseInHand(EntityUid uid, EnergySwordComponent comp, UseInHandEvent args) private void OnUseInHand(EntityUid uid, EnergySwordComponent comp, UseInHandEvent args)

2
Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
View File

@@ -21,6 +21,8 @@
shader: unshaded shader: unshaded
map: [ "blade" ] map: [ "blade" ]
- type: MeleeWeapon - type: MeleeWeapon
hitSound:
path: /Audio/Weapons/eblade1.ogg
damage: damage:
types: types:
Blunt: 7 Blunt: 7