fix zombie mispredicts (#11043)
This commit is contained in:
8
Content.Client/Zombies/ZombieSystem.cs
Normal file
8
Content.Client/Zombies/ZombieSystem.cs
Normal file
@@ -0,0 +1,8 @@
|
||||
using Content.Shared.Zombies;
|
||||
|
||||
namespace Content.Client.Zombies;
|
||||
|
||||
public sealed class ZombieSystem : SharedZombieSystem
|
||||
{
|
||||
|
||||
}
|
||||
@@ -13,12 +13,12 @@ using Content.Server.Inventory;
|
||||
using Robust.Shared.Prototypes;
|
||||
using Content.Server.Speech;
|
||||
using Content.Server.Chat.Systems;
|
||||
using Content.Shared.Movement.Systems;
|
||||
using Content.Shared.Damage;
|
||||
using Content.Shared.Zombies;
|
||||
|
||||
namespace Content.Server.Zombies
|
||||
{
|
||||
public sealed class ZombieSystem : EntitySystem
|
||||
public sealed class ZombieSystem : SharedZombieSystem
|
||||
{
|
||||
[Dependency] private readonly DiseaseSystem _disease = default!;
|
||||
[Dependency] private readonly BloodstreamSystem _bloodstream = default!;
|
||||
@@ -36,7 +36,7 @@ namespace Content.Server.Zombies
|
||||
SubscribeLocalEvent<ZombieComponent, MeleeHitEvent>(OnMeleeHit);
|
||||
SubscribeLocalEvent<ZombieComponent, MobStateChangedEvent>(OnMobState);
|
||||
SubscribeLocalEvent<ActiveZombieComponent, DamageChangedEvent>(OnDamage);
|
||||
SubscribeLocalEvent<ZombieComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshSpeed);
|
||||
|
||||
}
|
||||
|
||||
private void OnMobState(EntityUid uid, ZombieComponent component, MobStateChangedEvent args)
|
||||
@@ -53,12 +53,6 @@ namespace Content.Server.Zombies
|
||||
DoGroan(uid, component);
|
||||
}
|
||||
|
||||
private void OnRefreshSpeed(EntityUid uid, ZombieComponent component, RefreshMovementSpeedModifiersEvent args)
|
||||
{
|
||||
var mod = component.ZombieMovementSpeedDebuff;
|
||||
args.ModifySpeed(mod, mod);
|
||||
}
|
||||
|
||||
private float GetZombieInfectionChance(EntityUid uid, ZombieComponent component)
|
||||
{
|
||||
var baseChance = component.MaxZombieInfectionChance;
|
||||
|
||||
20
Content.Shared/Zombies/SharedZombieSystem.cs
Normal file
20
Content.Shared/Zombies/SharedZombieSystem.cs
Normal file
@@ -0,0 +1,20 @@
|
||||
using Content.Shared.Movement.Systems;
|
||||
|
||||
namespace Content.Shared.Zombies;
|
||||
|
||||
public abstract class SharedZombieSystem : EntitySystem
|
||||
{
|
||||
/// <inheritdoc/>
|
||||
public override void Initialize()
|
||||
{
|
||||
base.Initialize();
|
||||
|
||||
SubscribeLocalEvent<ZombieComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshSpeed);
|
||||
}
|
||||
|
||||
private void OnRefreshSpeed(EntityUid uid, ZombieComponent component, RefreshMovementSpeedModifiersEvent args)
|
||||
{
|
||||
var mod = component.ZombieMovementSpeedDebuff;
|
||||
args.ModifySpeed(mod, mod);
|
||||
}
|
||||
}
|
||||
@@ -1,10 +1,11 @@
|
||||
using Content.Shared.Roles;
|
||||
using Content.Shared.Weapons.Melee;
|
||||
using Robust.Shared.GameStates;
|
||||
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
|
||||
|
||||
namespace Content.Server.Zombies
|
||||
namespace Content.Shared.Zombies
|
||||
{
|
||||
[RegisterComponent]
|
||||
[RegisterComponent, NetworkedComponent]
|
||||
public sealed class ZombieComponent : Component
|
||||
{
|
||||
/// <summary>
|
||||
Reference in New Issue
Block a user