fix: some minor fixes

Author: xesdoog

SSV2/includes/classes/gta/atArray.lua

@@ -17,7 +17,7 @@
 ---@field private m_data array<pointer<T>>
 ---@field private m_size uint16_t
 ---@field private m_capacity uint16_t
----@field private m_data_type any
+---@field private m_data_type T|ClassMeta<T>|any
 ---@field [integer] pointer<T>
 ---@operator len: integer
 ---@overload fun(address: pointer, data_type?: optional<T>): atArray

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

@@ -23,7 +23,7 @@ local ScriptDisplayNames <const> = {
 	["gb_contraband_sell"]       = "CEO",
 	["gb_gunrunning"]            = "Bunker",
 	["gb_biker_contraband_sell"] = "Biker Business",
-	["fm_content_acid_lab_sell"] = "Acid Lab",
+	["fm_content_acid_lab_sell"] = "Acid Lab (Temporarily disabled)",
 }
 
 local NightclubNames <const>     = {
@@ -330,14 +330,6 @@ function YRV3:PopulateOffice()
 		coords      = ref.coords,
 		custom_name = _F("%s%s", name1, name2)
 	})
-
-	if (not self.m_businesses.office) then
-		return
-	end
-
-	for i = 0, 4 do
-		self.m_businesses.office:AddSubBusiness(i)
-	end
 end
 
 function YRV3:PopulateClubhouse()
@@ -348,9 +340,7 @@ function YRV3:PopulateClubhouse()
 
 	local idx      = club_prop - 90
 	local club_ref = self.m_raw_data.Clubhouses[idx]
-	if (not club_ref) then
-		return
-	end
+	if (not club_ref) then return end
 
 	local safe_data = self.m_raw_data.CashSafes.fronts.clubhouse
 	safe_data.name = "Clubhouse Duffle Bag"
@@ -360,14 +350,6 @@ function YRV3:PopulateClubhouse()
 		coords    = club_ref.coords,
 		safe_data = safe_data
 	})
-
-	if (not self.m_businesses.clubhouse) then
-		return
-	end
-
-	for i = 0, 4 do
-		self.m_businesses.clubhouse:AddSubBusiness(i)
-	end
 end
 
 function YRV3:PopulateBikerBusinesses()
@@ -433,45 +415,53 @@ function YRV3:PopulateNightclub()
 		safedata.name  = clubname
 
 
