Fix emote announce text
This commit is contained in:
parent
c4075d1ee9
commit
88f09f4fe4
1 changed files with 21 additions and 6 deletions
27
Roll.lua
27
Roll.lua
|
|
@ -41,14 +41,23 @@ local function AnnounceRoll(rollValue, modifiers, total)
|
||||||
local channelDef = AltSystem.AnnounceChannels[AltSystem.State.announceChannelIndex]
|
local channelDef = AltSystem.AnnounceChannels[AltSystem.State.announceChannelIndex]
|
||||||
if not channelDef then return end
|
if not channelDef then return end
|
||||||
|
|
||||||
local name = GetCharacterName()
|
local isEmote = channelDef.channel == "EMOTE"
|
||||||
local modStr = BuildModifierString(modifiers)
|
local modStr = BuildModifierString(modifiers)
|
||||||
|
|
||||||
local msg
|
local msg
|
||||||
if modStr ~= "" then
|
if isEmote then
|
||||||
msg = name .. " rolled " .. rollValue .. " " .. modStr .. " = " .. total
|
if modStr ~= "" then
|
||||||
|
msg = "rolled " .. rollValue .. " " .. modStr .. " = " .. total
|
||||||
|
else
|
||||||
|
msg = "rolled " .. rollValue .. " = " .. total
|
||||||
|
end
|
||||||
else
|
else
|
||||||
msg = name .. " rolled " .. rollValue .. " = " .. total
|
local name = GetCharacterName()
|
||||||
|
if modStr ~= "" then
|
||||||
|
msg = name .. " rolled " .. rollValue .. " " .. modStr .. " = " .. total
|
||||||
|
else
|
||||||
|
msg = name .. " rolled " .. rollValue .. " = " .. total
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
SendToChannel(msg, channelDef.channel)
|
SendToChannel(msg, channelDef.channel)
|
||||||
|
|
@ -88,7 +97,10 @@ function AltSystem:CalculateAndDisplayResult(rollType, rollValue)
|
||||||
if AltSystem.State.announceEnabled then
|
if AltSystem.State.announceEnabled then
|
||||||
local channelDef = AltSystem.AnnounceChannels[AltSystem.State.announceChannelIndex]
|
local channelDef = AltSystem.AnnounceChannels[AltSystem.State.announceChannelIndex]
|
||||||
if channelDef then
|
if channelDef then
|
||||||
SendToChannel(GetCharacterName() .. " rolled a Critical Failure!", channelDef.channel)
|
local critMsg = channelDef.channel == "EMOTE"
|
||||||
|
and "rolled a Critical Failure!"
|
||||||
|
or (GetCharacterName() .. " rolled a Critical Failure!")
|
||||||
|
SendToChannel(critMsg, channelDef.channel)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return
|
return
|
||||||
|
|
@ -99,7 +111,10 @@ function AltSystem:CalculateAndDisplayResult(rollType, rollValue)
|
||||||
if AltSystem.State.announceEnabled then
|
if AltSystem.State.announceEnabled then
|
||||||
local channelDef = AltSystem.AnnounceChannels[AltSystem.State.announceChannelIndex]
|
local channelDef = AltSystem.AnnounceChannels[AltSystem.State.announceChannelIndex]
|
||||||
if channelDef then
|
if channelDef then
|
||||||
SendToChannel(GetCharacterName() .. " rolled a Critical Success!", channelDef.channel)
|
local critMsg = channelDef.channel == "EMOTE"
|
||||||
|
and "rolled a Critical Success!"
|
||||||
|
or (GetCharacterName() .. " rolled a Critical Success!")
|
||||||
|
SendToChannel(critMsg, channelDef.channel)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return
|
return
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue