Skip to content

Dev > Live merge #1795

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
z16 merged 8 commits into from
Oct 11, 2019
Merged

Dev > Live merge #1795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d7c6390
Update 'indicolure effect duration'
Acbarakat Oct 10, 2019
0cd2a8a
Merge pull request #1791 from Acbarakat/dev
z16 Oct 10, 2019
e56715e
EasyNuke.lua add command for AncientMagic (//ez boomam)
RubenatorX Oct 11, 2019
3f7639d
Merge pull request #1792 from RubenatorX/patch-1
z16 Oct 11, 2019
9ecd236
Add Spirit Bond message to battlemod
KenshiDRK Oct 11, 2019
25e997c
Update battlemod.lua
KenshiDRK Oct 11, 2019
e9861a5
Update battlemod.lua
KenshiDRK Oct 11, 2019
539e1c9
Merge pull request #1794 from KenshiDRK/dev
z16 Oct 11, 2019
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
12 changes: 11 additions & 1 deletion addons/EasyNuke/EasyNuke.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,26 +59,32 @@ spell_tables["fire"] = {"Fire","Fire II","Fire III","Fire IV","Fire V","Fire VI"
spell_tables["fire"]["ga"] = {"Firaga","Firaga II","Firaga III","Firaja",}
spell_tables["fire"]["ra"] = {"Fira","Fira II","Fira III"}
spell_tables["fire"]["helix"] = {"Pyrohelix","Pyrohelix II"}
spell_tables["fire"]["am"] = {"Flare","Flare II"}
spell_tables["earth"] = {"Stone","Stone II","Stone III","Stone IV","Stone V","Stone VI",}
spell_tables["earth"]["ga"] = {"Stonega","Stonega II","Stonega III","Stoneja",}
spell_tables["earth"]["ra"] = {"Stonera","Stonera II","Stonera III"}
spell_tables["earth"]["helix"] = {"Geohelix","Geohelix II"}
spell_tables["earth"]["am"] = {"Quake","Quake II"}
spell_tables["wind"] = {"Aero","Aero II","Aero III","Aero IV","Aero V","Aero VI",}
spell_tables["wind"]["ga"] = {"Aeroga","Aeroga II","Aeroga III","Aeroja",}
spell_tables["wind"]["ra"] = {"Aerora","Aerora II","Aerora III"}
spell_tables["wind"]["helix"] = {"Anemohelix","Anemohelix II"}
spell_tables["wind"]["am"] = {"Tornado","Tornado II"}
spell_tables["water"] = {"Water","Water II","Water III","Water IV","Water V","Water VI",}
spell_tables["water"]["ga"] = {"Waterga","Waterga II","Waterga III","Waterja",}
spell_tables["water"]["ra"] = {"Watera","Watera II","Watera III"}
spell_tables["water"]["helix"] = {"Hydrohelix","Hydrohelix II"}
spell_tables["water"]["am"] = {"Flood","Flood II"}
spell_tables["ice"] = {"Blizzard","Blizzard II","Blizzard III","Blizzard IV","Blizzard V","Blizzard VI",}
spell_tables["ice"]["ga"] = {"Blizzaga","Blizzaga II","Blizzaga III","Blizzaja",}
spell_tables["ice"]["ra"] = {"Blizzara","Blizzara II","Blizzara III"}
spell_tables["ice"]["helix"] = {"Cryohelix","Cryohelix II"}
spell_tables["ice"]["am"] = {"Freeze","Freeze II"}
spell_tables["thunder"] = {"Thunder","Thunder II","Thunder III","Thunder IV","Thunder V","Thunder VI",}
spell_tables["thunder"]["ga"] = {"Thundaga","Thundaga II","Thundaga III","Thundaja",}
spell_tables["thunder"]["ra"] = {"Thundara","Thundara II","Thundara III"}
spell_tables["thunder"]["helix"] = {"Ionohelix","Ionohelix II"}
spell_tables["thunder"]["am"] = {"Burst","Burst II"}
spell_tables["light"] = {"Banish","Banish II","Holy","Banish III",}
spell_tables["light"]["ga"] = {"Banishga","Banishga II"}
spell_tables["light"]["helix"] = {"Luminohelix","Luminohelix II"}
Expand Down Expand Up @@ -133,6 +139,8 @@ windower.register_event("unhandled command", function (command, arg)
execute_spell_cast("ra", arg)
elseif command == "boomhelix" or command == "bhelix" then
execute_spell_cast("helix", arg)
elseif command = "boomam" or command == "bam" then
execute_spell_cast("am", arg)
end
end)

Expand All @@ -146,6 +154,8 @@ windower.register_event('addon command', function (command, arg)
execute_spell_cast("ra", arg)
elseif command == "boomhelix" or command == "bhelix" then
execute_spell_cast("helix", arg)
elseif command = "boomam" or command == "bam" then
execute_spell_cast("am", arg)

elseif command == "target" then
if arg then
Expand Down Expand Up @@ -240,4 +250,4 @@ windower.register_event('addon command', function (command, arg)
elseif command == "show" or command == "current" or command == "showcurrent" then
windower.add_to_chat(206, "----- Element Mode: "..string.ucfirst(current_element).." --- Target Mode: < "..target_mode.." > -----")
end
end)
end)
20 changes: 19 additions & 1 deletion addons/battlemod/battlemod.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,25 @@ windower.register_event('incoming chunk',function (id,original,modified,is_injec
if not check_filter(actor,target,0,am.message_id) then return true end

if not actor or not target then -- If the actor or target table is nil, ignore the packet
elseif T{206}:contains(am.message_id) and condensetargets then -- Wears off messages
elseif am.message_id == 800 then -- Spirit bond message
local status = color_it(res.buffs[am.param_1][language],color_arr.statuscol)
local targ = color_it(target.name or '',color_arr[target.owner or target.type])
local number = am.param_2
local color = color_filt(res.action_messages[am.message_id].color, am.target_id==Self.id)
if simplify then
local msg = line_noactor
:gsub('${abil}',status or '')
:gsub('${target}',targ)
:gsub('${numb}',number or '')
windower.add_to_chat(color, msg)
else
local msg = res.action_messages[am.message_id][language]
:gsub('${status}',status or '')
:gsub('${target}',targ)
:gsub('${number}',number or '')
windower.add_to_chat(color, msg)
end
elseif am.message_id == 206 and condensetargets then -- Wears off messages
-- Condenses across multiple packets
local status

Expand Down
3 changes: 2 additions & 1 deletion addons/checkparam/checkparam.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ defaults = {
PUP = 'pet: hp|pet: damage taken|pet: regen|martial arts|store tp|double attack|triple attack|quadruple attack',
DNC = 'store tp|double attack|triple attack|quadruple attack',
SCH = 'magic attack bonus|magic burst damage|magic burst damage ii|magic accuracy|magic damage|fast cast|elemental magic casting time|cure potency|enh mag eff dur|enhancing magic effect duration',
GEO = 'pet: regen|pet: damage taken|indicolure effect duration|indi eff dur|fast cast|magic evasion',
GEO = 'pet: regen|pet: damage taken|indicolure effect duration|fast cast|magic evasion|handbell skill|geomancy skill|geomancy',
RUN = 'enmity|damage taken|physical damage taken|magic damage taken|spell interruption rate|phalanx|inquartata|fastcast',
levelfilter = 99,
}
Expand Down Expand Up @@ -218,6 +218,7 @@ integrate = {
['enhancing magic duration'] = 'enhancing magic effect duration',
['eva'] = 'evasion',
['indicolure spell duration'] = 'indicolure effect duration',
['indi eff dur'] = 'indicolure effect duration',
['mag eva'] = 'magic evasion',
['magic atk bonus'] = 'magic attack bonus',
['magatkbns'] = 'magic attack bonus',
Expand Down