--- data/chats/player-inscription.lua	Mon Jan 19 23:26:36 1970
+++ data/chats/player-inscription.lua	Mon Jan 19 23:26:36 1970
@@ -34,7 +34,7 @@
 			player:removeObject(inven, item)
 		end, on_select=function(npc, player)
 			game.tooltip_x, game.tooltip_y = 1, 1
-			game:tooltipDisplayAtMap(game.w, game.h, "#GOLD#"..t.name.."#LAST#\n"..tostring(player:getTalentFullDescription(t, 1)))
+			game:tooltipDisplayAtMap(game.w, game.h, "#GOLD#"..t.name.."#LAST#\n"..tostring(player:getTalentFullDescription(t)))
 		end, }
 	end
 end
--- data/general/traps/natural_forest.lua	Mon Jan 19 23:26:36 1970
+++ data/general/traps/natural_forest.lua	Mon Jan 19 23:26:36 1970
@@ -39,6 +39,7 @@
 		else
 			game.logSeen(who, "%s resists!", who.name:capitalize())
 		end
+		return true
 	end
 }
 
--- data/timed_effects/mental.lua	Mon Jan 19 23:26:36 1970
+++ data/timed_effects/mental.lua	Mon Jan 19 23:26:36 1970
@@ -103,6 +103,7 @@
 	end,
 	deactivate = function(self, eff)
 		self:removeTemporaryValue("confused", eff.tmpid)
+		if self == game.player then self:updateMainShader() end
 	end,
 }
 
--- mod/class/Actor.lua	Mon Jan 19 23:26:36 1970
+++ mod/class/Actor.lua	Mon Jan 19 23:26:36 1970
@@ -1246,8 +1246,10 @@
 
 	local resists = {}
 	for t, v in pairs(self.resists) do
-		if t ~= "all" then v = self:combatGetResist(t) end
-		resists[#resists+1] = string.format("%d%% %s", v, t == "all" and "all" or DamageType:get(t).name)
+		if v~=0 then
+			if t ~= "all" then v = self:combatGetResist(t) end
+			resists[#resists+1] = string.format("%d%% %s", v, t == "all" and "all" or DamageType:get(t).name)
+		end
 	end
 
 	local ts = tstring{}
--- mod/class/Object.lua	Mon Jan 19 23:26:36 1970
+++ mod/class/Object.lua	Mon Jan 19 23:26:36 1970
@@ -468,7 +468,7 @@
 		compare_fields(combat, compare_with, field, "physcrit", "%+.1f%%", "Physical crit. chance: ", 1, false, false, add_table)
 		compare_fields(combat, compare_with, field, "physspeed", "%.0f%%", "Attack speed: ", 100, false, true, add_table)
 
-		compare_fields(combat, compare_with, field, "block", "%+d", "Block value: ", 1, false, true, add_table)
+		compare_fields(combat, compare_with, field, "block", "%+d", "Block value: ", 1, false, false, add_table)
 
 		compare_fields(combat, compare_with, field, "range", "%+d", "Firing range: ", 1, false, false, add_table)
 		compare_fields(combat, compare_with, field, "capacity", "%d", "Capacity: ", 1, false, false, add_table)
--- mod/dialogs/CharacterSheet.lua	Mon Jan 19 23:26:36 1970
+++ mod/dialogs/CharacterSheet.lua	Mon Jan 19 23:26:36 1970
@@ -568,7 +568,7 @@
 					self:mouseTooltip(self.TOOLTIP_COMBAT_APR,    s:drawColorStringBlended(self.font, ("APR         : #00ff00#%s"):format(text), w, h, 255, 255, 255, true)) h = h + self.font_h
 					text = compare_fields(player, actor_to_compare, function(actor, ...) return actor:combatCrit(...) end, "%3d%%", "%+.0f%%", 1, false, false, dam)
 					self:mouseTooltip(self.TOOLTIP_COMBAT_CRIT,   s:drawColorStringBlended(self.font, ("Crit. chance: #00ff00#%s"):format(text), w, h, 255, 255, 255, true)) h = h + self.font_h
-					text = compare_fields(player, actor_to_compare, function(actor, ...) return actor:combatSpeed(...) end, "%.2f%%", "%+.2f%%", 100, false, false, mean)
+					text = compare_fields(player, actor_to_compare, function(actor, ...) return actor:combatSpeed(...) end, "%.2f%%", "%+.2f%%", 100, true, false, mean)
 					self:mouseTooltip(self.TOOLTIP_COMBAT_SPEED,  s:drawColorStringBlended(self.font, ("Speed       : #00ff00#%s"):format(text), w, h, 255, 255, 255, true)) h = h + self.font_h
 				end
 				if mean and mean.range then
--- mod/dialogs/LevelupDialog.lua	Mon Jan 19 23:26:36 1970
+++ mod/dialogs/LevelupDialog.lua	Mon Jan 19 23:26:36 1970
@@ -626,14 +626,13 @@
 		local diff = function(i2, i1, res)
 			res:add({"color", "LIGHT_GREEN"}, i1, {"color", "LAST"}, " [->", {"color", "YELLOW_GREEN"}, i2, {"color", "LAST"}, "]")
 		end
-		if traw == 0 and self:getMaxTPoints(t) >= 2 then
+		if traw == 0 then
 			local req = self.actor:getTalentReqDesc(item.talent, 1):toTString():tokenize(" ()[]")
-			local req2 = self.actor:getTalentReqDesc(item.talent, 2):toTString():tokenize(" ()[]")
 			text:add{"color","WHITE"}
-			text:add({"font", "bold"}, "First talent level: ", tostring(traw+1), " [-> ", tostring(traw + 2), "]", {"font", "normal"})
+			text:add({"font", "bold"}, "First talent level: ", tostring(traw+1), {"font", "normal"})
 			text:add(true)
-			text:merge(req2:diffWith(req, diff))
-			text:merge(self.actor:getTalentFullDescription(t, 2):diffWith(self.actor:getTalentFullDescription(t, 1), diff))
+			text:merge(req)
+			text:merge(self.actor:getTalentFullDescription(t, 1))
 		elseif traw < self:getMaxTPoints(t) then
 			local req = self.actor:getTalentReqDesc(item.talent):toTString():tokenize(" ()[]")
 			local req2 = self.actor:getTalentReqDesc(item.talent, 1):toTString():tokenize(" ()[]")