Revert "Use offset mods for Cryogenesis redirect, label source"

This reverts commit baee98d.

Author: LocalIdentity

src/Classes/ModDB.lua

@@ -66,6 +66,44 @@ function ModDBClass:ReplaceModInternal(mod)
 	return false
 end
 
+---ConvertModInternal
+---  Converts an existing mod with oldName to a new mod with a different name.
+---  Moves the mod from the old name's bucket to the new name's bucket.
+---  If no matching mod exists, then the function returns false
+---@param oldName string @The name of the existing mod to find
+---@param mod table @The new mod to replace it with
+---@return boolean @Whether any mod was converted
+function ModDBClass:ConvertModInternal(oldName, mod)
+	if not self.mods[oldName] then
+		if self.parent then
+			return self.parent:ConvertModInternal(oldName, mod)
+		end
+		return false
+	end
+
+	local oldList = self.mods[oldName]
+	for i = 1, #oldList do
+		local curMod = oldList[i]
+		if oldName == curMod.name and mod.type == curMod.type and mod.flags == curMod.flags and mod.keywordFlags == curMod.keywordFlags and mod.source == curMod.source and not curMod.converted then
+			-- Remove from old name's bucket
+			t_remove(oldList, i)
+			-- Add to new name's bucket
+			local newName = mod.name
+			if not self.mods[newName] then
+				self.mods[newName] = { }
+			end
+			mod.converted = true
+			t_insert(self.mods[newName], mod)
+			return true
+		end
+	end
+
+	if self.parent then
+		return self.parent:ConvertModInternal(oldName, mod)
+	end
+
+	return false
+end
 
 function ModDBClass:AddList(modList)
 	local mods = self.mods

src/Classes/ModList.lua

@@ -45,6 +45,26 @@ function ModListClass:ReplaceModInternal(mod)
 	return false
 end
 
+---ConvertModInternal
+---  Converts an existing mod with oldName to a new mod with a different name.
+---  If no matching mod exists, then the function returns false
+---@param oldName string @The name of the existing mod to find
+---@param mod table @The new mod to replace it with
+---@return boolean @Whether any mod was converted
+function ModListClass:ConvertModInternal(oldName, mod)
+	for i, curMod in ipairs(self) do
+		if oldName == curMod.name and mod.type == curMod.type and mod.flags == curMod.flags and mod.keywordFlags == curMod.keywordFlags and mod.source == curMod.source then
+			self[i] = mod
+			return true
+		end
+	end
+
+	if self.parent then
+		return self.parent:ConvertModInternal(oldName, mod)
+	end
+
+	return false
+end
 
 function ModListClass:MergeMod(mod, skipNonAdditive)
 	if mod.type == "BASE" or mod.type == "INC" or mod.type == "MORE" then

src/Classes/ModStore.lua

@@ -110,6 +110,18 @@ function ModStoreClass:ReplaceMod(...)
 	end
 end
 
+---ConvertMod
+---  Converts an existing mod to a new name, replacing it in the store.
+---  Finds a mod matching oldName with the same type, flags, keywordFlags, and source as the new mod.
+---  If no matching mod exists, the new mod is added instead.
+---@param oldName string @The name of the existing mod to convert
+---@param ... any @Parameters to be passed along to the modLib.createMod function (new name, type, value, source, ...)
+function ModStoreClass:ConvertMod(oldName, ...)
+	local mod = mod_createMod(...)
+	if not self:ConvertModInternal(oldName, mod) then
+		self:AddMod(mod)
+	end
+end
 
 function ModStoreClass:Combine(modType, cfg, ...)
 	if modType == "MORE" then

src/Modules/CalcOffence.lua

@@ -3063,15 +3063,13 @@ function calcs.offence(env, actor, activeSkill)
 			if not skipRedirect then
 				for _, damageType in ipairs(dmgTypeList) do
 					if damageType ~= addedDamageRedirectType then
-						local addedMin = skillModList:Sum("BASE", cfg, damageType.."Min")
-						local addedMax = skillModList:Sum("BASE", cfg, damageType.."Max")
-						if addedMin ~= 0 then
-							skillModList:NewMod(damageType.."Min", "BASE", -addedMin, "Cryogenesis Conversion")
-							skillModList:NewMod(addedDamageRedirectType.."Min", "BASE", addedMin, "Cryogenesis Conversion")
+						for _, value in ipairs(skillModList:Tabulate("BASE", cfg, damageType.."Min")) do
+							local mod = value.mod
+							skillModList:ConvertMod(damageType.."Min", addedDamageRedirectType.."Min", "BASE", mod.value, mod.source, mod.flags, mod.keywordFlags, unpack(mod))
 						end
-						if addedMax ~= 0 then
-							skillModList:NewMod(damageType.."Max", "BASE", -addedMax, "Cryogenesis Conversion")
-							skillModList:NewMod(addedDamageRedirectType.."Max", "BASE", addedMax, "Cryogenesis Conversion")
+						for _, value in ipairs(skillModList:Tabulate("BASE", cfg, damageType.."Max")) do
+							local mod = value.mod
+							skillModList:ConvertMod(damageType.."Max", addedDamageRedirectType.."Max", "BASE", mod.value, mod.source, mod.flags, mod.keywordFlags, unpack(mod))
 						end
 					end
 				end