Skip to content

Bugfix in Integrate Key #1778

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 3 commits into from
Aug 28, 2019
Merged

Bugfix in Integrate Key #1778

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c98ae18
Bugfix in Integrate Key
Acbarakat Aug 27, 2019
936695a
Tab to Space
Acbarakat Aug 27, 2019
0a6d47f
Bugfix Pet: Haste
Acbarakat Aug 27, 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
7 changes: 3 additions & 4 deletions addons/checkparam/checkparam.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,7 @@ function split_text(id,text,arg)
local key = arg and arg..key or key
if key == "blood pact damage" then
key = "pet: blood pact damage"
end
if key == "damage taken" then
elseif key == "damage taken" then
tbl['physical damage taken'] = tonumber(value)+(tbl['physical damage taken'] or 0)
tbl['magic damage taken'] = tonumber(value)+(tbl['magic damage taken'] or 0)
else
Expand Down Expand Up @@ -213,7 +212,7 @@ integrate = {
['dblatk'] = 'double attack',
['blood pact ability delay'] = 'blood pact delay',
['blood pact ability delay ii'] = 'blood pact delay ii',
['blood pact ab. del. ii'] = 'blood pact delay ii',
['blood pact ab del ii'] = 'blood pact delay ii',
['blood pact recast time ii'] = 'blood pact delay ii',
['blood pact dmg'] = 'blood pact damage',
['enhancing magic duration'] = 'enhancing magic effect duration',
Expand Down Expand Up @@ -355,7 +354,7 @@ caps={
['quick cast']=10,
['physical damage taken']=-25,
['magic damage taken']=-25,
['pet: haste']=80,
['pet: haste']=25,
['magic burst damage']=40,
['blood pact delay']=-15,
['blood pact delay ii']=-15,
Expand Down