Skip to content

eager-load resources for actions.lua #2114

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
Byrth merged 2 commits into from
Jan 9, 2022
Merged

eager-load resources for actions.lua #2114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39a9458
Index res.monster_abilities once
Byrth Jan 9, 2022
e740ca3
Also fix it in the actions library
Byrth Jan 9, 2022
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
2 changes: 1 addition & 1 deletion addons/GearSwap/gearswap.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ require 'actions'
packets = require 'packets'

-- Resources Checks
if res.items and res.bags and res.slots and res.statuses and res.jobs and res.elements and res.skills and res.buffs and res.spells and res.job_abilities and res.weapon_skills and res.monster_skills and res.action_messages and res.skills and res.monstrosity and res.weather and res.moon_phases and res.races then
if res.items and res.bags and res.slots and res.statuses and res.jobs and res.elements and res.skills and res.buffs and res.spells and res.job_abilities and res.weapon_skills and res.monster_skills and res.action_messages and res.skills and res.monstrosity and res.weather and res.moon_phases and res.races and res.monster_abilities then
else
error('Missing resources!')
end
Expand Down
8 changes: 8 additions & 0 deletions addons/libs/actions.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,14 @@ local cat_to_res_map = {['weaponskill_finish']='weapon_skills', ['spell_finish']
['casting_begin']='spells', ['item_begin']='items', ['mob_tp_finish']='monster_abilities',
['avatar_tp_finish']='job_abilities', ['job_ability_unblinkable']='job_abilities',
['job_ability_run']='job_abilities'}
-- This library uses rawget() to index the resources for performance reasons.
-- However, the resources library lazy-loads resources using its metatable.
-- Thus we need to index each of the required resources once to force an eager-load.
for _,resource_name in pairs(cat_to_res_map) do
if not res[resource_name] then
print(resource_name.." not detected.")
end
end
local begin_categories = {['weaponskill_begin']=true, ['casting_begin']=true, ['item_begin']=true, ['ranged_begin']=true}
local finish_categories = {['melee']=true,['ranged_finish']=true,['weaponskill_finish']=true, ['spell_finish']=true, ['item_finish']=true,
['job_ability']=true, ['mob_tp_finish']=true, ['avatar_tp_finish']=true, ['job_ability_unblinkable']=true,
Expand Down