@@ -49,6 +49,7 @@ local SKILLLINES = "SKILLLINES"
4949
5050local LGB = LibGroupBroadcast
5151local EM = EVENT_MANAGER
52+ local SDM = SKILLS_DATA_MANAGER
5253local LocalEM = ZO_CallbackObject :New ()
5354local strmatch = string.match
5455local _isFirstOnPlayerActivated = true
@@ -809,6 +810,12 @@ function combat.GetBossTargetDamage()
809810 return bossUnits , totalBossDamage , bossTime
810811end
811812
813+ ---
814+
815+ local function GetBaseAbilityId (rawAbilityId )
816+ if rawAbilityId == nil or rawAbilityId == 0 then return 0 end
817+ return SDM :GetProgressionDataByAbilityId (rawAbilityId ).abilityId
818+ end
812819
813820--- update player values
814821local function updatePlayerUltValue ()
@@ -859,8 +866,11 @@ local function updatePlayerSlottedUlts()
859866 playerStats .ult .ult2Cost = 0
860867
861868 -- populate values
862- playerStats .ult .ult1ID = GetSlotBoundId (ACTION_BAR_ULTIMATE_SLOT_INDEX + 1 , HOTBAR_CATEGORY_PRIMARY )
863- playerStats .ult .ult2ID = GetSlotBoundId (ACTION_BAR_ULTIMATE_SLOT_INDEX + 1 , HOTBAR_CATEGORY_BACKUP )
869+ local rawUlt1ID = GetSlotBoundId (ACTION_BAR_ULTIMATE_SLOT_INDEX + 1 , HOTBAR_CATEGORY_PRIMARY )
870+ local rawUlt2ID = GetSlotBoundId (ACTION_BAR_ULTIMATE_SLOT_INDEX + 1 , HOTBAR_CATEGORY_BACKUP )
871+
872+ playerStats .ult .ult1ID = GetBaseAbilityId (rawUlt1ID )
873+ playerStats .ult .ult2ID = GetBaseAbilityId (rawUlt2ID )
864874 playerStats .ult .ult1Cost = GetAbilityCost (playerStats .ult .ult1ID , COMBAT_MECHANIC_FLAGS_ULTIMATE , nil , localPlayer )
865875 playerStats .ult .ult2Cost = GetAbilityCost (playerStats .ult .ult2ID , COMBAT_MECHANIC_FLAGS_ULTIMATE , nil , localPlayer )
866876
0 commit comments