fix(IManagedValue): fix missing logic

- Fix missing bit index parameter and logic for packed stats.

Author: xesdoog

SSV2/includes/structs/IManagedStat.lua

@@ -16,9 +16,10 @@ local IManagedValue = require("includes.structs.IManagedValue")
 ---@field protected m_id joaat_t|string tuneable name or joaat hash
 ---@field protected m_type eManagedValueDataType
 ---@field protected m_default_val? T
+---@field protected m_bit_index? integer
 ---@field protected m_modified boolean
----@field private __get fun(t: joaat_t|string): T
----@field private __set fun(t: joaat_t|string, v: T): nil
+---@field private __get fun(): T
+---@field private __set fun(v: T): nil
 local IManagedStat <const> = setmetatable({}, IManagedValue)
 IManagedStat.__index       = IManagedStat
 
@@ -28,16 +29,20 @@ IManagedStat.__index       = IManagedStat
 ---@param dataType eManagedValueDataType
 ---@param desired_val integer|float|boolean
 ---@param packed? boolean
+---@param bit_index? integer only for masked stats
 ---@return IManagedStat<T>
 ---@overload fun(name: string, identifier: ID, dataType: 1, desired_val: integer, packed?: boolean): IManagedStat<integer>
 ---@overload fun(name: string, identifier: ID, dataType: 2, desired_val: float, packed?: boolean): IManagedStat<float>
 ---@overload fun(name: string, identifier: ID, dataType: 3, desired_val: boolean, packed?: boolean): IManagedStat<boolean>
----@overload fun(name: string, identifier: ID, dataType: 4, desired_val: boolean, packed?: boolean): IManagedStat<boolean>
-function IManagedStat.new(name, stat, dataType, desired_val, packed)
+---@overload fun(name: string, identifier: ID, dataType: 4, desired_val: boolean, packed: false, bit_index: integer): IManagedStat<boolean>
+function IManagedStat.new(name, stat, dataType, desired_val, packed, bit_index)
+	if (dataType == Enums.eManagedValueDataType.BOOL_MASKED and bit_index ~= nil) then
+		packed = false
+	end
+
 	local statType = packed and Enums.eManagedValueType.PACKED_STAT or Enums.eManagedValueType.STAT
-	local base     = IManagedValue.new(name, stat, statType, dataType, desired_val)
-	local instance = setmetatable(base, IManagedStat) ---@cast instance IManagedStat
-	return instance
+	local base     = IManagedValue.new(name, stat, statType, dataType, desired_val, bit_index)
+	return setmetatable(base, IManagedStat)
 end
 
 return IManagedStat

SSV2/includes/structs/IManagedTuneable.lua

@@ -17,8 +17,8 @@ local IManagedValue = require("includes.structs.IManagedValue")
 ---@field protected m_type eManagedValueDataType
 ---@field protected m_default_val? T
 ---@field protected m_modified boolean
----@field private __get fun(t: joaat_t|string): T
----@field private __set fun(t: joaat_t|string, v: T): nil
+---@field private __get fun(): T
+---@field private __set fun(v: T): nil
 local IManagedTuneable <const> = setmetatable({}, IManagedValue)
 IManagedTuneable.__index       = IManagedTuneable
 
@@ -33,9 +33,8 @@ IManagedTuneable.__index       = IManagedTuneable
 ---@overload fun(name: string, identifier: ID, dataType: 3, desired_val: boolean): IManagedTuneable<boolean>
 ---@overload fun(name: string, identifier: ID, dataType: 4, desired_val: boolean): IManagedTuneable<boolean>
 function IManagedTuneable.new(name, tuneable, dataType, desired_val)
-	local base     = IManagedValue.new(name, tuneable, Enums.eManagedValueType.TUNEABLE, dataType, desired_val)
-	local instance = setmetatable(base, IManagedTuneable) ---@cast instance IManagedTuneable
-	return instance
+	local base = IManagedValue.new(name, tuneable, Enums.eManagedValueType.TUNEABLE, dataType, desired_val)
+	return setmetatable(base, IManagedTuneable)
 end
 
 return IManagedTuneable

