feat(vehicle): add slider for fast vehciels

- Add a slider for Fast Vehicles.
- Add a slider for Fast Planes.

closes #143
closes #144

Author: xesdoog

SSV2/includes/data/config.lua

@@ -185,6 +185,7 @@ local Config <const> = {
 			subwoofer = false,
 			horn_beams = false,
 			fast_vehicles = false,
+			fast_vehicles_speed = 10,
 			auto_brake_lights = false,
 			iv_exit = false,
 			no_wheel_recenter = false,
@@ -205,6 +206,7 @@ local Config <const> = {
 			auto_lock_doors = false,
 			cobra_maneuver = false,
 			fast_jets = false,
+			fast_jets_speed = 150.0,
 			no_jet_stall = false,
 			no_turbulence = false,
 			aircraft_mg = {

SSV2/includes/features/Speedometer.lua

@@ -9,6 +9,7 @@
 
 local gui_registered           = false
 local last_engine_state        = true
+local last_captured_top_spd    = 0.0
 local RUNTIME_COLORS <const>   = {
 	INDICATOR_RED   = Color(1.0, 0.215, 0.215, 1.0):AsU32(),
 	INDICATOR_GREEN = Color(0.1, 0.91, 0.0, 1.0):AsU32(),
@@ -88,21 +89,25 @@ local Speedometer   = {
 }; Speedometer.__index = Speedometer
 
 ---@public
-function Speedometer:UpdateState()
+---@param PV PlayerVehicle
+function Speedometer:UpdateState(PV)
 	local state = self._state
-	local PV    = LocalPlayer:GetVehicle()
 	if not (PV and PV:IsValid()) then
 		state.should_draw = false
 		return
 	end
 
-	local speed_modifier   = Match(GVars.features.speedometer.speed_unit, UNIT_MULTIPLIERS)
-	local fast_vehicles    = GVars.features.vehicle.fast_vehicles
-	local IsEngineOn       = PV:IsEngineOn()
+	local speed_modifier = Match(GVars.features.speedometer.speed_unit, UNIT_MULTIPLIERS)
+	local IsEngineOn     = PV:IsEngineOn()
+	local IsNosActive    = PV:IsNOSActive()
+	if (not IsNosActive) then
+		last_captured_top_spd = PV:GetMaxSpeed()
+	end
+
 	state.PV               = PV
 	state.speed_modifier   = speed_modifier
 	state.CurrentSpeed     = PV:GetSpeed() * speed_modifier
-	state.MaxSpeed         = math.floor((PV:GetDefaultMaxSpeed() * (fast_vehicles and 1.8 or 1)) * speed_modifier)
+	state.MaxSpeed         = math.floor(last_captured_top_spd * speed_modifier)
 	state.CurrentAltitude  = PV:GetHeightAboveGround()
 	state.Manufacturer     = PV:GetManufacturerName()
 	state.IsEngineOn       = IsEngineOn
@@ -111,7 +116,7 @@ function Speedometer:UpdateState()
 	state.IsABSEngaged     = PV:IsABSEngaged()
 	state.IsESCEngaged     = PV:IsESCEngaged()
 	state.IsESCDisabled    = get_is_tc_esc_dsabled(PV)
-	state.IsNOSActive      = PV:IsNOSActive()
+	state.IsNOSActive      = IsNosActive
 	state.IsAircraft       = PV:IsPlane() or PV:IsHeli()
 	state.IsSports         = PV:IsSportsOrSuper()
 	state.IsShootingFlares = PV.m_is_shooting_flares

SSV2/includes/features/online/yim_resupplier/YimResupplierV3.lua

@@ -130,14 +130,21 @@ function YRV3:Reset(disable, reason)
 	self.m_last_autosell_check_time  = 0
 	self.m_last_income_check_time    = 0
 	self.m_last_business_update_time = 0
-	self.m_businesses                = { safes = {} }
 	self.m_boss_types_avail          = { { name = "GB_BOSS" --[[VIP]], id = 0 } }
 	self.m_sell_script_running       = false
 	self.m_initial_data_done         = false
 	self.m_data_initialized          = false
 	self.m_autosell_state            = Enums.eAutoSellState.NONE
 	self.m_state                     = disable and Enums.eYRState.ERROR or Enums.eYRState.IDLE
 
+	for _, business in self:BusinessIter() do
+		local reset = business.Reset
+		if (reset) then
+			---@diagnostic disable-next-line
+			reset(business)
+		end
+	end; self.m_businesses = { safes = {} }
+
 	if (disable) then
 		self:SetLastError(reason or "Unhandled Exception.")
 	end

SSV2/includes/features/vehicle/misc_vehicle.lua

@@ -109,8 +109,8 @@ function MiscVehicle:ShootExplosiveMG(enemiesOnly, targetEntity, startPos, endPo
 end
 
 function MiscVehicle:UpdateMachineGuns()
-	if (not GVars.features.vehicle.aircraft_mg.triggerbot
-			and not GVars.features.vehicle.aircraft_mg.manual_aim) then
+	local cfg = GVars.features.vehicle.aircraft_mg
+	if not (cfg.triggerbot or cfg.manual_aim) then
 		return
 	end
 
@@ -120,17 +120,17 @@ function MiscVehicle:UpdateMachineGuns()
 
 	local PV                        = self.m_entity
 	local handle                    = PV:GetHandle()
-	local manualAim                 = GVars.features.vehicle.aircraft_mg.manual_aim
-	local triggerbotRange           = GVars.features.vehicle.aircraft_mg.tiggerbot_range
+	local manualAim                 = cfg.manual_aim
+	local triggerbotRange           = cfg.tiggerbot_range
 	local playerPos                 = LocalPlayer:GetPos()
 	local rotation                  = manualAim and CAM.GET_GAMEPLAY_CAM_ROT(2) or PV:GetRotation(2)
 	local direction                 = rotation:to_direction()
 	local multiplier                = manualAim and 200 or triggerbotRange
 	local destination               = playerPos + direction * multiplier
 	local hit, endCoords, entityHit = World:RayCast(playerPos, destination, -1, handle)
 
-	if (hit and GVars.features.vehicle.aircraft_mg.triggerbot and (ENTITY.IS_ENTITY_A_PED(entityHit) or ENTITY.IS_ENTITY_A_VEHICLE(entityHit))) then
-		local enemiesOnly = GVars.features.vehicle.aircraft_mg.enemies_only
+	if (hit and cfg.triggerbot and (ENTITY.IS_ENTITY_A_PED(entityHit) or ENTITY.IS_ENTITY_A_VEHICLE(entityHit))) then
+		local enemiesOnly = cfg.enemies_only
 		local ped         = Game.GetClosestPed(endCoords, 50, true)
 		local veh         = Game.GetClosestVehicle(endCoords, 50, handle)
 
@@ -150,8 +150,8 @@ function MiscVehicle:UpdateMachineGuns()
 			self:ShootExplosiveMG(false, 0, playerPos, endPos)
 		end
 
-		local color = GVars.features.vehicle.aircraft_mg.marker_color
-		local markerSize = GVars.features.vehicle.aircraft_mg.marker_size
+		local color      = cfg.marker_color
+		local markerSize = cfg.marker_size
 		local markerDest = hit and endCoords or vec3:new(
 			playerPos.x + direction.x * 50,
 			playerPos.y + direction.y * 50,
@@ -206,17 +206,18 @@ function MiscVehicle:DisableAirTurbulence()
 end
 
 function MiscVehicle:Update()
-	local PV = self.m_entity
+	local PV     = self.m_entity
 	local handle = PV:GetHandle()
+	local cfg    = GVars.features.vehicle
 
-	if (GVars.features.vehicle.fast_jets and PV:IsPlane() and (VEHICLE.GET_VEHICLE_FLIGHT_NOZZLE_POSITION(handle) ~= 1.0)) then
+	if (cfg.fast_jets and PV:IsPlane() and (VEHICLE.GET_VEHICLE_FLIGHT_NOZZLE_POSITION(handle) ~= 1.0)) then
 		local speed      = PV:GetSpeed()
 		local gearState  = PV:GetLandingGearState()
 		local rot        = PV:GetRotation(2)
 		local pitch      = rot.x
-		local baseThrust = 2e4
-		local minThrust  = 5e3
-		local maxSpeed   = 164.0
+		local baseThrust = 25e3
+		local minThrust  = 1e4
+		local maxSpeed   = cfg.fast_jets_speed or 150.0
 		local thrustMult = 1.0
 
 		if (pitch >= 60) then
@@ -225,10 +226,7 @@ function MiscVehicle:Update()
 			thrustMult = 1.4
 		end
 
-		if speed >= 72 and speed < maxSpeed
-			and PAD.IS_CONTROL_PRESSED(0, 87)
-			and gearState == Enums.eLandingGearState.RETRACTED
-		then
+		if (speed >= 70 and speed < maxSpeed and PAD.IS_CONTROL_PRESSED(0, 87) and gearState == Enums.eLandingGearState.RETRACTED) then
 			local lerp   = math.min(1.0, (speed) / (maxSpeed))
 			local thrust = math.min(minThrust, baseThrust * thrustMult * (1.0 - lerp))
 			ENTITY.APPLY_FORCE_TO_ENTITY_CENTER_OF_MASS(
@@ -245,13 +243,13 @@ function MiscVehicle:Update()
 		end
 	end
 
-	if (GVars.features.vehicle.no_jet_stall) then
+	if (cfg.no_jet_stall) then
 		if (PV:IsDriveable() and PV:GetEngineHealth() > 350 and PV:GetHeightAboveGround() > 5.0 and not PV:IsEngineOn()) then
 			VEHICLE.SET_VEHICLE_ENGINE_ON(handle, true, true, false)
 		end
 	end
 
-	if (GVars.features.vehicle.no_turbulence) then
+	if (cfg.no_turbulence) then
 		self:DisableAirTurbulence()
 	end
 

SSV2/includes/frontend/vehicle/aircraft_ui.lua

@@ -8,11 +8,11 @@
 
 
 local flrs                    = require("includes.features.vehicle.flares")
+Flares                        = LocalPlayer:GetVehicle():AddFeature(flrs)
 local autopilot_state_idx     = 0
 local autopilot_index_changed = false
 local autopilot_labels
 local planes_tab              = GUI:RegisterNewTab(Enums.eTabID.TAB_VEHICLE, "SUBTAB_AIRCRAFT", nil, nil, true)
-Flares                        = LocalPlayer:GetVehicle():AddFeature(flrs)
 local optionPopup             = {
 	flags       = ImGuiWindowFlags.NoResize | ImGuiWindowFlags.AlwaysAutoResize,
 	label       = "##optionsPopup",
@@ -50,7 +50,18 @@ planes_tab:AddBoolCommand("VEH_FAST_JETS",
 		gvar_key         = "features.vehicle.fast_jets",
 		translate_label  = true,
 		meta             = { description = "VEH_FAST_JETS_TT", isTranslatorLabel = true },
-		register_command = true
+		register_command = true,
+		options_data     = {
+			condition = function() return GVars.features.vehicle.fast_jets end,
+			callback  = function()
+				optionPopup.callback    = function()
+					local cfg           = GVars.features.vehicle
+					cfg.fast_jets_speed = ImGui.SliderFloat("##speed", cfg.fast_jets_speed, 100.0, 300.0)
+				end
+				optionPopup.label       = _T("VEH_FAST_JETS")
+				optionPopup.should_draw = true
+			end
+		}
 	}
 )
 planes_tab:AddBoolCommand("VEH_NO_JET_STALL",

SSV2/includes/frontend/vehicle/vehicle_ui.lua

@@ -281,7 +281,20 @@ vehicleTab:AddBoolCommand("VEH_FAST_AF",
 	{
 		gvar_key        = "features.vehicle.fast_vehicles",
 		meta            = { description = "VEH_FAST_AF_TT" },
-		translate_label = true
+		translate_label = true,
+		options_data    = {
+			condition = function()
+				return GVars.features.vehicle.fast_vehicles
+			end,
+			callback = function()
+				optionPopup.callback    = function()
+					local cfg               = GVars.features.vehicle
+					cfg.fast_vehicles_speed = ImGui.SliderFloat("##speed", cfg.fast_vehicles_speed, 10.0, 100.0)
+				end
+				optionPopup.label       = _T("VEH_FAST_AF")
+				optionPopup.should_draw = true
+			end
+		}
 	}
 )
 vehicleTab:AddBoolCommand("VEH_NOS",

SSV2/includes/modules/Entity.lua

@@ -346,7 +346,12 @@ end
 
 ---@return boolean
 function Entity:IsOutside()
-	return self:GetInteriorID() == 0
+	local interiorID = self:GetInteriorID()
+	if (interiorID == 0) then
+		return true
+	end
+	local groupID = INTERIOR.GET_INTERIOR_GROUP_ID(interiorID)
+	return groupID > 0
 end
 
 ---@return joaat_t

SSV2/includes/modules/PlayerVehicle.lua

@@ -48,6 +48,7 @@ local ManualGearbox    = require("includes.features.vehicle.manual_gearbox")
 ---@field private m_threads array<Thread>
 ---@field private m_default_max_speed float
 ---@field private m_has_loud_radio boolean
+---@field private m_top_speed_modified boolean
 ---@field private m_generic_toggleables table<string, GenericToggleable>
 ---@field public m_default_xenon_lights { enabled: boolean, index: integer }
 ---@field public m_default_tire_smoke { enabled: boolean, color: vec3 }
@@ -193,19 +194,19 @@ function PlayerVehicle:Set(handle)
 	self.m_autopilot.eligible           = self:IsAircraft()
 
 
-	local feats_cfg = GVars.features.vehicle
-	if (feats_cfg.no_turbulence and VEHICLE.IS_THIS_MODEL_A_PLANE(new_model)) then
+	local cfg = GVars.features.vehicle
+	if (cfg.no_turbulence and VEHICLE.IS_THIS_MODEL_A_PLANE(new_model)) then
 		VEHICLE.SET_PLANE_TURBULENCE_MULTIPLIER(handle, 0.0)
 	end
 
-	if (feats_cfg.default_station.enabled) then
-		self:SetRadioStation(feats_cfg.default_station.station_name)
+	if (cfg.default_station.enabled) then
+		self:SetRadioStation(cfg.default_station.station_name)
 	end
 
 	self.m_flag_controller:ApplyPresets()
 	self.m_stancer:OnNewVehicle()
 
-	if (feats_cfg.manual_gearbox.enabled) then
+	if (cfg.manual_gearbox.enabled) then
 		self.m_manual_gearbox:OnNewVehicle()
 	end
 	-- self:ResumeThreads()
@@ -607,42 +608,44 @@ function PlayerVehicle:Main()
 		return
 	end
 
+	local cfg    = GVars.features.vehicle
 	local handle = self:GetHandle()
 
-	if (GVars.features.vehicle.fast_vehicles) then
-		if (self:GetMaxSpeed() <= 80) then
-			VEHICLE.MODIFY_VEHICLE_TOP_SPEED(handle, 100)
-		end
-	elseif (self:GetMaxSpeed() >= 80) then
+	if (cfg.fast_vehicles) then
+		VEHICLE.MODIFY_VEHICLE_TOP_SPEED(handle, cfg.fast_vehicles_speed or 10)
+		self.m_top_speed_modified = true
+	elseif (self.m_top_speed_modified) then
 		VEHICLE.MODIFY_VEHICLE_TOP_SPEED(handle, -1)
+		self.m_top_speed_modified = false
 	end
 
-	if (GVars.features.vehicle.subwoofer and (not self:HasLoudRadio() or not self.m_generic_toggleables["subwoofer"])) then
+	if (cfg.subwoofer and (not self:HasLoudRadio() or not self.m_generic_toggleables["subwoofer"])) then
 		self:AddGenericToggleable("subwoofer", function()
 			self:ToggleSubwoofer(true)
 		end, self.ToggleSubwoofer, { self, false })
 	end
 
-	if (GVars.features.vehicle.unbreakable_windows) then
+	if (cfg.unbreakable_windows) then
 		local native = VEHICLE.SET_DONT_PROCESS_VEHICLE_GLASS
 		self:AddGenericToggleable("strongwindows", function()
 			native(handle, true)
 		end, native, { handle, false })
 	end
 
-	if (GVars.features.vehicle.auto_brake_lights and LocalPlayer:IsDriving()) then
+	if (cfg.auto_brake_lights and LocalPlayer:IsDriving()) then
 		if (self:IsDriveable() and self:IsEngineOn() and not self:IsMoving() and not PAD.IS_CONTROL_PRESSED(0, 72)) then
 			VEHICLE.SET_VEHICLE_BRAKE_LIGHTS(handle, true)
 		end
 	end
 
-	self.m_is_flatbed = self:IsFlatbedTruck()
+	self.m_is_flatbed             = self:IsFlatbedTruck()
 	self.m_engine_swap_compatible = self:IsCar()
+
 	self.m_feat_mgr:Update()
 	self:UpdateESC()
 	self:AutoLock()
 	self:HandleAutopilot()
-	Speedometer:UpdateState()
+	Speedometer:UpdateState(self)
 end
 
 -- Just for convenience so we don't have to remember patch names.