Merge pull request #77 from acidlabsdev/main

fix(misc): several bug fixes & improvements

Author: xesdoog

SSV2/includes/classes/CEntity.lua

@@ -63,6 +63,11 @@ function CEntity:IsValid()
 	return self.m_ptr and self.m_ptr:is_valid()
 end
 
+---@return uint64_t
+function CEntity:GetAddress()
+	return self.m_ptr:get_address()
+end
+
 ---@return eModelType
 function CEntity:GetModelType()
 	if not self:IsValid() then

SSV2/includes/classes/CVehicle.lua

@@ -48,6 +48,8 @@ local SubHandlingCtorMap <const> = {
 ---@field public m_current_gear pointer<int16_t>
 ---@field public m_top_gear pointer<int8_t>
 ---@field public m_engine_health pointer<float>
+---@field public m_steering_input pointer<float> // 0xD4 name might not correctly reflect what this actually is but this seems to store controller input (value is between 0.99 (left) .. -0.99 (right))
+---@field public m_current_steering pointer<float> 0xDC // actual wheel steer. Wr'll use it to rewrite last known wheel steer after exiting a vehicle in IV-Style Exit so we'll no longer need to teleport outside or patch CTaskVehicleExit
 ---@field public m_is_targetable pointer<byte> `bool`
 ---@field public m_door_lock_status pointer<uint32_t>
 ---@field public m_model_info_flags pointer<uint32_t>
@@ -72,6 +74,7 @@ local SubHandlingCtorMap <const> = {
 ---@field public m_deform_mult pointer<float>
 ---@field public m_wheel_scale pointer<float>
 ---@field public m_wheel_scale_rear pointer<float>
+---@field public m_throttle pointer<float> // 0x8D8
 ---@field public m_wheels atArray<CWheel> -- 0xC30
 ---@field public m_num_wheels number -- 0xC38
 ---@field public m_ride_height pointer<float>
@@ -106,11 +109,13 @@ function CVehicle:init(vehicle)
 	instance.m_deform_god                   = ptr:add(0x096C)
 	instance.m_is_targetable                = ptr:add(0x0AEE)
 	instance.m_door_lock_status             = ptr:add(0x13D0)
-	instance.m_water_damage                 = ptr:add(0xD8)
+	instance.m_water_damage                 = ptr:add(0x00D8)
 	instance.m_next_gear                    = ptr:add(0x0880)
 	instance.m_current_gear                 = ptr:add(0x0882)
 	instance.m_top_gear                     = ptr:add(0x0886)
 	instance.m_engine_health                = ptr:add(0x0910)
+	instance.m_steering_input               = ptr:add(0x09D4)
+	instance.m_current_steering             = ptr:add(0x09DC)
 	instance.m_model_info_flags             = instance.m_model_info:add(0x057C)
 	instance.m_mass                         = instance.m_handling_data:add(0x000C)
 	instance.m_initial_drag_coeff           = instance.m_handling_data:add(0x0010)
@@ -133,9 +138,10 @@ function CVehicle:init(vehicle)
 	instance.m_damage_flags                 = instance.m_handling_data:add(0x012C)
 	instance.m_wheel_scale                  = instance.m_model_info:add(0x048C)
 	instance.m_wheel_scale_rear             = instance.m_model_info:add(0x0490)
-	instance.m_wheels                       = atArray(ptr:add(0xC30), CWheel)
-	instance.m_num_wheels                   = ptr:add(0xC38):get_int()
-	instance.m_ride_height                  = ptr:add(0xC30):deref():add(0x07C)
+	instance.m_throttle                     = instance.m_model_info:add(0x08D8)
+	instance.m_wheels                       = atArray(ptr:add(0x0C30), CWheel)
+	instance.m_num_wheels                   = ptr:add(0x0C38):get_int()
+	instance.m_ride_height                  = ptr:add(0x0C30):deref():add(0x07C)
 
 	return instance
 end
@@ -429,8 +435,28 @@ function CVehicle:IsWheelBrokenOff(wheelIndex)
 		return false
 	end
 
-	-- Thanks tupoy-ya
-	return (self.m_ptr:add(0xA98):get_dword() >> (wheelIndex & 0x1F) & 1) ~= 0
+	-- -- Thanks tupoy-ya
+	-- return (self.m_ptr:add(0xA98):get_dword() >> (wheelIndex & 0x1F) & 1) ~= 0
+
+	local cwheel = self:GetWheel(wheelIndex)
+	if (not cwheel) then
+		return false
+	end
+
+	return cwheel:GetDynamicFlag(Enums.eWheelDynamicFlags.BROKEN_OFF)
+end
+
+---@return CWheel?
+function CVehicle:GetWheel(index)
+	if (not self:IsValid()) then
+		return
+	end
+
+	if (index > self.m_wheels:Size()) then
+		return
+	end
+
+	return CWheel(self.m_wheels:Get(index))
 end
 
 ---@param refresh? boolean

SSV2/includes/classes/CWheel.lua

@@ -1,7 +1,7 @@
 ---@diagnostic disable: param-type-mismatch
 
----@enum eWheelFlags
-Enums.eWheelFlags = {
+---@enum eWheelDynamicFlags
+Enums.eWheelDynamicFlags = {
 	HIT                       = 0,
 	HIT_PREV                  = 1,
 	ON_GAS                    = 2,
@@ -89,30 +89,30 @@ Enums.eWheelConfigFlags = {
 ---@field m_suspension_length pointer<float> //0x110
 ---@field m_max_suspension_travel pointer<float> //0x114
 ---@field m_suspension_forward_offset pointer<float> //0x13C // prefer this to raise/lower individual wheels
----@field m_suspension_compression pointer<float> // 0x164 `radians`
----@field m_suspension_compression_2 pointer<float> // 0x168 `radians`
+---@field m_suspension_compression pointer<float> // 0x164
+---@field m_suspension_compression_2 pointer<float> // 0x168
 ---@field m_wheel_compression pointer<float> // 0x16C
 ---@field m_rotation_speed pointer // 0x170
 ---@field m_unk0190 pointer // ?? 0x190
 ---@field m_unk0194 pointer // ?? 0x194
 ---@field m_tire_drag_coeff pointer<float> // 0x198
 ---@field m_top_speed_mult pointer<float> // 0x19C
----@field m_steering_angle pointer<float> // 0x1CC `radians`
+---@field m_steering_angle pointer<float> // 0x1CC
 ---@field m_brake_force pointer<float> // 0x1D0
 ---@field m_drive_force pointer<float> // 0x1D4
 ---@field m_suspension_health pointer<float> // 0x1E8 // 100.0f: car gets slammed (old method of shooting your suspension to stance your car) // 0.0f: wheel should fall off but doesn't. Something else must be set to trigger wheel detachment
 ---@field m_tyre_health pointer<float> // 0x1EC // <= 500.0f: flat tyre // 0.0f: no tyre
 ---@field m_tyre_wear_mult pointer<float> // 0x1F0 // 0.0f: tyres won't burst from long burnout
 ---@field m_tyre_wear_unk pointer<float> // 0x1F8 // similar?
----@field m_wheel_flags pointer<eWheelFlags> // 0x200
+---@field m_wheel_flags pointer<eWheelDynamicFlags> // 0x200
 ---@field m_wheel_config_flags pointer<eWheelConfigFlags> // 0x204
 ---@field m_unk_u16 pointer<uint16_t> // 0x208
 ---@field m_unk_u8 pointer<uint8_t> // 0x20A
 ---@field m_tyre_is_burst pointer<bool> // 0x20B
 ---@field m_unk_byte pointer<byte> // 0x20C
----@field m_has_hydraulics pointer<bool> // 0x20D // true for cars with DUNK mod
+---@field m_has_hydraulics pointer<bool> // 0x20D // true for cars with DONK mod
 ---@overload fun(addr: pointer): CWheel|nil
-local CWheel = { m_size = 0x1FC }
+local CWheel = { m_size = 0x20E }
 CWheel.__index = CWheel
 CWheel.__type = "CWheel"
 setmetatable(CWheel, {
@@ -233,9 +233,9 @@ function CWheel:GetTiltAngle()
 	return math.deg(math.acos(dot / mag))
 end
 
----@param flag eWheelFlags
+---@param flag eWheelDynamicFlags
 ---@return boolean
-function CWheel:GetWheelFlag(flag)
+function CWheel:GetDynamicFlag(flag)
 	if (not self:IsValid()) then
 		return false
 	end
@@ -253,9 +253,9 @@ function CWheel:GetConfigFlag(flag)
 	return Bit.is_set(self.m_wheel_config_flags:get_dword(), flag)
 end
 
----@param flag eWheelFlags
+---@param flag eWheelDynamicFlags
 ---@param toggle boolean
-function CWheel:SetWheelFlag(flag, toggle)
+function CWheel:SetDynamicFlag(flag, toggle)
 	if (not self:IsValid()) then
 		return
 	end

SSV2/includes/data/pointers.lua

@@ -1,8 +1,8 @@
 PatternScanner = require("includes.services.PatternScanner"):init()
 
---- A place to store callable naems returned from `memory.dynamic_call`
----@class DynamicFuncNames
----@field dfn_IsVehicleWheelBrokenOff? string
+--- A place to store functions returned from `memory.dynamic_call`
+---@class DynamicFuncs
+---@field BreakOffVehicleWheel? fun(pVehicleDamage: pointer<CVehicleDamage>, wheelIdx: integer, ptfxChance: float, deleteChance: float, burstChance: float, setOnFire: bool, isNetwork: bool)
 
 -- ### A place to store pointers globally.
 --
@@ -19,20 +19,18 @@ PatternScanner = require("includes.services.PatternScanner"):init()
 ---@field GameTime pointer<uint32_t>
 ---@field GameVersion { _build: string, _online: string }
 ---@field ScreenResolution vec2
----@field IsVehicleWheelBrokenOff pointer<function>
----@field DynamicFuncNames DynamicFuncNames
+---@field DynamicFuncs DynamicFuncs
 local GPointers = {
-	Init                    = function() PatternScanner:Scan() end,
-	Retry                   = function() PatternScanner:RetryScan() end,
-	ScriptGlobals           = nullptr,
-	GameState               = nullptr,
-	GameTime                = nullptr,
-	IsVehicleWheelBrokenOff = nullptr,
-	GameVersion             = { _build = "nil", _online = "nil" },
-	ScreenResolution        = vec2:zero(),
+	Init             = function() PatternScanner:Scan() end,
+	Retry            = function() PatternScanner:RetryScan() end,
+	ScriptGlobals    = nullptr,
+	GameState        = nullptr,
+	GameTime         = nullptr,
+	GameVersion      = { _build = "nil", _online = "nil" },
+	ScreenResolution = vec2:zero(),
 }
 
-GPointers.DynamicFuncNames = {}
+GPointers.DynamicFuncs = {}
 
 
 ---@class MemoryBatch
@@ -98,18 +96,21 @@ local mem_batches <const> = {
 				ptr:add(0x4):rip():get_word()
 			)
 		end),
-		-- MemoryBatch.new("IsVehicleWheelBrokenOff", "E8 ? ? ? ? 48 8B CD 41 88 84 1F", function(ptr)
+
+		-- fuck my life man fuck it
+		-- MemoryBatch.new("BreakOffVehicleWheel", "F3 44 0F 11 4C 24 ? E8 ? ? ? ? EB 7A", function(ptr)
 		-- 	if ptr:is_null() then
 		-- 		return
 		-- 	end
 
-		-- 	local func_ptr = ptr:add(0x1):rip()
-		-- 	GPointers.IsVehicleWheelBrokenOff = func_ptr -- not needed for this but we'll just go ahead and store it
-		-- 	GPointers.DynamicFuncNames.dfn_IsVehicleWheelBrokenOff = memory.dynamic_call(
-		-- 		"bool",
-		-- 		{ "void*", "int" },
+		-- 	local func_ptr = ptr:add(0x7)
+		-- 	local func_name = memory.dynamic_call(
+		-- 		"void",
+		-- 		{ "void*", "uint32_t", "float", "float", "float", "bool", "bool" },
 		-- 		func_ptr
 		-- 	)
+
+		-- 	GPointers.DynamicFuncs.BreakOffVehicleWheel = _G[func_name]
 		-- end),
 	},
 	[Enums.eAPIVersion.V2] = {
@@ -148,9 +149,7 @@ local mem_batches <const> = {
 			)
 		end),
 	},
-	[Enums.eAPIVersion.L54] = {
-		-- dummy
-	},
+	[Enums.eAPIVersion.L54] = { --[[dummy]] },
 }
 
 local API_VERSON <const> = Backend:GetAPIVersion()

SSV2/includes/features/Speedometer.lua

@@ -298,7 +298,7 @@ function Speedometer:DrawImpl(ImDrawList, center, radius, current_speed, max_spe
 			local textWidth = ImGui.CalcTextSize(self._state.Manufacturer)
 			ImGui.ImDrawListAddText(
 				ImDrawList,
-				21,
+				19.5,
 				center.x - 5 - (textWidth / 2),
 				center.y - 15 - (radius / 2),
 				GVars.features.speedometer.colors.text - (math.pi * 10),

SSV2/includes/features/vehicle/drift_mode.lua

@@ -1,13 +1,14 @@
 ---@diagnostic disable: param-type-mismatch, return-type-mismatch, assign-type-mismatch
 
 local FeatureBase = require("includes.modules.FeatureBase")
+local CWheel      = require("includes.classes.CWheel")
 
 ---@class DriftMode : FeatureBase
 ---@field private m_entity PlayerVehicle -- Reference to PlayerVehicle
 ---@field private m_smoke_fx array<handle>|nil
 ---@field private m_is_active boolean
 ---@overload fun(pv: PlayerVehicle): DriftMode
-local DriftMode = setmetatable({}, FeatureBase)
+local DriftMode   = setmetatable({}, FeatureBase)
 DriftMode.__index = DriftMode
 DriftMode.fxBones = { "suspension_lr", "suspension_rr" }
 
@@ -107,7 +108,90 @@ function DriftMode:UpdateFX()
 	end
 end
 
-function DriftMode:Update()
+-- local debug_txt_scale = vec2:new(0.3, 0.3)
+-- local debug_white = Color(225, 225, 225, 255)
+-- function DriftMode:DrawDebugHUD()
+-- 	local PV = self.m_entity
+-- 	if (not PV:IsValid()) then
+-- 		return
+-- 	end
+
+-- 	local speed_vec   = PV:GetSpeedVector()
+-- 	local lateral_vel = speed_vec.x
+-- 	local forward_vel = speed_vec.y
+-- 	local absolute_x  = math.abs(lateral_vel)
+-- 	local absolute_y  = math.abs(speed_vec.y)
+-- 	local delta_x     = 0 + absolute_x
+-- 	local delta_y     = 0 + absolute_y
+-- 	local angle_rad   = math.atan(delta_y, delta_x)
+-- 	local angle_deg   = math.deg(angle_rad)
+-- 	local wheels      = PV:Resolve().m_wheels
+
+-- 	Game.DrawText(
+-- 		vec2:new(0.8, 0.35),
+-- 		_F("Raw Lateral Velocity: %.3f", lateral_vel),
+-- 		debug_white,
+-- 		debug_txt_scale,
+-- 		4
+-- 	)
+-- 	Game.DrawText(
+-- 		vec2:new(0.8, 0.37),
+-- 		_F("Angle: %.0f°", angle_deg),
+-- 		debug_white,
+-- 		debug_txt_scale,
+-- 		4
+-- 	)
+
+-- 	Game.DrawText(
+-- 		vec2:new(0.8, 0.39),
+-- 		_F("Forward Velocity: %.3f", forward_vel),
+-- 		debug_white,
+-- 		debug_txt_scale,
+-- 		4
+-- 	)
+
+-- 	for i, wheel in wheels:Iter() do
+-- 		local cwheel = CWheel(wheel)
+-- 		if (not cwheel) then
+-- 			goto continue
+-- 		end
+
+-- 		local wheel_pwr       = cwheel.m_drive_force:get_float()
+-- 		local brk_pwr         = cwheel.m_brake_force:get_float()
+-- 		local drag_co         = cwheel.m_tire_drag_coeff:get_float()
+-- 		local rot_spd         = cwheel.m_rotation_speed:get_float()
+-- 		local top_spd_mult    = cwheel.m_top_speed_mult:get_float()
+-- 		local is_full_thottle = cwheel:GetWheelFlag(Enums.eWheelFlags.FULL_THROTTLE)
+-- 		local is_cheat_tc     = cwheel:GetWheelFlag(Enums.eWheelFlags.CHEAT_TC)
+-- 		local is_cheat_sc     = cwheel:GetWheelFlag(Enums.eWheelFlags.CHEAT_SC)
+-- 		local is_driven       = cwheel:GetConfigFlag(Enums.eWheelConfigFlags.POWERED)
+-- 		local wheel_txt       = _F(
+-- 			"- %d: Power: %.3f | Brake: %.3f | Drag: %.3f | Rotation: %.3f | Speed Mult: %.3f",
+-- 			i,
+-- 			wheel_pwr,
+-- 			brk_pwr,
+-- 			drag_co,
+-- 			rot_spd,
+-- 			top_spd_mult
+-- 		)
+
+-- 		Game.DrawText(
+-- 			vec2:new(0.7, 0.4 + (i * 0.02)),
+-- 			wheel_txt,
+-- 			debug_white,
+-- 			debug_txt_scale,
+-- 			4
+-- 		)
+
+-- 		::continue::
+-- 	end
+
+-- 	if (angle_deg <= 88 and PAD.IS_CONTROL_PRESSED(0, 71)) then
+-- 		VEHICLE.SET_VEHICLE_CHEAT_POWER_INCREASE(PV:GetHandle(), 10.0)
+-- 	end
+-- end
+
+function DriftMode:UpdateArcadeStyle()
 	local PV = self.m_entity
 	local handle = PV:GetHandle()
 
@@ -135,8 +219,18 @@ function DriftMode:Update()
 		VEHICLE.SET_VEHICLE_CHEAT_POWER_INCREASE(handle, 1.0)
 		self.m_is_active = false
 	end
+end
+
+function DriftMode:Update()
+	if (GVars.features.vehicle.drift.mode < 3) then
+		self:UpdateArcadeStyle()
+	end
 
 	self:UpdateFX()
+
+	-- if (Backend.debug_mode) then
+	-- 	self:DrawDebugHUD()
+	-- end
 end
 
 return DriftMode