diff --git a/Client/Entities/EntitiesPed.cs b/Client/Entities/EntitiesPed.cs index 14d43d8..319770c 100644 --- a/Client/Entities/EntitiesPed.cs +++ b/Client/Entities/EntitiesPed.cs @@ -12,14 +12,11 @@ using LemonUI.Elements; namespace CoopClient.Entities { /// - /// Please DO NOT CHANGE any val + /// ? /// public class EntitiesPed { - /// - /// ? - /// - public long NPCVehHandle { get; internal set; } = 0; + internal long NPCVehHandle { get; set; } = 0; /// /// 0 = Nothing /// 1 = Character @@ -27,16 +24,13 @@ namespace CoopClient.Entities /// private byte ModelNotFound = 0; private bool AllDataAvailable = false; + internal bool LastSyncWasFull { get; set; } = false; /// - /// ? - /// - public bool LastSyncWasFull { get; internal set; } = false; - /// - /// ? + /// Get the last update = TickCount64() /// public ulong LastUpdateReceived { get; internal set; } /// - /// ? + /// Get the player latency /// public float Latency { get; internal set; } @@ -45,13 +39,13 @@ namespace CoopClient.Entities /// public Ped Character { get; internal set; } /// - /// ? + /// The latest character health (may not have been applied yet) /// public int Health { get; internal set; } private int LastModelHash = 0; private int CurrentModelHash = 0; /// - /// ? + /// The latest character model hash (may not have been applied yet) /// public int ModelHash { @@ -63,79 +57,43 @@ namespace CoopClient.Entities } } private Dictionary LastProps = new Dictionary(); + internal Dictionary Props { get; set; } /// - /// ? - /// - public Dictionary Props { get; internal set; } - /// - /// ? + /// The latest character position (may not have been applied yet) /// public Vector3 Position { get; internal set; } #region -- ON FOOT -- /// - /// ? + /// The latest character rotation (may not have been applied yet) /// public Vector3 Rotation { get; internal set; } /// - /// ? + /// The latest character velocity (may not have been applied yet) /// public Vector3 Velocity { get; internal set; } - /// - /// ? - /// - public byte Speed { get; internal set; } + internal byte Speed { get; set; } private bool LastIsJumping = false; - /// - /// ? - /// - public bool IsJumping { get; internal set; } - /// - /// ? - /// - public bool IsRagdoll { get; internal set; } - /// - /// ? - /// - public bool IsOnFire { get; internal set; } - /// - /// ? - /// - public Vector3 AimCoords { get; internal set; } - /// - /// ? - /// - public bool IsAiming { get; internal set; } - /// - /// ? - /// - public bool IsShooting { get; internal set; } - /// - /// ? - /// - public bool IsReloading { get; internal set; } - /// - /// ? - /// - public int CurrentWeaponHash { get; internal set; } + internal bool IsJumping { get; set; } + internal bool IsRagdoll { get; set; } + internal bool IsOnFire { get; set; } + internal Vector3 AimCoords { get; set; } + internal bool IsAiming { get; set; } + internal bool IsShooting { get; set; } + internal bool IsReloading { get; set; } + internal int CurrentWeaponHash { get; set; } #endregion - /// - /// ? - /// - public Blip PedBlip; + internal Blip PedBlip = null; #region -- IN VEHICLE -- private ulong VehicleStopTime { get; set; } - /// - /// ? - /// - public bool IsInVehicle { get; internal set; } + internal bool IsInVehicle { get; set; } private int LastVehicleModelHash = 0; private int CurrentVehicleModelHash = 0; /// - /// ? + /// The latest vehicle model hash (may not have been applied yet) /// public int VehicleModelHash { @@ -147,106 +105,53 @@ namespace CoopClient.Entities } } private int[] LastVehicleColors = new int[] { 0, 0 }; - /// - /// ? - /// - public int[] VehicleColors { get; internal set; } + internal int[] VehicleColors { get; set; } private Dictionary LastVehicleMods = new Dictionary(); - /// - /// ? - /// - public Dictionary VehicleMods { get; internal set; } - /// - /// ? - /// - public bool VehicleDead { get; internal set; } - /// - /// ? - /// - public float VehicleEngineHealth { get; internal set; } - /// - /// ? - /// - public int VehicleSeatIndex { get; internal set; } + internal Dictionary VehicleMods { get; set; } + internal bool VehicleDead { get; set; } + internal float VehicleEngineHealth { get; set; } + internal int VehicleSeatIndex { get; set; } /// /// ? /// public Vehicle MainVehicle { get; internal set; } /// - /// ? + /// The latest vehicle position (may not have been applied yet) /// public Vector3 VehiclePosition { get; internal set; } /// - /// ? + /// The latest vehicle rotation (may not have been applied yet) /// public Quaternion VehicleRotation { get; internal set; } - /// - /// ? - /// - public Vector3 VehicleVelocity { get; internal set; } + internal Vector3 VehicleVelocity { get; set; } private float LastVehicleSpeed { get; set; } private float CurrentVehicleSpeed { get; set; } - /// - /// ? - /// - public float VehicleSpeed + internal float VehicleSpeed { get => CurrentVehicleSpeed; - internal set + set { LastVehicleSpeed = CurrentVehicleSpeed; CurrentVehicleSpeed = value; } } - /// - /// ? - /// - public float VehicleSteeringAngle { get; internal set; } + internal float VehicleSteeringAngle { get; set; } private int LastVehicleAim; - /// - /// ? - /// - public bool VehIsEngineRunning { get; internal set; } - /// - /// ? - /// - public float VehRPM { get; internal set; } + internal bool VehIsEngineRunning { get; set; } + internal float VehRPM { get; set; } private bool LastTransformed = false; - /// - /// ? - /// - public bool Transformed { get; internal set; } + internal bool Transformed { get; set; } private bool LastHornActive = false; - /// - /// ? - /// - public bool IsHornActive { get; internal set; } - /// - /// ? - /// - public bool VehAreLightsOn { get; internal set; } - /// - /// ? - /// - public bool VehAreHighBeamsOn { get; internal set; } - /// - /// ? - /// - public byte VehLandingGear { get; internal set; } - /// - /// ? - /// - public bool VehIsSireneActive { get; internal set; } + internal bool IsHornActive { get; set; } + internal bool VehAreLightsOn { get; set; } + internal bool VehAreHighBeamsOn { get; set; } + internal byte VehLandingGear { get; set; } + + internal bool VehIsSireneActive { get; set; } private VehicleDoors[] LastVehDoors; - /// - /// ? - /// - public VehicleDoors[] VehDoors { get; internal set; } + internal VehicleDoors[] VehDoors { get; set; } private int LastVehTires; - /// - /// ? - /// - public int VehTires { get; internal set; } + internal int VehTires { get; set; } #endregion internal void DisplayLocally(string username) diff --git a/Client/Main.cs b/Client/Main.cs index fab465d..dfde731 100644 --- a/Client/Main.cs +++ b/Client/Main.cs @@ -28,25 +28,13 @@ namespace CoopClient internal static bool NPCsAllowed = false; private static bool IsGoingToCar = false; - /// - /// Don't use it! - /// - public static Settings MainSettings = null; - /// - /// Don't use it! - /// - public static Networking MainNetworking = null; + internal static Settings MainSettings = null; + internal static Networking MainNetworking = null; #if !NON_INTERACTIVE - /// - /// Don't use it! - /// - public static MenusMain MainMenu = null; + internal static MenusMain MainMenu = null; #endif - /// - /// Don't use it! - /// - public static Chat MainChat = null; + internal static Chat MainChat = null; internal static long LocalNetHandle = 0; internal static Dictionary Players = null;