diff --git a/config.json b/config.json index db00b2d..657d6e9 100644 --- a/config.json +++ b/config.json @@ -1,7 +1,7 @@ { "signatures": [ { - "name": "entityList", + "name": "dwEntityList", "module": "client.dll", "pattern": "48 8B 0D ? ? ? ? 48 89 7C 24 ? 8B FA C1 EB", "operations": [ @@ -11,7 +11,91 @@ ] }, { - "name": "globalVars", + "name": "dwForceBackward", + "module": "client.dll", + "pattern": "48 8B 05 ? ? ? ? 4C 8D 1D", + "operations": [ + { + "type": "ripRelative" + }, + { + "type": "add", + "value": 48 + } + ] + }, + { + "name": "dwForceCrouch", + "module": "client.dll", + "pattern": "48 8B 05 ? ? ? ? 4C 8D 3D ? ? ? ? 48 89 45", + "operations": [ + { + "type": "ripRelative" + }, + { + "type": "add", + "value": 48 + } + ] + }, + { + "name": "dwForceForward", + "module": "client.dll", + "pattern": "48 8B 05 ? ? ? ? 4C 8D 0D ? ? ? ? 48 89 45", + "operations": [ + { + "type": "ripRelative" + }, + { + "type": "add", + "value": 48 + } + ] + }, + { + "name": "dwForceJump", + "module": "client.dll", + "pattern": "48 8B 05 ? ? ? ? 48 8D 1D ? ? ? ? 48 89 45", + "operations": [ + { + "type": "ripRelative" + }, + { + "type": "add", + "value": 48 + } + ] + }, + { + "name": "dwForceLeft", + "module": "client.dll", + "pattern": "48 8B 05 ? ? ? ? 48 8D 0D ? ? ? ? 44 8B 15", + "operations": [ + { + "type": "ripRelative" + }, + { + "type": "add", + "value": 48 + } + ] + }, + { + "name": "dwForceRight", + "module": "client.dll", + "pattern": "48 8B 05 ? ? ? ? 48 8D 15 ? ? ? ? 48 89 45", + "operations": [ + { + "type": "ripRelative" + }, + { + "type": "add", + "value": 48 + } + ] + }, + { + "name": "dwGlobalVars", "module": "client.dll", "pattern": "48 89 0D ? ? ? ? 48 89 41", "operations": [ @@ -21,7 +105,7 @@ ] }, { - "name": "interfaceLinkList", + "name": "dwInterfaceLinkList", "module": "client.dll", "pattern": "4C 8B 0D ? ? ? ? 4C 8B D2 4C 8B D9", "operations": [ @@ -31,7 +115,7 @@ ] }, { - "name": "localPlayerController", + "name": "dwLocalPlayerController", "module": "client.dll", "pattern": "48 8B 05 ? ? ? ? 48 85 C0 74 4F", "operations": [ @@ -41,7 +125,7 @@ ] }, { - "name": "localPlayerPawn", + "name": "dwLocalPlayerPawn", "module": "client.dll", "pattern": "48 8D 05 ? ? ? ? C3 CC CC CC CC CC CC CC CC 48 83 EC ? 8B 0D", "operations": [ @@ -55,7 +139,7 @@ ] }, { - "name": "networkGameClient", + "name": "dwNetworkGameClient", "module": "engine2.dll", "pattern": "48 89 3D ? ? ? ? 48 8D 15", "operations": [ @@ -65,7 +149,7 @@ ] }, { - "name": "networkGameClient_maxClients", + "name": "dwNetworkGameClient_maxClients", "module": "engine2.dll", "pattern": "8B 81 ? ? ? ? C3 CC CC CC CC CC CC CC CC CC 48 8D 81", "operations": [ @@ -76,7 +160,7 @@ ] }, { - "name": "networkGameClient_signOnState", + "name": "dwNetworkGameClient_signOnState", "module": "engine2.dll", "pattern": "44 8B 81 ? ? ? ? 48 8D 0D", "operations": [ @@ -87,7 +171,7 @@ ] }, { - "name": "plantedC4", + "name": "dwPlantedC4", "module": "client.dll", "pattern": "48 89 05 ? ? ? ? 8B 05 ? ? ? ? A9 ? ? ? ? 74 ? 25 ? ? ? ? 89 05 ? ? ? ? 8B 0D", "operations": [ @@ -97,7 +181,7 @@ ] }, { - "name": "viewAngles", + "name": "dwViewAngles", "module": "client.dll", "pattern": "48 8B 0D ? ? ? ? 48 8B 01 48 FF 60 30", "operations": [ @@ -114,7 +198,7 @@ ] }, { - "name": "viewMatrix", + "name": "dwViewMatrix", "module": "client.dll", "pattern": "48 8D 0D ? ? ? ? 48 C1 E0 06", "operations": [ diff --git a/generated/offsets.cs b/generated/offsets.cs index 3958cc5..71a02f7 100644 --- a/generated/offsets.cs +++ b/generated/offsets.cs @@ -1,16 +1,22 @@ public static class client_dll { - public const nint entityList = 0x178B898; - public const nint globalVars = 0x168ECE8; - public const nint interfaceLinkList = 0x1971A58; - public const nint localPlayerController = 0x17DA118; - public const nint localPlayerPawn = 0x1878C08; - public const nint plantedC4 = 0x187E9A0; - public const nint viewAngles = 0x18D85B0; - public const nint viewMatrix = 0x18796F0; + public const nint dwEntityList = 0x178B898; + public const nint dwForceBackward = 0x1692EC0; + public const nint dwForceCrouch = 0x1693190; + public const nint dwForceForward = 0x1692E30; + public const nint dwForceJump = 0x1693100; + public const nint dwForceLeft = 0x1692F50; + public const nint dwForceRight = 0x1692FE0; + public const nint dwGlobalVars = 0x168ECE8; + public const nint dwInterfaceLinkList = 0x1971A58; + public const nint dwLocalPlayerController = 0x17DA118; + public const nint dwLocalPlayerPawn = 0x1878C08; + public const nint dwPlantedC4 = 0x187E9A0; + public const nint dwViewAngles = 0x18D85B0; + public const nint dwViewMatrix = 0x18796F0; } public static class engine2_dll { - public const nint networkGameClient = 0x48AAB0; - public const nint networkGameClient_maxClients = 0x250; - public const nint networkGameClient_signOnState = 0x240; + public const nint dwNetworkGameClient = 0x48AAB0; + public const nint dwNetworkGameClient_maxClients = 0x250; + public const nint dwNetworkGameClient_signOnState = 0x240; } \ No newline at end of file diff --git a/generated/offsets.hpp b/generated/offsets.hpp index ebb8f08..9f5b3ff 100644 --- a/generated/offsets.hpp +++ b/generated/offsets.hpp @@ -3,18 +3,24 @@ #include namespace client_dll { - constexpr std::ptrdiff_t entityList = 0x178B898; - constexpr std::ptrdiff_t globalVars = 0x168ECE8; - constexpr std::ptrdiff_t interfaceLinkList = 0x1971A58; - constexpr std::ptrdiff_t localPlayerController = 0x17DA118; - constexpr std::ptrdiff_t localPlayerPawn = 0x1878C08; - constexpr std::ptrdiff_t plantedC4 = 0x187E9A0; - constexpr std::ptrdiff_t viewAngles = 0x18D85B0; - constexpr std::ptrdiff_t viewMatrix = 0x18796F0; + constexpr std::ptrdiff_t dwEntityList = 0x178B898; + constexpr std::ptrdiff_t dwForceBackward = 0x1692EC0; + constexpr std::ptrdiff_t dwForceCrouch = 0x1693190; + constexpr std::ptrdiff_t dwForceForward = 0x1692E30; + constexpr std::ptrdiff_t dwForceJump = 0x1693100; + constexpr std::ptrdiff_t dwForceLeft = 0x1692F50; + constexpr std::ptrdiff_t dwForceRight = 0x1692FE0; + constexpr std::ptrdiff_t dwGlobalVars = 0x168ECE8; + constexpr std::ptrdiff_t dwInterfaceLinkList = 0x1971A58; + constexpr std::ptrdiff_t dwLocalPlayerController = 0x17DA118; + constexpr std::ptrdiff_t dwLocalPlayerPawn = 0x1878C08; + constexpr std::ptrdiff_t dwPlantedC4 = 0x187E9A0; + constexpr std::ptrdiff_t dwViewAngles = 0x18D85B0; + constexpr std::ptrdiff_t dwViewMatrix = 0x18796F0; } namespace engine2_dll { - constexpr std::ptrdiff_t networkGameClient = 0x48AAB0; - constexpr std::ptrdiff_t networkGameClient_maxClients = 0x250; - constexpr std::ptrdiff_t networkGameClient_signOnState = 0x240; + constexpr std::ptrdiff_t dwNetworkGameClient = 0x48AAB0; + constexpr std::ptrdiff_t dwNetworkGameClient_maxClients = 0x250; + constexpr std::ptrdiff_t dwNetworkGameClient_signOnState = 0x240; } \ No newline at end of file diff --git a/generated/offsets.json b/generated/offsets.json index fd76e4d..ec747fa 100644 --- a/generated/offsets.json +++ b/generated/offsets.json @@ -1,17 +1 @@ -{ - "client_dll": { - "entityList": 24688792, - "globalVars": 23653608, - "interfaceLinkList": 26679896, - "localPlayerController": 25010456, - "localPlayerPawn": 25660424, - "plantedC4": 25684384, - "viewAngles": 26052016, - "viewMatrix": 25663216 - }, - "engine2_dll": { - "networkGameClient": 4762288, - "networkGameClient_maxClients": 592, - "networkGameClient_signOnState": 576 - } -} \ No newline at end of file +null \ No newline at end of file diff --git a/generated/offsets.rs b/generated/offsets.rs index beb852b..298e481 100644 --- a/generated/offsets.rs +++ b/generated/offsets.rs @@ -1,18 +1,24 @@ #![allow(non_snake_case, non_upper_case_globals)] pub mod client_dll { - pub const entityList: usize = 0x178B898; - pub const globalVars: usize = 0x168ECE8; - pub const interfaceLinkList: usize = 0x1971A58; - pub const localPlayerController: usize = 0x17DA118; - pub const localPlayerPawn: usize = 0x1878C08; - pub const plantedC4: usize = 0x187E9A0; - pub const viewAngles: usize = 0x18D85B0; - pub const viewMatrix: usize = 0x18796F0; + pub const dwEntityList: usize = 0x178B898; + pub const dwForceBackward: usize = 0x1692EC0; + pub const dwForceCrouch: usize = 0x1693190; + pub const dwForceForward: usize = 0x1692E30; + pub const dwForceJump: usize = 0x1693100; + pub const dwForceLeft: usize = 0x1692F50; + pub const dwForceRight: usize = 0x1692FE0; + pub const dwGlobalVars: usize = 0x168ECE8; + pub const dwInterfaceLinkList: usize = 0x1971A58; + pub const dwLocalPlayerController: usize = 0x17DA118; + pub const dwLocalPlayerPawn: usize = 0x1878C08; + pub const dwPlantedC4: usize = 0x187E9A0; + pub const dwViewAngles: usize = 0x18D85B0; + pub const dwViewMatrix: usize = 0x18796F0; } pub mod engine2_dll { - pub const networkGameClient: usize = 0x48AAB0; - pub const networkGameClient_maxClients: usize = 0x250; - pub const networkGameClient_signOnState: usize = 0x240; + pub const dwNetworkGameClient: usize = 0x48AAB0; + pub const dwNetworkGameClient_maxClients: usize = 0x250; + pub const dwNetworkGameClient_signOnState: usize = 0x240; } \ No newline at end of file diff --git a/src/main.rs b/src/main.rs index 82f9e24..7c6fe7e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -19,7 +19,7 @@ mod error; mod remote; mod sdk; -#[derive(Parser, Debug)] +#[derive(Debug, Parser)] #[command(author, version, about, long_about = None)] struct Args { #[arg(long)]