Merge with develop

--HG-- branch : compatibility-develop
9 years ago · 6cd73cca03
parent ef5b22045c 0a110eff4f
commit 6cd73cca03
1 changed files with 1 additions and 1 deletions
--- a/code/ryzom/client/data/gamedev/interfaces_v3/info_player.lua
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/info_player.lua
@ -161,7 +161,7 @@ end
 ------------------------------------------------------------------------------------------------------------
 -- Compute the current Max Resist
 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);
 end