From 3981173a1546dd1d4a21b1c85451ea7eaf69c6f8 Mon Sep 17 00:00:00 2001 From: "Mr. 27" <45323883+Dutch-VanDerLinde@users.noreply.github.com> Date: Wed, 13 Mar 2024 06:02:10 -0400 Subject: [PATCH] Zombie wideswing and misc fix (#26064) * inital * b * Update MeleeWeaponComponent.cs * Update Content.Shared/Zombies/ZombieComponent.cs --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> --- Content.Server/Zombies/ZombieSystem.Transform.cs | 3 +++ Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs | 2 +- Content.Shared/Zombies/ZombieComponent.cs | 6 ++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs index 386a7c6419..a4bd234307 100644 --- a/Content.Server/Zombies/ZombieSystem.Transform.cs +++ b/Content.Server/Zombies/ZombieSystem.Transform.cs @@ -125,7 +125,10 @@ namespace Content.Server.Zombies var melee = EnsureComp(target); melee.Animation = zombiecomp.AttackAnimation; melee.WideAnimation = zombiecomp.AttackAnimation; + melee.AltDisarm = false; melee.Range = 1.2f; + melee.Angle = 0.0f; + melee.HitSound = zombiecomp.BiteSound; if (mobState.CurrentState == MobState.Alive) { diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs index e5b35f6c0b..85d2e4675f 100644 --- a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs +++ b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs @@ -18,7 +18,7 @@ public sealed partial class MeleeWeaponComponent : Component /// /// Does this entity do a disarm on alt attack. /// - [DataField, ViewVariables(VVAccess.ReadWrite)] + [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField] public bool AltDisarm = true; /// diff --git a/Content.Shared/Zombies/ZombieComponent.cs b/Content.Shared/Zombies/ZombieComponent.cs index 023bf751ff..85e1599e48 100644 --- a/Content.Shared/Zombies/ZombieComponent.cs +++ b/Content.Shared/Zombies/ZombieComponent.cs @@ -140,6 +140,12 @@ public sealed partial class ZombieComponent : Component, IAntagStatusIconCompone [DataField("greetSoundNotification")] public SoundSpecifier GreetSoundNotification = new SoundPathSpecifier("/Audio/Ambience/Antag/zombie_start.ogg"); + /// + /// Hit sound on zombie bite. + /// + [DataField] + public SoundSpecifier BiteSound = new SoundPathSpecifier("/Audio/Effects/bite.ogg"); + /// /// The blood reagent of the humanoid to restore in case of cloning /// -- 2.51.2