Merge pull request #57 from ByteCorum/WIP

Offsets up to date

.gitattributes

@@ -65,3 +65,4 @@ CMakeLists.txt linguist-documentation=false
 
 DragonBurn/Resources/*		    linguist-vendored
 DragonBurn/Utils/yaml-cpp/*		linguist-vendored
+DragonBurn/OffsetsList/*        linguist-vendored

DragonBurn/Bone.h

@@ -40,9 +40,9 @@ class CBone
 {
 private:
 	DWORD64 EntityPawnAddress = 0;
+
 public:
 	std::vector<BoneJointPos> BonePosList;
-
 	bool UpdateAllBoneData(const DWORD64& EntityPawnAddress);
 };
 

DragonBurn/Offsets.h

@@ -1,101 +1,106 @@
 #pragma once
 #include <Windows.h>
 #include "Utils/ProcessManager.hpp"
+#include "OffsetsList/Offsets.hpp"
+
+namespace dll = cs2_dumper::schemas::client_dll;
 
 namespace Offset
 {
 	inline long long CS2ver = 8926190;
-	inline DWORD EntityList = 26882856;
-	inline DWORD Matrix = 27284176;
-	inline DWORD ViewAngle = 27337880;
-	inline DWORD LocalPlayerController = 27210392;
-	inline DWORD LocalPlayerPawn = 25221912;
-	inline DWORD GlobalVars = 25172976;
-	inline DWORD PlantedC4 = 27304952;
-	inline DWORD InputSystem = 231376;
-	inline DWORD Sensitivity = 27269560;
+
+	//https://github.com/a2x/cs2-dumper/blob/main/output/offsets.json
+	inline DWORD EntityList = 26882856;				//dwEntityList
+	inline DWORD Matrix = 27284176;					//dwViewMatrix
+	inline DWORD ViewAngle = 27337880;				//dwViewAngles
+	inline DWORD LocalPlayerController = 27210392;	//dwLocalPlayerController
+	inline DWORD LocalPlayerPawn = 25221912;		//dwLocalPlayerPawn
+	inline DWORD GlobalVars = 25172976;				//dwGlobalVars
+	inline DWORD PlantedC4 = 27304952;				//dwPlantedC4
+	inline DWORD InputSystem = 231376;				//dwInputSystem
+	inline DWORD Sensitivity = 27269560;			//dwSensitivity
 
 	struct
 	{
-		DWORD IsAlive = 0x7EC;
-		DWORD PlayerPawn = 0x7E4;
-		DWORD iszPlayerName = 0x638;
+		DWORD IsAlive =				dll::CCSPlayerController::m_bPawnIsAlive;
+		DWORD PlayerPawn =			dll::CCSPlayerController::m_hPlayerPawn;
+		DWORD iszPlayerName =		dll::CBasePlayerController::m_iszPlayerName;
 	}Entity;
 
 	struct
 	{
-		DWORD BulletServices = 0x1470;
-		DWORD CameraServices = 0x1138;
-		DWORD pClippingWeapon = 0x12F8;
+		DWORD BulletServices =		dll::C_CSPlayerPawn::m_pBulletServices;
+		DWORD CameraServices =		dll::C_BasePlayerPawn::m_pCameraServices;
+		DWORD pClippingWeapon =		dll::C_CSPlayerPawnBase::m_pClippingWeapon;
 
-		DWORD isScoped = 0x2290;
-		DWORD isDefusing = 0x2292;
-		DWORD TotalHit = 0x40;
-		DWORD Pos = 0x127C;
-		DWORD CurrentArmor = 0x22C0;
-		DWORD MaxHealth = 0x330;
-		DWORD CurrentHealth = 0x334;
-		DWORD GameSceneNode = 0x318;
-		DWORD BoneArray = 0x160 + 0x80;
-		DWORD angEyeAngles = 0x1390;
-		DWORD vecLastClipCameraPos = 0x12DC;
-		DWORD iShotsFired = 0x22A4;
-		DWORD flFlashDuration = 0x1364;
-		DWORD aimPunchAngle = 0x14D4;
-		DWORD aimPunchCache = 0x14F8;
-		DWORD iIDEntIndex = 0x13B0;
-		DWORD iTeamNum = 0x3CB;
-		DWORD iFovStart = 0x214;
-		DWORD fFlags = 0x3D4;
-		DWORD bSpottedByMask = 0x2278 + 0xC;
-		DWORD AbsVelocity = 0x3D8;
+		DWORD isScoped =			dll::C_CSPlayerPawn::m_bIsScoped;
+		DWORD isDefusing =			dll::C_CSPlayerPawn::m_bIsDefusing;
+		DWORD TotalHit =			dll::CCSPlayer_BulletServices::m_totalHitsOnServer;
+		DWORD Pos =					dll::C_BasePlayerPawn::m_vOldOrigin;
+		DWORD CurrentArmor =		dll::C_CSPlayerPawn::m_ArmorValue;
+		DWORD MaxHealth =			dll::C_BaseEntity::m_iMaxHealth;
+		DWORD CurrentHealth =		dll::C_BaseEntity::m_iHealth;
+		DWORD GameSceneNode =		dll::C_BaseEntity::m_pGameSceneNode;
+		DWORD BoneArray =			0x1F0;
+		DWORD angEyeAngles =		dll::C_CSPlayerPawnBase::m_angEyeAngles;
+		DWORD vecLastClipCameraPos= dll::C_CSPlayerPawnBase::m_vecLastClipCameraPos;
+		DWORD iShotsFired =			dll::C_CSPlayerPawn::m_iShotsFired;
+		DWORD flFlashDuration =		dll::C_CSPlayerPawnBase::m_flFlashDuration;
+		DWORD aimPunchAngle =		dll::C_CSPlayerPawn::m_aimPunchAngle;
+		DWORD aimPunchCache =		dll::C_CSPlayerPawn::m_aimPunchCache;
+		DWORD iIDEntIndex =			dll::C_CSPlayerPawnBase::m_iIDEntIndex;
+		DWORD iTeamNum =			dll::C_BaseEntity::m_iTeamNum;
+		DWORD iFovStart =			dll::CCSPlayerBase_CameraServices::m_iFOVStart;
+		DWORD fFlags =				dll::C_BaseEntity::m_fFlags;
+		DWORD bSpottedByMask =		dll::C_CSPlayerPawn::m_entitySpottedState + dll::EntitySpottedState_t::m_bSpottedByMask;
+		DWORD AbsVelocity =			dll::C_BaseEntity::m_vecAbsVelocity;
 	} Pawn;
 
 	struct
 	{
-		DWORD RealTime = 0x00;
-		DWORD FrameCount = 0x04;
-		DWORD MaxClients = 0x10;
-		DWORD IntervalPerTick = 0x14;
-		DWORD CurrentTime = 0x2C;
-		DWORD CurrentTime2 = 0x30;
-		DWORD TickCount = 0x40;
-		DWORD IntervalPerTick2 = 0x44;
-		DWORD CurrentNetchan = 0x0048;
-		DWORD CurrentMap = 0x0180;
-		DWORD CurrentMapName = 0x0188;
+		DWORD RealTime =			0x00;
+		DWORD FrameCount =			0x04;
+		DWORD MaxClients =			0x10;
+		DWORD IntervalPerTick =		0x14;
+		DWORD CurrentTime =			0x2C;
+		DWORD CurrentTime2 =		0x30;
+		DWORD TickCount =			0x40;
+		DWORD IntervalPerTick2 =	0x44;
+		DWORD CurrentNetchan =		0x0048;
+		DWORD CurrentMap =			0x0180;
+		DWORD CurrentMapName =		0x0188;
 	} GlobalVar;
 
 	struct
 	{
-		DWORD m_hPawn = 0x604;
-		DWORD m_pObserverServices = 0x1118;
-		DWORD m_hObserverTarget = 0x44;
-		DWORD m_hController = 0x1294;
-		DWORD PawnArmor = 0x7F4;
-		DWORD HasDefuser = 0x7F8;
-		DWORD HasHelmet = 0x7F9;
+		DWORD m_hPawn =				dll::CBasePlayerController::m_hPawn;
+		DWORD m_pObserverServices = dll::C_BasePlayerPawn::m_pObserverServices;
+		DWORD m_hObserverTarget =	dll::CPlayer_ObserverServices::m_hObserverTarget;
+		DWORD m_hController =		dll::C_BasePlayerPawn::m_hController;
+		DWORD PawnArmor =			dll::CCSPlayerController::m_iPawnArmor;
+		DWORD HasDefuser =			dll::CCSPlayerController::m_bPawnHasDefuser;
+		DWORD HasHelmet =			dll::CCSPlayerController::m_bPawnHasHelmet;
 	} PlayerController;
 
 	struct
 	{
-		DWORD AttributeManager = 0x1098;		
+		DWORD AttributeManager =	dll::C_EconEntity::m_AttributeManager;
 	} EconEntity;
 
 	struct
 	{
-		DWORD WeaponDataPTR = 0x368;
-		DWORD szName = 0xC20;
-		DWORD Clip1 = 0x15C8;	
-		DWORD MaxClip = 0x1FC;	
-		DWORD Item = 0x50;	
-		DWORD ItemDefinitionIndex = 0x1BA;
+		DWORD WeaponDataPTR =		0x360;
+		DWORD szName =				dll::CCSWeaponBaseVData::m_szName;
+		DWORD Clip1 =				dll::C_BasePlayerWeapon::m_iClip1;
+		DWORD MaxClip =				dll::CBasePlayerWeaponVData::m_iMaxClip1;
+		DWORD Item =				dll::C_AttributeContainer::m_Item;
+		DWORD ItemDefinitionIndex = dll::C_EconItemView::m_iItemDefinitionIndex;
 	} WeaponBaseData;
 
 	struct
 	{
-		DWORD m_bBeingDefused = 0xF14;
-		DWORD m_flDefuseCountDown = 0xF28;
-		DWORD m_nBombSite = 0xEDC;
+		DWORD m_bBeingDefused =		dll::C_PlantedC4::m_bBeingDefused;
+		DWORD m_flDefuseCountDown = dll::C_PlantedC4::m_flDefuseCountDown;
+		DWORD m_nBombSite =			dll::C_PlantedC4::m_nBombSite;
 	} C4;
 }