diff --git a/Fika.Core/Coop/BotClasses/BotPlayerBridge.cs b/Fika.Core/Coop/BotClasses/BotPlayerBridge.cs index d979a3c4..39bb6662 100644 --- a/Fika.Core/Coop/BotClasses/BotPlayerBridge.cs +++ b/Fika.Core/Coop/BotClasses/BotPlayerBridge.cs @@ -6,7 +6,7 @@ namespace Fika.Core.Coop.ObservedClasses { - public class BotPlayerBridge(CoopBot bot) : BodyPartCollider.GInterface20 + public class BotPlayerBridge(CoopBot bot) : BodyPartCollider.IPlayerBridge { private readonly CoopBot bot = bot; diff --git a/Fika.Core/Coop/BotClasses/CoopBotHealthController.cs b/Fika.Core/Coop/BotClasses/CoopBotHealthController.cs index 38d02975..6755b468 100644 --- a/Fika.Core/Coop/BotClasses/CoopBotHealthController.cs +++ b/Fika.Core/Coop/BotClasses/CoopBotHealthController.cs @@ -18,9 +18,9 @@ public override bool _sendNetworkSyncPackets } } - public override void SendNetworkSyncPacket(GStruct358 packet) + public override void SendNetworkSyncPacket(NetworkHealthSyncStruct packet) { - if (packet.SyncType == GStruct358.ESyncType.IsAlive && !packet.Data.IsAlive.IsAlive) + if (packet.SyncType == NetworkHealthSyncStruct.ESyncType.IsAlive && !packet.Data.IsAlive.IsAlive) { coopBot.PacketSender.HealthSyncPackets.Enqueue(coopBot.SetupCorpseSyncPacket(packet)); return; diff --git a/Fika.Core/Coop/ClientClasses/CoopClientGameWorld.cs b/Fika.Core/Coop/ClientClasses/CoopClientGameWorld.cs index 7dc48be0..9d18813f 100644 --- a/Fika.Core/Coop/ClientClasses/CoopClientGameWorld.cs +++ b/Fika.Core/Coop/ClientClasses/CoopClientGameWorld.cs @@ -28,7 +28,7 @@ public static CoopClientGameWorld Create(GameObject gameObject, PoolManager obje return gameWorld; } - public override GClass737 CreateGrenadeFactory() + public override GrenadeFactoryClass CreateGrenadeFactory() { return new GClass738(); } diff --git a/Fika.Core/Coop/ClientClasses/CoopClientHealthController.cs b/Fika.Core/Coop/ClientClasses/CoopClientHealthController.cs index ba4fbc5a..c6ca4249 100644 --- a/Fika.Core/Coop/ClientClasses/CoopClientHealthController.cs +++ b/Fika.Core/Coop/ClientClasses/CoopClientHealthController.cs @@ -18,9 +18,9 @@ public override bool _sendNetworkSyncPackets } } - public override void SendNetworkSyncPacket(GStruct358 packet) + public override void SendNetworkSyncPacket(NetworkHealthSyncStruct packet) { - if (packet.SyncType == GStruct358.ESyncType.IsAlive && !packet.Data.IsAlive.IsAlive) + if (packet.SyncType == NetworkHealthSyncStruct.ESyncType.IsAlive && !packet.Data.IsAlive.IsAlive) { coopPlayer.PacketSender.HealthSyncPackets.Enqueue(coopPlayer.SetupCorpseSyncPacket(packet)); return; diff --git a/Fika.Core/Coop/ClientClasses/FikaClientWorld.cs b/Fika.Core/Coop/ClientClasses/FikaClientWorld.cs index a12e9d32..a819f7ea 100644 --- a/Fika.Core/Coop/ClientClasses/FikaClientWorld.cs +++ b/Fika.Core/Coop/ClientClasses/FikaClientWorld.cs @@ -11,14 +11,14 @@ namespace Fika.Core.Coop.ClientClasses /// public class FikaClientWorld : World { - public List LootSyncPackets; + public List LootSyncPackets; private CoopClientGameWorld clientGameWorld; public static FikaClientWorld Create(CoopClientGameWorld gameWorld) { FikaClientWorld clientWorld = gameWorld.gameObject.AddComponent(); clientWorld.clientGameWorld = gameWorld; - clientWorld.LootSyncPackets = new List(8); + clientWorld.LootSyncPackets = new List(8); Singleton.Instance.FikaClientWorld = clientWorld; return clientWorld; } @@ -32,7 +32,7 @@ public void UpdateLootItems(GClass786 lootItems) { for (int i = LootSyncPackets.Count - 1; i >= 0; i--) { - GStruct128 gstruct = LootSyncPackets[i]; + LootSyncStruct gstruct = LootSyncPackets[i]; if (lootItems.TryGetByKey(gstruct.Id, out LootItem lootItem)) { if (lootItem is ObservedLootItem observedLootItem) diff --git a/Fika.Core/Coop/ClientClasses/HandsControllers/CoopClientFirearmController.cs b/Fika.Core/Coop/ClientClasses/HandsControllers/CoopClientFirearmController.cs index 8b5b54bf..92e50633 100644 --- a/Fika.Core/Coop/ClientClasses/HandsControllers/CoopClientFirearmController.cs +++ b/Fika.Core/Coop/ClientClasses/HandsControllers/CoopClientFirearmController.cs @@ -44,7 +44,7 @@ public override Dictionary GetOperationFactoryDe Dictionary operationFactoryDelegates = base.GetOperationFactoryDelegates(); operationFactoryDelegates[typeof(GClass1752)] = new OperationFactoryDelegate(Weapon1); operationFactoryDelegates[typeof(GClass1753)] = new OperationFactoryDelegate(Weapon2); - operationFactoryDelegates[typeof(GClass1765)] = new OperationFactoryDelegate(Weapon3); + operationFactoryDelegates[typeof(GenericFireOperationClass)] = new OperationFactoryDelegate(Weapon3); return operationFactoryDelegates; } @@ -95,11 +95,11 @@ public Player.BaseAnimationOperation Weapon3() { if (Item.IsFlareGun) { - return new GClass1768(this); + return new FlareGunFireOperationClass(this); } if (Item.IsOneOff) { - return new GClass1770(this); + return new IsOneOffFireOperationClass(this); } if (Item.ReloadMode == Weapon.EReloadMode.OnlyBarrel) { @@ -107,11 +107,11 @@ public Player.BaseAnimationOperation Weapon3() } if (Item is GClass3048) // This is a revolver { - return new GClass1767(this); + return new RevolverFireOperationClass(this); } if (!Item.BoltAction) { - return new GClass1765(this); + return new GenericFireOperationClass(this); } return new FirearmClass4(this); } diff --git a/Fika.Core/Coop/Components/ItemPositionSyncer.cs b/Fika.Core/Coop/Components/ItemPositionSyncer.cs index d4e48a08..85521f3b 100644 --- a/Fika.Core/Coop/Components/ItemPositionSyncer.cs +++ b/Fika.Core/Coop/Components/ItemPositionSyncer.cs @@ -12,7 +12,7 @@ public class ItemPositionSyncer : MonoBehaviour private FikaClient client; private bool isServer; private ObservedLootItem lootItem; - private GStruct128 data; + private LootSyncStruct data; private Rigidbody Rigidbody { diff --git a/Fika.Core/Coop/GameMode/CoopGame.cs b/Fika.Core/Coop/GameMode/CoopGame.cs index 417cbf65..3d5900ff 100644 --- a/Fika.Core/Coop/GameMode/CoopGame.cs +++ b/Fika.Core/Coop/GameMode/CoopGame.cs @@ -132,7 +132,7 @@ public ESeason Season } } - public GClass2359 SeasonsSettings { get; set; } + public SeasonsSettingsClass SeasonsSettings { get; set; } private static ManualLogSource Logger; diff --git a/Fika.Core/Coop/GameMode/IFikaGame.cs b/Fika.Core/Coop/GameMode/IFikaGame.cs index 1c2219a6..e53e3ebe 100644 --- a/Fika.Core/Coop/GameMode/IFikaGame.cs +++ b/Fika.Core/Coop/GameMode/IFikaGame.cs @@ -18,6 +18,6 @@ public interface IFikaGame public ESeason Season { get; set; } - public GClass2359 SeasonsSettings { get; set; } + public SeasonsSettingsClass SeasonsSettings { get; set; } } } diff --git a/Fika.Core/Coop/HostClasses/CoopHostGameWorld.cs b/Fika.Core/Coop/HostClasses/CoopHostGameWorld.cs index ae3b575e..10a11e1e 100644 --- a/Fika.Core/Coop/HostClasses/CoopHostGameWorld.cs +++ b/Fika.Core/Coop/HostClasses/CoopHostGameWorld.cs @@ -42,7 +42,7 @@ public static CoopHostGameWorld Create(GameObject gameObject, PoolManager object return gameWorld; } - public override GClass737 CreateGrenadeFactory() + public override GrenadeFactoryClass CreateGrenadeFactory() { return new HostGrenadeFactory(); } diff --git a/Fika.Core/Coop/HostClasses/FikaHostWorld.cs b/Fika.Core/Coop/HostClasses/FikaHostWorld.cs index fc50c4b8..d8da9a41 100644 --- a/Fika.Core/Coop/HostClasses/FikaHostWorld.cs +++ b/Fika.Core/Coop/HostClasses/FikaHostWorld.cs @@ -13,7 +13,7 @@ namespace Fika.Core.Coop.HostClasses /// public class FikaHostWorld : World { - public List LootSyncPackets; + public List LootSyncPackets; private FikaServer server; private GameWorld gameWorld; @@ -24,7 +24,7 @@ public static FikaHostWorld Create(CoopHostGameWorld gameWorld) hostWorld.server = Singleton.Instance; hostWorld.server.FikaHostWorld = hostWorld; hostWorld.gameWorld = gameWorld; - hostWorld.LootSyncPackets = new List(8); + hostWorld.LootSyncPackets = new List(8); return hostWorld; } @@ -77,7 +77,7 @@ public void UpdateLootItems(GClass786 lootItems) { for (int i = LootSyncPackets.Count - 1; i >= 0; i--) { - GStruct128 gstruct = LootSyncPackets[i]; + LootSyncStruct gstruct = LootSyncPackets[i]; if (lootItems.TryGetByKey(gstruct.Id, out LootItem lootItem)) { if (lootItem is ObservedLootItem observedLootItem) diff --git a/Fika.Core/Coop/HostClasses/HostGrenadeFactory.cs b/Fika.Core/Coop/HostClasses/HostGrenadeFactory.cs index e5a20e50..e9799bdf 100644 --- a/Fika.Core/Coop/HostClasses/HostGrenadeFactory.cs +++ b/Fika.Core/Coop/HostClasses/HostGrenadeFactory.cs @@ -3,7 +3,7 @@ namespace Fika.Core.Coop.HostClasses { - public class HostGrenadeFactory : GClass737 + public class HostGrenadeFactory : GrenadeFactoryClass { public override Grenade AddGrenade(GameObject gameObject) { diff --git a/Fika.Core/Coop/ObservedClasses/ObservedHealthController.cs b/Fika.Core/Coop/ObservedClasses/ObservedHealthController.cs index b84bf895..2afab9ea 100644 --- a/Fika.Core/Coop/ObservedClasses/ObservedHealthController.cs +++ b/Fika.Core/Coop/ObservedClasses/ObservedHealthController.cs @@ -36,7 +36,7 @@ public void PauseAllEffects() for (int i = list_1.Count - 1; i >= 0; i--) { handler.PausedEffects.Add(list_1[i]); - GStruct357 gstruct = gclass803_0.Withdraw(); + PausedEffectsStruct gstruct = gclass803_0.Withdraw(); gstruct.SaveInfo(list_1[i].Id, list_1[i].HealthController, list_1[i].Type, list_1[i].BodyPart, list_1[i].Strength, list_1[i].CurrentStrength, list_1[i].DelayTime, list_1[i].StateTime, list_1[i].WorkStateTime, list_1[i].BuildUpTime, list_1[i].ResidueTime, list_1[i].State); @@ -121,7 +121,7 @@ private class EffectHandler(ObservedHealthController healthController) { private readonly ObservedHealthController healthController = healthController; public readonly List PausedEffects = []; - public readonly List PausedEffectsInfo = []; + public readonly List PausedEffectsInfo = []; public void UnpauseEffects() { diff --git a/Fika.Core/Coop/ObservedClasses/PlayerBridge/ObservedClientBridge.cs b/Fika.Core/Coop/ObservedClasses/PlayerBridge/ObservedClientBridge.cs index 87098757..d34e789a 100644 --- a/Fika.Core/Coop/ObservedClasses/PlayerBridge/ObservedClientBridge.cs +++ b/Fika.Core/Coop/ObservedClasses/PlayerBridge/ObservedClientBridge.cs @@ -6,7 +6,7 @@ namespace Fika.Core.Coop.ObservedClasses { - public class ObservedClientBridge(ObservedCoopPlayer observedPlayer) : BodyPartCollider.GInterface20 + public class ObservedClientBridge(ObservedCoopPlayer observedPlayer) : BodyPartCollider.IPlayerBridge { private readonly ObservedCoopPlayer observedPlayer = observedPlayer; diff --git a/Fika.Core/Coop/ObservedClasses/PlayerBridge/ObservedHostBridge.cs b/Fika.Core/Coop/ObservedClasses/PlayerBridge/ObservedHostBridge.cs index b5673e34..ea5d587d 100644 --- a/Fika.Core/Coop/ObservedClasses/PlayerBridge/ObservedHostBridge.cs +++ b/Fika.Core/Coop/ObservedClasses/PlayerBridge/ObservedHostBridge.cs @@ -6,7 +6,7 @@ namespace Fika.Core.Coop.ObservedClasses { - public class ObservedHostBridge(ObservedCoopPlayer observedPlayer) : BodyPartCollider.GInterface20 + public class ObservedHostBridge(ObservedCoopPlayer observedPlayer) : BodyPartCollider.IPlayerBridge { private readonly ObservedCoopPlayer observedPlayer = observedPlayer; diff --git a/Fika.Core/Coop/PacketHandlers/PacketReceiver.cs b/Fika.Core/Coop/PacketHandlers/PacketReceiver.cs index 9f43e39f..37f0ff7f 100644 --- a/Fika.Core/Coop/PacketHandlers/PacketReceiver.cs +++ b/Fika.Core/Coop/PacketHandlers/PacketReceiver.cs @@ -67,7 +67,7 @@ protected void Update() for (int i = 0; i < healthSyncPackets; i++) { HealthSyncPacket packet = HealthSyncPackets.Dequeue(); - if (packet.Packet.SyncType == GStruct358.ESyncType.IsAlive && !packet.Packet.Data.IsAlive.IsAlive) + if (packet.Packet.SyncType == NetworkHealthSyncStruct.ESyncType.IsAlive && !packet.Packet.Data.IsAlive.IsAlive) { observedPlayer.SetAggressorData(packet.KillerId, packet.BodyPart, packet.WeaponId); observedPlayer.CorpseSyncPacket = packet.CorpseSyncPacket; diff --git a/Fika.Core/Coop/Patches/GrenadeClass_Init_Patch.cs b/Fika.Core/Coop/Patches/GrenadeClass_Init_Patch.cs index 59ee2e4a..0ab70d6d 100644 --- a/Fika.Core/Coop/Patches/GrenadeClass_Init_Patch.cs +++ b/Fika.Core/Coop/Patches/GrenadeClass_Init_Patch.cs @@ -13,7 +13,7 @@ public class GrenadeClass_Init_Patch : ModulePatch { protected override MethodBase GetTargetMethod() { - return typeof(GClass737).GetMethod(nameof(GClass737.Create)); + return typeof(GrenadeFactoryClass).GetMethod(nameof(GrenadeFactoryClass.Create)); } [PatchPostfix] diff --git a/Fika.Core/Coop/Players/CoopPlayer.cs b/Fika.Core/Coop/Players/CoopPlayer.cs index 29ab3cbf..626aad16 100644 --- a/Fika.Core/Coop/Players/CoopPlayer.cs +++ b/Fika.Core/Coop/Players/CoopPlayer.cs @@ -752,7 +752,7 @@ public override void ApplyCorpseImpulse() Corpse.Ragdoll.ApplyImpulse(LastDamageInfo.HitCollider, LastDamageInfo.Direction, LastDamageInfo.HitPoint, _corpseAppliedForce); } - public HealthSyncPacket SetupCorpseSyncPacket(GStruct358 packet) + public HealthSyncPacket SetupCorpseSyncPacket(NetworkHealthSyncStruct packet) { float num = EFTHardSettings.Instance.HIT_FORCE; num *= 0.3f + 0.7f * Mathf.InverseLerp(50f, 20f, LastDamageInfo.PenetrationPower); diff --git a/Fika.Core/Networking/Packets/GameWorld/LootSyncPacket.cs b/Fika.Core/Networking/Packets/GameWorld/LootSyncPacket.cs index 4fe68269..dca643b3 100644 --- a/Fika.Core/Networking/Packets/GameWorld/LootSyncPacket.cs +++ b/Fika.Core/Networking/Packets/GameWorld/LootSyncPacket.cs @@ -4,7 +4,7 @@ namespace Fika.Core.Networking { public struct LootSyncPacket : INetSerializable { - public GStruct128 Data; + public LootSyncStruct Data; public void Deserialize(NetDataReader reader) { diff --git a/Fika.Core/Networking/Packets/Player/HealthSyncPacket.cs b/Fika.Core/Networking/Packets/Player/HealthSyncPacket.cs index 1f2f7433..3bc27a2c 100644 --- a/Fika.Core/Networking/Packets/Player/HealthSyncPacket.cs +++ b/Fika.Core/Networking/Packets/Player/HealthSyncPacket.cs @@ -7,7 +7,7 @@ namespace Fika.Core.Networking public struct HealthSyncPacket(int netId) : INetSerializable { public int NetId = netId; - public GStruct358 Packet; + public NetworkHealthSyncStruct Packet; public string KillerId; public string WeaponId; public EBodyPart BodyPart; @@ -18,13 +18,13 @@ public struct HealthSyncPacket(int netId) : INetSerializable public void Deserialize(NetDataReader reader) { NetId = reader.GetInt(); - GStruct358 packet = new() + NetworkHealthSyncStruct packet = new() { - SyncType = (GStruct358.ESyncType)reader.GetByte() + SyncType = (NetworkHealthSyncStruct.ESyncType)reader.GetByte() }; switch (packet.SyncType) { - case GStruct358.ESyncType.AddEffect: + case NetworkHealthSyncStruct.ESyncType.AddEffect: { packet.Data.AddEffect = new() { @@ -36,11 +36,11 @@ public void Deserialize(NetDataReader reader) WorkTime = reader.GetFloat(), ResidueTime = reader.GetFloat(), Strength = reader.GetFloat(), - ExtraDataType = (GStruct358.GStruct359.EExtraDataType)reader.GetByte() + ExtraDataType = (NetworkHealthSyncStruct.GStruct359.EExtraDataType)reader.GetByte() }; switch (packet.Data.AddEffect.ExtraDataType) { - case GStruct358.GStruct359.EExtraDataType.MedEffect: + case NetworkHealthSyncStruct.GStruct359.EExtraDataType.MedEffect: { packet.Data.AddEffect.ExtraData = new() { @@ -52,7 +52,7 @@ public void Deserialize(NetDataReader reader) }; } break; - case GStruct358.GStruct359.EExtraDataType.Stimulator: + case NetworkHealthSyncStruct.GStruct359.EExtraDataType.Stimulator: { packet.Data.AddEffect.ExtraData = new() { @@ -66,7 +66,7 @@ public void Deserialize(NetDataReader reader) } break; } - case GStruct358.ESyncType.RemoveEffect: + case NetworkHealthSyncStruct.ESyncType.RemoveEffect: { packet.Data.RemoveEffect = new() { @@ -74,7 +74,7 @@ public void Deserialize(NetDataReader reader) }; break; } - case GStruct358.ESyncType.EffectNextState: + case NetworkHealthSyncStruct.ESyncType.EffectNextState: { packet.Data.EffectNextState = new() { @@ -83,7 +83,7 @@ public void Deserialize(NetDataReader reader) }; break; } - case GStruct358.ESyncType.EffectStateTime: + case NetworkHealthSyncStruct.ESyncType.EffectStateTime: { packet.Data.EffectStateTime = new() { @@ -92,7 +92,7 @@ public void Deserialize(NetDataReader reader) }; break; } - case GStruct358.ESyncType.EffectStrength: + case NetworkHealthSyncStruct.ESyncType.EffectStrength: { packet.Data.EffectStrength = new() { @@ -101,7 +101,7 @@ public void Deserialize(NetDataReader reader) }; break; } - case GStruct358.ESyncType.EffectMedResource: + case NetworkHealthSyncStruct.ESyncType.EffectMedResource: { packet.Data.EffectMedResource = new() { @@ -110,7 +110,7 @@ public void Deserialize(NetDataReader reader) }; break; } - case GStruct358.ESyncType.EffectStimulatorBuff: + case NetworkHealthSyncStruct.ESyncType.EffectStimulatorBuff: { packet.Data.EffectStimulatorBuff = new() { @@ -127,7 +127,7 @@ public void Deserialize(NetDataReader reader) } break; } - case GStruct358.ESyncType.IsAlive: + case NetworkHealthSyncStruct.ESyncType.IsAlive: { packet.Data.IsAlive = new() { @@ -145,7 +145,7 @@ public void Deserialize(NetDataReader reader) } break; } - case GStruct358.ESyncType.BodyHealth: + case NetworkHealthSyncStruct.ESyncType.BodyHealth: { packet.Data.BodyHealth = new() { @@ -154,7 +154,7 @@ public void Deserialize(NetDataReader reader) }; break; } - case GStruct358.ESyncType.Energy: + case NetworkHealthSyncStruct.ESyncType.Energy: { packet.Data.Energy = new() { @@ -162,7 +162,7 @@ public void Deserialize(NetDataReader reader) }; break; } - case GStruct358.ESyncType.Hydration: + case NetworkHealthSyncStruct.ESyncType.Hydration: { packet.Data.Hydration = new() { @@ -170,7 +170,7 @@ public void Deserialize(NetDataReader reader) }; break; } - case GStruct358.ESyncType.Temperature: + case NetworkHealthSyncStruct.ESyncType.Temperature: { packet.Data.Temperature = new() { @@ -178,7 +178,7 @@ public void Deserialize(NetDataReader reader) }; break; } - case GStruct358.ESyncType.DamageCoeff: + case NetworkHealthSyncStruct.ESyncType.DamageCoeff: { packet.Data.DamageCoeff = new() { @@ -186,7 +186,7 @@ public void Deserialize(NetDataReader reader) }; break; } - case GStruct358.ESyncType.ApplyDamage: + case NetworkHealthSyncStruct.ESyncType.ApplyDamage: { packet.Data.ApplyDamage = new() { @@ -196,7 +196,7 @@ public void Deserialize(NetDataReader reader) }; break; } - case GStruct358.ESyncType.DestroyedBodyPart: + case NetworkHealthSyncStruct.ESyncType.DestroyedBodyPart: { packet.Data.DestroyedBodyPart = new() { @@ -211,7 +211,7 @@ public void Deserialize(NetDataReader reader) packet.Data.DestroyedBodyPart.HealthMaximum = reader.GetFloat(); break; } - case GStruct358.ESyncType.HealthRates: + case NetworkHealthSyncStruct.ESyncType.HealthRates: { packet.Data.HealthRates = new() { @@ -224,7 +224,7 @@ public void Deserialize(NetDataReader reader) }; break; } - case GStruct358.ESyncType.HealerDone: + case NetworkHealthSyncStruct.ESyncType.HealerDone: { packet.Data.HealerDone = new() { @@ -232,7 +232,7 @@ public void Deserialize(NetDataReader reader) }; break; } - case GStruct358.ESyncType.BurnEyes: + case NetworkHealthSyncStruct.ESyncType.BurnEyes: { packet.Data.BurnEyes = new() { @@ -242,7 +242,7 @@ public void Deserialize(NetDataReader reader) }; break; } - case GStruct358.ESyncType.Poison: + case NetworkHealthSyncStruct.ESyncType.Poison: { packet.Data.Poison = new() { @@ -250,7 +250,7 @@ public void Deserialize(NetDataReader reader) }; break; } - case GStruct358.ESyncType.StaminaCoeff: + case NetworkHealthSyncStruct.ESyncType.StaminaCoeff: { packet.Data.StaminaCoeff = new() { @@ -266,11 +266,11 @@ public void Deserialize(NetDataReader reader) public void Serialize(NetDataWriter writer) { writer.Put(NetId); - GStruct358.GStruct377 packet = Packet.Data; + NetworkHealthSyncStruct.GStruct377 packet = Packet.Data; writer.Put((byte)Packet.SyncType); switch (Packet.SyncType) { - case GStruct358.ESyncType.AddEffect: + case NetworkHealthSyncStruct.ESyncType.AddEffect: { writer.Put(packet.AddEffect.EffectId); writer.Put(packet.AddEffect.Type); @@ -283,15 +283,15 @@ public void Serialize(NetDataWriter writer) writer.Put((byte)packet.AddEffect.ExtraDataType); switch (packet.AddEffect.ExtraDataType) { - case GStruct358.GStruct359.EExtraDataType.None: + case NetworkHealthSyncStruct.GStruct359.EExtraDataType.None: break; - case GStruct358.GStruct359.EExtraDataType.MedEffect: + case NetworkHealthSyncStruct.GStruct359.EExtraDataType.MedEffect: { writer.Put(packet.AddEffect.ExtraData.MedEffect.ItemId); writer.Put(packet.AddEffect.ExtraData.MedEffect.Amount); break; } - case GStruct358.GStruct359.EExtraDataType.Stimulator: + case NetworkHealthSyncStruct.GStruct359.EExtraDataType.Stimulator: { writer.Put(packet.AddEffect.ExtraData.Stimulator.BuffsName); break; @@ -299,36 +299,36 @@ public void Serialize(NetDataWriter writer) } break; } - case GStruct358.ESyncType.RemoveEffect: + case NetworkHealthSyncStruct.ESyncType.RemoveEffect: { writer.Put(packet.RemoveEffect.EffectId); break; } - case GStruct358.ESyncType.EffectNextState: + case NetworkHealthSyncStruct.ESyncType.EffectNextState: { writer.Put(packet.EffectNextState.EffectId); writer.Put(packet.EffectNextState.StateTime); break; } - case GStruct358.ESyncType.EffectStateTime: + case NetworkHealthSyncStruct.ESyncType.EffectStateTime: { writer.Put(packet.EffectStateTime.EffectId); writer.Put(packet.EffectStateTime.RemainingStateTime); break; } - case GStruct358.ESyncType.EffectStrength: + case NetworkHealthSyncStruct.ESyncType.EffectStrength: { writer.Put(packet.EffectStrength.EffectId); writer.Put(packet.EffectStrength.Strength); break; } - case GStruct358.ESyncType.EffectMedResource: + case NetworkHealthSyncStruct.ESyncType.EffectMedResource: { writer.Put(packet.EffectMedResource.EffectId); writer.Put(packet.EffectMedResource.Resource); break; } - case GStruct358.ESyncType.EffectStimulatorBuff: + case NetworkHealthSyncStruct.ESyncType.EffectStimulatorBuff: { writer.Put(packet.EffectStimulatorBuff.EffectId); writer.Put(packet.EffectStimulatorBuff.BuffIndex); @@ -342,7 +342,7 @@ public void Serialize(NetDataWriter writer) } break; } - case GStruct358.ESyncType.IsAlive: + case NetworkHealthSyncStruct.ESyncType.IsAlive: { writer.Put(packet.IsAlive.IsAlive); if (!packet.IsAlive.IsAlive) @@ -357,40 +357,40 @@ public void Serialize(NetDataWriter writer) } break; } - case GStruct358.ESyncType.BodyHealth: + case NetworkHealthSyncStruct.ESyncType.BodyHealth: { writer.Put((byte)packet.BodyHealth.BodyPart); writer.Put(packet.BodyHealth.Value); break; } - case GStruct358.ESyncType.Energy: + case NetworkHealthSyncStruct.ESyncType.Energy: { writer.Put(packet.Energy.Value); break; } - case GStruct358.ESyncType.Hydration: + case NetworkHealthSyncStruct.ESyncType.Hydration: { writer.Put(packet.Hydration.Value); break; } - case GStruct358.ESyncType.Temperature: + case NetworkHealthSyncStruct.ESyncType.Temperature: { writer.Put(packet.Temperature.Value); break; } - case GStruct358.ESyncType.DamageCoeff: + case NetworkHealthSyncStruct.ESyncType.DamageCoeff: { writer.Put(packet.DamageCoeff.DamageCoeff); break; } - case GStruct358.ESyncType.ApplyDamage: + case NetworkHealthSyncStruct.ESyncType.ApplyDamage: { writer.Put((byte)packet.ApplyDamage.BodyPart); writer.Put(packet.ApplyDamage.Damage); writer.Put((int)packet.ApplyDamage.DamageType); break; } - case GStruct358.ESyncType.DestroyedBodyPart: + case NetworkHealthSyncStruct.ESyncType.DestroyedBodyPart: { writer.Put((byte)packet.DestroyedBodyPart.BodyPart); writer.Put(packet.DestroyedBodyPart.IsDestroyed); @@ -402,7 +402,7 @@ public void Serialize(NetDataWriter writer) writer.Put(packet.DestroyedBodyPart.HealthMaximum); break; } - case GStruct358.ESyncType.HealthRates: + case NetworkHealthSyncStruct.ESyncType.HealthRates: { writer.Put(packet.HealthRates.HealRate); writer.Put(packet.HealthRates.DamageRate); @@ -412,24 +412,24 @@ public void Serialize(NetDataWriter writer) writer.Put(packet.HealthRates.Temperature); break; } - case GStruct358.ESyncType.HealerDone: + case NetworkHealthSyncStruct.ESyncType.HealerDone: { writer.Put(packet.HealerDone.EffectId); break; } - case GStruct358.ESyncType.BurnEyes: + case NetworkHealthSyncStruct.ESyncType.BurnEyes: { writer.Put(packet.BurnEyes.Position); writer.Put(packet.BurnEyes.DistanceStrength); writer.Put(packet.BurnEyes.NormalTime); break; } - case GStruct358.ESyncType.Poison: + case NetworkHealthSyncStruct.ESyncType.Poison: { writer.Put(packet.Poison.Value); break; } - case GStruct358.ESyncType.StaminaCoeff: + case NetworkHealthSyncStruct.ESyncType.StaminaCoeff: { writer.Put(packet.StaminaCoeff.StaminaCoeff); break;