few updates

git-svn-id: http://svn.net-core.org/repos/t-engine4@5792 51575b47-30f0-44d4-a5cc-537603b46e54

build/te4core.lua

@@ -57,7 +57,7 @@ project "TEngine"
 
 
 	configuration "linux"
-		libdirs {"/opt/SDL-2.0/lib/"}
+		libdirs {"/home/nicolas/local/lib/"}
 		links { "dl", "SDL2", "SDL2_ttf", "SDL2_image", "png", "openal", "vorbisfile", "GL", "GLU", "m", "pthread" }
 		defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_LINUX' }
 

game/modules/tome/class/interface/PlayerDumpJSON.lua

@@ -222,14 +222,14 @@ function _M:dumpToJSON(js, bypass, nosub)
 
 	c.spell = {
 		spellpower = self:combatSpellpower(),
-		crit = self:combatSpellCrit(),
+		crit = string.format("%d%%", self:combatSpellCrit()),
 		speed = self:combatSpellSpeed(),
 		cooldown = (self.spell_cooldown_reduction or 0) * 100,
 	}
 
 	c.mind = {
 		mindpower = self:combatMindpower(),
-		crit = self:combatMindCrit(),
+		crit = string.format("%d%%", self:combatMindCrit()),
 		speed = self:combatMindSpeed(),
 	}
 
@@ -242,6 +242,15 @@ function _M:dumpToJSON(js, bypass, nosub)
 		end
 	end
 
+	c.damage_pen = {}
+
+	if self.resists_pen.all then c.damage_pen.all = string.format("%d%%", self.resists_pen.all) end
+	for i, t in ipairs(DamageType.dam_def) do
+		if self.resists_pen[DamageType[t.type]] and self.resists_pen[DamageType[t.type]] ~= 0 then
+			c.damage_pen[t.name] = string.format("%d%%", self.resists_pen[DamageType[t.type]] + (self.resists_pen.all or 0))
+		end
+	end
+
 	-------------------------------------------------------------------
 	-- Defense
 	-------------------------------------------------------------------

premake4.lua

@@ -18,7 +18,7 @@ solution "TEngine"
 		"src/physfs",
 		"src/physfs/zlib123",
 		"src/bzip2",
-		"/opt/SDL-2.0/include/SDL2/",
+		"/home/nicolas/local/include/SDL2/",
 		"/usr/include/GL",
 	}
 	if _OPTIONS.lua == "default" then includedirs{"src/lua"}