Desperate Blows with merits Incorrect

[tourmaline3333]

I have:

• [x] searched existing issues (http://github.com/darkstarproject/darkstar/issues/) to see if the issue I am posting has already been addressed or opened by another contributor
• [x] checked the commit log to see if my issue has been resolved since my server was last updated

Client Version (type /ver in game) : 30190731

Source Branch (master/stable) : master

Additional Information (Steps to reproduce/Expected behavior) : Desperate Blows has haste "15%". Desperate Blows Merits has "-2% per 1 point" Desperate Blows with Merits 5 -> haste 25% So, addMod(dsp.mod.HASTE_ABILITY, 2500)

but "effect/last_resort.lua" coded

target:addMod(dsp.mod.HASTE_ABILITY, target:getMod(dsp.mod.DESPERATE_BLOWS) + target:getMerit(dsp.merit.DESPERATE_BLOWS))

its addMod(dsp.mod.HASTE_ABILITY, 1532). because "target:getMerit(dsp.merit.DESPERATE_BLOWS)" was only 32, not 1000.