@quenty/rogue-properties 11.1.0 → 11.2.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.
 
+# [11.2.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/rogue-properties@11.1.0...@quenty/rogue-properties@11.2.0) (2024-03-27)
+
+
+### Bug Fixes
+
+* Adjust calculations for additive providers ([b8e15e0](https://github.com/Quenty/NevermoreEngine/commit/b8e15e071499bbc55631ab5f0183e37c42b1d242))
+
+
+
+
+
 # [11.1.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/rogue-properties@11.0.0...@quenty/rogue-properties@11.1.0) (2024-03-09)
 
 **Note:** Version bump only for package @quenty/rogue-properties

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/rogue-properties",
-  "version": "11.1.0",
+  "version": "11.2.0",
   "description": "Roguelike properties which can be modified by external provides",
   "keywords": [
     "Roblox",
@@ -25,7 +25,7 @@
   ],
   "dependencies": {
     "@quenty/baseobject": "^10.1.0",
-    "@quenty/binder": "^14.1.0",
+    "@quenty/binder": "^14.2.0",
     "@quenty/brio": "^14.1.0",
     "@quenty/defaultvalueutils": "^1.1.0",
     "@quenty/ducktype": "^5.1.0",
@@ -35,7 +35,7 @@
     "@quenty/loader": "^10.1.0",
     "@quenty/maid": "^3.1.0",
     "@quenty/rx": "^13.1.0",
-    "@quenty/rxbinderutils": "^14.1.0",
+    "@quenty/rxbinderutils": "^14.2.0",
     "@quenty/rxsignal": "^7.1.0",
     "@quenty/servicebag": "^11.1.0",
     "@quenty/signal": "^7.1.0",
@@ -48,5 +48,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e0148dde5ca3864389a0faa2da66153a776acc1e"
+  "gitHead": "ab3631a54c4e8d448b4229c7e422a9c7f43c0dd7"
 }

package/src/Shared/Modifiers/Additive/RogueAdditiveProvider.lua

@@ -12,8 +12,7 @@ local BinderUtils = require("BinderUtils")
 local RoguePropertyModifierUtils = require("RoguePropertyModifierUtils")
 local RoguePropertyService = require("RoguePropertyService")
 local Observable = require("Observable")
-local Maid = require("Maid")
-local ValueObject = require("ValueObject")
+local RxBrioUtils = require("RxBrioUtils")
 
 local RogueAdditiveProvider = {}
 RogueAdditiveProvider.ServiceName = "RogueAdditiveProvider"
@@ -56,13 +55,7 @@ end
 
 function RogueAdditiveProvider:GetInvertedVersion(propObj, rogueProperty, baseValue)
 	if rogueProperty:GetDefinition():GetValueType() == "number" then
-		local value = baseValue
-
-		for _, item in pairs(self:_getAdditives(propObj)) do
-			value = value - item:GetAdditive()
-		end
-
-		return value
+		return baseValue - self:_getTotalAdditive(propObj)
 	else
 		return baseValue
 	end
@@ -70,58 +63,39 @@ end
 
 function RogueAdditiveProvider:GetModifiedVersion(propObj, rogueProperty, baseValue)
 	if rogueProperty:GetDefinition():GetValueType() == "number" then
-		local value = baseValue
-
-		for _, item in pairs(self:_getAdditives(propObj)) do
-			value = value + item:GetAdditive()
-		end
-
-		return value
+		return baseValue + self:_getTotalAdditive(propObj)
 	else
 		return baseValue
 	end
 end
 
 function RogueAdditiveProvider:ObserveModifiedVersion(propObj, rogueProperty, observeBaseValue)
-	if rogueProperty:GetDefinition():GetValueType() == "number" then
-		return Observable.new(function(sub)
-			local topMaid = Maid.new()
-
-			local lastValue = topMaid:Add(ValueObject.fromObservable(observeBaseValue))
-
-			local function update()
-				sub:Fire(lastValue.Value)
-			end
-
-			topMaid:GiveTask(self:_observeAddersBrio(propObj):Subscribe(function(brio)
-				if brio:IsDead() then
-					return
-				end
+	assert(rogueProperty, "No rogueProperty")
+	assert(Observable.isObservable(observeBaseValue), "Bad observeBaseValue")
 
-				local maid = brio:ToMaid()
-				local value = brio:GetValue()
-
-				maid:GiveTask(value:ObserveAdditive():Subscribe(function()
-					update()
-				end))
-
-				update()
-
-				maid:GiveTask(function()
-					update()
-				end)
-			end))
-
-			topMaid:GiveTask(observeBaseValue:Subscribe(function()
-				update()
-			end))
-
-			return topMaid
-		end):Pipe({
-			Rx.throttleDefer();
-			Rx.map(function(baseValue)
-				return self:GetModifiedVersion(propObj, rogueProperty, baseValue)
+	if rogueProperty:GetDefinition():GetValueType() == "number" then
+		return RxBrioUtils.flatCombineLatest({
+			baseValue = observeBaseValue;
+			additive = self:_observeAddersBrio(propObj):Pipe({
+				RxBrioUtils.flatMapBrio(function(item)
+					return item:ObserveAdditive();
+				end);
+				RxBrioUtils.reduceToAliveList();
+				RxBrioUtils.switchMapBrio(function(state)
+					local additive = 0
+					for _, item in pairs(state) do
+						additive = additive + item
+					end
+					return Rx.of(additive)
+				end);
+				RxBrioUtils.emitOnDeath(0);
+				Rx.distinct();
+			});
+		}):Pipe({
+			Rx.map(function(state)
+				return state.baseValue + state.additive
 			end);
+			Rx.distinct();
 		})
 	else
 		return observeBaseValue
@@ -132,8 +106,12 @@ function RogueAdditiveProvider:_observeAddersBrio(propObj)
 	return RxBinderUtils.observeBoundChildClassBrio(self._rogueAdditiveBinder, propObj)
 end
 
-function RogueAdditiveProvider:_getAdditives(propObj)
-	return BinderUtils.getChildren(self._rogueAdditiveBinder, propObj)
+function RogueAdditiveProvider:_getTotalAdditive(propObj)
+	local additive = 0
+	for _, item in pairs(BinderUtils.getChildren(self._rogueAdditiveBinder, propObj)) do
+		additive = additive + item:GetAdditive()
+	end
+	return additive
 end
 
 return RogueAdditiveProvider

package/src/Shared/Modifiers/Multiplier/RogueMultiplierProvider.lua

@@ -12,8 +12,7 @@ local BinderUtils = require("BinderUtils")
 local RoguePropertyModifierUtils = require("RoguePropertyModifierUtils")
 local RoguePropertyService = require("RoguePropertyService")
 local Observable = require("Observable")
-local Maid = require("Maid")
-local ValueObject = require("ValueObject")
+local RxBrioUtils = require("RxBrioUtils")
 
 local RogueMultiplierProvider = {}
 RogueMultiplierProvider.ServiceName = "RogueMultiplierProvider"
@@ -56,11 +55,7 @@ end
 
 function RogueMultiplierProvider:GetInvertedVersion(propObj, rogueProperty, baseValue)
 	if rogueProperty:GetDefinition():GetValueType() == "number" then
-		local multiplier = 1
-
-		for _, item in pairs(self:_getMultipliers(propObj)) do
-			multiplier = multiplier*item:GetMultiplier()
-		end
+		local multiplier = self:_getTotalMultiplier(propObj)
 
 		return baseValue/multiplier
 	else
@@ -70,11 +65,7 @@ end
 
 function RogueMultiplierProvider:GetModifiedVersion(propObj, rogueProperty, baseValue)
 	if rogueProperty:GetDefinition():GetValueType() == "number" then
-		local multiplier = 1
-
-		for _, item in pairs(self:_getMultipliers(propObj)) do
-			multiplier = multiplier*item:GetMultiplier()
-		end
+		local multiplier = self:_getTotalMultiplier(propObj)
 
 		return baseValue*multiplier
 	else
@@ -83,45 +74,32 @@ function RogueMultiplierProvider:GetModifiedVersion(propObj, rogueProperty, base
 end
 
 function RogueMultiplierProvider:ObserveModifiedVersion(propObj, rogueProperty, observeBaseValue)
-	if rogueProperty:GetDefinition():GetValueType() == "number" then
-		return Observable.new(function(sub)
-			local topMaid = Maid.new()
-
-			local lastValue = topMaid:Add(ValueObject.fromObservable(observeBaseValue))
-
-			local function update()
-				sub:Fire(lastValue.Value)
-			end
-
-			topMaid:GiveTask(self:_observeMultipliersBrio(propObj):Subscribe(function(brio)
-				if brio:IsDead() then
-					return
-				end
-
-				local maid = brio:ToMaid()
-				local value = brio:GetValue()
+	assert(rogueProperty, "No rogueProperty")
+	assert(Observable.isObservable(observeBaseValue), "Bad observeBaseValue")
 
-				maid:GiveTask(value:ObserveMultiplier():Subscribe(function()
-					update()
-				end))
-
-				update()
-
-				maid:GiveTask(function()
-					update()
-				end)
-			end))
-
-			topMaid:GiveTask(lastValue:Observe():Subscribe(function()
-				update()
-			end))
-
-			return topMaid
-		end):Pipe({
-			Rx.throttleDefer();
-			Rx.map(function(baseValue)
-				return self:GetModifiedVersion(propObj, rogueProperty, baseValue)
+	if rogueProperty:GetDefinition():GetValueType() == "number" then
+		return RxBrioUtils.flatCombineLatest({
+			baseValue = observeBaseValue;
+			multiplier = self:_observeMultipliersBrio(propObj):Pipe({
+				RxBrioUtils.flatMapBrio(function(item)
+					return item:ObserveMultiplier();
+				end);
+				RxBrioUtils.reduceToAliveList();
+				RxBrioUtils.switchMapBrio(function(state)
+					local multiplier = 1
+					for _, item in pairs(state) do
+						multiplier = multiplier*item
+					end
+					return Rx.of(multiplier)
+				end);
+				RxBrioUtils.emitOnDeath(1);
+				Rx.distinct();
+			});
+		}):Pipe({
+			Rx.map(function(state)
+				return state.baseValue*state.multiplier
 			end);
+			Rx.distinct();
 		})
 	else
 		return observeBaseValue
@@ -132,8 +110,12 @@ function RogueMultiplierProvider:_observeMultipliersBrio(propObj)
 	return RxBinderUtils.observeBoundChildClassBrio(self._rogueMultiplierBinder, propObj)
 end
 
-function RogueMultiplierProvider:_getMultipliers(propObj)
-	return BinderUtils.getChildren(self._rogueMultiplierBinder, propObj)
+function RogueMultiplierProvider:_getTotalMultiplier(propObj)
+	local multiplier = 1
+	for _, item in pairs(BinderUtils.getChildren(self._rogueMultiplierBinder, propObj)) do
+		multiplier = multiplier*item:GetMultiplier()
+	end
+	return multiplier
 end
 
 return RogueMultiplierProvider

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

@@ -11,6 +11,7 @@ local BinderUtils = require("BinderUtils")
 local RoguePropertyModifierUtils = require("RoguePropertyModifierUtils")
 local RoguePropertyService = require("RoguePropertyService")
 local ValueBaseUtils = require("ValueBaseUtils")
+local Observable = require("Observable")
 
 local RogueSetterProvider = {}
 RogueSetterProvider.ServiceName = "RogueSetterProvider"
@@ -67,19 +68,37 @@ function RogueSetterProvider:GetModifiedVersion(propObj, _rogueProperty, baseVal
 end
 
 function RogueSetterProvider:ObserveModifiedVersion(propObj, rogueProperty, observeBaseValue)
+	assert(rogueProperty, "No rogueProperty")
+	assert(Observable.isObservable(observeBaseValue), "Bad observeBaseValue")
+
 	-- TODO: optimize this.
 	return RxBrioUtils.flatCombineLatest({
 		value = observeBaseValue;
-		allSetters = self:_observeSettersBrio(propObj):Pipe({
+		prioritySetter = 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;
+			end);
+			RxBrioUtils.reduceToAliveList();
+			RxBrioUtils.switchMapBrio(function(state)
+				local lastSetter = nil
+				for _, item in pairs(state) do
+					lastSetter = item
+				end
+				return Rx.of(lastSetter)
+			end);
+			-- TODO: Emit token instead
+			RxBrioUtils.emitOnDeath(nil);
+			Rx.distinct();
 		});
 	}):Pipe({
 		Rx.map(function(state)
-			return self:GetModifiedVersion(propObj, rogueProperty, state.value)
+			if state.prioritySetter ~= nil then
+				return state.prioritySetter
+			else
+				return state.value
+			end
 		end);
+		Rx.distinct();
 	})
 end