Merge pull request #138 from YimMenu-Lua/manual_gearbox_and_fixes

Manual gearbox and fixes

Author: xesdoog

SSV2/includes/backend.lua

@@ -500,7 +500,11 @@ function Backend:RegisterHandlers()
 		Translator:OnTick()
 
 		yield()
-	end)
+	end, {
+		exception_handler = function()
+			Backend:Cleanup()
+		end
+	})
 
 	ThreadManager:RegisterLooped("SS_POOLMGR", function()
 		self:PoolMgr()

SSV2/includes/classes/Set.lua

@@ -10,28 +10,25 @@
 --------------------------------------
 -- Class: Set
 --------------------------------------
----@generic T
 ---@class Set<T> : { [T]: true }
----@field protected m_data table<anyval, true>
+---@field protected m_data table<T, true>
 ---@field protected m_data_type string
----@overload fun(...): Set<...>
-Set = {}
+---@field new fun(...: T): Set<T>
+---@overload fun(...: T): Set<T>
+Set         = { __type = "Set" }
 Set.__index = Set
-Set.__type = "Set"
+
 ---@diagnostic disable-next-line: param-type-mismatch
 setmetatable(Set, {
 	__call = function(_, ...)
 		return Set.new(...)
 	end
 })
 
----@generic T
----@param ... T
----@return Set<T>
 function Set.new(...)
 	---@diagnostic disable-next-line: param-type-mismatch
 	local instance = setmetatable({ m_data = {} }, Set)
-	local args = { ... }
+	local args     = { ... }
 
 	if (#args > 0) then
 		instance.m_data_type = type(args[1])
@@ -43,7 +40,7 @@ function Set.new(...)
 	return instance
 end
 
----@param element anyval
+---@param element T
 function Set:Push(element)
 	if (element == nil) then
 		return
@@ -67,20 +64,16 @@ function Set:Push(element)
 	self.m_data[element] = true
 end
 
----@param element anyval
+---@param element T
 function Set:Pop(element)
-	if (type(element) ~= self.m_data_type) then
-		return
-	end
-
 	self.m_data[element] = nil
 end
 
 function Set:Clear()
 	self.m_data = {}
 end
 
----@param element anyval
+---@param element any
 ---@return boolean
 function Set:Contains(element)
 	return self.m_data[element] == true
@@ -96,10 +89,14 @@ function Set:Size()
 	return table.getlen(self.m_data)
 end
 
+---@return fun(t: table<T, true>, index?: T): T, true
+---@return table<T, true>
 function Set:Iter()
 	return pairs(self.m_data)
 end
 
+---@return fun(t: table<T, true>, index?: T): T, true
+---@return table<T, true>
 function Set:__pairs()
 	return pairs(self.m_data)
 end

SSV2/includes/classes/gta/CEntity.lua

@@ -40,7 +40,7 @@ local CEntity = Class("CEntity", { symbolic_size = 0x028C })
 ---@param entity handle
 ---@return CEntity
 function CEntity:init(entity)
-	if (not Game.IsScriptHandle(entity)) then
+	if (not ENTITY.DOES_ENTITY_EXIST(entity)) then
 		error("Invalid entity!")
 	end
 

SSV2/includes/classes/gta/CPed.lua

@@ -41,7 +41,7 @@ local CPed = Class("CPed", { parent = CEntity, symbolic_size = 0x161C })
 ---@param ped handle
 ---@return CPed
 function CPed:init(ped)
-	if (not Game.IsScriptHandle(ped) or not ENTITY.IS_ENTITY_A_PED(ped)) then
+	if (not ENTITY.IS_ENTITY_A_PED(ped)) then
 		error("Invalid entity!")
 	end
 

SSV2/includes/classes/gta/CTransmission.lua

@@ -0,0 +1,94 @@
+-- Copyright (C) 2026 SAMURAI (xesdoog) & Contributors.
+-- This file is part of Samurai's Scripts.
+--
+-- Permission is hereby granted to copy, modify, and redistribute
+-- this code as long as you respect these conditions:
+--	* Credit the owner and contributors.
+--	* Provide a copy of or a link to the original license (GPL-3.0 or later); see LICENSE.md or <https://www.gnu.org/licenses/>.
+
+
+local CStructView = require("includes.classes.gta.CStructView")
+
+
+--------------------------------------
+-- Class: CTransmission
+--------------------------------------
+---@class CTransmission
+---@field public m_current_gear pointer<uint8_t>
+---@field public m_previous_gear pointer<uint8_t>
+---@field public m_top_gear pointer<uint8_t>
+---@field public m_gear_ratios array<pointer<float>>
+---@field public m_drive_force pointer<float>
+---@field public m_drive_max_flat_velocity pointer<float>
+---@field public m_drive_max_velocity pointer<float>
+---@field public m_throttle_unk pointer<float> -- not sure what this does but I managed to force revs using only this offset. it worked once then stopped doing anything
+---@field public m_rpm pointer<float>
+---@field public m_rpm_2 pointer<float>
+---@field public m_clutch pointer<float> cvehicle + 0x08D4
+---@field public m_throttle pointer<float> these two might be flipped
+---@field public m_throttle_input pointer<float> //
+---@field public m_boost_pressure pointer<float> m_throttle_input + 16 ? TODO: fix this it's wrong. this keeps incrementing when throttle is held and resets to 0 when released. pressure does not infinitely accumulate but this does
+---@overload fun(ptr: pointer): CTransmission
+local CTransmission = CStructView("CTransmission")
+
+---@param ptr pointer
+---@return CTransmission
+function CTransmission.new(ptr)
+	---@diagnostic disable-next-line
+	local instance                     = setmetatable({ m_ptr = ptr, }, CTransmission)
+	instance.m_current_gear            = ptr:add(0x0000)
+	instance.m_previous_gear           = ptr:add(0x0002)
+	instance.m_top_gear                = ptr:add(0x0006)
+	instance.m_drive_force             = ptr:add(0x0038)
+	instance.m_drive_max_flat_velocity = ptr:add(0x003C)
+	instance.m_drive_max_velocity      = ptr:add(0x0040)
+	instance.m_throttle_unk            = ptr:add(0x0044)
+	instance.m_rpm                     = ptr:add(0x0048)
+	instance.m_rpm_2                   = ptr:add(0x004C)
+	instance.m_clutch                  = ptr:add(0x0054)
+	instance.m_throttle                = ptr:add(0x0058)
+	instance.m_throttle_input          = ptr:add(0x0060)
+	instance.m_boost_pressure          = ptr:add(0x0070)
+
+
+	local gearRatios  = {} ---@type array<pointer<float>>
+	local pArrayStart = ptr:add(0x000C)
+	for i = 0, 10 do -- reverse + 10 fwd gears
+		gearRatios[i + 1] = pArrayStart:add(i * 0x4)
+	end
+	instance.m_gear_ratios = gearRatios
+
+	return instance
+end
+
+---@param gear uint8_t
+---@return float
+function CTransmission:GetRatioForGear(gear)
+	local ptr = self.m_gear_ratios[gear + 1]
+	if (not ptr or ptr:is_null()) then
+		return 0.0
+	end
+
+	return ptr:get_float()
+end
+
+---@param gear uint8_t
+---@param ratio float
+function CTransmission:SetRatioForGear(gear, ratio)
+	local ptr = self.m_gear_ratios[gear + 1]
+	if (not ptr or ptr:is_null()) then return end
+	ptr:set_float(ratio)
+end
+
+---@param gear uint8_t
+---@return float
+function CTransmission:GetMaxSpeedForGear(gear)
+	local max_drive_vel = self.m_drive_max_velocity:get_float()
+	local gear_ratio    = math.abs(self:GetRatioForGear(gear))
+	if (gear_ratio == 0) then
+		return 0.0
+	end
+	return max_drive_vel / gear_ratio
+end
+
+return CTransmission

SSV2/includes/classes/gta/CVehicle.lua

@@ -14,10 +14,10 @@ local CHandlingData     = require("includes.classes.gta.CHandlingData")
 local CEntity           = require("includes.classes.gta.CEntity")
 local CVehicleDrawData  = require("includes.classes.gta.CVehicleDrawData")
 local CVehicleModelInfo = require("includes.classes.gta.CVehicleModelInfo")
+local CTransmission     = require("includes.classes.gta.CTransmission")
 local CWheel            = require("includes.classes.gta.CWheel")
 local fMatrix44         = require("includes.classes.gta.fMatrix44")
 local phFragInst        = require("includes.classes.gta.phFragInst")
-local CCarHandlingData  = require("includes.classes.gta.CCarHandlingData")
 
 
 ---@class CAdvancedData
@@ -30,25 +30,26 @@ local CCarHandlingData  = require("includes.classes.gta.CCarHandlingData")
 ---@ignore
 ---@class CVehicle : CEntity
 ---@field protected m_ptr pointer
----@field public m_physics_fragments phFragInst //0x30 `struct rage::phFragInst`
 ---@field public m_draw_data CVehicleDrawData
 ---@field public m_handling_data CHandlingData
 ---@field public m_model_info CVehicleModelInfo
 ---@field public m_vehicle_damage pointer<CVehicleDamage>
 ---@field public m_can_boost_jump pointer<byte> `bool`
 ---@field public m_velocity pointer<vec3>
+---@field public m_transmission CTransmission
 ---@field public m_deform_god pointer<uint8_t>
+---@field public m_frag_inst phFragInst //0x09C0 `fragInstGTA`
+---@field public m_turbo pointer<float>
 ---@field public m_water_damage pointer<uint32_t>
----@field public m_next_gear pointer<int16_t>
----@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_steering_input pointer<float> // 0x00D4 name might not correctly reflect what this actually is but this seems to store controller input (value is between 1.0 (left) .. -1.0 (right))
+---@field public m_steering_angle pointer<float> 0x00DC // steering angle?. We'll use it to rewrite last known steering value after exiting a vehicle in IV-Style Exit so we'll no longer have to teleport outside or patch CTaskVehicleExit
+---@field public m_throttle_power pointer<float> m_steering_angle + 0x8
+---@field public m_brake_power pointer<float>
 ---@field public m_is_targetable pointer<byte> `bool`
 ---@field public m_door_lock_status pointer<uint32_t>
----@field public m_wheels atArray<CWheel> -- 0xC30
----@field public m_num_wheels number -- 0xC38
+---@field public m_wheels atArray<CWheel> -- 0x0C30
+---@field public m_num_wheels integer -- 0x0C38
 ---@field public m_ride_height pointer<float>
 ---@field private DumpFlags fun(self: CVehicle, enum_flags: Enum, get_func: fun(self: CVehicle, flag: integer): boolean): nil
 ---@overload fun(vehicle: integer): CVehicle|nil
@@ -57,7 +58,7 @@ local CVehicle = Class("CVehicle", { parent = CEntity, symbolic_size = 0xC40 })
 ---@param vehicle handle
 ---@return CVehicle
 function CVehicle:init(vehicle)
-	if (not Game.IsScriptHandle(vehicle) or not ENTITY.IS_ENTITY_A_VEHICLE(vehicle)) then
+	if (not ENTITY.IS_ENTITY_A_VEHICLE(vehicle)) then
 		error("Invalid entity!")
 	end
 
@@ -66,30 +67,32 @@ function CVehicle:init(vehicle)
 	local instance = setmetatable({}, CVehicle)
 	instance:super().init(instance, vehicle)
 
-	local ptr                    = memory.handle_to_ptr(vehicle)
-	instance.m_ptr               = ptr
-	instance.m_model_info        = CVehicleModelInfo(ptr:add(0x0020):deref())
-	instance.m_water_damage      = ptr:add(0x00D8)
-	instance.m_physics_fragments = phFragInst(ptr:add(0x0030):deref())
-	instance.m_draw_data         = CVehicleDrawData(ptr:add(0x0048):deref())
-	instance.m_can_boost_jump    = ptr:add(0x03A4)
-	instance.m_vehicle_damage    = ptr:add(0x0420)
-	instance.m_velocity          = ptr:add(0x07D0)
-	instance.m_is_targetable     = ptr:add(0x0AEE)
-	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_handling_data     = CHandlingData(ptr:add(0x0960):deref(), instance.m_model_info:GetVehicleType())
-	instance.m_deform_god        = ptr:add(0x096C)
-	instance.m_steering_input    = ptr:add(0x09D4)
-	instance.m_current_steering  = ptr:add(0x09DC)
-	instance.m_door_lock_status  = ptr:add(0x13D0)
-
-	local array_ptr              = ptr:add(0x0C30)
-	instance.m_wheels            = atArray(array_ptr, CWheel)
-	instance.m_num_wheels        = array_ptr:add(0x8):get_int()
-	instance.m_ride_height       = array_ptr:deref():add(0x007C)
+	local ptr                   = memory.handle_to_ptr(vehicle)
+	instance.m_ptr              = ptr
+	instance.m_model_info       = CVehicleModelInfo(ptr:add(0x0020):deref())
+	instance.m_draw_data        = CVehicleDrawData(ptr:add(0x0048):deref())
+	instance.m_turbo            = ptr:add(0x007C)
+	instance.m_water_damage     = ptr:add(0x00D8)
+	instance.m_can_boost_jump   = ptr:add(0x03A4)
+	instance.m_vehicle_damage   = ptr:add(0x0420)
+	instance.m_velocity         = ptr:add(0x07D0)
+	instance.m_transmission     = CTransmission(ptr:add(0x0880))
+	instance.m_engine_health    = ptr:add(0x0910)
+	instance.m_handling_data    = CHandlingData(ptr:add(0x0960):deref(), instance.m_model_info:GetVehicleType())
+	instance.m_deform_god       = ptr:add(0x096C)
+	instance.m_frag_inst        = phFragInst(ptr:add(0x09C0):deref())
+	instance.m_steering_input   = ptr:add(0x09D4)
+	instance.m_steering_angle   = ptr:add(0x09DC)
+	instance.m_throttle_power   = ptr:add(0x09E4)
+	instance.m_brake_power      = ptr:add(0x09E8)
+	instance.m_is_targetable    = ptr:add(0x0AEE)
+
+	local array_ptr             = ptr:add(0x0C30)
+	instance.m_wheels           = atArray(array_ptr, CWheel)
+	instance.m_num_wheels       = array_ptr:add(0x8):get_int()
+	instance.m_ride_height      = array_ptr:deref():add(0x007C)
+
+	instance.m_door_lock_status = ptr:add(0x13D0)
 
 	return instance
 end
@@ -115,14 +118,6 @@ function CVehicle:GetDeformMultiplier()
 	end)
 end
 
--- ---@param handlingType eHandlingType
--- ---@return CCarHandlingData|CBikeHandlingData|CFlyingHandlingData|any
--- function CVehicle:GetSubHandlingData(handlingType)
--- 	return self:__safecall(nil, function()
--- 		return self.m_handling_data:GetSubHandlingData(handlingType)
--- 	end)
--- end
-
 ---@return pointer<(CCarHandlingData|CBikeHandlingData|CFlyingHandlingData)?>
 function CVehicle:GetSubHandlingData()
 	return self.m_handling_data:GetSubHandlingData()
@@ -322,7 +317,7 @@ end
 ---@param boneIndex integer
 ---@return fMatrix44
 function CVehicle:GetBoneMatrix(boneIndex)
-	local ph_frag_inst = self.m_physics_fragments
+	local ph_frag_inst = self.m_frag_inst
 	if not ph_frag_inst then
 		return fMatrix44:zero()
 	end
@@ -338,7 +333,7 @@ end
 ---@param boneIndex integer
 ---@param matrix fMatrix44
 function CVehicle:SetBoneMatrix(boneIndex, matrix)
-	local ph_frag_inst = self.m_physics_fragments
+	local ph_frag_inst = self.m_frag_inst
 	if not ph_frag_inst then
 		return
 	end

SSV2/includes/classes/gta/CVehicleModelInfo.lua

@@ -32,13 +32,12 @@ local CVehicleModelInfo = CStructView("CVehicleModelInfo", 0x08DC)
 ---@return CVehicleModelInfo
 function CVehicleModelInfo.new(ptr)
 	return setmetatable({
-		m_ptr               = ptr,
-		m_vehicle_layout    = ptr:add(0x00B0),
-		m_vehicle_type      = ptr:add(0x0340),
-		m_wheel_scale       = ptr:add(0x048C),
-		m_wheel_scale_rear  = ptr:add(0x0490),
-		m_model_info_flags  = ptr:add(0x057C),
-		m_throttle_position = ptr:add(0x08D8),
+		m_ptr              = ptr,
+		m_vehicle_layout   = ptr:add(0x00B0),
+		m_vehicle_type     = ptr:add(0x0340),
+		m_wheel_scale      = ptr:add(0x048C),
+		m_wheel_scale_rear = ptr:add(0x0490),
+		m_model_info_flags = ptr:add(0x057C),
 		---@diagnostic disable-next-line: param-type-mismatch
 	}, CVehicleModelInfo)
 end