fix(misc): miscellaneous fixes

Author: xesdoog

SSV2/includes/backend.lua

@@ -42,36 +42,38 @@ Enums.eEntityType = {
 ---@class Backend
 ---@field private api_version eAPIVersion
 local Backend = {
-	__version          = "",
-	target_build       = "",
-	target_version     = "",
-	disable_input      = false, -- Never serialize this runtime variable!
+	__version                = "",
+	target_build             = "",
+	target_version           = "",
+	disable_input            = false, -- Never serialize this runtime variable!
+	is_in_session_transition = false,
+	is_in_player_transition  = false,
 
 	---@type table<integer, integer>
-	ControlsToDisable  = {},
+	ControlsToDisable        = {},
 
 	---@type table<integer, BlipData>
-	CreatedBlips       = {},
+	CreatedBlips             = {},
 
 	---@type array<handle>
-	AttachedEntities   = {},
+	AttachedEntities         = {},
 
 	---@type table<eBackendEvent, array<function>>
-	EventCallbacks     = {
+	EventCallbacks           = {
 		[Enums.eBackendEvent.RELOAD_UNLOAD]  = { ClearPreview },
 		[Enums.eBackendEvent.SESSION_SWITCH] = { ClearPreview },
 		[Enums.eBackendEvent.PLAYER_SWITCH]  = { ClearPreview }
 	},
 
 	---@type table<eEntityType, table<handle, handle>>
-	SpawnedEntities    = {
+	SpawnedEntities          = {
 		[Enums.eEntityType.Ped]     = {},
 		[Enums.eEntityType.Vehicle] = {},
 		[Enums.eEntityType.Object]  = {},
 	},
 
 	---@type table<eEntityType, integer>
-	MaxAllowedEntities = {
+	MaxAllowedEntities       = {
 		[Enums.eEntityType.Ped]     = 50,
 		[Enums.eEntityType.Vehicle] = 25,
 		[Enums.eEntityType.Object]  = 75,
@@ -418,29 +420,47 @@ function Backend:Cleanup()
 end
 
 function Backend:OnSessionSwitch()
+	if (self.is_in_session_transition) then
+		return
+	end
+
 	if (not script.is_active("maintransition")) then
 		return
 	end
 
-	self:TriggerEventCallbacks(Enums.eBackendEvent.SESSION_SWITCH)
+	self.is_in_session_transition = true
+	ThreadManager:Run(function()
+		self:TriggerEventCallbacks(Enums.eBackendEvent.SESSION_SWITCH)
 
-	repeat
-		sleep(100)
-	until not script.is_active("maintransition")
-	sleep(1000)
+		while (script.is_active("maintransition")) do
+			yield()
+		end
+
+		sleep(1000)
+		self.is_in_session_transition = false
+	end)
 end
 
 function Backend:OnPlayerSwitch()
+	if (self.is_in_player_transition) then
+		return
+	end
+
 	if (not self:IsPlayerSwitchInProgress()) then
 		return
 	end
 
-	self:TriggerEventCallbacks(Enums.eBackendEvent.PLAYER_SWITCH)
+	self.is_in_player_transition = true
+
+	ThreadManager:Run(function()
+		self:TriggerEventCallbacks(Enums.eBackendEvent.PLAYER_SWITCH)
+
+		while (self:IsPlayerSwitchInProgress()) do
+			yield()
+		end
 
-	repeat
-		sleep(100)
-	until not self:IsPlayerSwitchInProgress()
-	sleep(1000)
+		self.is_in_player_transition = false
+	end)
 end
 
 function Backend:RegisterHandlers()

SSV2/includes/data/yrv3_data.lua

@@ -566,26 +566,26 @@ local RawBusinessData <const> = {
 		{ size = 2, max = 111, coords = vec3:new(93.278641, -2216.144775, 6.033320) },
 	},
 	BikerBusinesses = {
-		{ gxt = "MP_BWH_METH_1",   coords = vec3:new(52.903, 6338.585, 31.35), },
-		{ gxt = "MP_BWH_WEED_1",   coords = vec3:new(416.7524, 6520.753, 27.7121), },
-		{ gxt = "MP_BWH_CRACK_1",  coords = vec3:new(51.7653, 6486.163, 31.428), },
-		{ gxt = "MP_BWH_CASH_1",   coords = vec3:new(-413.6606, 6171.938, 31.4782), },
-		{ gxt = "MP_BWH_FAKEID_1", coords = vec3:new(-163.6828, 6334.845, 31.5808), },
-		{ gxt = "MP_BWH_METH_2",   coords = vec3:new(1454.671, -1651.986, 67), },
-		{ gxt = "MP_BWH_WEED_2",   coords = vec3:new(102.14, 175.26, 104.56), },
-		{ gxt = "MP_BWH_CRACK_2",  coords = vec3:new(-1462.622, -381.826, 38.802), },
-		{ gxt = "MP_BWH_CASH_2",   coords = vec3:new(-1171.005, -1380.922, 4.937), },
-		{ gxt = "MP_BWH_FAKEID_2", coords = vec3:new(299.071, -759.072, 29.333), },
-		{ gxt = "MP_BWH_METH_3",   coords = vec3:new(201.8909, 2461.782, 55.6885), },
-		{ gxt = "MP_BWH_WEED_3",   coords = vec3:new(2848.369, 4450.147, 48.5139), },
-		{ gxt = "MP_BWH_CRACK_3",  coords = vec3:new(387.5332, 3585.042, 33.2922), },
-		{ gxt = "MP_BWH_CASH_3",   coords = vec3:new(636.6344, 2785.126, 42.0111), },
-		{ gxt = "MP_BWH_FAKEID_3", coords = vec3:new(1657.066, 4851.732, 41.9882), },
-		{ gxt = "MP_BWH_METH_4",   coords = vec3:new(1181.44, -3113.82, 6.03), },
-		{ gxt = "MP_BWH_WEED_4",   coords = vec3:new(136.973, -2472.795, 5.98), },
-		{ gxt = "MP_BWH_CRACK_4",  coords = vec3:new(-253.31, -2591.15, 5.97), },
-		{ gxt = "MP_BWH_CASH_4",   coords = vec3:new(671.451, -2667.502, 6.0812), },
-		{ gxt = "MP_BWH_FAKEID_4", coords = vec3:new(-331.52, -2778.97, 5.12), },
+		{ gxt = "MP_BWH_METH_1",   id = 3, coords = vec3:new(52.903, 6338.585, 31.35), },
+		{ gxt = "MP_BWH_WEED_1",   id = 1, coords = vec3:new(416.7524, 6520.753, 27.7121), },
+		{ gxt = "MP_BWH_CRACK_1",  id = 4, coords = vec3:new(51.7653, 6486.163, 31.428), },
+		{ gxt = "MP_BWH_CASH_1",   id = 2, coords = vec3:new(-413.6606, 6171.938, 31.4782), },
+		{ gxt = "MP_BWH_FAKEID_1", id = 0, coords = vec3:new(-163.6828, 6334.845, 31.5808), },
+		{ gxt = "MP_BWH_METH_2",   id = 3, coords = vec3:new(1454.671, -1651.986, 67), },
+		{ gxt = "MP_BWH_WEED_2",   id = 1, coords = vec3:new(102.14, 175.26, 104.56), },
+		{ gxt = "MP_BWH_CRACK_2",  id = 4, coords = vec3:new(-1462.622, -381.826, 38.802), },
+		{ gxt = "MP_BWH_CASH_2",   id = 2, coords = vec3:new(-1171.005, -1380.922, 4.937), },
+		{ gxt = "MP_BWH_FAKEID_2", id = 0, coords = vec3:new(299.071, -759.072, 29.333), },
+		{ gxt = "MP_BWH_METH_3",   id = 3, coords = vec3:new(201.8909, 2461.782, 55.6885), },
+		{ gxt = "MP_BWH_WEED_3",   id = 1, coords = vec3:new(2848.369, 4450.147, 48.5139), },
+		{ gxt = "MP_BWH_CRACK_3",  id = 4, coords = vec3:new(387.5332, 3585.042, 33.2922), },
+		{ gxt = "MP_BWH_CASH_3",   id = 2, coords = vec3:new(636.6344, 2785.126, 42.0111), },
+		{ gxt = "MP_BWH_FAKEID_3", id = 0, coords = vec3:new(1657.066, 4851.732, 41.9882), },
+		{ gxt = "MP_BWH_METH_4",   id = 3, coords = vec3:new(1181.44, -3113.82, 6.03), },
+		{ gxt = "MP_BWH_WEED_4",   id = 1, coords = vec3:new(136.973, -2472.795, 5.98), },
+		{ gxt = "MP_BWH_CRACK_4",  id = 4, coords = vec3:new(-253.31, -2591.15, 5.97), },
+		{ gxt = "MP_BWH_CASH_4",   id = 2, coords = vec3:new(671.451, -2667.502, 6.0812), },
+		{ gxt = "MP_BWH_FAKEID_4", id = 0, coords = vec3:new(-331.52, -2778.97, 5.12), },
 	},
 	BikerTunables = {
 		[0] = { max_units = 60, vpu = "BIKER_FAKEIDS_PRODUCT_VALUE", mult_1 = "BIKER_FAKEIDS_PRODUCT_VALUE_EQUIPMENT_UPGRADE", mult_2 = "BIKER_FAKEIDS_PRODUCT_VALUE_STAFF_UPGRADE" },

SSV2/includes/features/YimResupplierV3.lua

@@ -41,6 +41,15 @@ local ScriptsToTerminate <const> = {
 	"appbusinesshub"
 }
 
+---@enum eYRState
+Enums.eYRState                   = {
+	OFFLINE = 0x0,
+	WAITING = 0x1,
+	LOADING = 0x2,
+	RUNNING = 0x3,
+	ERROR   = 0x4
+}
+
 ---@class YRV3Businesses
 ---@field warehouses Warehouse[]
 ---@field biker_businesses BikerBusiness[]
@@ -66,6 +75,7 @@ local ScriptsToTerminate <const> = {
 ---@field private m_cooldown_state_dirty boolean
 ---@field private m_initial_data_done boolean
 ---@field private m_data_initialized boolean
+---@field protected m_state eYRState
 ---@field protected m_thread Thread?
 ---@field protected m_initialized boolean
 local YRV3                       = { m_raw_data = require("includes.data.yrv3_data") }
@@ -81,13 +91,15 @@ function YRV3:init()
 	self.m_bhub_script_handle     = 0
 	self.m_last_as_check_time     = 0
 	self.m_last_income_check_time = 0
+	self.m_state                  = Enums.eYRState.OFFLINE
 	self.m_has_triggered_autosell = false
 	self.m_sell_script_running    = false
 	self.m_initial_data_done      = false
 	self.m_data_initialized       = false
 	self.m_cooldown_state_dirty   = true
 	self.m_sell_script_name       = nil
 	self.m_sell_script_disp_name  = "None"
+	self.m_last_error             = ""
 	self.m_businesses             = {
 		warehouses       = {},
 		biker_businesses = {},
@@ -101,30 +113,61 @@ function YRV3:init()
 	end)
 
 	Backend:RegisterEventCallback(Enums.eBackendEvent.RELOAD_UNLOAD, function()
-		self:Reset()
+		if (self.m_data_initialized) then
+			self:Reset()
+		end
 	end)
 
 	Backend:RegisterEventCallback(Enums.eBackendEvent.SESSION_SWITCH, function()
-		self:Reset()
+		if (self.m_data_initialized) then
+			self:Reset()
+		end
 	end)
 
 	return self
 end
 
 function YRV3:Reset()
-	self.m_cooldown_state_dirty = true
+	self.m_total_sum              = 0
+	self.m_last_as_check_time     = 0
+	self.m_last_income_check_time = 0
+	self.m_businesses             = {
+		warehouses       = {},
+		biker_businesses = {},
+		safes            = self.m_raw_data.BS_Default,
+		money_fronts     = self.m_raw_data.MF_Default,
+	}
+	self.m_has_triggered_autosell = false
+	self.m_sell_script_running    = false
+	self.m_initial_data_done      = false
+	self.m_data_initialized       = false
+	self.m_cooldown_state_dirty   = true
+end
+
+function YRV3:Reload()
+	if (self.m_thread and self.m_thread:IsRunning()) then
+		self.m_thread:Suspend()
+	end
 
-	-- we no longer reset business data here and end up with dangling pointers in ImGui.
-	-- if the player changes something (swaps properties, buys a new one, etc.)
-	-- they can simply reload the script. It's not rocket science
+	self:Reset()
+
+	if (self.m_thread and self.m_thread:IsSuspended()) then
+		self.m_thread:Resume()
+	end
 end
 
+---@return boolean
 function YRV3:CanAccess()
 	return Backend:IsUpToDate()
 		and Game.IsOnline()
 		and not Backend:IsMockEnv()
-		and not script.is_active("maintransition")
 		and not NETWORK.NETWORK_IS_ACTIVITY_SESSION()
+		and self.m_state ~= Enums.eYRState.ERROR
+end
+
+---@return boolean
+function YRV3:IsDataInitialized()
+	return self.m_data_initialized
 end
 
 ---@param where integer|vec3
@@ -138,8 +181,9 @@ function YRV3:Teleport(where, keepVehicle)
 	Self:Teleport(where, keepVehicle)
 end
 
-function YRV3:IsDataInitialized()
-	return self.m_data_initialized
+---@return eYRState
+function YRV3:GetState()
+	return self.m_state
 end
 
 ---@return string
@@ -151,6 +195,15 @@ function YRV3:GetLastError()
 	return self.m_last_error
 end
 
+---@param msg string
+function YRV3:SetLastError(msg)
+	if (msg == self.m_last_error) then
+		return
+	end
+
+	self.m_last_error = msg
+end
+
 ---@return array<Warehouse>
 function YRV3:GetSCWarehouses()
 	return self.m_businesses.warehouses
@@ -243,14 +296,18 @@ end
 function YRV3:PopulateBikerBusinesses()
 	for i = 0, 4 do
 		local property_index = (stats.get_int(_F("MPX_FACTORYSLOT%d", i)))
-		local ref            = self.m_raw_data.BikerBusinesses[property_index]
-		local ref2           = self.m_raw_data.BikerTunables[ref.id]
-		if (not ref or not ref2) then
+		local ref = self.m_raw_data.BikerBusinesses[property_index]
+		if (not ref) then
+			goto continue
+		end
+
+		local ref2 = self.m_raw_data.BikerTunables[ref.id]
+		if (not ref2) then
 			goto continue
 		end
 
-		local has_eq_upgrade    = stats.get_int(_F("MPX_FACTORYUPGRADES%d", ref.id)) == 1
-		local has_staff_upgrade = stats.get_int(_F("MPX_FACTORYUPGRADES%d_1", ref.id)) == 1
+		local has_eq_upgrade    = stats.get_int(_F("MPX_FACTORYUPGRADES%d", i)) == 1
+		local has_staff_upgrade = stats.get_int(_F("MPX_FACTORYUPGRADES%d_1", i)) == 1
 		local eq_upg_mult       = tunables.get_int(ref2.mult_1)
 		local stf_upg_mult      = tunables.get_int(ref2.mult_2)
 		table.insert(self.m_businesses.biker_businesses, BikerBusiness.new({
@@ -301,6 +358,7 @@ function YRV3:PopulateBikerBusinesses()
 			vpu_mult_2 = 0,
 			vpu        = tunables.get_int("BIKER_ACID_PRODUCT_VALUE"),
 			max_units  = 160,
+			blip       = 847,
 		})
 	end
 end
@@ -416,10 +474,12 @@ function YRV3:PreInit()
 end
 
 function YRV3:InitializeData()
-	if (self.m_data_initialized or not Game.IsOnline()) then
+	if (self.m_data_initialized or not Game.IsOnline() or self.m_state == Enums.eYRState.LOADING) then
 		return
 	end
 
+	self.m_state      = Enums.eYRState.LOADING
+	self.m_last_error = "GENERIC_WAIT_LABEL"
 	self:PreInit()
 	self:PopulateNightclub()
 end
@@ -891,11 +951,27 @@ end
 
 function YRV3:OnTick()
 	if (not Backend:IsUpToDate() and (self.m_thread and self.m_thread:IsRunning())) then
+		self.m_state = Enums.eYRState.ERROR
+		self:SetLastError("GENERIC_OUTDATED")
 		self.m_thread:Stop()
 		return
 	end
 
 	if (not self:CanAccess()) then
+		self.m_state = Enums.eYRState.OFFLINE
+
+		if (not network.is_session_started()) then
+			self:SetLastError("GENERIC_UNAVAILABLE_SP")
+		else
+			if (script.is_active("maintransition")) then
+				self.m_state = Enums.eYRState.WAITING
+				self:SetLastError("YRV3_STATE_WAIT_TRANSITION")
+			elseif (NETWORK.NETWORK_IS_ACTIVITY_SESSION()) then
+				self.m_state = Enums.eYRState.ERROR
+				self:SetLastError("YRV3_STATE_ERR_WRONG_SESSION")
+			end
+		end
+
 		yield()
 		return
 	end
@@ -907,6 +983,9 @@ function YRV3:OnTick()
 		return
 	end
 
+	self.m_state = Enums.eYRState.RUNNING
+	self:SetLastError("")
+
 	self:AutoSellHandler()
 	self:AutoFillHandler()
 	self:AutoProduceHandler()