-		self.m_businesses.nightclub = Nightclub.new({
+		local nightclub = Nightclub.new({
 			id          = nc_index,
 			name        = Game.GetGXTLabel(_F("MP_NCLU_%d", nc_index)),
 			custom_name = clubname,
 			coords      = ref.coords,
 			safe_data   = safedata
 		})
 
+		if not (nightclub and nightclub:IsValid()) then
+			self.m_data_initialized = true
+			return
+		end
+
 		while (not self.m_initial_data_done) do
 			yield()
 		end
 
 		local owns_cargo = false
-		if (self.m_businesses.hangar) then
+		local hangar     = self.m_businesses.hangar
+		local office     = self.m_businesses.office
+		local clubhouse  = self.m_businesses.clubhouse
+
+		if (hangar and hangar:IsValid()) then
 			owns_cargo = true
-		elseif (self.m_businesses.office) then
-			if (self.m_businesses.office:HasCargoWarehouse()) then
-				owns_cargo = true
-			end
+		elseif (office and office:IsValid()) then
+			owns_cargo = office:HasCargoWarehouse()
 		end
 
 		if (owns_cargo) then
-			self.m_businesses.nightclub:AddSubBusiness(0)
+			nightclub:AddSubBusiness(0)
 		end
 
 		if (self.m_businesses.bunker) then
-			self.m_businesses.nightclub:AddSubBusiness(1)
+			nightclub:AddSubBusiness(1)
 		end
 
-		if (self.m_businesses.clubhouse) then
-			for _, bb in ipairs(self.m_businesses.clubhouse:GetSubBusinesses()) do
+		if (clubhouse and clubhouse:IsValid()) then
+			for _, bb in ipairs(clubhouse:GetSubBusinesses()) do
 				if (bb:IsValid()) then
 					local index = bb:GetIndex()
-					self.m_businesses.nightclub:AddSubBusiness(index + 2)
+					nightclub:AddSubBusiness(index + 2)
 				end
 			end
 		end
 
-		self.m_data_initialized = true
+		self.m_businesses.nightclub = nightclub
+		self.m_data_initialized     = true
 
 		if (GVars.features.yrv3.nc_always_popular) then
 			self.m_businesses.nightclub:LockPopularityDecay()
@@ -650,38 +640,35 @@ end
 ---@param index integer -- `1 .. 7`
 ---@return Factory?
 function YRV3:GetFactoryByIndex(index)
-	if (not self:CanAccess()) then
-		return
-	end
+	if (not self:CanAccess()) then return end
 
 	if (type(index) ~= "number" or not math.is_inrange(index, 1, 7)) then
 		Notifier:ShowError("YRV3", "Invalid factory index! Please make sure to use a number between 1 and 7.")
 		return
 	end
 
-	local factory -- fwd decl
-	if (index < 6) then
+	index = index - 1
+	if (index < 5) then
 		local clubhouse = self.m_businesses.clubhouse
-		if (not clubhouse) then
+		if (not clubhouse) then return end
+
+		local factories = self.m_businesses.clubhouse:GetSubBusinesses()
+		if (type(factories) ~= "table") then
 			return
 		end
 
-		local factories = self.m_businesses.clubhouse:GetSubBusinesses()
-		if (type(factories) == "table") then
-			for _, f in ipairs(factories) do
-				if (f:GetIndex() == index - 1) then
-					factory = f
-					break
-				end
+		for _, f in ipairs(factories) do
+			if (f:GetIndex() == index) then
+				return f
 			end
 		end
+	elseif (index == 5) then
+		return self.m_businesses.bunker
 	elseif (index == 6) then
-		factory = self.m_businesses.bunker
-	elseif (index == 7) then
-		factory = self.m_businesses.acid_lab
+		return self.m_businesses.acid_lab
 	end
 
-	return factory
+	return nil
 end
 
 ---@param index integer -- `1 .. 7`
@@ -731,34 +718,37 @@ function YRV3:CommandToggleProduction(index, isNightclubHub)
 
 	if (factory:HasFullProduction()) then
 		Notifier:ShowError(name, _T("YRV3_FAST_PROD_ERR"))
-	else
-		local prefix = "Fast production"
-		local state  = bool and "enabled" or "disabled"
-		local msg    = isNightclubHub and _F("%s for the %s hub", state, factory:GetName()) or state
-		Notifier:ShowMessage(name, _F("%s %s.", prefix, msg))
+		return
 	end
+
+	local prefix = "Fast production"
+	local state  = bool and "enabled" or "disabled"
+	local msg    = isNightclubHub and _F("%s for the %s hub", state, factory:GetName()) or state
+	Notifier:ShowMessage(name, _F("%s %s.", prefix, msg))
 end
 
 function YRV3:FillAll()
 	if (not self:CanAccess()) then
 		return
 	end
 
-	if (self.m_businesses.office) then
-		for _, wh in ipairs(self.m_businesses.office:GetCargoWarehouses()) do
+	local office = self.m_businesses.office
+	local hangar = self.m_businesses.hangar
+	if (office and office:IsValid()) then
+		for _, wh in ipairs(office:GetCargoWarehouses()) do
 			if (wh:IsValid()) then
 				wh.auto_fill = true
 			end
 		end
 	end
 
-	if (self.m_businesses.hangar and self.m_businesses.hangar:IsValid()) then
-		self.m_businesses.hangar.auto_fill = true
+	if (hangar and hangar:IsValid()) then
+		hangar.auto_fill = true
 	end
 
 	for i = 1, 7 do
 		local factory = self:GetFactoryByIndex(i)
-		if (factory) then
+		if (factory and factory:IsValid() and factory:IsSetup()) then
 			factory:ReStock()
 			sleep(math.random(600, 1200))
 		end

SSV2/includes/features/online/yim_resupplier/businesses/BusinessFront.lua

@@ -45,15 +45,14 @@ function BusinessFront.new(opts)
 	-- assert(IsInstance(opts.coords, vec3), "Missing argument: coords<vec3>") -- not necessary. UI does not render a tp button if this is missing and LuaLS will warn as well
 
 	local base                        = BusinessBase.new(opts)
-	local instance                    = setmetatable(base, BusinessFront)
+	local instance                    = setmetatable(base, BusinessFront) ---@cast instance BusinessFront
 	instance.m_subs                   = {}
 	instance.m_last_report_check_time = 0
 
 	if (opts.safe_data) then
 		instance.m_safe = CashSafe.new(opts.safe_data)
 	end
 
-	---@diagnostic disable-next-line
 	return instance
 end
 

SSV2/includes/features/online/yim_resupplier/businesses/BusinessHub.lua

@@ -37,15 +37,14 @@ function BusinessHub.new(opts)
 	assert(type(opts.max_units) == "number", "Missing argument: max_units<integer>")
 
 	local base                 = BusinessBase.new(opts)
-	local instance             = setmetatable(base, BusinessHub)
+	local instance             = setmetatable(base, BusinessHub) ---@cast instance BusinessHub
 	instance.fast_prod_enabled = false
 	instance.fast_prod_running = false
 	instance.m_vpu             = opts.vpu
 	instance.m_prod_time_g     = SGSL:Get(SGSL.data.bhub_prod_time_global):AsGlobal():At(1, base:GetIndex())
 	instance.m_prod_bool_g     = SGSL:Get(SGSL.data.bhub_prod_bool_global):AsGlobal()
 	instance.m_tech_global     = base:GetBaseGlobal():At(321)
 
-	---@diagnostic disable-next-line
 	return instance
 end
 

SSV2/includes/features/online/yim_resupplier/businesses/CarWash.lua

@@ -148,7 +148,7 @@ CarWash.__index = CarWash
 ---@return CarWash
 function CarWash.new(opts)
 	local base        = BasicBusiness.new(opts)
-	local instance    = setmetatable(base, CarWash)
+	local instance    = setmetatable(base, CarWash) ---@cast instance CarWash
 	instance.m_safe   = CashSafe.new({
 		name            = opts.name,
 		cash_value_stat = "MPX_CWASH_SAFE_CASH_VALUE",
@@ -189,7 +189,6 @@ function CarWash.new(opts)
 		}))
 	end
 
-	---@diagnostic disable-next-line
 	return instance
 end
 

SSV2/includes/features/online/yim_resupplier/businesses/Clubhouse.lua

@@ -26,12 +26,15 @@ Clubhouse.__index     = Clubhouse
 ---@return Clubhouse
 function Clubhouse.new(opts)
 	local base             = BusinessFront.new(opts)
-	local instance         = setmetatable(base, Clubhouse)
+	local instance         = setmetatable(base, Clubhouse) ---@cast instance Clubhouse
 	local custom_name1     = stats.get_string("MPX_MC_GANG_NAME")
 	local custom_name2     = stats.get_string("MPX_MC_GANG_NAME2")
 	instance.m_custom_name = _F("%s%s", custom_name1, custom_name2)
 
-	---@diagnostic disable-next-line
+	for i = 0, 4 do
+		instance:AddSubBusiness(i)
+	end
+
 	return instance
 end
 

SSV2/includes/features/online/yim_resupplier/businesses/Factory.lua

@@ -46,7 +46,7 @@ function Factory.new(opts)
 	assert(type(opts.id) == "number" and math.is_inrange(opts.id, 0, 6), "Invalid Biker Business id.")
 
 	local base                   = BusinessBase.new(opts)
-	local instance               = setmetatable(base, Factory)
+	local instance               = setmetatable(base, Factory) ---@cast instance Factory
 	instance.m_normalized_name   = opts.normalized_name
 	instance.fast_prod_enabled   = false
 	instance.m_fast_prod_running = false
@@ -64,7 +64,6 @@ function Factory.new(opts)
 	instance.m_prod_time_g       = baseGlobal:At(205):At(idx, 13):At(9)
 	instance.m_restock_g         = restockGlobal:At(1, idx)
 
-	---@diagnostic disable-next-line
 	return instance
 end
 

SSV2/includes/features/online/yim_resupplier/businesses/Nightclub.lua

@@ -29,9 +29,9 @@ Nightclub.__index     = Nightclub
 ---@return Nightclub
 function Nightclub.new(opts)
 	local base             = BusinessFront.new(opts)
-	local instance         = setmetatable(base, Nightclub)
+	local instance         = setmetatable(base, Nightclub) ---@cast instance Nightclub
 	instance.m_custom_name = opts.custom_name or "Nightclub"
-	---@diagnostic disable-next-line
+
 	return instance
 end
 

SSV2/includes/features/online/yim_resupplier/businesses/Office.lua

@@ -41,10 +41,7 @@ Office.__index = Office
 ---@return Office
 function Office.new(opts)
 	local base                 = BusinessFront.new(opts)
-
-	---@type Office
-	---@diagnostic disable-next-line
-	local instance             = setmetatable(base, Office)
+	local instance             = setmetatable(base, Office) ---@cast instance Office
 	instance.m_custom_name     = opts.custom_name
 	instance.m_earnings_report = {
 		lifetime_buy_undertaken  = 0,
@@ -54,7 +51,12 @@ function Office.new(opts)
 		lifetime_earnings        = 0,
 		lifetime_earnings_fmt    = "$0",
 	}
+
+	for i = 0, 4 do
+		instance:AddSubBusiness(i)
+	end
 	instance:CheckVehicleWarehouse()
+
 	return instance
 end
 
@@ -71,9 +73,7 @@ function Office:CheckVehicleWarehouse()
 
 	local idx = ie_wh_prop - 114
 	local ref = RawBusinessData.VehicleWarehouses[idx]
-	if (not ref) then
-		return
-	end
+	if (not ref) then return end
 
 	self.m_vehicle_warehouse = VehicleWarehouse.new(
 		Game.GetGXTLabel(ref.gxt),

SSV2/includes/features/online/yim_resupplier/businesses/SalvageYard.lua

@@ -24,8 +24,7 @@ SalvageYard.__index = SalvageYard
 ---@param opts SYOpts
 ---@return SalvageYard
 function SalvageYard.new(opts)
-	local base = BusinessFront.new(opts)
-	---@diagnostic disable-next-line
+	local base = BusinessFront.new(opts) ---@cast base SalvageYard
 	return setmetatable(base, SalvageYard)
 end
 
@@ -134,9 +133,9 @@ end
 
 ---@param slot integer
 ---@return string
-function SalvageYard:GetSalvageCarInSlot(slot)
+function SalvageYard:GetRobberyCarInSlot(slot)
 	local index = stats.get_int(_F("MPX_MPSV_MODEL_SALVAGE_VEH%d", slot))
-	return data.vehicle_targets[index] or "NULL"
+	return data.vehicle_targets[index]
 end
 
 function SalvageYard:DisableWeeklyCooldown()