Merge pull request YimMenu-Lua#134 from YimMenu-Lua/next_week_update

refactor(YRV3): misc refactors

Author: xesdoog

SSV2/includes/backend.lua

@@ -16,13 +16,6 @@ local ClearPreview   = function() PreviewService:Clear() end
 ---@field owner integer
 ---@field alpha integer
 
----@enum eGameBranch
-Enums.eGameBranch   = {
-	LAGECY   = 1,
-	ENHANCED = 2,
-	MOCK     = 99,
-}
-
 ---@enum eBackendEvent
 Enums.eBackendEvent = {
 	RELOAD_UNLOAD  = 1,

SSV2/includes/classes/gta/CWheel.lua

@@ -7,9 +7,8 @@
 --	* Provide a copy of or a link to the original license (GPL-3.0 or later); see LICENSE.md or <https://www.gnu.org/licenses/>.
 
 
-local CStructView       = require("includes.classes.gta.CStructView")
-local fVector3          = require("fVector3")
-local VEC3_ZERO <const> = vec3:zero()
+local CStructView = require("includes.classes.gta.CStructView")
+local fVector3    = require("fVector3")
 
 
 --------------------------------------
@@ -19,8 +18,8 @@ local VEC3_ZERO <const> = vec3:zero()
 ---@class CWheel : CStructBase<CWheel>
 ---@field protected m_ptr pointer
 ---@field private m_size uint16_t
----@field m_rotation fVector3
----@field m_rotation_inv fVector3 -- used to negate rotation from the previous vector
+---@field m_rotation_axis fVector3 -- this (and the one below) look and behave like eulers but they are confusing the hell out of me. 0x4 can either be the x or y component but it controls the wheel's yaw (rotation around z axis?? makes no sense) and 0x8 controls the roll (around x axis, also makes no sense)
+---@field m_constraint_axis fVector3 -- and then this one: when simulating camber, we change the roll in the above field at 0x8 and we MUST set the exact opposite of that value here at 0x10, otherwise the wheel tilts on just one side and sinks into the ground. for now we'll treat this as a collision correction or constraint vector but further insight/help would be appreciated
 ---@field m_offset_from_body pointer<float> -- smells like a component of a vector but my alignment makes no sense!
 ---@field m_x_offset pointer<float> // same as offset from body? // edit: this is also in a vector (x component). we currently use it for track width so I'm just gonna leave it as is at least for now
 ---@field m_last_ground_pos fVector3
@@ -75,8 +74,8 @@ local CWheel = CStructView("CWheel", 0x020E)
 function CWheel.new(ptr)
 	return setmetatable({
 		m_ptr                      = ptr,
-		m_rotation                 = fVector3(ptr:add(0x0000)),
-		m_rotation_inv             = fVector3(ptr:add(0x000C)),
+		m_rotation_axis            = fVector3(ptr:add(0x0000)),
+		m_constraint_axis          = fVector3(ptr:add(0x000C)),
 		m_offset_from_body         = ptr:add(0x0020),
 		m_x_offset                 = ptr:add(0x0030),
 		m_last_ground_pos          = fVector3(ptr:add(0x003C)),

SSV2/includes/classes/gta/fVector3.lua

@@ -32,9 +32,7 @@ local __base_fields__ <const> = {
 local fVector3 <const> = setmetatable({}, {
 	__type     = "fVector3",
 	__ptr_ctor = true,
-	__call     = function(t, ...)
-		return t.new(...)
-	end
+	__call     = function(t, ...) return t.new(...) end
 })
 
 ---@private

SSV2/includes/data/config.lua

@@ -303,7 +303,7 @@ local Config <const> = {
 			sy_disable_rob_cd = false,
 			sy_disable_rob_weekly_cd = false,
 			sy_disable_tow_cd = false,
-			safe_loop_warn_ack = false,
+			unsafe_feats_enabled = false,
 		},
 		yim_actions = {
 			auto_close_ped_window = false,

SSV2/includes/data/enums/__init__.lua

@@ -18,6 +18,8 @@ local Enums <const> = {
 	eGameLanguage          = require("game_language"),
 	eHandlingType          = require("handling_type"),
 	eLandingGearState      = require("landing_gear_state"),
+	eManagedValueDataType  = require("managed_value_data_type"),
+	eManagedValueType      = require("managed_value_type"),
 	eModelType             = require("model_type"),
 	ePedCombatAttributes   = require("ped_combat_attributes"),
 	ePedComponents         = require("ped_components"),

SSV2/includes/data/enums/managed_value_data_type.lua

@@ -0,0 +1,18 @@
+-- Copyright (C) 2026 SAMURAI (xesdoog) & Contributors.
+-- This file is part of Samurai's Scripts.
+--
+-- Permission is hereby granted to copy, modify, and redistribute
+-- this code as long as you respect these conditions:
+--	* Credit the owner and contributors.
+--	* Provide a copy of or a link to the original license (GPL-3.0 or later); see LICENSE.md or <https://www.gnu.org/licenses/>.
+
+
+---@enum eManagedValueDataType
+local eManagedValueDataType <const> = {
+	INT         = 1,
+	FLOAT       = 2,
+	BOOL        = 3,
+	BOOL_MASKED = 4,
+}
+
+return eManagedValueDataType

SSV2/includes/data/enums/managed_value_type.lua

@@ -0,0 +1,17 @@
+-- Copyright (C) 2026 SAMURAI (xesdoog) & Contributors.
+-- This file is part of Samurai's Scripts.
+--
+-- Permission is hereby granted to copy, modify, and redistribute
+-- this code as long as you respect these conditions:
+--	* Credit the owner and contributors.
+--	* Provide a copy of or a link to the original license (GPL-3.0 or later); see LICENSE.md or <https://www.gnu.org/licenses/>.
+
+
+---@enum eManagedValueType
+local eManagedValueType <const> = {
+	TUNEABLE    = 0,
+	STAT        = 1,
+	PACKED_STAT = 2,
+}
+
+return eManagedValueType

SSV2/includes/data/globals_locals.lua

@@ -156,6 +156,44 @@ return {
 			}
 		}
 	},
+	car_wash_safe_global = {
+		description = "car wash safe global",
+		file = "freemode.c",
+		LEGACY = {
+			value = 1882572,
+			pattern = [[Global_(\d{7})\[.*?/\*(\d{3})\*/\]\.f_(\d{3})\.f_27\.f_2 = \w+0;]],
+			capture_group = 1,
+			offsets = {
+				{
+					value = 315,
+					capture_group = 2,
+					description = "player id read size"
+				},
+				{
+					value = 158,
+					capture_group = 3,
+					description = "car wash entry?"
+				},
+			}
+		},
+		ENHANCED = {
+			value = 1882717,
+			pattern = [[Global_(\d{7})\[.*?/\*(\d{3})\*/\]\.f_(\d{3})\.f_27\.f_2 = \w+0;]],
+			capture_group = 1,
+			offsets = {
+				{
+					value = 315,
+					capture_group = 2,
+					description = "player id read size"
+				},
+				{
+					value = 158,
+					capture_group = 3,
+					description = "car wash entry?"
+				},
+			}
+		}
+	},
 	gb_contraband_buy_local_1 = {
 		description = "Contraband Buy Local 1",
 		file = "gb_contraband_buy.c",
@@ -398,8 +436,34 @@ return {
 			}
 		}
 	},
-	acid_lab_sell_local = {
-		description = "Acid Lab Sell Local",
+	acid_lab_sell_deliveries_local = {
+		description = "Acid Lab Deliveries. This shit is pissing me off and my dumbass doesn't know how to use scrDBG without creating a bazillion GB log file.",
+		file = "fm_content_acid_lab_sell.c",
+		LEGACY = {
+			value = 144,
+			pattern = [[if \(.*?Local_(\d{3})\.f_(\d{1}) !=.*?Local_\d{3}\.f_\d{4}\[0 /\*6\*/\]\.f_2\)]],
+			capture_group = 1,
+			offsets = {
+				{
+					value = 9,
+					capture_group = 2
+				}
+			}
+		},
+		ENHANCED = {
+			value = 146,
+			pattern = [[if \(.*?Local_(\d{3})\.f_(\d{1}) !=.*?Local_\d{3}\.f_\d{4}\[0 /\*6\*/\]\.f_2\)]],
+			capture_group = 1,
+			offsets = {
+				{
+					value = 9,
+					capture_group = 2
+				}
+			}
+		}
+	},
+	acid_lab_sell_mission_state_local = {
+		description = "Acid Lab Mission State",
 		file = "fm_content_acid_lab_sell.c",
 		LEGACY = {
 			value = 5723,
@@ -424,7 +488,7 @@ return {
 			}
 		}
 	},
-	acid_lab_sell_bitset = {
+	acid_lab_sell_gen_bs = {
 		description = "Acid Lab Sell Generic Bitset",
 		file = "fm_content_acid_lab_sell.c",
 		LEGACY = {
@@ -875,6 +939,72 @@ return {
 			}
 		}
 	},
+	bb_sell_local = {
+		description = "business battles sell local",
+		file = "business_battles_sell.c",
+		LEGACY = {
+			value = 2386,
+			pattern = [[if.*?Local_(\d{4})\.f_(\d{3}) -.*?Local_\d{4}\.f_(\d{3}) <= 1 && func_\d+\(28\)]],
+			capture_group = 1,
+			offsets = {
+				{
+					value = 203,
+					capture_group = 2,
+					description = "required deliveries"
+				},
+				{
+					value = 202,
+					capture_group = 3,
+					description = "deliveries made"
+				}
+			}
+		},
+		ENHANCED = {
+			value = 2388,
+			pattern = [[if.*?Local_(\d{4})\.f_(\d{3}) -.*?Local_\d{4}\.f_(\d{3}) <= 1 && func_\d+\(28\)]],
+			capture_group = 1,
+			offsets = {
+				{
+					value = 205,
+					capture_group = 2,
+					description = "required deliveries"
+				},
+				{
+					value = 204,
+					capture_group = 3,
+					description = "deliveries made"
+				}
+			}
+		}
+	},
+	bb_sell_mission_state_offset = {
+		description = "business battles sell mission state local",
+		file = "business_battles_sell.c",
+		LEGACY = {
+			value = 25,
+			pattern = [[if \(!NETWORK::NETWORK_IS_HOST_OF_THIS_SCRIPT\(\)\).*?\n\s+?return;.*?\n.*?\n.*?Local_\d{4}\.f_(\d{2})\s+?=\s+?\w+0;]],
+			capture_group = 1,
+		},
+		ENHANCED = {
+			value = 27,
+			pattern = [[if \(!NETWORK::NETWORK_IS_HOST_OF_THIS_SCRIPT\(\)\).*?\n\s+?return;.*?\n.*?\n.*?Local_\d{4}\.f_(\d{2})\s+?=\s+?\w+0;]],
+			capture_group = 1,
+		}
+	},
+	bb_sell_vehicle_array_offset = {
+		description = "business battles sell mission vehicle array",
+		file = "business_battles_sell.c",
+		LEGACY = {
+			value = 32,
+			pattern = [[Local_\d{4}\.f_(\d{2})\[i /\*42\*/\]\.f_30 = func_\d{3}\(\);]],
+			capture_group = 1,
+		},
+		ENHANCED = {
+			value = 34,
+			pattern = [[Local_\d{4}\.f_(\d{2})\[i /\*42\*/\]\.f_30 = func_\d{3}\(\);]],
+			capture_group = 1,
+		}
+	},
 	request_services_global = {
 		description = "Request Services Global. Only used for Kosatka atm, same global for all services.",
 		file = "am_mp_submarine.c",

SSV2/includes/data/stancer_data.lua

@@ -21,16 +21,16 @@ return {
 		{
 			key   = "m_toe",
 			axle  = Enums.eWheelAxle.FRONT,
-			read  = function(w) return w.m_rotation.y end,
-			write = function(w, v) w.m_rotation.y = v end
+			read  = function(w) return w.m_rotation_axis.y end,
+			write = function(w, v) w.m_rotation_axis.y = v end
 		},
 		{
 			key   = "m_camber",
 			axle  = Enums.eWheelAxle.FRONT,
-			read  = function(w) return w.m_rotation.y end,
+			read  = function(w) return w.m_rotation_axis.y end,
 			write = function(w, v)
-				w.m_rotation.z = v
-				w.m_rotation_inv.y = -v
+				w.m_rotation_axis.z = v
+				w.m_constraint_axis.y = -v
 			end
 		},
 		{
@@ -75,16 +75,16 @@ return {
 		{
 			key   = "m_toe",
 			axle  = Enums.eWheelAxle.REAR,
-			read  = function(w) return w.m_rotation.y end,
-			write = function(w, v) w.m_rotation.y = v end
+			read  = function(w) return w.m_rotation_axis.y end,
+			write = function(w, v) w.m_rotation_axis.y = v end
 		},
 		{
 			key   = "m_camber",
 			axle  = Enums.eWheelAxle.REAR,
-			read  = function(w) return w.m_rotation.z end,
+			read  = function(w) return w.m_rotation_axis.z end,
 			write = function(w, v)
-				w.m_rotation.z     = v
-				w.m_rotation_inv.y = -v
+				w.m_rotation_axis.z   = v
+				w.m_constraint_axis.y = -v
 			end
 		},
 		{