fix(misc): miscellaneous fixes

### YRV3

- Do not render factory features if the business has not been setup.
- Fix warehouse autofill using wrong integer index.
- Refactor: Add an update method to businesses and let them handle updating themselves.
- Throttle business update tick in math thread.
- Replace problematic asserts in the `Warehouse` module with simple if statements.
- Do not populate Nightclub hubs if the player does not own a business hub.

### GUI

- Always default to the first tab in the side bar.
- Persist previous tab between category switches.
- Fix text wrapping.

Author: xesdoog

SSV2/includes/features/YimResupplierV3.lua

@@ -9,7 +9,7 @@
 
 local SGSL                       = require("includes.services.SGSL")
 local Warehouse                  = require("includes.modules.businesses.Warehouse")
-local BikerBusiness              = require("includes.modules.businesses.BikerBusiness")
+local Factory                    = require("SSV2.includes.modules.businesses.Factory")
 local Nightclub                  = require("includes.modules.businesses.Nightclub")
 local Clubhouse                  = require("includes.modules.businesses.Clubhouse")
 local CashSafe                   = require("includes.modules.businesses.CashSafe")
@@ -59,8 +59,8 @@ Enums.eYRState                   = {
 ---@field safes array<CashSafe>
 ---@field clubhouse? Clubhouse
 ---@field hangar? Warehouse
----@field bunker? BikerBusiness
----@field acid_lab? BikerBusiness
+---@field bunker? Factory
+---@field acid_lab? Factory
 ---@field nightclub? Nightclub
 ---@field car_wash? CarWash
 ---@field salvage_yard? SalvageYard
@@ -75,8 +75,9 @@ Enums.eYRState                   = {
 ---@field private m_sell_script_disp_name string
 ---@field private m_raw_data RawBusinessData
 ---@field private m_businesses YRV3Businesses
----@field private m_last_as_check_time milliseconds
+---@field private m_last_autosell_check_time milliseconds
 ---@field private m_last_income_check_time milliseconds
+---@field private m_last_business_update_time milliseconds
 ---@field private m_cooldown_state_dirty boolean
 ---@field private m_initial_data_done boolean
 ---@field private m_data_initialized boolean
@@ -92,20 +93,21 @@ function YRV3:init()
 		return self
 	end
 
-	self.m_total_sum              = 0
-	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             = {
+	self.m_total_sum                 = 0
+	self.m_bhub_script_handle        = 0
+	self.m_last_autosell_check_time  = 0
+	self.m_last_income_check_time    = 0
+	self.m_last_business_update_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 = {},
 		safes      = {},
 	}
@@ -131,18 +133,19 @@ function YRV3:init()
 end
 
 function YRV3:Reset()
-	self.m_total_sum              = 0
-	self.m_last_as_check_time     = 0
-	self.m_last_income_check_time = 0
-	self.m_businesses             = {
+	self.m_total_sum                 = 0
+	self.m_last_autosell_check_time  = 0
+	self.m_last_income_check_time    = 0
+	self.m_last_business_update_time = 0
+	self.m_businesses                = {
 		warehouses = {},
 		safes      = {},
 	}
-	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_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()
@@ -235,12 +238,12 @@ function YRV3:GetCarWash()
 	return self.m_businesses.car_wash
 end
 
----@return BikerBusiness?
+---@return Factory?
 function YRV3:GetBunker()
 	return self.m_businesses.bunker
 end
 
----@return BikerBusiness?
+---@return Factory?
 function YRV3:GetAcidLab()
 	return self.m_businesses.acid_lab
 end
@@ -343,7 +346,7 @@ function YRV3:PopulateBikerBusinesses()
 			local eq_upg_mult        = tunables.get_int("GR_MANU_PRODUCT_VALUE_EQUIPMENT_UPGRADE")
 			local stf_upg_mult       = tunables.get_int("GR_MANU_PRODUCT_VALUE_STAFF_UPGRADE")
 
-			self.m_businesses.bunker = BikerBusiness.new({
+			self.m_businesses.bunker = Factory.new({
 				id         = 5,
 				name       = Game.GetGXTLabel(_F("MP_BUNKER_%d", gxt_idx)),
 				coords     = ref and ref.coords or vec3:zero(),
@@ -360,7 +363,7 @@ function YRV3:PopulateBikerBusinesses()
 			and (stats.get_int("MPX_XM22_LAB_EQUIP_UPGRADED") == 1)
 		local eq_upg_mult          = tunables.get_int("BIKER_ACID_PRODUCT_VALUE_EQUIPMENT_UPGRADE")
 
-		self.m_businesses.acid_lab = BikerBusiness.new({
+		self.m_businesses.acid_lab = Factory.new({
 			id         = 6,
 			name       = Game.GetGXTLabel("MP_BWH_ACID"),
 			vpu_mult_1 = has_eq_upgrade and eq_upg_mult or 0,
@@ -554,27 +557,6 @@ function YRV3:InitializeData()
 	self:PopulateNightclub()
 end
 
-function YRV3:WarehouseAutofill()
-	if (not self:CanAccess()) then
-		return
-	end
-
-	for _, wh in ipairs(self.m_businesses.warehouses) do
-		wh:AutoFill()
-	end
-end
-
-function YRV3:HangarAutofill()
-	if (not self:CanAccess()) then
-		return
-	end
-
-	local hangar = self.m_businesses.hangar
-	if (hangar and hangar:IsValid()) then
-		self.m_businesses.hangar:AutoFill()
-	end
-end
-
 function YRV3:FinishSaleOnCommand()
 	if (not self:CanAccess()) then
 		return
@@ -809,7 +791,7 @@ end
 local fadedOutTimer = Timer.new(1e4)
 fadedOutTimer:pause()
 function YRV3:SetupAutosell()
-	if (Time.millis() - self.m_last_as_check_time < 1200) then
+	if (Time.millis() - self.m_last_autosell_check_time < 1200) then
 		return
 	end
 
@@ -858,7 +840,7 @@ function YRV3:SetupAutosell()
 		fadedOutTimer:pause()
 	end
 
-	self.m_last_as_check_time = Time.millis()
+	self.m_last_autosell_check_time = Time.millis()
 end
 
 function YRV3:AutoSellHandler()
@@ -927,46 +909,33 @@ function YRV3:MCT()
 	end)
 end
 
-function YRV3:AutoProduceHandler()
-	for _, bb in ipairs(self.m_businesses.clubhouse:GetSubBusinesses()) do
-		if (bb.fast_prod_enabled and not bb.fast_prod_running) then
-			bb:LoopProduction()
-		end
-	end
-
-	local bunker = self.m_businesses.bunker
-	if (bunker and bunker:IsValid()) then
-		if (bunker.fast_prod_enabled and not bunker.fast_prod_running) then
-			bunker:LoopProduction()
-		end
-	end
-
-	local acidlab = self.m_businesses.acid_lab
-	if (acidlab and acidlab:IsValid()) then
-		if (acidlab.fast_prod_enabled and not acidlab.fast_prod_running) then
-			acidlab:LoopProduction()
-		end
-	end
-
-	if (not self.m_businesses.nightclub) then
+function YRV3:UpdateBusinesses()
+	if (not self:CanAccess()) then
 		return
 	end
 
-	local hubs = self.m_businesses.nightclub:GetSubBusinesses()
-	if (not hubs) then
+	if (Time.millis() - self.m_last_business_update_time < 500) then
 		return
 	end
 
-	for _, hub in ipairs(hubs) do
-		if (hub.fast_prod_enabled and not hub.fast_prod_running) then
-			hub:LoopProduction()
+	for key, business in pairs(self.m_businesses) do
+		if (key == "safes" or key == "salvage_yard" or key == "car_wash") then
+			goto continue
 		end
+
+		if (key == "warehouses") then
+			for _, wh in ipairs(business) do
+				if (type(wh.Update) == "function") then
+					wh:Update()
+				end
+			end
+		elseif (type(business.Update) == "function") then
+			business:Update()
+		end
+		::continue::
 	end
-end
 
-function YRV3:AutoFillHandler()
-	self:HangarAutofill()
-	self:WarehouseAutofill()
+	self.m_last_business_update_time = Time.millis()
 end
 
 ---@param business BusinessBase|BasicBusiness
@@ -1046,11 +1015,11 @@ function YRV3:OnTick()
 	self.m_state = Enums.eYRState.RUNNING
 	self:SetLastError("")
 
+	self:UpdateBusinesses()
+	self:CalculateEstimatedIncome()
+
 	self:AutoSellHandler()
-	self:AutoFillHandler()
-	self:AutoProduceHandler()
 	self:CooldownHandler()
-	self:CalculateEstimatedIncome()
 end
 
 return YRV3

SSV2/includes/frontend/casino_ui.lua

@@ -14,8 +14,8 @@ local function drawGamblingTab()
 	ImGui.SeparatorText(_T "CP_COOLDOWN_BYPASS")
 	GVars.features.dunk.bypass_casino_bans, _ = GUI:CustomToggle(_T "CP_COOLDOWN_BYPASS_ENABLE",
 		GVars.features.dunk.bypass_casino_bans, {
-			tooltip = _T "CP_COOLDOWN_BYPASS_TOOLTIP",
-			color = Color("#AA0000")
+			tooltip = _T("CP_COOLDOWN_BYPASS_TOOLTIP"),
+			color   = Color("#AA0000")
 		})
 
 	ImGui.SameLine()
@@ -25,9 +25,12 @@ local function drawGamblingTab()
 
 	ImGui.SeparatorText(_T "CP_POKER_SETTINGS")
 	GVars.features.dunk.force_poker_cards, _ = GUI:CustomToggle(_T "CP_POKER_FORCE_ROYAL_FLUSH",
-		GVars.features.dunk.force_poker_cards)
+		GVars.features.dunk.force_poker_cards
+	)
+
 	GVars.features.dunk.set_dealers_poker_cards, _ = GUI:CustomToggle(_T "CP_POKER_FORCE_BAD_BEAT",
-		GVars.features.dunk.set_dealers_poker_cards)
+		GVars.features.dunk.set_dealers_poker_cards
+	)
 
 	ImGui.SeparatorText(_T "CP_BLACKJACK_SETTINGS")
 	ImGui.BulletText(_T "CP_BLACKJACK_DEALER_FACE_DOWN_CARD")

SSV2/includes/frontend/yrv3_ui.lua

@@ -191,7 +191,7 @@ local function drawWarehouse(warehouse, notOwnedLabel)
 	ImGui.PopStyleVar()
 end
 
----@param bb? BikerBusiness
+---@param bb? Factory
 ---@param notOwnedLabel? string Optional label to display if the business isn't owned
 local function drawBikerBusiness(bb, notOwnedLabel)
 	if (not bb or not bb:IsValid()) then
@@ -202,6 +202,11 @@ local function drawBikerBusiness(bb, notOwnedLabel)
 		return
 	end
 
+	if (not bb:IsSetup()) then
+		ImGui.Text(_T("YRV3_GENERIC_NOT_SETUP"))
+		return
+	end
+
 	local bulletWidth   = measureBulletWidths({
 		_T("YRV3_EQUIP_UPGDRADE"),
 		_T("YRV3_STAFF_UPGDRADE"),

SSV2/includes/lib/translations/__hashmap.json

@@ -563,5 +563,6 @@
     "YRV3_CLUBHOUSE_NOT_OWNED": 3232489524,
     "YRV3_CASH_SAFE": 3656730806,
     "SY_ALWAYS_MAX_INCOME": 668681147,
-    "SY_ALWAYS_MAX_INCOME_TT": 3152143970
+    "SY_ALWAYS_MAX_INCOME_TT": 3152143970,
+    "YRV3_GENERIC_NOT_SETUP": 2494197122
 }

SSV2/includes/lib/translations/de-DE.lua

@@ -563,5 +563,6 @@ return {
 	["SY_CD_ROB_TYPE_ERR"] = "Aktueller Raubüberfall konnte nicht abgerufen werden! Sind Sie sicher, dass Sie eines gestartet haben?",
 	["YRV3_CLUBHOUSE_NOT_OWNED"] = "Sie besitzen keinen Motorradclub.",
 	["SY_ALWAYS_MAX_INCOME_TT"] = "Verhindert, dass Ihre Einkommensgrenze mit der Zeit sinkt.",
-	["SY_ALWAYS_MAX_INCOME"] = "Sperrschwelle"
+	["SY_ALWAYS_MAX_INCOME"] = "Sperrschwelle",
+	["YRV3_GENERIC_NOT_SETUP"] = "Dieses Unternehmen wurde noch nicht eingerichtet. Bitte kehren Sie nach Abschluss der Setup-Mission zurück."
 }

SSV2/includes/lib/translations/en-US.lua

@@ -220,6 +220,7 @@ return {
 	["YRV3_LSD_LAB_NOT_OWNED"]             = "You don't own an acid lab.",
 	["YRV3_CLUB_NOT_OWNED"]                = "You don't own a nightclub.",
 	["YRV3_GENERIC_NOT_OWNED"]             = "You don't own this business.",
+	["YRV3_GENERIC_NOT_SETUP"]             = "This business has not been setup. Please return after finishing the setup mission.",
 	["YRV3_CASH_SAFE"]                     = "Safe Cash",
 	["YRV3_CARGO_AMT"]                     = "Cargo Held",
 	["YRV3_CRATES_LABEL"]                  = "Crates",

SSV2/includes/lib/translations/es-ES.lua

@@ -563,5 +563,6 @@ return {
 	["SY_MAX_THRESHOLD"] = "Maximizar los ingresos",
 	["YRV3_CASH_SAFE"] = "Efectivo seguro",
 	["SY_ALWAYS_MAX_INCOME"] = "Umbral de bloqueo",
-	["SY_ALWAYS_MAX_INCOME_TT"] = "Evita que su umbral de ingresos disminuya con el tiempo."
+	["SY_ALWAYS_MAX_INCOME_TT"] = "Evita que su umbral de ingresos disminuya con el tiempo.",
+	["YRV3_GENERIC_NOT_SETUP"] = "Este negocio no ha sido creado. Regrese después de finalizar la misión de configuración."
 }

SSV2/includes/lib/translations/fr-FR.lua

@@ -563,5 +563,6 @@ return {
 	["YRV3_CASH_SAFE"] = "Argent sécurisé",
 	["SY_ROB_IN_PROGRESS"] = "En cours.",
 	["SY_ALWAYS_MAX_INCOME_TT"] = "Empêche votre seuil de revenu de diminuer avec le temps.",
-	["SY_ALWAYS_MAX_INCOME"] = "Seuil de verrouillage"
+	["SY_ALWAYS_MAX_INCOME"] = "Seuil de verrouillage",
+	["YRV3_GENERIC_NOT_SETUP"] = "Cette entreprise n'a pas été créée. Veuillez revenir après avoir terminé la mission de configuration."
 }

SSV2/includes/lib/translations/it-IT.lua

@@ -563,5 +563,6 @@ return {
 	["SY_CD_ROB_TYPE_ERR"] = "Impossibile ottenere la rapina in corso! Sei sicuro di averne iniziato uno?",
 	["SY_INCOME_THRESHOLD"] = "Soglia di reddito",
 	["SY_ALWAYS_MAX_INCOME"] = "Soglia di blocco",
-	["SY_ALWAYS_MAX_INCOME_TT"] = "Evita che la tua soglia di reddito diminuisca nel tempo."
+	["SY_ALWAYS_MAX_INCOME_TT"] = "Evita che la tua soglia di reddito diminuisca nel tempo.",
+	["YRV3_GENERIC_NOT_SETUP"] = "Questa attività non è stata configurata. Si prega di tornare dopo aver terminato la missione di configurazione."
 }

SSV2/includes/lib/translations/ja-JP.lua

@@ -563,5 +563,6 @@ return {
 	["YRV3_CASH_SAFE"] = "安全な現金",
 	["YRV3_CLUBHOUSE_NOT_OWNED"] = "あなたはオートバイクラブを所有していません。",
 	["SY_ALWAYS_MAX_INCOME"] = "ロックしきい値",
-	["SY_ALWAYS_MAX_INCOME_TT"] = "収入の基準値が時間の経過とともに低下するのを防ぎます。"
+	["SY_ALWAYS_MAX_INCOME_TT"] = "収入の基準値が時間の経過とともに低下するのを防ぎます。",
+	["YRV3_GENERIC_NOT_SETUP"] = "このビジネスは確立されていません。セットアップミッション終了後、お戻りください。"
 }