From 69008e4550605def193eb37e64da239fc11d273a Mon Sep 17 00:00:00 2001 From: Cilraaz Date: Tue, 24 Sep 2024 08:04:52 -0400 Subject: [PATCH] feat(Equipment): Return SpellID and IsUsable in GetTrinketData --- HeroLib/Class/Unit/Player/Equipment.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/HeroLib/Class/Unit/Player/Equipment.lua b/HeroLib/Class/Unit/Player/Equipment.lua index 03fe6027..e7bb8a2e 100755 --- a/HeroLib/Class/Unit/Player/Equipment.lua +++ b/HeroLib/Class/Unit/Player/Equipment.lua @@ -225,15 +225,21 @@ function Player:GetTrinketData() local Trinket2 = Equip[14] and Item(Equip[14]) or Item(0) local Trinket1Spell = Trinket1:OnUseSpell() local Trinket2Spell = Trinket2:OnUseSpell() + local Trinket1SpellID = Trinket1Spell and Trinket1Spell:ID() or 0 + local Trinket2SpellID = Trinket2Spell and Trinket2Spell:ID() or 0 local Trinket1Range = (Trinket1Spell and Trinket1Spell.MaximumRange > 0 and Trinket1Spell.MaximumRange <= 100) and Trinket1Spell.MaximumRange or 100 local Trinket2Range = (Trinket2Spell and Trinket2Spell.MaximumRange > 0 and Trinket2Spell.MaximumRange <= 100) and Trinket2Spell.MaximumRange or 100 local Trinket1CastTime = Trinket1Spell and Trinket1Spell:CastTime() or 0 local Trinket2CastTime = Trinket2Spell and Trinket2Spell:CastTime() or 0 + local Trinket1Usable = Trinket1:IsUsable() + local Trinket2Usable = Trinket2:IsUsable() local T1 = { Object = Trinket1, ID = Trinket1:ID(), Spell = Trinket1Spell, + SpellID = Trinket1SpellID, Range = Trinket1Range, + Usable = Trinket1Usable, CastTime = Trinket1CastTime, Cooldown = Trinket1:Cooldown(), Blacklisted = Player:IsItemBlacklisted(Trinket1) @@ -242,7 +248,9 @@ function Player:GetTrinketData() Object = Trinket2, ID = Trinket2:ID(), Spell = Trinket2Spell, + SpellID = Trinket2SpellID, Range = Trinket2Range, + Usable = Trinket2Usable, CastTime = Trinket2CastTime, Cooldown = Trinket2:Cooldown(), Blacklisted = Player:IsItemBlacklisted(Trinket2)