From 7db5bfd39d61afca850d11f5594274f36349cd9f Mon Sep 17 00:00:00 2001 From: VigersRay Date: Wed, 31 Jul 2024 03:56:35 +0300 Subject: [PATCH] oops --- Content.Server/Zombies/ZombieSystem.cs | 10 ++-------- Content.Shared/Zombies/ZombieComponent.cs | 9 +++------ 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/Content.Server/Zombies/ZombieSystem.cs b/Content.Server/Zombies/ZombieSystem.cs index c20b280c16..ff8a7a7334 100644 --- a/Content.Server/Zombies/ZombieSystem.cs +++ b/Content.Server/Zombies/ZombieSystem.cs @@ -1,11 +1,11 @@ using System.Linq; -using System.Text.RegularExpressions; // Sunrise +using System.Text.RegularExpressions; using Content.Server.Actions; using Content.Server.Body.Systems; using Content.Server.Chat; using Content.Server.Chat.Systems; using Content.Server.Emoting.Systems; -using Content.Server.Pinpointer; // Sunrise +using Content.Server.Pinpointer; using Content.Server.Speech.EntitySystems; using Content.Shared.Bed.Sleep; using Content.Shared.Cloning; @@ -22,7 +22,6 @@ using Content.Shared.Stunnable; using Content.Shared.Throwing; using Content.Shared.Weapons.Melee.Events; using Content.Shared.Zombies; -using Robust.Server.GameObjects; // Sunrise using Robust.Shared.Prototypes; using Robust.Shared.Random; using Robust.Shared.Timing; @@ -48,7 +47,6 @@ namespace Content.Server.Zombies [Dependency] private readonly ActionsSystem _action = default!; [Dependency] private readonly SharedStunSystem _stun = default!; [Dependency] private readonly NavMapSystem _navMap = default!; // Sunrise-Zombies - [Dependency] private readonly TransformSystem _transform = default!; // Sunrise-Zombies public const SlotFlags ProtectiveSlots = SlotFlags.FEET | @@ -96,9 +94,6 @@ namespace Content.Server.Zombies return; if (!_mobState.IsAlive(args.Target)) return; - if (_timing.CurTime - component.LastThrowHit < component.ThrowHitDelay) - return; - component.LastThrowHit = _timing.CurTime; _stun.TryParalyze(args.Target, TimeSpan.FromSeconds(component.ParalyzeTime), false); _damageable.TryChangeDamage(args.Target, component.Damage, origin: args.Thrown); @@ -132,7 +127,6 @@ namespace Content.Server.Zombies { nearestUid = targetUid; minDistance = distance; - nearestXform = xform; } } diff --git a/Content.Shared/Zombies/ZombieComponent.cs b/Content.Shared/Zombies/ZombieComponent.cs index 1f69f47a8d..8f26189a42 100644 --- a/Content.Shared/Zombies/ZombieComponent.cs +++ b/Content.Shared/Zombies/ZombieComponent.cs @@ -31,7 +31,7 @@ public sealed partial class ZombieComponent : Component public float MinZombieInfectionChance = 0.6f; // Sunrise-Edit [ViewVariables(VVAccess.ReadWrite)] - public float ZombieMovementSpeedBuff = 1f; // Sunrise-Edit + public float ZombieMovementSpeedBuff = 1.05f; // Sunrise-Edit /// /// The skin color of the zombie @@ -104,7 +104,7 @@ public sealed partial class ZombieComponent : Component { "Slash", -5 }, // Sunrise-Edit { "Piercing", -5 }, // Sunrise-Edit { "Heat", -0.02 }, - { "Shock", -0.02 } + { "Shock", -0.02 }, } }; @@ -124,7 +124,7 @@ public sealed partial class ZombieComponent : Component { { "Blunt", -5 }, // Sunrise-Edit { "Slash", -5 }, // Sunrise-Edit - { "Piercing", -5 } // Sunrise-Edit + { "Piercing", -5 }, // Sunrise-Edit } }; @@ -177,9 +177,6 @@ public sealed partial class ZombieComponent : Component [DataField] public TimeSpan? LastThrowHit; - [DataField] - public TimeSpan ThrowHitDelay = TimeSpan.Zero(); - [DataField] public float MaxThrow = 10f;