Merge pull request #113 from How-Bout-No/feature/enhanced-compat

fix(Mm): Proper checks

Author: xesdoog

SSV2/includes/data/globals_locals.lua

@@ -907,12 +907,22 @@ return {
 			capture_group = 1
 		}
 	},
-	submarine_global = {
-		description = "Submarine Global",
-		file = "am_mp_submarine.c",
+	service_vehicles_global = {
+		description = [[Stores status of Service Vehicles.
+		To find bitsets:
+		> freemode.c func_15166
+		> 	Global_2733138.f_XXX ;; i.e. 613 for Kosatka, 592 for Acid Lab
+		> 		func_15202(blah, blah, blah, THIS_NUMBER_IS_YOUR_BITSET_OFFSET);
+
+		Scrolling through offsets for Vectors has revealed that this has the coords of:
+		- Super Yacht @ offset -48
+		- Kosatka/Terrorbyte/MOC @ offset +13
+		- Acid Lab @ offset +75	
+		]],
+		file = "freemode.c",
 		LEGACY = {
 			value = 2658291,
-			pattern = [[if \(NETWORK::NETWORK_DOES_NETWORK_ID_EXIST\(Global_(\d{7})\[.*?Param0 /\*(\d+)\*/\]\.(f_\d{2})\)\)]],
+			pattern = [[MISC::SET_BIT\(&\(Global_(\d{7})\[PLAYER::PLAYER_ID\(\) /\*(\d{3})\*/\]\.(f_\d{3})\.f_\d{1}\), 31\);]],
 			capture_group = 1,
 			offsets = {
 				{
@@ -921,14 +931,14 @@ return {
 					description = "playerID read size."
 				},
 				{
-					value = 52,
+					value = 325,
 					capture_group = 3
 				}
 			}
 		},
 		ENHANCED = {
 			value = 2658294,
-			pattern = [[if \(NETWORK::NETWORK_DOES_NETWORK_ID_EXIST\(Global_(\d{7})\[.*?Param0 /\*(\d+)\*/\]\.(f_\d{2})\)\)]],
+			pattern = [[MISC::SET_BIT\(&\(Global_(\d{7})\[PLAYER::PLAYER_ID\(\) /\*(\d{3})\*/\]\.(f_\d{3})\.f_\d{1}\), 31\);]],
 			capture_group = 1,
 			offsets = {
 				{
@@ -937,7 +947,7 @@ return {
 					description = "playerID read size."
 				},
 				{
-					value = 52,
+					value = 325,
 					capture_group = 3
 				}
 			}

SSV2/includes/data/yrv3_data.lua

@@ -531,7 +531,7 @@ local RawBusinessData <const> = {
 		{ gxt = "MP_DBASE_2",  coords = vec3:new(34.4699, 2620.9768, 84.6202) },
 		{ gxt = "MP_DBASE_3",  coords = vec3:new(2755.9807, 3907.2722, 44.3148) },
 		{ gxt = "MP_DBASE_4",  coords = vec3:new(3389.6028, 5508.971, 24.875) },
-		{ gxt = "MP_DBASE_6",  coords = vec3:new(19.4492, 6825.3613, 14.4952) },
+		{ gxt = "MP_DBASE_6",  coords = vec3:new(19.4492, 6825.3613, 14.4952) }, -- skips DBASE_5
 		{ gxt = "MP_DBASE_7",  coords = vec3:new(-2229.408, 2395.4102, 12.0106) },
 		{ gxt = "MP_DBASE_8",  coords = vec3:new(-3.0095, 3344.4888, 40.2769) },
 		{ gxt = "MP_DBASE_9",  coords = vec3:new(2086.0674, 1761.3461, 103.043) },

SSV2/includes/features/Mastermind.lua

@@ -31,6 +31,7 @@ local secondary_targets = { "CASH", "WEED", "COKE", "GOLD" }
 ---@class FieldHangarProperty : GenericProperty
 ---@class SubmarineProperty : GenericProperty
 ---@field public heading float
+---@field public is_spawned boolean
 
 ---@alias HEIST_TYPES table<integer, HeistInfo>
 
@@ -101,17 +102,34 @@ function Mastermind:GetCayoSecTargets()
 	return loot_i or -1, loot_c or -1
 end
 
----@return ScriptGlobal
-local function GetSubCoordsGlobal()
-	local coords_global = SGSL:Get(SGSL.data.submarine_global)
-	local pid_size = coords_global:GetOffset(1)
-	local offset2 = coords_global:GetOffset(2)
-	local vec_offset = 286 -- magic
+--- Returns the coords and heading to either the Kosatka/Terrorbyte/MOC, whichever is called in.
+---@return vec3, float
+local function getServiceVehicleCoords()
+	local ser_veh_global = SGSL:Get(SGSL.data.service_vehicles_global)
+	local pid_size = ser_veh_global:GetOffset(1)
+	local offset2 = ser_veh_global:GetOffset(2)
+	local vec_offset = 13
 
-	return coords_global:AsGlobal()
+	local final = ser_veh_global:AsGlobal()
 		:At(LocalPlayer:GetPlayerID(), pid_size)
 		:At(offset2)
 		:At(vec_offset)
+
+	return final:ReadVec3(), final:At(3):ReadFloat()
+end
+
+---@return boolean
+local function isSubmarineSpawned()
+	local sub_global = SGSL:Get(SGSL.data.service_vehicles_global)
+	local pid_size = sub_global:GetOffset(1)
+	local offset2 = sub_global:GetOffset(2)
+	local sub_offset = 4
+	local sub_status = sub_global:AsGlobal()
+		:At(LocalPlayer:GetPlayerID(), pid_size)
+		:At(offset2)
+		:At(sub_offset)
+		:ReadInt()
+	return Bit.IsBitSet(sub_status, 31)
 end
 
 function Mastermind:ReadPropertyData()
@@ -135,17 +153,17 @@ function Mastermind:ReadPropertyData()
 		end
 
 		local hangar_idx = stats.get_int("MPX_MCKENZIE_HANGAR_OWNED")
-		if (hangar_idx > 0) then
-			local hangar_ref = self.m_raw_data.FieldHangar[1]
+		local hangar_ref = self.m_raw_data.FieldHangar[hangar_idx]
+		if (hangar_ref) then
 			self.m_properties.hangar = {
 				name   = Game.GetGXTLabel(hangar_ref.gxt),
 				coords = hangar_ref.coords
 			}
 		end
 
 		local facility_idx = stats.get_int("MPX_DBASE_OWNED")
-		if (facility_idx > 0) then
-			local facility_ref = self.m_raw_data.Facilities[facility_idx]
+		local facility_ref = self.m_raw_data.Facilities[facility_idx]
+		if (facility_ref) then
 			self.m_properties.facility = {
 				name   = Game.GetGXTLabel(facility_ref.gxt),
 				coords = facility_ref.coords
@@ -154,11 +172,11 @@ function Mastermind:ReadPropertyData()
 
 		local sub_hash = stats.get_int("MPX_IH_SUB_OWNED")
 		if (sub_hash == _J("kosatka")) then
-			local global = GetSubCoordsGlobal()
 			self.m_properties.submarine = {
 				name    = Game.GetGXTLabel("CELL_SUBMARINE"),
-				coords  = global:ReadVec3(),
-				heading = global:At(3):ReadFloat()
+				coords  = vec3:zero(),
+				heading = 0.0,
+				is_spawned = isSubmarineSpawned()
 			}
 		end
 	end)
@@ -230,9 +248,10 @@ function Mastermind:GetSubmarine()
 		return
 	end
 
-	local sub_global = GetSubCoordsGlobal()
-	sub.coords = sub_global:ReadVec3()
-	sub.heading = sub_global:At(3):ReadFloat()
+	sub.is_spawned = isSubmarineSpawned()
+	if (sub.is_spawned) then
+		sub.coords, sub.heading = getServiceVehicleCoords()
+	end
 	return sub
 end
 

SSV2/includes/frontend/mastermind_ui.lua

@@ -152,10 +152,9 @@ local function drawCayoTab()
 	end
 
 	local request_kosatka = SGSL:Get(SGSL.data.request_services_global):AsGlobal():At(613)
-	local sub_requested   = request_kosatka:ReadInt() == 1
-	local sub_spawned     = not sub.coords:is_zero()
+	local sub_requested = request_kosatka:ReadInt() == 1
 
-	ImGui.BeginDisabled(not sub_spawned)
+	ImGui.BeginDisabled(not sub.is_spawned)
 	if (GUI:Button(_T("GENERIC_TELEPORT"))) then
 		local forward_angle = math.rad(sub.heading + 90)
 		local offset = vec3:new(math.cos(forward_angle), math.sin(forward_angle), 4) -- front of door
@@ -170,7 +169,7 @@ local function drawCayoTab()
 
 	local btn_label = (sub_requested) and ImGui.TextSpinner() or _T("YH_CAYO_REQUEST_SUB")
 
-	ImGui.BeginDisabled(sub_requested or sub_spawned)
+	ImGui.BeginDisabled(sub_requested or sub.is_spawned)
 	ImGui.SameLine()
 	if (GUI:Button(btn_label)) then
 		ThreadManager:Run(function()
@@ -388,7 +387,7 @@ end
 
 -- Maybe port https://github.com/YimMenu/YimMenuV2/blob/enhanced/src/game/features/recovery/Heist/ApartmentHeist.cpp ?
 -- Apartment heists actually seem complicated in that (I assume) since they're old they use a different method of storing progress as there isn't just 1 stat to check like all the others
--- Or if there is, there only *was* because no stats I've found seem to do anything today, like the stat from that link right there. Doesn't do anything, am I missing something?
+-- Or if there is, there only *was* because no stats I've found seem to do anything today, like the stat from that link right there. Doesn't do anything here or in YimMenuV2, am I missing something?
 local function drawAptTab()
 end