SSV2/includes/structs/IManagedValue.lua

@@ -43,9 +43,10 @@ local TypeRefs <const> = {
 ---@field protected m_data_type eManagedValueDataType
 ---@field protected m_default_val? T
 ---@field protected m_desired_val T
+---@field protected m_bit_index? integer
 ---@field private m_modified boolean
----@field private __get fun(t: joaat_t|string): T
----@field private __set fun(t: joaat_t|string, v: T)
+---@field private __get fun(): T
+---@field private __set fun(v: T): nil
 local IManagedValue <const> = {}
 IManagedValue.__index       = IManagedValue
 
@@ -55,12 +56,18 @@ IManagedValue.__index       = IManagedValue
 ---@param valueType eManagedValueType
 ---@param dataType eManagedValueDataType
 ---@param desired_val integer|float|boolean
+---@param bit_index? integer only for masked stats
 ---@return IManagedValue<T>
 ---@overload fun(name: string, identifier: ID, valueType: eManagedValueType, dataType: 1, desired_val: integer): IManagedValue<integer>
 ---@overload fun(name: string, identifier: ID, valueType: eManagedValueType, dataType: 2, desired_val: float): IManagedValue<float>
 ---@overload fun(name: string, identifier: ID, valueType: eManagedValueType, dataType: 3, desired_val: boolean): IManagedValue<boolean>
----@overload fun(name: string, identifier: ID, valueType: 2, dataType: 4, desired_val: boolean): IManagedValue<boolean>
-function IManagedValue.new(name, identifier, valueType, dataType, desired_val)
+---@overload fun(name: string, identifier: ID, valueType: 2, dataType: 4, desired_val: boolean, bit_index: integer): IManagedValue<boolean>
+function IManagedValue.new(name, identifier, valueType, dataType, desired_val, bit_index)
+	local isMasked = valueType == Enums.eManagedValueType.STAT and dataType == Enums.eManagedValueDataType.BOOL_MASKED
+	if (isMasked) then
+		assert(type(bit_index) == "number", "Missing parameter: bit_index<integer>!")
+	end
+
 	local ref = TypeRefs[valueType]
 	assert(ref ~= nil, "Unknown type reference.")
 
@@ -78,15 +85,32 @@ function IManagedValue.new(name, identifier, valueType, dataType, desired_val)
 		)
 	end
 
+	local getWrapper = function()
+		if (isMasked) then
+			return get_func(identifier, bit_index)
+		else
+			return get_func(identifier)
+		end
+	end
+
+	local setWrapper = function(v)
+		if (isMasked) then
+			set_func(identifier, v, bit_index)
+		else
+			set_func(identifier, v)
+		end
+	end
+
 	local instance = setmetatable({
 		m_name         = name,
 		m_id           = identifier,
 		m_managed_type = valueType,
 		m_data_type    = dataType,
 		m_desired_val  = desired_val,
+		m_bit_index    = isMasked and bit_index or nil,
 		m_modified     = false,
-		__get          = get_func,
-		__set          = set_func
+		__get          = getWrapper,
+		__set          = setWrapper
 	}, IManagedValue)
 
 
@@ -120,7 +144,7 @@ end
 function IManagedValue:SaveDefaultValue()
 	if (not self:CanAccess()) then return end
 
-	local default      = self.__get(self.m_id)
+	local default      = self.__get()
 	self.m_default_val = default
 end
 
@@ -142,7 +166,7 @@ end
 
 ---@return T
 function IManagedValue:GetValue()
-	return self.__get(self.m_id)
+	return self.__get()
 end
 
 ---@nodiscard
@@ -153,7 +177,7 @@ function IManagedValue:Apply()
 		return false
 	end
 
-	self.__set(self.m_id, self.m_desired_val)
+	self.__set(self.m_desired_val)
 	self.m_modified = true
 	return true
 end
@@ -163,7 +187,7 @@ function IManagedValue:Reset()
 		return
 	end
 
-	self.__set(self.m_id, self.m_default_val)
+	self.__set(self.m_default_val)
 	self.m_modified = false
 end