Skip to content

Adds /pw i, to toggle instance pets #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
neonvoidx wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adds /pw i, to toggle instance pets #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions events.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,10 @@ local function PLAYER_ENTERING_WORLD(is_login, is_reload)
end
ns.pet_verified = false
C_TimerAfter(delay, function()
if not is_login and not is_reload and ns.is_instance_summoning_blocked() then
ns.dismiss_current_pet()
return
end
ns.transitioncheck()
-- For the moment, calling this separately, since `transitioncheck` in its current form is abortable
ns.events:register_summon_events()
Expand Down
1 change: 1 addition & 0 deletions init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ local defaults_global = {
recentPets = {},
eventAlt = nil,
debugMode = false,
instanceSummoning = true,
}

local defaults_perchar = {
Expand Down
12 changes: 12 additions & 0 deletions main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,18 @@ local function forbidden_instance()
local _, _, difficulty_id = GetInstanceInfo()
if difficulty_id == 8 then return true end
end
return not ns.db.instanceSummoning
end

function ns.dismiss_current_pet()
local actpet = C_PetJournal_GetSummonedPetGUID()
if actpet then
C_PetJournal_SummonPetByGUID(actpet)
end
end

function ns.is_instance_summoning_blocked()
return forbidden_instance()
end

-- To test against if pet-on-back aura is found (AFAIK, only Daisy)
Expand Down
15 changes: 15 additions & 0 deletions ui.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ local C_PetJournal_GetBattlePetLink = _G.C_PetJournal.GetBattlePetLink
local tostring = _G.tostring
local format = _G.format
local print = _G.print
local IsInInstance = _G.IsInInstance

local CHAR_NAME = UnitName 'player'
local MAX_NUM_RECENTS = 20
Expand Down Expand Up @@ -239,6 +240,8 @@ function ns.help_display(print_bottomspace)

{CO.c .. 'v', ' : ', CO.k .. 'Verbosity: ', CO.s .. 'silent ', '(only failures and warnings are printed to chat); ', CO.c .. 'vv ', 'for ', CO.s .. 'medium ', CO.k .. 'verbosity ', '(new summons); ', CO.c .. 'vvv ', 'for ', CO.s .. 'full ', CO.k .. 'verbosity ', '(also restored pets).'},

{CO.c .. 'i', ' : ', 'Toggle ', CO.k .. 'auto-summoning in instances', '. (Requires ', CO.c .. '/pw a', ' to be enabled.)'},

{CO.c .. 's', ' : ', 'Display current ', CO.k .. 'status/settings.'},

{CO.c .. 'h', ' : ', 'This help text.'},
Expand Down Expand Up @@ -270,6 +273,8 @@ function ns.status_display(print_topsep, print_bottomsep)

{CO.k .. 'Summon Timer ', 'is ', CO.s .. (ns.db.newPetTimer > 0 and (ns.db.newPetTimer/60) .. CO.bn .. ' minutes' or 'disabled'), '. Next random pet in ', CO.e .. ns.remaining_timer_for_display(), '.'},

{CO.k ..'Auto-summoning in instances ', 'is ', CO.s .. (ns.db.instanceSummoning and 'enabled' or CO.bw .. 'disabled'), '.'},

{CO.k ..'Automatic summoning while mounted for Skyriding ', 'is ', CO.s .. (ns.db.drSummoning and 'allowed' or 'not allowed'), '.'},

{CO.k .. 'History ', 'of Previous Pets: ', CO.s .. ns.db.numRecents - 1, ' (1 to ' .. MAX_NUM_RECENTS .. ').'},
Expand Down Expand Up @@ -359,6 +364,8 @@ function SlashCmdList.PetWalker(msg)
ns.status_display(true, true)
elseif tonumber(args[1]) then
ns:timer_slash_cmd(args[1])
elseif args[1] == 'i' or args[1] == 'instance' then
ns.instance_summoning_toggle()
elseif args[1] == 'sr' then
ns.dr_summoning_toggle()
elseif args[1] == 't' or args[1] == 'target' then
Expand Down Expand Up @@ -449,6 +456,14 @@ function ns.charfavs_slash_toggle() -- for slash command only
chat_user_notification(format('%sCharacter-specific favorites %s for %s%s.', CO.bn, ns.dbc.charFavsEnabled and 'enabled' or 'disabled', CO.e, CHAR_NAME))
end

function ns.instance_summoning_toggle()
ns.db.instanceSummoning = not ns.db.instanceSummoning
if not ns.db.instanceSummoning and IsInInstance() then
ns.dismiss_current_pet()
end
chat_user_notification(format('%sPet auto-summoning in instances %s.', CO.bn, ns.db.instanceSummoning and 'enabled' or 'disabled'))
end

function ns.dr_summoning_toggle()
ns.db.drSummoning = not ns.db.drSummoning
chat_user_notification(format('%sSummoning while mounted for Skyriding %s.', CO.bn, ns.db.drSummoning and 'enabled' or 'disabled'))
Expand Down