Skip to content

Commit

Permalink
Merge pull request Softrix#46 from ynazar1/tidecaller-and-levelup
Browse files Browse the repository at this point in the history
  • Loading branch information
Softrix authored Oct 4, 2024
2 parents adc24b8 + 58ad0ef commit 5106428
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
6 changes: 5 additions & 1 deletion SmartBuff.buffs.lua
Original file line number Diff line number Diff line change
Expand Up @@ -641,6 +641,7 @@ function SMARTBUFF_InitSpellIDs()
SMARTBUFF_SOULLINK = getSpellBookItemByName(108447);--"Soul Link"
SMARTBUFF_LIFETAP = getSpellBookItemByName(1454); --"Life Tap"
SMARTBUFF_CREATEHS = getSpellBookItemByName(6201); --"Create Healthstone"
SMARTBUFF_CREATEHSWELL = getSpellBookItemByName(29893); --"Create Soulwell"
SMARTBUFF_SOULSTONE = getSpellBookItemByName(20707); --"Soulstone"
SMARTBUFF_GOSACRIFICE = getSpellBookItemByName(108503);--"Grimoire of Sacrifice"
SMARTBUFF_INQUISITORGAZE = getSpellBookItemByName(386344);--"Inquisitor's Gaze"
Expand Down Expand Up @@ -705,7 +706,8 @@ function SMARTBUFF_InitSpellIDs()
SMARTBUFF_FLAMETONGUEW = getSpellBookItemByName(318038); --"Flametongue Weapon"
SMARTBUFF_EVERLIVINGW = getSpellBookItemByName(382021); --"Everliving Weapon"
SMARTBUFF_SKYFURY = getSpellBookItemByName(462854); --"Skyfury"
SMARTBUFF_TSWARD = getSpellBookItemByName(462742); --"Thunderstrike Ward" -- Shield!!!
SMARTBUFF_TSWARD = getSpellBookItemByName(462742); --"Thunderstrike Ward" -- Shield
SMARTBUFF_TIDEGUARD = getSpellBookItemByName(457481); --"Tidecaller's Guard" -- Shield. Replaces Flametongue Weapon

-- Shaman buff links
S.ChainShamanShield = { SMARTBUFF_LIGHTNINGSHIELD, SMARTBUFF_WATERSHIELD, SMARTBUFF_EARTHSHIELD };
Expand Down Expand Up @@ -1147,6 +1149,7 @@ function SMARTBUFF_InitSpellList()
{SMARTBUFF_BLOODHORROR, 1, SMARTBUFF_CONST_SELF},
{SMARTBUFF_SOULSTONE, 15, SMARTBUFF_CONST_GROUP, {18}, "WARRIOR;DRUID;SHAMAN;HUNTER;ROGUE;MAGE;PRIEST;PALADIN;WARLOCK;DEATHKNIGHT;EVOKER;MONK;DEMONHUNTER;HPET;WPET;DKPET"},
{SMARTBUFF_CREATEHS, 0.03, SMARTBUFF_CONST_ITEM, nil, SMARTBUFF_HEALTHSTONE, nil, S.StoneWarlock},
{SMARTBUFF_CREATEHSWELL, 0.03, SMARTBUFF_CONST_ITEM, nil, SMARTBUFF_HEALTHSTONE, nil, S.StoneWarlock},
{SMARTBUFF_SUMMONIMP, -1, SMARTBUFF_CONST_SELF, nil, S.CheckPet},
{SMARTBUFF_SUMMONFELHUNTER, -1, SMARTBUFF_CONST_SELF, nil, S.CheckPet},
{SMARTBUFF_SUMMONVOIDWALKER, -1, SMARTBUFF_CONST_SELF, nil, S.CheckPet},
Expand Down Expand Up @@ -1201,6 +1204,7 @@ function SMARTBUFF_InitSpellList()
{SMARTBUFF_WINDFURYW, 60, SMARTBUFF_CONST_WEAPON},
{SMARTBUFF_FLAMETONGUEW, 60, SMARTBUFF_CONST_WEAPON},
{SMARTBUFF_TSWARD, 60, SMARTBUFF_CONST_WEAPON},
{SMARTBUFF_TIDEGUARD, 60, SMARTBUFF_CONST_WEAPON},
{SMARTBUFF_EVERLIVINGW, 60, SMARTBUFF_CONST_WEAPON},
{SMARTBUFF_EARTHSHIELD, 10, SMARTBUFF_CONST_GROUP, {50,60,70,75,80}, "WARRIOR;DEATHKNIGHT;DRUID;SHAMAN;HUNTER;ROGUE;MAGE;PRIEST;PALADIN;WARLOCK;MONK;DEMONHUNTER;EVOKER;HPET;WPET;DKPET"},
{SMARTBUFF_UNLEASHFLAME, 0.333, SMARTBUFF_CONST_SELF},
Expand Down
4 changes: 3 additions & 1 deletion SmartBuff.lua
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,7 @@ function SMARTBUFF_OnLoad(self)
self:RegisterEvent("UPDATE_MOUSEOVER_UNIT");
self:RegisterEvent("UNIT_SPELLCAST_FAILED");
self:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED");
self:RegisterEvent("PLAYER_LEVEL_UP");
--auto template events
self:RegisterEvent("ZONE_CHANGED_NEW_AREA")
self:RegisterEvent("GROUP_ROSTER_UPDATE")
Expand Down Expand Up @@ -706,7 +707,8 @@ function SMARTBUFF_OnEvent(self, event, ...)
-- TODO: This is a blizzard bug workaround that spams GROUP_ROSTER_UPDATE during delves
local name, instanceType, difficultyID, difficultyName, maxPlayers, dynamicDifficulty, isDynamic, instanceID, instanceGroupSize, LfgDungeonID =
GetInstanceInfo()
if event == "ZONE_CHANGED_NEW_AREA" or (event == "GROUP_ROSTER_UPDATE" and instanceType ~= "scenario") then
-- Any other event here
if event == "ZONE_CHANGED_NEW_AREA" or (event == "GROUP_ROSTER_UPDATE" and instanceType ~= "scenario") or event == PLAYER_LEVEL_UP then
SMARTBUFF_SetTemplate()
end
end
Expand Down

0 comments on commit 5106428

Please sign in to comment.