@quenty/rogue-properties 4.24.0 → 4.25.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.25.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/rogue-properties@4.24.0...@quenty/rogue-properties@4.25.0) (2023-07-17)
+
+
+### Features
+
+* Can set rogue properties setter ([b3c148a](https://github.com/Quenty/NevermoreEngine/commit/b3c148a2d81a0c88e1fc7d9ae8e3c1cfc2033bf9))
+
+
+
+
+
 # [4.24.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/rogue-properties@4.23.0...@quenty/rogue-properties@4.24.0) (2023-07-15)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/rogue-properties",
-  "version": "4.24.0",
+  "version": "4.25.0",
   "description": "Roguelike properties which can be modified by external provides",
   "keywords": [
     "Roblox",
@@ -44,5 +44,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "af7a623f58fe7ec96b47c80e385b71f820fd4cb8"
+  "gitHead": "ce69150f3e814a2e38a086bc90c7d92121b0c28b"
 }

package/src/Shared/Modifiers/Setter/RogueSetterProvider.lua

@@ -11,6 +11,7 @@ local RogueBindersShared = require("RogueBindersShared")
 local BinderUtils = require("BinderUtils")
 local RoguePropertyModifierUtils = require("RoguePropertyModifierUtils")
 local RoguePropertyService = require("RoguePropertyService")
+local ValueBaseUtils = require("ValueBaseUtils")
 
 local RogueSetterProvider = {}
 RogueSetterProvider.ServiceName = "RogueSetterProvider"
@@ -31,10 +32,15 @@ function RogueSetterProvider:GetBinder()
 end
 
 function RogueSetterProvider:Create(value, source)
-	assert(type(value) == "number", "Bad value")
 	assert(typeof(source) == "Instance" or source == nil, "Bad source")
 
-	local obj = Instance.new("NumberValue")
+	local className = ValueBaseUtils.getClassNameFromType(typeof(value))
+	if not className then
+		error(string.format("[RogueSetterProvider] - Can't set to type %q", typeof(value)))
+		return nil
+	end
+
+	local obj = Instance.new(className)
 	obj.Name = "Setter"
 	obj.Value = value
 
@@ -52,38 +58,30 @@ function RogueSetterProvider:GetInvertedVersion(_propObj, _rogueProperty, baseVa
 	return baseValue
 end
 
-function RogueSetterProvider:GetModifiedVersion(propObj, rogueProperty, baseValue)
-	-- TODO: Support more than just the base value type
-	if rogueProperty:GetDefinition():GetValueType() == "number" then
-		for _, item in pairs(self:_getSetters(propObj)) do
-			return item:GetValue()
-		end
-
-		return baseValue
-	else
-		return baseValue
+function RogueSetterProvider:GetModifiedVersion(propObj, _rogueProperty, baseValue)
+	-- Just return the first value
+	for _, item in pairs(self:_getSetters(propObj)) do
+		return item:GetValue()
 	end
+
+	return baseValue
 end
 
 function RogueSetterProvider:ObserveModifiedVersion(propObj, rogueProperty, observeBaseValue)
-	if rogueProperty:GetDefinition():GetValueType() == "number" then
-		-- TODO: optimize this.
-		return RxBrioUtils.flatCombineLatest({
-			value = observeBaseValue;
-			allSetters = self:_observeSettersBrio(propObj):Pipe({
-				RxBrioUtils.flatMapBrio(function(item)
-					return item:ObserveValue();
-				end); -- this gets us a list of multipliers which should mutate pretty frequently.
-				Rx.defaultsToNil;
-			});
-		}):Pipe({
-			Rx.map(function(state)
-				return self:GetModifiedVersion(propObj, rogueProperty, state.value)
-			end);
-		})
-	else
-		return observeBaseValue
-	end
+	-- TODO: optimize this.
+	return RxBrioUtils.flatCombineLatest({
+		value = observeBaseValue;
+		allSetters = self:_observeSettersBrio(propObj):Pipe({
+			RxBrioUtils.flatMapBrio(function(item)
+				return item:ObserveValue();
+			end); -- this gets us a list of multipliers which should mutate pretty frequently.
+			Rx.defaultsToNil;
+		});
+	}):Pipe({
+		Rx.map(function(state)
+			return self:GetModifiedVersion(propObj, rogueProperty, state.value)
+		end);
+	})
 end
 
 function RogueSetterProvider:_observeSettersBrio(propObj)

package/src/Shared/Property/RogueProperty.lua

@@ -89,14 +89,14 @@ function RogueProperty:SetBaseValue(value)
 	if baseValue then
 		baseValue.Value = self:_encodeValue(value)
 	else
-		warn("Failed to get the baseValue to parent")
+		warn("[RogueProperty] - Failed to get the baseValue to parent")
 	end
 end
 
 function RogueProperty:SetValue(value)
 	local baseValue = self:GetBaseValueObject()
 	if not baseValue then
-		warn("Failed to get the baseValue to parent")
+		warn("[RogueProperty] - Failed to get the baseValue to parent")
 		return
 	end
 
@@ -199,7 +199,7 @@ function RogueProperty:CreateMultiplier(amount, source)
 	local baseValue = self:GetBaseValueObject()
 
 	if not baseValue then
-		warn("Failed to get the baseValue to parent")
+		warn("[RogueProperty] - Failed to get the baseValue to parent")
 	end
 
 	local multiplier = provider:Create(amount, source)
@@ -215,7 +215,7 @@ function RogueProperty:CreateAdditive(amount, source)
 	local baseValue = self:GetBaseValueObject()
 
 	if not baseValue then
-		warn("Failed to get the baseValue to parent")
+		warn("[RogueProperty] - Failed to get the baseValue to parent")
 	end
 
 	local multiplier = provider:Create(amount, source)
@@ -224,17 +224,15 @@ function RogueProperty:CreateAdditive(amount, source)
 	return multiplier
 end
 
-function RogueProperty:CreateSetter(amount, source)
-	assert(type(amount) == "number", "Bad amount")
-
+function RogueProperty:CreateSetter(value, source)
 	local provider = self._serviceBag:GetService(RogueSetterProvider)
 	local baseValue = self:GetBaseValueObject()
 
 	if not baseValue then
-		warn("Failed to get the baseValue to parent")
+		warn("[RogueProperty] - Failed to get the baseValue to parent")
 	end
 
-	local setter = provider:Create(amount, source)
+	local setter = provider:Create(value, source)
 	setter.Parent = baseValue
 
 	return setter