Merge pull request #94 from acidlabsdev/main

refactor(ImGuiExt): refactor notification widget

Author: xesdoog

CONTRIBUTING.md

@@ -99,7 +99,7 @@ You are free to use any style you want, except in these cases:
 ### Formatting
 
 - **Indentations:**
-  - Does not matter. If using tabs, make sure one tab equals **four** spaces.
+  - Indentation and empty spaces are handled by [.editorconfig](.editorconfig). Please make sure you have it in your workspace.
 
 - **Line Wrapping:**
   - Try to wrap wide lines using either your IDE's formatter or a Pythonic way.

SSV2/includes/data/config.lua

@@ -300,6 +300,7 @@ local Config <const> = {
 			sy_always_max_income = false,
 			sy_disable_rob_cd = false,
 			sy_disable_rob_weekly_cd = false,
+			safe_loop_warn_ack = false,
 		},
 		bsv2 = {
 			escort_groups = {

SSV2/includes/data/ped_reverse_lookup.lua SSV2/includes/data/ped_hashmap.luaSSV2/includes/data/ped_reverse_lookup.lua renamed to SSV2/includes/data/ped_hashmap.lua

@@ -521,6 +521,9 @@ local RawBusinessData <const> = {
 			{
 				property_stat   = "MPX_ARCADE_OWNED",
 				cash_value_stat = "MPX_ARCADE_SAFE_CASH_VALUE",
+				paytime_stat    = "MPX_ARCADE_PAY_TIME_LEFT",
+				interior_id     = 278273,
+				room_hash       = 3710124102, -- MAINW_RM
 				raw_data_entry  = "Arcades",
 				get_max_cash    = function()
 					return tunables.get_int("MAXARCADESAFESTORAGE")
@@ -529,23 +532,32 @@ local RawBusinessData <const> = {
 			{
 				property_stat   = "MPX_FIXER_HQ_OWNED",
 				cash_value_stat = "MPX_FIXER_SAFE_CASH_VALUE",
+				paytime_stat    = "MPX_FIXER_PASSIVE_PAY_TIME_LEFT",
+				interior_id     = 288257,
+				room_hash       = 767622941, -- ROOM_MAIN
 				raw_data_entry  = "Agencies",
 				get_max_cash    = function()
 					return tunables.get_int("MAXFIXERHQSAFESTORAGE")
 				end,
 			},
 			{
 				property_stat   = "MPX_BAIL_OFFICE_OWNED",
-				cash_value_stat = "MPX_ARCADE_SAFE_CASH_VALUE",
+				cash_value_stat = "MPX_BAIL_SAFE_CASH_VALUE",
 				raw_data_entry  = "BailOffices",
+				interior_id     = 295425,
+				room_hash       = 2990789022, -- ROOM_OFFICE
 				get_max_cash    = function()
 					return tunables.get_int(-1736487760)
 				end,
+				-- no paytime_stat; this functions somewhat similar to the clubhouse duffle
 			},
 			{
 				property_stat   = "MPX_HACKER_DEN_OWNED",
 				cash_value_stat = "MPX_HDEN24_SAFE_CASH_VALUE",
+				paytime_stat    = "MPX_HDEN24_PAY_TIME_LEFT",
 				raw_data_entry  = "HackerDen",
+				interior_id     = 297729,
+				room_hash       = 1055494658, -- ROOM_WORKSHOP
 				get_max_cash    = function()
 					return tunables.get_int(-792265290)
 				end,
@@ -554,6 +566,9 @@ local RawBusinessData <const> = {
 		fronts = {
 			salvage_yard = {
 				cash_value_stat = "MPX_SALVAGE_SAFE_CASH_VALUE",
+				paytime_stat    = "MPX_SALVAGE_PAY_TIME_LEFT",
+				interior_id     = 293377,
+				room_hash       = 1287104603, -- SHOP_OFFICE
 				get_max_cash    = function()
 					if (stats.get_int("MPX_SALVAGE_YARD_WALL_SAFE") == 1) then
 						return tunables.get_int(594814186)
@@ -563,12 +578,21 @@ local RawBusinessData <const> = {
 			},
 			clubhouse = {
 				cash_value_stat = "MPX_BIKER_BAR_RESUPPLY_CASH",
+				interior_id     = 246273,
+				room_hash       = 405984664, -- BIKERDLC_INT01_OFFRM
 				get_max_cash    = function()
 					return tunables.get_int("BIKER_PASSIVE_INCOME_BAG_LIMIT")
 				end,
+				-- there's no paytime stat; naturally there's still a timer
+				-- but this uses a packed stat int and a bool global as well.
+				-- Im not even gonna bother.
+				-- hint: 36620
 			},
 			nightclub = {
 				cash_value_stat = "MPX_CLUB_SAFE_CASH_VALUE",
+				paytime_stat    = "MPX_CLUB_PAY_TIME_LEFT",
+				interior_id     = 271617,
+				room_hash       = 3920029441, -- "INT_01_ORIFICE"
 				get_max_cash    = function()
 					return tunables.get_int("NIGHTCLUBMAXSAFEVALUE")
 				end,

SSV2/includes/data/yrv3_data.lua

@@ -302,13 +302,23 @@ function YRV3:DoesPlayerOwnAnyBikerBusiness()
 	return false
 end
 
+---@param idx integer
+---@return boolean
+function YRV3:IsPropertyIndexValid(idx)
+	if (type(idx) ~= "number") then
+		return false
+	end
+
+	return idx > 0 and idx < math.int32_max()
+end
+
 function YRV3:PopulateClubhouse()
 	local club_prop = stats.get_int("MPX_PROP_CLUBHOUSE")
-	if (club_prop == 0) then
+	if (not self:IsPropertyIndexValid(club_prop)) then
 		return
 	end
 
-	local idx = club_prop - 90
+	local idx      = club_prop - 90
 	local club_ref = self.m_raw_data.Clubhouses[idx]
 	if (not club_ref) then
 		return
@@ -420,18 +430,22 @@ function YRV3:PopulateNightclub()
 
 	ThreadManager:Run(function()
 		local nc_index = stats.get_int("MPX_NIGHTCLUB_OWNED")
-		local ref = self.m_raw_data.Nightclubs[nc_index]
-		if (nc_index == 0 or not ref) then
+		local ref      = self.m_raw_data.Nightclubs[nc_index]
+		if (not self:IsPropertyIndexValid(nc_index) or not ref) then
 			self.m_data_initialized = true
 			return
 		end
 
+		local nameid   = stats.get_int("MPX_PROP_NIGHTCLUB_NAME_ID")
 		local safedata = self.m_raw_data.CashSafes.fronts.nightclub
-		safedata.name = "Nightclub Safe"
+		local clubname = NightclubNames[nameid + 1]
+		safedata.name  = clubname
+
+
 		self.m_businesses.nightclub = Nightclub.new({
 			id          = nc_index,
 			name        = Game.GetGXTLabel(_F("MP_NCLU_%d", nc_index)),
-			custom_name = NightclubNames[stats.get_int("MPX_PROP_NIGHTCLUB_NAME_ID") + 1],
+			custom_name = clubname,
 			coords      = ref.coords,
 			safe_data   = safedata
 		})
@@ -471,7 +485,6 @@ function YRV3:PopulateNightclub()
 		end
 
 		self.m_data_initialized = true
-		sleep(3000)
 
 		if (GVars.features.yrv3.nc_always_popular) then
 			self.m_businesses.nightclub:LockPopularityDecay()
@@ -480,7 +493,8 @@ function YRV3:PopulateNightclub()
 end
 
 function YRV3:PopulateCarWash()
-	if (stats.get_int("MPX_SB_CAR_WASH_OWNED") == 0) then
+	local idx = stats.get_int("MPX_SB_CAR_WASH_OWNED")
+	if (not self:IsPropertyIndexValid(idx)) then
 		return
 	end
 
@@ -493,7 +507,7 @@ end
 function YRV3:PopulateCashSafes()
 	for i, data in ipairs(self.m_raw_data.CashSafes.regular) do
 		local property_index = stats.get_int(data.property_stat)
-		if (property_index == 0) then
+		if (not self:IsPropertyIndexValid(property_index)) then
 			goto continue
 		end
 
@@ -504,6 +518,9 @@ function YRV3:PopulateCashSafes()
 			name            = name,
 			coords          = coords,
 			cash_value_stat = data.cash_value_stat,
+			paytime_stat    = data.paytime_stat,
+			interior_id     = data.interior_id,
+			room_hash       = data.room_hash,
 			get_max_cash    = data.get_max_cash,
 		})
 
@@ -513,14 +530,16 @@ end
 
 function YRV3:PopulateSalvageYard()
 	local property_index = stats.get_int("MPX_SALVAGE_YARD_OWNED")
-	if (property_index == 0) then
+	if (not self:IsPropertyIndexValid(property_index)) then
 		return
 	end
 
-	local ref                      = self.m_raw_data.SalvageYards[property_index]
-	local name                     = ref and Game.GetGXTLabel(ref.gxt) or _T("SY_SALVAGE_YARD")
-	local safe_data                = self.m_raw_data.CashSafes.fronts.salvage_yard
-	safe_data.name                 = name
+	local ref       = self.m_raw_data.SalvageYards[property_index]
+	local name      = ref and Game.GetGXTLabel(ref.gxt) or _T("SY_SALVAGE_YARD")
+	local safe_data = self.m_raw_data.CashSafes.fronts.salvage_yard
+	safe_data.name  = name
+
+
 	self.m_businesses.salvage_yard = SalvageYard.new({
 		id        = property_index,
 		name      = name,
@@ -1023,20 +1042,19 @@ function YRV3:UpdateBusinesses()
 	end
 
 	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 (key == "safes") then
+			for _, safe in ipairs(self.m_businesses.safes) do
+				safe:Update()
+			end
 		elseif (type(business.Update) == "function") then
 			business:Update()
 		end
-		::continue::
 	end
 
 	self.m_last_business_update_time = Time.millis()

SSV2/includes/features/YimResupplierV3.lua

@@ -9,7 +9,7 @@
 
 local World                      = require("includes.modules.World")
 local t_GameObjects              = require("includes.data.objects")
-local t_GamePeds                 = require("includes.data.ped_reverse_lookup")
+local t_GamePeds                 = require("includes.data.ped_hashmap")
 local t_GameVehicles             = require("includes.data.vehicles")
 local t_PedScenarios             = require("includes.data.actions.scenarios")
 local Refs                       = require("includes.data.refs")