Merge with develop

This commit is contained in:
kervala 2016-04-09 13:02:40 +02:00
parent 0bcf110925
commit a98e6b1fee

View file

@ -161,7 +161,7 @@ end
------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------
-- Compute the current Max Resist -- Compute the current Max Resist
function game:getMagicResistMaxLevel() function game:getMagicResistMaxLevel()
local mlvl= self:getMagicResistBaseLevel() + getDbProp(formatUI('%player_resist_maxratio')); local mlvl= 25 + self:getMagicResistBaseLevel() + getDbProp(formatUI('%player_resist_maxratio'));
return math.max(0,mlvl); return math.max(0,mlvl);
end end