Merge branch 'small_fixes' into 'master'

Small fixes

some forum complaints being fixed, nothing big.

game/modules/tome/class/uiset/ClassicPlayerDisplay.lua

@@ -95,6 +95,7 @@ local function samecolor(c1, c2)
 end
 
 function _M:makeTextureBar(text, nfmt, val, max, reg, x, y, r, g, b, bar_col, bar_bgcol)
+	val = util.bound(val, 0, max)
 	local cached = self.tex_cache.texture_bars[text]
 	-- it's a bunch of number comparisons so it's sufficiently fast for jit
 	local cached_ok = cached and (nfmt == cached.nfmt) and (val == cached.val) and (max == cached.max) and (reg == cached.reg) and

game/modules/tome/data/general/objects/egos/staves.lua

@@ -250,7 +250,7 @@ newEntity{
 			local explosion, particle, trail
 
 			local DamageType = require "engine.DamageType"
-			local damtype = combat.element
+			local damtype = combat.element or DamageType.ARCANE
 			if     damtype == DamageType.FIRE then      explosion = "flame"               particle = "bolt_fire"      trail = "firetrail"
 			elseif damtype == DamageType.COLD then      explosion = "freeze"              particle = "ice_shards"     trail = "icetrail"
 			elseif damtype == DamageType.ACID then      explosion = "acid"                particle = "bolt_acid"      trail = "acidtrail"
@@ -261,7 +261,7 @@ newEntity{
 			elseif damtype == DamageType.BLIGHT then    explosion = "slime"               particle = "bolt_slime"     trail = "slimetrail"
 			elseif damtype == DamageType.PHYSICAL then  explosion = "dark"                particle = "stone_shards"   trail = "earthtrail"
 			elseif damtype == DamageType.TEMPORAL then  explosion = "light"				  particle = "temporal_bolt"  trail = "lighttrail"
-			else                                        explosion = "manathrust"          particle = "bolt_arcane"    trail = "arcanetrail" damtype = DamageType.ARCANE
+			else                                        explosion = "manathrust"          particle = "bolt_arcane"    trail = "arcanetrail" --damtype = DamageType.ARCANE
 			end
 
 			local x, y = who:getTarget(tg)
@@ -351,7 +351,7 @@ newEntity{
 			if not combat then return end
 
 			local DamageType = require "engine.DamageType"
-			local damtype = combat.element
+			local damtype = combat.element or DamageType.ARCANE
 			local explosion
 
 			if     damtype == DamageType.FIRE then      explosion = "flame"
@@ -364,7 +364,7 @@ newEntity{
 			elseif damtype == DamageType.BLIGHT then    explosion = "slime"
 			elseif damtype == DamageType.PHYSICAL then  explosion = "dark"
 			elseif damtype == DamageType.TEMPORAL then  explosion = "light"
-			else                                        explosion = "manathrust"         damtype = DamageType.ARCANE
+			else                                        explosion = "manathrust"         -- damtype = DamageType.ARCANE
 			end
 
 			-- Compute damage
@@ -466,7 +466,7 @@ newEntity{
 			local combat = weapon.combat
 
 			local DamageType = require "engine.DamageType"
-			local damtype = combat.element
+			local damtype = combat.element or DamageType.ARCANE
 			local explosion
 			
 			if     damtype == DamageType.FIRE then      explosion = "flame"
@@ -479,7 +479,7 @@ newEntity{
 			elseif damtype == DamageType.BLIGHT then    explosion = "slime"
 			elseif damtype == DamageType.PHYSICAL then  explosion = "dark"
 			elseif damtype == DamageType.TEMPORAL then  explosion = "light"
-			else                                        explosion = "manathrust"          damtype = DamageType.ARCANE
+			else                                        explosion = "manathrust"          -- damtype = DamageType.ARCANE
 			end
 
 			local x, y = who:getTarget(tg)

game/modules/tome/data/talents/spells/staff-combat.lua

@@ -17,6 +17,8 @@
 -- Nicolas Casalini "DarkGod"
 -- darkgod@te4.org
 
+local DamageType = require "engine.DamageType"
+
 newTalent{
 	name = "Channel Staff",
 	type = {"spell/staff-combat", 1},
@@ -46,7 +48,7 @@ newTalent{
 		local particle = "bolt_fire"
 		local explosion = "flame"
 
-		local damtype = combat.element or combat.damtype or engine.DamageType.PHYSICAL
+		local damtype = combat.element or combat.damtype or DamageType.ARCANE
 
 		if     damtype == DamageType.FIRE then      explosion = "flame"               particle = "bolt_fire"      trail = "firetrail"
 		elseif damtype == DamageType.COLD then      explosion = "freeze"              particle = "ice_shards"     trail = "icetrail"
@@ -58,7 +60,7 @@ newTalent{
 		elseif damtype == DamageType.BLIGHT then    explosion = "slime"               particle = "bolt_slime"     trail = "slimetrail"
 		elseif damtype == DamageType.PHYSICAL then  explosion = "dark"                particle = "stone_shards"   trail = "earthtrail"
 		elseif damtype == DamageType.TEMPORAL then  explosion = "light"				  particle = "temporal_bolt"  trail = "lighttrail"
-		else                                        explosion = "manathrust"          particle = "bolt_arcane"    trail = "arcanetrail" damtype = DamageType.ARCANE
+		else                                        explosion = "manathrust"          particle = "bolt_arcane"    trail = "arcanetrail" --damtype = DamageType.ARCANE
 		end
 
 		local tg = self:getTalentTarget(t)