@quenty/rogue-properties 11.25.1 → 11.25.2-canary.ff3c47a.0

package/CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [11.25.2-canary.ff3c47a.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/rogue-properties@11.25.1...@quenty/rogue-properties@11.25.2-canary.ff3c47a.0) (2025-09-26)
+
+
+### Bug Fixes
+
+* Fix caching performance of the rogue system when multiple things want to observe state ([1a067f7](https://github.com/Quenty/NevermoreEngine/commit/1a067f7dec837a2eb4db399e46bf06566824c9a3))
+* Style stuff ([ff3c47a](https://github.com/Quenty/NevermoreEngine/commit/ff3c47af4e5b23f912aa09a0784849751d5736e1))
+
+
+### Features
+
+* Move the rogue properties over to attributes as required ([4aa23b0](https://github.com/Quenty/NevermoreEngine/commit/4aa23b0092ba07490b615f1d8ab5920f86b78756))
+
+
+
+
+
 ## [11.25.1](https://github.com/Quenty/NevermoreEngine/compare/@quenty/rogue-properties@11.25.0...@quenty/rogue-properties@11.25.1) (2025-09-15)
 
 **Note:** Version bump only for package @quenty/rogue-properties

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/rogue-properties",
-  "version": "11.25.1",
+  "version": "11.25.2-canary.ff3c47a.0",
   "description": "Roguelike properties which can be modified by external provides",
   "keywords": [
     "Roblox",
@@ -24,33 +24,35 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/adorneedata": "^7.20.0",
-    "@quenty/baseobject": "^10.9.0",
-    "@quenty/binder": "^14.22.0",
-    "@quenty/brio": "^14.19.0",
-    "@quenty/defaultvalueutils": "^1.2.2",
-    "@quenty/ducktype": "^5.9.0",
-    "@quenty/instanceutils": "^13.19.0",
-    "@quenty/jsonutils": "^10.12.0",
-    "@quenty/linkutils": "^13.19.0",
-    "@quenty/loader": "^10.9.0",
-    "@quenty/maid": "^3.5.0",
-    "@quenty/observablecollection": "^12.22.1",
-    "@quenty/rx": "^13.19.0",
-    "@quenty/rxbinderutils": "^14.22.0",
-    "@quenty/rxsignal": "^7.19.0",
-    "@quenty/servicebag": "^11.13.1",
-    "@quenty/signal": "^7.11.1",
-    "@quenty/spring": "^10.9.0",
-    "@quenty/string": "^3.3.3",
-    "@quenty/table": "^3.8.0",
-    "@quenty/tie": "^10.22.0",
-    "@quenty/valuebaseutils": "^13.19.0",
-    "@quenty/valueobject": "^13.19.0",
+    "@quenty/adorneedata": "7.20.1-canary.ff3c47a.0",
+    "@quenty/attributeutils": "14.19.1-canary.ff3c47a.0",
+    "@quenty/baseobject": "10.9.0",
+    "@quenty/binder": "14.22.1-canary.ff3c47a.0",
+    "@quenty/brio": "14.19.1-canary.ff3c47a.0",
+    "@quenty/defaultvalueutils": "1.2.2",
+    "@quenty/ducktype": "5.9.0",
+    "@quenty/instanceutils": "13.19.1-canary.ff3c47a.0",
+    "@quenty/jsonutils": "10.12.0",
+    "@quenty/linkutils": "13.19.1-canary.ff3c47a.0",
+    "@quenty/loader": "10.9.0",
+    "@quenty/maid": "3.5.0",
+    "@quenty/observablecollection": "12.22.2-canary.ff3c47a.0",
+    "@quenty/remoting": "12.20.1-canary.ff3c47a.0",
+    "@quenty/rx": "13.19.1-canary.ff3c47a.0",
+    "@quenty/rxbinderutils": "14.22.1-canary.ff3c47a.0",
+    "@quenty/rxsignal": "7.19.1-canary.ff3c47a.0",
+    "@quenty/servicebag": "11.13.1",
+    "@quenty/signal": "7.11.1",
+    "@quenty/spring": "10.9.0",
+    "@quenty/string": "3.3.3",
+    "@quenty/table": "3.8.0",
+    "@quenty/tie": "10.22.1-canary.ff3c47a.0",
+    "@quenty/valuebaseutils": "13.19.1-canary.ff3c47a.0",
+    "@quenty/valueobject": "13.19.1-canary.ff3c47a.0",
     "@quentystudios/t": "^3.0.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "697bad47e4b554e9f674e1aebefc65a99b84e41d"
+  "gitHead": "ff3c47af4e5b23f912aa09a0784849751d5736e1"
 }

package/src/Shared/Array/RoguePropertyArrayUtils.lua

@@ -114,6 +114,13 @@ end
 function RoguePropertyArrayUtils.getDefaultValueMapFromContainer(container: Instance)
 	local value = {}
 
+	-- This is a hack, kinda
+	for attributeKey, attributeValue in container:GetAttributes() do
+		if attributeKey ~= "HasInitializedArrayComponent" then
+			value[attributeKey] = attributeValue
+		end
+	end
+
 	for _, item in container:GetChildren() do
 		local index = RoguePropertyArrayUtils.getIndexFromName(item.Name)
 		if index then

package/src/Shared/Definition/RoguePropertyDefinition.lua

@@ -7,6 +7,7 @@ local require = require(script.Parent.loader).load(script)
 local DuckTypeUtils = require("DuckTypeUtils")
 local RogueProperty = require("RogueProperty")
 local RoguePropertyCacheService = require("RoguePropertyCacheService")
+local RoguePropertyConstants = require("RoguePropertyConstants")
 local RoguePropertyUtils = require("RoguePropertyUtils")
 local ServiceBag = require("ServiceBag")
 local ValueBaseUtils = require("ValueBaseUtils")
@@ -36,6 +37,10 @@ function RoguePropertyDefinition.isRoguePropertyDefinition(value: any): boolean
 	return DuckTypeUtils.isImplementation(RoguePropertyDefinition, value)
 end
 
+function RoguePropertyDefinition:HasChildren(): boolean
+	return false
+end
+
 --[=[
 	@param serviceBag ServiceBag
 	@param adornee Instance
@@ -61,12 +66,21 @@ end
 function RoguePropertyDefinition:GetOrCreateInstance(parent: Instance)
 	assert(typeof(parent) == "Instance", "Bad parent")
 
-	return ValueBaseUtils.getOrCreateValue(
+	-- Note, in forcing the creation, we move to an attribute
+	local original = parent:GetAttribute(self:GetName())
+	local created = ValueBaseUtils.getOrCreateValue(
 		parent,
 		self:GetStorageInstanceType(),
 		self:GetName(),
 		self:GetEncodedDefaultValue()
 	)
+
+	if original ~= nil and original ~= RoguePropertyConstants.INSTANCE_ATTRIBUTE_VALUE then
+		created.Value = original
+	end
+
+	parent:SetAttribute(self:GetName(), RoguePropertyConstants.INSTANCE_ATTRIBUTE_VALUE)
+	return created
 end
 
 function RoguePropertyDefinition:SetParentPropertyTableDefinition(parentPropertyTableDefinition)

package/src/Shared/Definition/RoguePropertyTableDefinition.lua

@@ -12,8 +12,6 @@ local RoguePropertyDefinition = require("RoguePropertyDefinition")
 local RoguePropertyDefinitionArrayHelper = require("RoguePropertyDefinitionArrayHelper")
 local RoguePropertyService = require("RoguePropertyService")
 local RoguePropertyTable = require("RoguePropertyTable")
-local RxBrioUtils = require("RxBrioUtils")
-local RxInstanceUtils = require("RxInstanceUtils")
 local ServiceBag = require("ServiceBag")
 local Set = require("Set")
 local Table = require("Table")
@@ -133,6 +131,11 @@ function RoguePropertyTableDefinition:CanAssign(mainValue, strict: boolean): (bo
 				return false, string.format("Bad index %q, %q is not an array", tostring(key), self:GetFullName())
 			end
 		else
+			if self._arrayDefinitionHelper then
+				-- TODO: Maybe this check is actually wrong...? we might need to remove it.
+				return false, string.format("Bad index %q, %q is an array", tostring(key), self:GetFullName())
+			end
+
 			if self._definitionMap[key] then
 				local canAssign, message = self._definitionMap[key]:CanAssign(value, strict)
 				if not canAssign then
@@ -176,6 +179,10 @@ function RoguePropertyTableDefinition:GetDefinitionMap()
 	return self._definitionMap
 end
 
+function RoguePropertyTableDefinition:HasChildren()
+	return true
+end
+
 --[=[
 	Gets the RoguePropertyDefinition if it exists
 	@param propertyName
@@ -223,27 +230,21 @@ RoguePropertyTableDefinition.GetPropertyTable = RoguePropertyTableDefinition.Get
 --[=[
 	Observes the current container while it exists for the given adornee.
 
-	@param adornee Instance
-	@param canInitialize boolean
 	@return Observable<Brio<Folder>>
 ]=]
-function RoguePropertyTableDefinition:ObserveContainerBrio(adornee: Instance, canInitialize)
+function RoguePropertyTableDefinition:ObserveContainerBrio(
+	serviceBag: ServiceBag.ServiceBag,
+	adornee: Instance,
+	canInitialize: boolean
+)
 	assert(typeof(adornee) == "Instance", "Bad adornee")
 	assert(type(canInitialize) == "boolean", "Bad canInitialize")
 
-	-- TODO: Optimize so we aren't duplcating this logic each time we index a property
-	self:GetContainer(adornee, canInitialize)
+	local found = self:Get(serviceBag, adornee)
 
-	local parentDefinition = self:GetParentPropertyDefinition()
-	if parentDefinition then
-		return parentDefinition:ObserveContainerBrio(adornee, canInitialize):Pipe({
-			RxBrioUtils.switchMapBrio(function(parent)
-				return RxInstanceUtils.observeLastNamedChildBrio(parent, "Folder", self:GetName())
-			end),
-		})
-	else
-		return RxInstanceUtils.observeLastNamedChildBrio(adornee, "Folder", self:GetName())
-	end
+	-- TODO: caninitialize is broken
+
+	return found:ObserveContainerBrio(canInitialize)
 end
 
 --[=[
@@ -252,27 +253,17 @@ end
 	@param canInitialize boolean
 	@return Folder?
 ]=]
-function RoguePropertyTableDefinition:GetContainer(adornee: Instance, canInitialize): Folder?
+function RoguePropertyTableDefinition:GetContainer(
+	serviceBag: ServiceBag.ServiceBag,
+	adornee: Instance,
+	canInitialize: boolean
+): Folder?
 	assert(typeof(adornee) == "Instance", "Bad adornee")
 	assert(type(canInitialize) == "boolean", "Bad canInitialize")
 
-	local parent
-	local parentDefinition = self:GetParentPropertyDefinition()
-	if parentDefinition then
-		parent = parentDefinition:GetContainer(adornee, canInitialize)
-	else
-		parent = adornee
-	end
-
-	if not parent then
-		return nil
-	end
+	local found = self:Get(serviceBag, adornee)
 
-	if canInitialize then
-		return self:GetOrCreateInstance(parent)
-	else
-		return parent:FindFirstChild(self:GetName())
-	end
+	return found:GetContainer()
 end
 
 function RoguePropertyTableDefinition:GetOrCreateInstance(parent)

package/src/Shared/Implementation/RogueProperty.lua

@@ -4,22 +4,31 @@
 
 local require = require(script.Parent.loader).load(script)
 
+local AttributeValue = require("AttributeValue")
 local Maid = require("Maid")
 local Observable = require("Observable")
 local ObservableSortedList = require("ObservableSortedList")
 local RogueAdditive = require("RogueAdditive")
 local RogueModifierInterface = require("RogueModifierInterface")
 local RogueMultiplier = require("RogueMultiplier")
+local RoguePropertyBaseValueTypeUtils = require("RoguePropertyBaseValueTypeUtils")
+local RoguePropertyBaseValueTypes = require("RoguePropertyBaseValueTypes")
+local RoguePropertyConstants = require("RoguePropertyConstants")
 local RoguePropertyModifierData = require("RoguePropertyModifierData")
 local RoguePropertyUtils = require("RoguePropertyUtils")
 local RogueSetter = require("RogueSetter")
 local Rx = require("Rx")
+local RxAttributeUtils = require("RxAttributeUtils")
 local RxBrioUtils = require("RxBrioUtils")
 local RxInstanceUtils = require("RxInstanceUtils")
 local RxSignal = require("RxSignal")
 local ServiceBag = require("ServiceBag")
+local TieRealmService = require("TieRealmService")
 local ValueBaseUtils = require("ValueBaseUtils")
 
+local ONLY_USE_INSTANCES = false
+local LOCAL_MODIFIER_CONTAINER_CLASS_NAME = "Camera"
+
 local RogueProperty = {}
 RogueProperty.ClassName = "RogueProperty"
 RogueProperty.__index = RogueProperty
@@ -28,6 +37,7 @@ function RogueProperty.new(adornee: Instance, serviceBag: ServiceBag.ServiceBag,
 	local self = {}
 
 	self._serviceBag = assert(serviceBag, "No serviceBag")
+	self._tieRealmService = self._serviceBag:GetService(TieRealmService)
 
 	self._adornee = assert(adornee, "Bad adornee")
 	self._definition = assert(definition, "Bad definition")
@@ -43,7 +53,7 @@ function RogueProperty:SetCanInitialize(canInitialize: boolean)
 		rawset(self, "_canInitialize", canInitialize)
 
 		if canInitialize then
-			self:GetBaseValueObject()
+			self:GetBaseValueObject(RoguePropertyBaseValueTypes.ANY)
 		end
 	end
 end
@@ -56,66 +66,126 @@ function RogueProperty:CanInitialize()
 	return rawget(self, "_canInitialize")
 end
 
-function RogueProperty:GetBaseValueObject()
-	local cached = rawget(self, "_baseValueCache")
-	local adornee = rawget(self, "_adornee")
-	local definition = rawget(self, "_definition")
-
-	if cached and cached:IsDescendantOf(adornee) then
-		return cached
+function RogueProperty:_getParentContainer()
+	local parentDefinition = self._definition:GetParentPropertyDefinition()
+	if parentDefinition then
+		return parentDefinition:Get(self._serviceBag, self._adornee):GetContainer()
+	else
+		return self._adornee
 	end
+end
 
-	local parent
-	local parentDefinition = definition:GetParentPropertyDefinition()
+function RogueProperty:GetBaseValueObject(roguePropertyBaseValueType)
+	assert(
+		RoguePropertyBaseValueTypeUtils.isRoguePropertyBaseValueType(roguePropertyBaseValueType),
+		"Bad roguePropertyBaseValueType"
+	)
 
-	if parentDefinition then
-		parent = parentDefinition:GetContainer(adornee, self:CanInitialize())
-	else
-		parent = adornee
+	-- TODO: check this caching!
+	local cachedInstance = rawget(self, "_baseValueInstanceCache")
+	local adornee = rawget(self, "_adornee")
+
+	if cachedInstance then
+		if cachedInstance:IsDescendantOf(adornee) then
+			return cachedInstance
+		else
+			rawset(self, "_baseValueInstanceCache", nil)
+		end
 	end
 
+	local definition = rawget(self, "_definition")
+
+	local parent = self:_getParentContainer()
 	if not parent then
 		return nil
 	end
 
+	local currentAttribute = parent:GetAttribute(definition:GetName())
+	local instanceRequired = roguePropertyBaseValueType == RoguePropertyBaseValueTypes.INSTANCE
+		or definition:HasChildren()
+		or currentAttribute == RoguePropertyConstants.INSTANCE_ATTRIBUTE_VALUE
+		or ONLY_USE_INSTANCES
+
+	-- Short circuit querying datamodel
+	local hasValidAttribute = currentAttribute ~= nil
+		and currentAttribute ~= RoguePropertyConstants.INSTANCE_ATTRIBUTE_VALUE
+	if hasValidAttribute and not instanceRequired then
+		-- TODO: Interface/avoid attribute value/cache
+		return AttributeValue.new(parent, definition:GetName(), definition:GetEncodedDefaultValue())
+	end
+
 	local found
-	if self:CanInitialize() then
+	if self:CanInitialize() and instanceRequired then
 		found = definition:GetOrCreateInstance(parent)
 	else
 		found = parent:FindFirstChild(definition:GetName())
 	end
 
-	-- Store cache
-	rawset(self, "_baseValueCache", found)
-
-	return found
+	if found then
+		rawset(self, "_baseValueInstanceCache", found)
+		parent:SetAttribute(definition:GetName(), RoguePropertyConstants.INSTANCE_ATTRIBUTE_VALUE)
+		return found
+	elseif not instanceRequired then
+		if self:CanInitialize() then
+			return AttributeValue.new(parent, definition:GetName(), definition:GetEncodedDefaultValue())
+		else
+			if currentAttribute ~= nil then
+				return AttributeValue.new(parent, definition:GetName(), definition:GetEncodedDefaultValue())
+			else
+				return nil
+			end
+		end
+	else
+		return nil
+	end
 end
 
-function RogueProperty:_observeBaseValueBrio()
+function RogueProperty:_observeParentBrio()
+	local cache = rawget(self, "_observeParentBrioCache")
+	if cache then
+		return cache
+	end
+
 	local parentDefinition = self._definition:GetParentPropertyDefinition()
 	if parentDefinition then
-		return parentDefinition:ObserveContainerBrio(self._adornee, self:CanInitialize()):Pipe({
-			RxBrioUtils.switchMapBrio(function(container)
-				return RxInstanceUtils.observeLastNamedChildBrio(
-					container,
-					self._definition:GetStorageInstanceType(),
-					self._definition:GetName()
-				)
-			end),
-		})
+		local parentTable = parentDefinition:Get(self._serviceBag, self._adornee)
+		cache = parentTable:ObserveContainerBrio()
 	else
-		return RxInstanceUtils.observeLastNamedChildBrio(
-			self._adornee,
-			self._definition:GetStorageInstanceType(),
-			self._definition:GetName()
-		)
+		-- TODO: Performance very sad, unneeded table construction
+		cache = RxBrioUtils.of(self._adornee)
 	end
+
+	rawset(self, "_observeParentBrioCache", cache)
+
+	return cache
+end
+
+function RogueProperty:_observeBaseValueBrio()
+	local cache = rawget(self, "_observeBaseValueBrioCache")
+	if cache then
+		return cache
+	end
+
+	cache = self:_observeParentBrio():Pipe({
+		RxBrioUtils.switchMapBrio(function(container)
+			return RxInstanceUtils.observeLastNamedChildBrio(
+				container,
+				self._definition:GetStorageInstanceType(),
+				self._definition:GetName()
+			)
+		end),
+		Rx.cache(),
+	})
+
+	rawset(self, "_observeBaseValueBrioCache", cache)
+
+	return cache
 end
 
 function RogueProperty:SetBaseValue(value)
 	assert(self._definition:CanAssign(value, false)) -- This has a good error message
 
-	local baseValue = self:GetBaseValueObject()
+	local baseValue = self:GetBaseValueObject(RoguePropertyBaseValueTypes.ANY)
 	if baseValue then
 		baseValue.Value = self:_encodeValue(value)
 	else
@@ -129,10 +199,96 @@ function RogueProperty:SetBaseValue(value)
 	end
 end
 
+function RogueProperty:_getModifierParentContainerForNewModifier()
+	if self:CanInitialize() then
+		return self:GetBaseValueObject(RoguePropertyBaseValueTypes.INSTANCE)
+	end
+
+	local found = self:GetBaseValueObject(RoguePropertyBaseValueTypes.ANY)
+	if found then
+		if typeof(found) == "Instance" then
+			return found
+		end
+	end
+
+	-- else, search for local parent
+	local parent = self:_getParentContainer()
+	if not parent then
+		return nil
+	end
+
+	-- TODO: Maybe we should use this before anything else on the client...?
+	-- TODO: Maybe only do this on the client?
+	local name = self:_getLocalModifierParentName()
+
+	found = parent:FindFirstChild(name)
+	if found then
+		return found
+	end
+
+	local localParent = Instance.new(LOCAL_MODIFIER_CONTAINER_CLASS_NAME)
+	localParent.Name = name
+	localParent.Archivable = false
+	localParent.Parent = parent
+
+	return localParent
+end
+
+function RogueProperty:_getLocalModifierParentName()
+	return self._definition:GetName() .. "_LocalModifiers"
+end
+
+function RogueProperty:_getModifierParentContainerList()
+	local containerList = {}
+
+	if self:CanInitialize() then
+		local found = self:GetBaseValueObject(RoguePropertyBaseValueTypes.ANY)
+		if typeof(found) == "Instance" then
+			table.insert(containerList, found)
+		end
+	end
+
+	local parent = self:_getParentContainer()
+	if parent then
+		local name = self:_getLocalModifierParentName()
+
+		local localParent = parent:FindFirstChild(name)
+		if localParent then
+			table.insert(containerList, localParent)
+		end
+	end
+
+	return containerList
+end
+
+function RogueProperty:_observeModifierContainersBrio()
+	local name = self:_getLocalModifierParentName()
+
+	return self:_observeParentBrio():Pipe({
+		RxBrioUtils.switchMapBrio(function(parent)
+			return Rx.merge({
+				-- The main container
+				RxAttributeUtils.observeAttributeBrio(parent, self._definition:GetName(), function(attribute)
+					return attribute == RoguePropertyConstants.INSTANCE_ATTRIBUTE_VALUE
+				end):Pipe({
+					Rx.switchMap(function()
+						return self:_observeBaseValueBrio()
+					end),
+				}),
+
+				-- The modifier parent
+				RxInstanceUtils.observeChildrenBrio(parent, function(child)
+					return child:IsA(LOCAL_MODIFIER_CONTAINER_CLASS_NAME) and child.Name == name
+				end),
+			})
+		end),
+	})
+end
+
 function RogueProperty:SetValue(value)
 	assert(self._definition:CanAssign(value, false)) -- This has a good error message
 
-	local baseValue = self:GetBaseValueObject()
+	local baseValue = self:GetBaseValueObject(RoguePropertyBaseValueTypes.ANY)
 	if not baseValue then
 		warn(
 			string.format(
@@ -155,7 +311,7 @@ function RogueProperty:SetValue(value)
 end
 
 function RogueProperty:GetBaseValue()
-	local baseValue = self:GetBaseValueObject()
+	local baseValue = self:GetBaseValueObject(RoguePropertyBaseValueTypes.ANY)
 	if baseValue then
 		return self:_decodeValue(baseValue.Value)
 	else
@@ -164,7 +320,7 @@ function RogueProperty:GetBaseValue()
 end
 
 function RogueProperty:GetValue()
-	local propObj = self:GetBaseValueObject()
+	local propObj = self:GetBaseValueObject(RoguePropertyBaseValueTypes.ANY)
 	if not propObj then
 		return self._definition:GetDefaultValue()
 	end
@@ -183,63 +339,99 @@ function RogueProperty:GetDefinition()
 end
 
 function RogueProperty:GetRogueModifiers()
-	local propObj = self:GetBaseValueObject()
-	if not propObj then
-		return {}
+	local modifierList = {}
+
+	for _, parent in self:_getModifierParentContainerList() do
+		for _, modifier in RogueModifierInterface:GetChildren(parent, self._tieRealmService:GetTieRealm()) do
+			table.insert(modifierList, modifier)
+		end
 	end
 
-	local found = RogueModifierInterface:GetChildren(propObj)
+	if not next(modifierList) then
+		return modifierList
+	end
 
-	local orders = {}
-	for _, item in found do
-		orders[item] = item.Order.Value
+	local orderMap = {}
+	for _, item in modifierList do
+		orderMap[item] = item.Order.Value
 	end
-	table.sort(found, function(a, b)
-		return orders[a] < orders[b]
+	table.sort(modifierList, function(a, b)
+		return orderMap[a] < orderMap[b]
 	end)
 
-	return found
+	return modifierList
 end
 
 function RogueProperty:_observeModifierSortedList()
-	return Observable.new(function(sub)
+	local cache = rawget(self, "_observeModifierSortedListCache")
+	if cache then
+		return cache
+	end
+
+	cache = Observable.new(function(sub)
 		local topMaid = Maid.new()
 
 		local sortedList = topMaid:Add(ObservableSortedList.new())
 
-		topMaid:GiveTask(self:_observeBaseValueBrio()
+		topMaid:GiveTask(self:_observeModifierContainersBrio()
 			:Pipe({
 				RxBrioUtils.flatMapBrio(function(baseValue)
-					return RogueModifierInterface:ObserveChildrenBrio(baseValue)
+					return RogueModifierInterface:ObserveChildrenBrio(baseValue, self._tieRealmService:GetTieRealm())
 				end),
 			})
 			:Subscribe(function(brio)
 				if brio:IsDead() then
 					return
 				end
+
 				local maid, rogueModifier = brio:ToMaidAndValue()
 				maid:GiveTask(sortedList:Add(rogueModifier, rogueModifier.Order:Observe()))
 			end))
 
+		debug.profilebegin("sorted_list_add")
 		sub:Fire(sortedList)
+		debug.profileend()
 
 		return topMaid
 	end):Pipe({
 		Rx.cache(),
 	})
+
+	rawset(self, "_observeModifierSortedListCache", cache)
+	return cache
 end
 
 function RogueProperty:Observe()
-	local observeInitialValue = self:_observeBaseValueBrio():Pipe({
-		RxBrioUtils.switchMapBrio(function(baseValue)
-			return RxInstanceUtils.observeProperty(baseValue, "Value")
+	local cache = rawget(self, "_observeCache")
+	if cache then
+		return cache
+	end
+
+	local observeInitialValue = self:_observeParentBrio():Pipe({
+		RxBrioUtils.switchMapBrio(function(parent)
+			return RxAttributeUtils.observeAttribute(parent, self._definition:GetName())
+		end),
+		RxBrioUtils.switchMapBrio(function(attribute)
+			if attribute == RoguePropertyConstants.INSTANCE_ATTRIBUTE_VALUE then
+				return self:_observeBaseValueBrio():Pipe({
+					RxBrioUtils.switchMapBrio(function(baseValue)
+						return RxInstanceUtils.observeProperty(baseValue, "Value")
+					end),
+				})
+			end
+			local decoded = self:_decodeValue(attribute)
+			if decoded == nil then
+				return Rx.of(self._definition:GetDefaultValue())
+			else
+				return Rx.of(decoded)
+			end
 		end),
 		RxBrioUtils.emitOnDeath(self._definition:GetDefaultValue()),
 		Rx.defaultsTo(self._definition:GetDefaultValue()),
 		Rx.distinct(),
 	})
 
-	return self:_observeModifierSortedList():Pipe({
+	cache = self:_observeModifierSortedList():Pipe({
 		Rx.switchMap(function(sortedList)
 			return sortedList:Observe()
 		end),
@@ -250,7 +442,10 @@ function RogueProperty:Observe()
 			end
 			return current
 		end),
+		Rx.cache(),
 	})
+	rawset(self, "_observeCache", cache)
+	return cache
 end
 
 function RogueProperty:ObserveBrio(predicate)
@@ -259,14 +454,14 @@ function RogueProperty:ObserveBrio(predicate)
 	})
 end
 
-function RogueProperty:CreateMultiplier(amount, source)
+function RogueProperty:CreateMultiplier(amount: number, source)
 	assert(type(amount) == "number", "Bad amount")
 
-	local baseValue = self:GetBaseValueObject()
-	if not baseValue then
+	local modifierParent = self:_getModifierParentContainerForNewModifier()
+	if not modifierParent then
 		warn(
 			string.format(
-				"[RogueProperty.CreateMultiplier] - Failed to get the baseValue for %q on %q",
+				"[RogueProperty.CreateMultiplier] - Failed to get the modifierParent for %q on %q",
 				self._definition:GetFullName(),
 				self._adornee:GetFullName()
 			)
@@ -289,7 +484,7 @@ function RogueProperty:CreateMultiplier(amount, source)
 
 	RogueMultiplier:Tag(multiplier)
 
-	multiplier.Parent = baseValue
+	multiplier.Parent = modifierParent
 
 	return multiplier
 end
@@ -297,11 +492,11 @@ end
 function RogueProperty:CreateAdditive(amount: number, source)
 	assert(type(amount) == "number", "Bad amount")
 
-	local baseValue = self:GetBaseValueObject()
-	if not baseValue then
+	local modifierParent = self:_getModifierParentContainerForNewModifier()
+	if not modifierParent then
 		warn(
 			string.format(
-				"[RogueProperty.CreateAdditive] - Failed to get the baseValue for %q on %q",
+				"[RogueProperty.CreateAdditive] - Failed to get the modifierParent for %q on %q",
 				self._definition:GetFullName(),
 				self._adornee:GetFullName()
 			)
@@ -325,17 +520,17 @@ function RogueProperty:CreateAdditive(amount: number, source)
 
 	RogueAdditive:Tag(additive)
 
-	additive.Parent = baseValue
+	additive.Parent = modifierParent
 
 	return additive
 end
 
 function RogueProperty:GetNamedAdditive(name, source)
-	local baseValue = self:GetBaseValueObject()
-	if not baseValue then
+	local modifierParent = self:_getModifierParentContainerForNewModifier()
+	if not modifierParent then
 		warn(
 			string.format(
-				"[RogueProperty.GetNamedAdditive] - Failed to get the baseValue for %q on %q",
+				"[RogueProperty.GetNamedAdditive] - Failed to get the modifierParent for %q on %q",
 				self._definition:GetFullName(),
 				self._adornee:GetFullName()
 			)
@@ -345,7 +540,7 @@ function RogueProperty:GetNamedAdditive(name, source)
 
 	local searchName = name .. "Additive"
 
-	local found = baseValue:FindFirstChild(searchName)
+	local found = modifierParent:FindFirstChild(searchName)
 	if found then
 		return found
 	end
@@ -356,11 +551,11 @@ function RogueProperty:GetNamedAdditive(name, source)
 end
 
 function RogueProperty:CreateSetter(value, source)
-	local baseValue = self:GetBaseValueObject()
-	if not baseValue then
+	local modifierParent = self:_getModifierParentContainerForNewModifier()
+	if not modifierParent then
 		warn(
 			string.format(
-				"[RogueProperty.CreateSetter] - Failed to get the baseValue for %q on %q",
+				"[RogueProperty.CreateSetter] - Failed to get the modifierParent for %q on %q",
 				self._definition:GetFullName(),
 				self._adornee:GetFullName()
 			)
@@ -384,18 +579,18 @@ function RogueProperty:CreateSetter(value, source)
 
 	RogueSetter:Tag(setter)
 
-	setter.Parent = baseValue
+	setter.Parent = modifierParent
 
 	return setter
 end
 
 function RogueProperty:__index(index)
-	if index == "Value" then
+	if RogueProperty[index] then
+		return RogueProperty[index]
+	elseif index == "Value" then
 		return self:GetValue()
 	elseif index == "Changed" then
 		return self:GetChangedEvent()
-	elseif RogueProperty[index] then
-		return RogueProperty[index]
 	else
 		error(string.format("Bad index %q", tostring(index)))
 	end

package/src/Shared/Implementation/RoguePropertyArrayHelper.lua

@@ -6,6 +6,7 @@ local require = require(script.Parent.loader).load(script)
 
 local BaseObject = require("BaseObject")
 local RoguePropertyArrayUtils = require("RoguePropertyArrayUtils")
+local RoguePropertyBaseValueTypes = require("RoguePropertyBaseValueTypes")
 local Rx = require("Rx")
 
 local RoguePropertyArrayHelper = setmetatable({}, BaseObject)
@@ -113,7 +114,11 @@ function RoguePropertyArrayHelper:SetArrayBaseData(arrayData)
 		else
 			-- Cleanup this old one and setup a new one
 			if available[index] then
-				available[index]:GetBaseValueObject():Destroy()
+				local found = available[index]:GetBaseValueObject(RoguePropertyBaseValueTypes.ANY)
+				if typeof(found) == "Instance" then
+					found:Destroy()
+					return
+				end
 			end
 
 			local property = definition:Get(self._serviceBag, adornee)
@@ -148,7 +153,11 @@ function RoguePropertyArrayHelper:SetArrayData(arrayData)
 		else
 			-- Cleanup this old one and setup a new one
 			if available[index] then
-				available[index]:GetBaseValueObject():Destroy()
+				local found = available[index]:GetBaseValueObject(RoguePropertyBaseValueTypes.ANY)
+				if typeof(found) == "Instance" then
+					found:Destroy()
+					return
+				end
 			end
 
 			local property = definition:Get(self._serviceBag, adornee)

package/src/Shared/Implementation/RoguePropertyTable.lua

@@ -7,6 +7,8 @@ local require = require(script.Parent.loader).load(script)
 local RogueProperty = require("RogueProperty")
 local RoguePropertyArrayHelper = require("RoguePropertyArrayHelper")
 local Rx = require("Rx")
+local RxBrioUtils = require("RxBrioUtils")
+local RxInstanceUtils = require("RxInstanceUtils")
 local ServiceBag = require("ServiceBag")
 
 local RoguePropertyTable = {} -- inherits from RogueProperty
@@ -29,29 +31,70 @@ end
 function RoguePropertyTable:SetCanInitialize(canInitialize: boolean)
 	assert(type(canInitialize) == "boolean", "Bad canInitialize")
 
-	RogueProperty.SetCanInitialize(self, canInitialize)
+	if self:CanInitialize() ~= canInitialize then
+		RogueProperty.SetCanInitialize(self, canInitialize)
 
-	for _, property in self:GetRogueProperties() do
-		property:SetCanInitialize(canInitialize)
-	end
+		for _, property in self:GetRogueProperties() do
+			property:SetCanInitialize(canInitialize)
+		end
 
-	local arrayHelper = rawget(self, "_arrayHelper")
-	if arrayHelper then
-		arrayHelper:SetCanInitialize(canInitialize)
+		local arrayHelper = rawget(self, "_arrayHelper")
+		if arrayHelper then
+			arrayHelper:SetCanInitialize(canInitialize)
+		end
 	end
 end
 
 function RoguePropertyTable:ObserveContainerBrio()
-	return self._definition:ObserveContainerBrio(self._adornee, self:CanInitialize())
+	local cache = rawget(self, "_observeContainerCache")
+	if cache then
+		return cache
+	end
+
+	local parentDefinition = self._definition:GetParentPropertyDefinition()
+	if parentDefinition then
+		local parentTable = parentDefinition:Get(self._serviceBag, self._adornee)
+		parentTable:GetContainer()
+
+		cache = parentTable:ObserveContainerBrio():Pipe({
+			RxBrioUtils.switchMapBrio(function(parent)
+				return RxInstanceUtils.observeLastNamedChildBrio(parent, "Folder", self._definition:GetName())
+			end),
+			Rx.cache(),
+		})
+	else
+		cache = RxInstanceUtils.observeLastNamedChildBrio(self._adornee, "Folder", self._definition:GetName()):Pipe({
+			Rx.cache(),
+		})
+	end
+
+	cache = cache
+	rawset(self, "_observeContainerCache", cache)
+	return cache
 end
 
 function RoguePropertyTable:GetContainer(): Instance
 	local cached = rawget(self, "_containerCache")
-	if cached and cached:IsDescendantOf(self._adornee) then
-		return cached
+	if cached then
+		if cached:IsDescendantOf(self._adornee) then
+			return cached
+		else
+			rawset(self, "_containerCache", nil)
+		end
+	end
+
+	local parent
+	local parentDefinition = self._definition:GetParentPropertyDefinition()
+	if parentDefinition then
+		local parentTable = parentDefinition:Get(self._serviceBag, self._adornee)
+		parent = parentTable:GetContainer()
+	else
+		parent = self._adornee
 	end
 
-	local container = self._definition:GetContainer(self._adornee, self:CanInitialize())
+	local container = self._definition:GetOrCreateInstance(parent, self:CanInitialize())
+	container:AddTag("RoguePropertyTable")
+
 	rawset(self, "_containerCache", container)
 	return container
 end
@@ -167,6 +210,10 @@ end
 
 function RoguePropertyTable:_observeDictionary()
 	-- ok, this is definitely slow
+	local cache = rawget(self, "_observeDictionaryCache")
+	if cache then
+		return cache
+	end
 
 	local toObserve = {}
 
@@ -180,10 +227,16 @@ function RoguePropertyTable:_observeDictionary()
 	end
 
 	if next(toObserve) == nil then
-		return Rx.of({})
+		cache = Rx.of({})
+	else
+		cache = Rx.combineLatest(toObserve):Pipe({
+			Rx.cache(),
+		})
 	end
 
-	return Rx.combineLatest(toObserve)
+	rawset(self, "_observeDictionaryCache", cache)
+
+	return cache
 end
 
 function RoguePropertyTable:GetRogueProperty(name: string)

package/src/Shared/RoguePropertyBaseValueTypeUtils.lua

@@ -0,0 +1,15 @@
+--[=[
+	@class RoguePropertyBaseValueTypeUtils
+]=]
+
+local require = require(script.Parent.loader).load(script)
+
+local RoguePropertyBaseValueTypes = require("RoguePropertyBaseValueTypes")
+
+local RoguePropertyBaseValueTypeUtils = {}
+
+function RoguePropertyBaseValueTypeUtils.isRoguePropertyBaseValueType(value)
+	return value == RoguePropertyBaseValueTypes.INSTANCE or value == RoguePropertyBaseValueTypes.ANY
+end
+
+return RoguePropertyBaseValueTypeUtils

package/src/Shared/RoguePropertyBaseValueTypes.lua

@@ -0,0 +1,12 @@
+--[=[
+	@class RoguePropertyBaseValueTypes
+]=]
+
+local require = require(script.Parent.loader).load(script)
+
+local Table = require("Table")
+
+return Table.readonly({
+	INSTANCE = "instance",
+	ANY = "any",
+})

package/src/Shared/RoguePropertyConstants.lua

@@ -0,0 +1,11 @@
+--[=[
+	@class RoguePropertyConstants
+]=]
+
+local require = require(script.Parent.loader).load(script)
+
+local Table = require("Table")
+
+return Table.readonly({
+	INSTANCE_ATTRIBUTE_VALUE = "_DATAMODEL_INSTANCE",
+})