Skip to content

[battlemod] Adding puppetmaster messages #1809

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

Merged
Chiaia merged 1 commit into from
Dec 10, 2019
Merged

[battlemod] Adding puppetmaster messages #1809

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
14 changes: 11 additions & 3 deletions addons/battlemod/parse_action_packet.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,11 +367,11 @@ function simplify_message(msg_ID)
if T{93,273,522,653,654,655,656,85,284,75,114,156,189,248,283,312,323,336,351,355,408,422,423,425,453,659,158,245,324,658}:contains(msg_ID) then
fields.status = true
end
if msg_ID == 31 then
if msg_ID == 31 or msg_ID == 798 or msg_ID == 799 then
fields.actor = true
end
end
if (msg_ID > 287 and msg_ID < 303) or (msg_ID > 384 and msg_ID < 399) or (msg_ID > 766 and msg_ID < 771) or
T{129,152,161,162,163,165,229,384,453,603,652}:contains(msg_ID) then
T{129,152,161,162,163,165,229,384,453,603,652,798}:contains(msg_ID) then
fields.ability = true
end

Expand Down Expand Up @@ -410,6 +410,14 @@ function simplify_message(msg_ID)
msg = line_noactor
elseif line_noability and not fields.actor then
msg = line_noability
elseif line_notarget and fields.actor and fields.number then
if msg_ID == 798 then --Maneuver message
msg = line_notarget.."%"
elseif msg_ID == 799 then --Maneuver message with overload
msg = line_notarget.."% (${actor} overloaded)"
else
msg = line_notarget
end
end
end
return msg
Expand Down
2 changes: 2 additions & 0 deletions addons/battlemod/statics.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ line_steal = '[${actor}] ${abil} '..string.char(129,168)..' ${target} (${ite
line_noability = '${numb} '..string.char(129,168)..' ${target}'
line_noactor = '${abil} ${numb} '..string.char(129,168)..' ${target}'
line_nonumber = '[${actor}] ${abil} '..string.char(129,168)..' ${target}'
line_notarget = '[${actor}] ${abil} '..string.char(129,168)..' ${number}'
line_roll = '${actor} ${abil} '..string.char(129,168)..' ${target} '..string.char(129,170)..' ${number}'

default_settings_table = {line_aoe = 'AOE ${numb} '..string.char(129,168)..' ${target}',
Expand All @@ -94,6 +95,7 @@ default_settings_table = {line_aoe = 'AOE ${numb} '..string.char(129,168).
line_noability = '${numb} '..string.char(129,168)..' ${target}',
line_noactor = '${abil} ${numb} '..string.char(129,168)..' ${target}',
line_nonumber = '[${actor}] ${abil} '..string.char(129,168)..' ${target}',
line_notarget = '[${actor}] ${abil} '..string.char(129,168)..' ${number}',
line_roll = '${actor} ${abil} '..string.char(129,168)..' ${target} '..string.char(129,170)..' ${number}',
condensedamage=true,condensetargets=true,cancelmulti=true,oxford=true,commamode=false,targetnumber=true,swingnumber=true,sumdamage=true,condensecrits=false}

Expand Down