Chat log can now be scrolled

Clicking on a channel name will popup a big scrollable chat log


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

@@ -33,7 +33,7 @@ function _M:init()
 	self.channels_changed = true
 	self.cur_channel = "global"
 	self.channels = {}
-	self.max = 50
+	self.max = 500
 end
 
 --- Hook up in the current running game
@@ -136,6 +136,7 @@ function _M:selectChannel(channel)
 	self.cur_channel = channel
 	self.channels_changed = true
 	self.changed = true
+	self.scroll = 0
 	self:updateChanList(true)
 end
 
@@ -201,6 +202,18 @@ end
 -- UI Section
 ----------------------------------------------------------------
 
+--- Make a dialog popup with the full log
+function _M:showLogDialog(title, shadow)
+	local log = {}
+	if self.channels[self.cur_channel] then
+		for _, i in ipairs(self.channels[self.cur_channel].log) do
+			log[#log+1] = ("<%s> %s"):format(i.name, i.msg)
+		end
+	end
+	local d = require("engine.dialogs.ShowLog").new(title or "Chat Log", shadow, {log=log})
+	game:registerDialog(d)
+end
+
 --- Resize the display area
 function _M:resize(x, y, w, h, fontname, fontsize, color, bgcolor)
 	self.color = color or {255,255,255}
@@ -241,7 +254,9 @@ function _M:resize(x, y, w, h, fontname, fontsize, color, bgcolor)
 	self.mouse.delegate_offset_x = self.display_x
 	self.mouse.delegate_offset_y = self.display_y
 	self.mouse:registerZone(0, 0, self.w, self.h, function(button, x, y, xrel, yrel, bx, by, event)
-		if event == "button" and button == "left" and y <= self.frame.h then
+		if button == "wheelup" then self:scrollUp(1)
+		elseif button == "wheeldown" then self:scrollUp(-1)
+		elseif event == "button" and button == "left" and y <= self.frame.h then
 			local w = 0
 			local last_ok = nil
 			for i = 1, #self.display_chans do
@@ -250,7 +265,11 @@ function _M:resize(x, y, w, h, fontname, fontsize, color, bgcolor)
 				w = w + item.w + 4
 				if w > x then break end
 			end
-			if last_ok then self:selectChannel(last_ok.name) end
+			if last_ok then
+				local old = self.cur_channel
+				self:selectChannel(last_ok.name)
+				if old == self.cur_channel then self:showLogDialog(nil, self.shadow) end
+			end
 		else
 			if not self.on_mouse or not self.dlist then return end
 			local citem = nil
@@ -357,8 +376,10 @@ end
 --- Scroll the zone
 -- @param i number representing how many lines to scroll
 function _M:scrollUp(i)
+	local log = {}
+	if self.channels[self.cur_channel] then log = self.channels[self.cur_channel].log end
 	self.scroll = self.scroll + i
-	if self.scroll > #self.log - 1 then self.scroll = #self.log - 1 end
+	if self.scroll > #log - 1 then self.scroll = #log - 1 end
 	if self.scroll < 0 then self.scroll = 0 end
 	self.changed = true
 end

@@ -191,10 +191,15 @@ function _M:init(t, no_default)
 		atk=1, apr=0,
 		physcrit=0,
 		physspeed =1,
-		dammod= { str=1 },
+		dammod = { str=1 },
 		damrange=1.1,
 		talented = "unarmed",
 	}
+	-- Insures we have certain values for gloves to modify
+	self.combat.damrange = self.combat.damrange or 1.1
+	self.combat.physspeed = self.combat.physspeed or 1
+	self.combat.dammod = self.combat.dammod or {str=0.6}
+
 	self.talents[self.T_ATTACK] = self.talents[self.T_ATTACK] or 1
 
 	self:resetCanSeeCache()

@@ -51,8 +51,10 @@ function _M:event(e)
 		if not data then return end
 		if data.kind == "object-link" then
 			self.chat:addMessage(e.channel, e.login, e.name, "#ANTIQUE_WHITE#has linked an item: #WHITE# "..data.name, {mode="tooltip", tooltip=data.desc})
+			game.logChat("#LIGHT_BLUE#%s has linked an item <%s>", e.name, data.name)
 		elseif data.kind == "actor-link" then
 			self.chat:addMessage(e.channel, e.login, e.name, "#ANTIQUE_WHITE#has linked a creature: #WHITE# "..data.name, {mode="tooltip", tooltip=data.desc})
+			game.logChat("#LIGHT_BLUE#%s has linked a creature <%s>", e.name, data.name)
 		end
 	end
 end