Skip to content

Added several message sources for last message (Yell, General, Trade, Raid, etc.) #84

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 6 commits into
base: master
Choose a base branch
from
Open

Added several message sources for last message (Yell, General, Trade, Raid, etc.) #84

Changes from all commits
Commits
Show all changes
6 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
4c718e4
test
cloudbells Dec 7, 2021
7525cd1
Added message sources for last message
cloudbells Dec 7, 2021
24027ea
Replaced spaces with tabs
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
173 changes: 108 additions & 65 deletions Hardcore.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,15 +195,15 @@ local ALERT_STYLES = {
frame = Hardcore_Alert_Frame,
text = Hardcore_Alert_Text,
icon = Hardcore_Alert_Icon,
file = "alert-hc-red.blp",
file = "alert-hc-red.blp",
delay = 10,
alertSound = nil
},
hc_pvp_warning = {
frame = Hardcore_Alert_Frame,
text = Hardcore_Alert_Text,
icon = Hardcore_Alert_Icon,
file = "hc-pvp-alert.blp",
file = "hc-pvp-alert.blp",
delay = 10,
alertSound = 8192
},
Expand Down Expand Up @@ -416,9 +416,15 @@ function Hardcore:PLAYER_LOGIN()
self:RegisterEvent("TIME_PLAYED_MSG")
self:RegisterEvent("QUEST_ACCEPTED") -- For Videre Elixir quest.
self:RegisterEvent("QUEST_TURNED_IN") -- For Videre Elixir quest.
self:RegisterEvent("CHAT_MSG_PARTY")
self:RegisterEvent("CHAT_MSG_SAY")
self:RegisterEvent("CHAT_MSG_YELL")
self:RegisterEvent("CHAT_MSG_PARTY")
self:RegisterEvent("CHAT_MSG_PARTY_LEADER")
self:RegisterEvent("CHAT_MSG_RAID")
self:RegisterEvent("CHAT_MSG_RAID_LEADER")
self:RegisterEvent("CHAT_MSG_RAID_WARNING")
self:RegisterEvent("CHAT_MSG_GUILD")
self:RegisterEvent("CHAT_MSG_CHANNEL")

-- Register spell cast events for paladin for checking bubble hearth
self:RegisterEvent("UNIT_SPELLCAST_START")
Expand All @@ -434,7 +440,7 @@ function Hardcore:PLAYER_LOGIN()

-- cache player name
PLAYER_NAME, _ = UnitName("player")
PLAYERGUID = UnitGUID("player")
PLAYERGUID = UnitGUID("player")

-- Show recording reminder
Hardcore:RecordReminder()
Expand Down Expand Up @@ -582,29 +588,27 @@ function Hardcore:PLAYER_DEAD()
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 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")
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, "WHISPER", nil, "Alveria")

-- Send addon message
local deathData = string.format("%s%s%s", level, COMM_FIELD_DELIM, mapID and mapID or "")
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")
Expand Down Expand Up @@ -695,7 +699,7 @@ function Hardcore:TIME_PLAYED_MSG(...)

Hardcore:Debug(Hardcore_Character.tracked_played_percentage)

-- Check to see if the gap since the last recording is too long. When receiving played time for the first time.
-- Check to see if the gap since the last recording is too long. When receiving played time for the first time.
if RECEIVED_FIRST_PLAYED_TIME_MSG == false and Hardcore_Character.accumulated_time_diff ~= nil then

local debug_message = "Playtime gap percentage: " .. Hardcore_Character.tracked_played_percentage .. "%."
Expand Down Expand Up @@ -878,34 +882,73 @@ function Hardcore:COMBAT_LOG_EVENT_UNFILTERED(...)
end

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

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

function Hardcore:CHAT_MSG_PARTY(...)
if self:SetRecentMsg(...) then
recent_msg["type"] = 1
end
if self:SetRecentMsg(...) then
recent_msg["type"] = 2
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")
end
function Hardcore:CHAT_MSG_PARTY_LEADER(...)
if self:SetRecentMsg(...) then
recent_msg["type"] = 2
end
end

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

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

if senderGUID == PLAYERGUID then
recent_msg["text"] = text
return true
end
return false
function Hardcore:CHAT_MSG_RAID_LEADER(...)
if self:SetRecentMsg(...) then
recent_msg["type"] = 3
end
end

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

function Hardcore:CHAT_MSG_CHANNEL(...)
local _, _, _, _, _, _, channelID = ...
if channelID == 1 or channelID == 2 or channelID >= 22 and channelID <= 25 then
if self:SetRecentMsg(...) then
recent_msg["type"] = 5
end
end
end

-- Returns true if the last message was successfully recorded, false otherwise.
function Hardcore:SetRecentMsg(...)
local text, _, _, _, _, _, _, _, _, _, _, senderGUID = ...
if PLAYERGUID == nil then
PLAYERGUID = UnitGUID("player")
end
if senderGUID == PLAYERGUID then
recent_msg["text"] = text
return true
end
return false
end

function Hardcore:GUILD_ROSTER_UPDATE(...)
Expand Down Expand Up @@ -980,30 +1023,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 Expand Up @@ -1495,7 +1538,7 @@ end
function Hardcore:InitiatePulsePlayed()
--init time played
Hardcore:RequestTimePlayed()
--time accumulator
C_Timer.NewTicker(TIME_TRACK_PULSE, function()
Hardcore_Character.time_tracked = Hardcore_Character.time_tracked + TIME_TRACK_PULSE
Expand Down