Skip to content

Fixed double guild/addon message #80

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
cloudbells wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixed double guild/addon message #80

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d84f39d
Fixed double guild/addon message
cloudbells Dec 2, 2021
9a68fde
Checking for pet death
cloudbells Dec 7, 2021
72d84b5
Replaced spaces with tabs
cloudbells Dec 7, 2021
e62347f
Removed death check on login
cloudbells Dec 7, 2021
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
167 changes: 86 additions & 81 deletions Hardcore.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ Hardcore_Character = {

--[[ Local variables ]]--
local debug = false
local isPlayerDead -- Used to prevent double guild/addon messages.
local pulses = {}
local alert_msg_time = {
PULSE = {},
Expand Down Expand Up @@ -540,6 +541,8 @@ function Hardcore:UNIT_SPELLCAST_SUCCEEDED(...)
end

function Hardcore:PLAYER_ENTERING_WORLD()
isPlayerDead = UnitIsDeadOrGhost("player")

Hardcore_Frame:RegisterForDrag("LeftButton")
Hardcore_Alerts_Button:SetText(Hardcore_Settings.notify and "Disable alerts" or "Enable alerts")

Expand All @@ -565,49 +568,56 @@ function Hardcore:PLAYER_ALIVE()
end

function Hardcore:PLAYER_DEAD()
-- Screenshot
C_Timer.After(PICTURE_DELAY, Screenshot)

-- Update deaths
if #Hardcore_Character.deaths == 0 or (#Hardcore_Character.deaths > 0 and Hardcore_Character.deaths[#Hardcore_Character.deaths].player_alive_trigger ~= nil) then
table.insert(Hardcore_Character.deaths, {
player_dead_trigger = date("%m/%d/%y %H:%M:%S"),
player_alive_trigger = nil
})
end
if not isPlayerDead then
if Last_Attack_Source == UnitName("pet") then -- If the pet died first, do nothing.
return
end

-- Screenshot
C_Timer.After(PICTURE_DELAY, Screenshot)

-- Send message to guild
local playerGreet = GENDER_GREETING[UnitSex("player")]
local name = UnitName("player")
local _, _, classID = UnitClass("player")
local class = CLASSES[classID]
local level = UnitLevel("player")
local zone, mapID
if IsInInstance() then
zone = GetInstanceInfo()
else
mapID = C_Map.GetBestMapForUnit("player")
zone = C_Map.GetMapInfo(mapID).name
end
local messageFormat = "Our brave %s, %s the %s, has died at level %d in %s"
local messageString = messageFormat:format(playerGreet, name, class, level, zone)
if not (Last_Attack_Source == nil) then
messageString = string.format("%s to a %s", messageString, Last_Attack_Source)
Last_Attack_Source = nil
end

if not (recent_msg["text"] == nil) then
local playerPronoun = GENDER_POSSESSIVE_PRONOUN[UnitSex("player")]
messageString = string.format("%s. %s last words were \"%s\"", messageString, playerPronoun, recent_msg["text"])
end

SendChatMessage(messageString, "GUILD")
-- Update deaths
if #Hardcore_Character.deaths == 0 or (#Hardcore_Character.deaths > 0 and Hardcore_Character.deaths[#Hardcore_Character.deaths].player_alive_trigger ~= nil) then
table.insert(Hardcore_Character.deaths, {
player_dead_trigger = date("%m/%d/%y %H:%M:%S"),
player_alive_trigger = nil
})
end

-- Send addon message
local deathData = string.format("%s%s%s", level, COMM_FIELD_DELIM, mapID and mapID or "")
local commMessage = COMM_COMMANDS[3] .. COMM_COMMAND_DELIM .. deathData
if CTL then
CTL:SendAddonMessage("ALERT", COMM_NAME, commMessage, "GUILD")
-- Send message to guild
local playerGreet = GENDER_GREETING[UnitSex("player")]
local name = UnitName("player")
local _, _, classID = UnitClass("player")
local class = CLASSES[classID]
local level = UnitLevel("player")
local zone, mapID
if IsInInstance() then
zone = GetInstanceInfo()
else
mapID = C_Map.GetBestMapForUnit("player")
zone = C_Map.GetMapInfo(mapID).name
end
local messageFormat = "Our brave %s, %s the %s, has died at level %d in %s"
local messageString = messageFormat:format(playerGreet, name, class, level, zone)
if not (Last_Attack_Source == nil) then
messageString = string.format("%s to a %s", messageString, Last_Attack_Source)
Last_Attack_Source = nil
end

if not (recent_msg["text"] == nil) then
local playerPronoun = GENDER_POSSESSIVE_PRONOUN[UnitSex("player")]
messageString = string.format("%s. %s last words were \"%s\"", messageString, playerPronoun, recent_msg["text"])
end

SendChatMessage(messageString, "GUILD")

-- Send addon message
local deathData = string.format("%s%s%s", level, COMM_FIELD_DELIM, mapID and mapID or "")
local commMessage = COMM_COMMANDS[3] .. COMM_COMMAND_DELIM .. deathData
if CTL then
CTL:SendAddonMessage("ALERT", COMM_NAME, commMessage, "GUILD")
end
isPlayerDead = true
end
end

Expand Down Expand Up @@ -636,6 +646,7 @@ function Hardcore:PLAYER_TARGET_CHANGED()
end

function Hardcore:PLAYER_UNGHOST()
isPlayerDead = false
if UnitIsDeadOrGhost("player") == 1 then
return
end -- prevent message on ghost login or zone
Expand Down Expand Up @@ -864,46 +875,40 @@ function Hardcore:CHAT_MSG_ADDON(prefix, datastr, scope, sender)
end
end

function Hardcore:COMBAT_LOG_EVENT_UNFILTERED(...)
-- local time, token, hidding, source_serial, source_name, caster_flags, caster_flags2, target_serial, target_name, target_flags, target_flags2, ability_id, ability_name, ability_type, extraSpellID, extraSpellName, extraSchool = CombatLogGetCurrentEventInfo()
local _, ev, _, _, source_name, _, _, _, _, _, _, _, _, _, _, _, _ = CombatLogGetCurrentEventInfo()

if not (source_name == PLAYER_NAME) then
if not (source_name == nil) then
if string.find(ev, "DAMAGE") ~= nil then
Last_Attack_Source = source_name
end
end
function Hardcore:COMBAT_LOG_EVENT_UNFILTERED()
local _, subEvent, _, sourceGUID, sourceName, _, _, destGUID = CombatLogGetCurrentEventInfo()
if destGUID == PLAYER_GUID and sourceGUID ~= PLAYER_GUID and sourceName and subEvent:find("DAMAGE") then
Last_Attack_Source = sourceName
end
end

function Hardcore:CHAT_MSG_SAY(...)
if self:SetRecentMsg(...) then
recent_msg["type"] = 0
recent_msg["type"] = 0
end
end

function Hardcore:CHAT_MSG_GUILD(...)
if self:SetRecentMsg(...) then
recent_msg["type"] = 2
recent_msg["type"] = 2
end
end

function Hardcore:CHAT_MSG_PARTY(...)
if self:SetRecentMsg(...) then
recent_msg["type"] = 1
recent_msg["type"] = 1
end
end

function Hardcore:SetRecentMsg(...)
local text, sn, LN, CN, p2, sF, zcI, cI, cB, unu, lI, senderGUID = ...
if PLAYERGUID == nil then
PLAYERGUID = UnitGUID("player")
PLAYERGUID = UnitGUID("player")
end

if senderGUID == PLAYERGUID then
recent_msg["text"] = text
return true
recent_msg["text"] = text
return true
end
return false
end
Expand Down Expand Up @@ -980,30 +985,30 @@ function Hardcore:ShowAlertFrame(styleConfig, message)
end

function Hardcore:Add(data, sender)
-- Display the death locally if alerts are not toggled off.
if Hardcore_Settings.notify then
local level = 0
local mapID
if data then
level, mapID = string.split(COMM_FIELD_DELIM, data)
level = tonumber(level)
mapID = tonumber(mapID)
end
if type(level) == "number" then
for i = 1, GetNumGuildMembers() do
local name, _, _, guildLevel, _, zone, _, _, _, _, class = GetGuildRosterInfo(i)
if name == sender then
if mapID then
local mapData = C_Map.GetMapInfo(mapID) -- In case some idiot sends an invalid map ID, it won't cause mass lua errors.
zone = mapData and mapData.name or zone -- If player is in an instance, will have to get zone from guild roster.
end
level = level > 0 and level < 61 and level or guildLevel -- If player is using an older version of the addon, will have to get level from guild roster.
local messageFormat = "%s the %s%s|r has died at level %d in %s"
local messageString = messageFormat:format(name:gsub("%-.*", ""), "|c" .. RAID_CLASS_COLORS[class].colorStr, class, level, zone)
Hardcore:ShowAlertFrame(ALERT_STYLES.death, messageString)
end
end
end
-- Display the death locally if alerts are not toggled off.
if Hardcore_Settings.notify then
local level = 0
local mapID
if data then
level, mapID = string.split(COMM_FIELD_DELIM, data)
level = tonumber(level)
mapID = tonumber(mapID)
end
if type(level) == "number" then
for i = 1, GetNumGuildMembers() do
local name, _, _, guildLevel, _, zone, _, _, _, _, class = GetGuildRosterInfo(i)
if name == sender then
if mapID then
local mapData = C_Map.GetMapInfo(mapID) -- In case some idiot sends an invalid map ID, it won't cause mass lua errors.
zone = mapData and mapData.name or zone -- If player is in an instance, will have to get zone from guild roster.
end
level = level > 0 and level < 61 and level or guildLevel -- If player is using an older version of the addon, will have to get level from guild roster.
local messageFormat = "%s the %s%s|r has died at level %d in %s"
local messageString = messageFormat:format(name:gsub("%-.*", ""), "|c" .. RAID_CLASS_COLORS[class].colorStr, class, level, zone)
Hardcore:ShowAlertFrame(ALERT_STYLES.death, messageString)
end
end
end
end
end

Expand Down