Skip to content
Snippets Groups Projects
Commit a894565d authored by dg's avatar dg
Browse files

Developers are marked in red in the chat 

git-svn-id: http://svn.net-core.org/repos/t-engine4@4923 51575b47-30f0-44d4-a5cc-537603b46e54
parent 1bd5021b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
game/engines/default/engine/UserChat.lua
+ 14
− 7
View file @ a894565d
......@@ -97,7 +97,8 @@ function _M:event(e)
if e.se == "Talk" then
e.msg = e.msg:removeColorCodes()
local color = colors.WHITE
if e.donator == "oneshot" then color = colors.LIGHT_GREEN
if e.status == 'dev' then color = colors.CRIMSON
elseif e.donator == "oneshot" then color = colors.LIGHT_GREEN
elseif e.donator == "recurring" then color = colors.ROYAL_BLUE end
self.channels[e.channel] = self.channels[e.channel] or {users={}, log={}}
......@@ -109,7 +110,8 @@ function _M:event(e)
elseif e.se == "Whisper" then
e.msg = e.msg:removeColorCodes()
local color = colors.WHITE
if e.donator == "oneshot" then color = colors.LIGHT_GREEN
if e.status == 'dev' then color = colors.CRIMSON
elseif e.donator == "oneshot" then color = colors.LIGHT_GREEN
elseif e.donator == "recurring" then color = colors.ROYAL_BLUE end
self.channels[self.cur_channel] = self.channels[self.cur_channel] or {users={}, log={}}
......@@ -121,7 +123,8 @@ function _M:event(e)
elseif e.se == "Achievement" then
e.msg = e.msg:removeColorCodes()
local color = colors.WHITE
if e.donator == "oneshot" then color = colors.LIGHT_GREEN
if e.status == 'dev' then color = colors.CRIMSON
elseif e.donator == "oneshot" then color = colors.LIGHT_GREEN
elseif e.donator == "recurring" then color = colors.ROYAL_BLUE end
self.channels[e.channel] = self.channels[e.channel] or {users={}, log={}}
......@@ -132,7 +135,8 @@ function _M:event(e)
end
elseif e.se == "SerialData" then
local color = colors.WHITE
if e.donator == "oneshot" then color = colors.LIGHT_GREEN
if e.status == 'dev' then color = colors.CRIMSON
elseif e.donator == "oneshot" then color = colors.LIGHT_GREEN
elseif e.donator == "recurring" then color = colors.ROYAL_BLUE end
e.color_name = color
......@@ -142,11 +146,12 @@ function _M:event(e)
end
elseif e.se == "Join" then
local color = colors.WHITE
if e.donator == "oneshot" then color = colors.LIGHT_GREEN
if e.status == 'dev' then color = colors.CRIMSON
elseif e.donator == "oneshot" then color = colors.LIGHT_GREEN
elseif e.donator == "recurring" then color = colors.ROYAL_BLUE end
self.channels[e.channel] = self.channels[e.channel] or {users={}, log={}}
self.channels[e.channel].users[e.login] = {name=e.name, donator=e.donator, login=e.login}
self.channels[e.channel].users[e.login] = {name=e.name, donator=e.donator, status=e.status, login=e.login}
self.channels_changed = true
self:addMessage("join", e.channel, e.login, {e.name, color}, "#{italic}##FIREBRICK#has joined the channel#{normal}#", nil, true)
if type(game) == "table" and game.logChat and e.channel == self.cur_channel then
......@@ -155,7 +160,8 @@ function _M:event(e)
self:updateChanList()
elseif e.se == "Part" then
local color = colors.WHITE
if e.donator == "oneshot" then color = colors.LIGHT_GREEN
if e.status == 'dev' then color = colors.CRIMSON
elseif e.donator == "oneshot" then color = colors.LIGHT_GREEN
elseif e.donator == "recurring" then color = colors.ROYAL_BLUE end
self.channels[e.channel] = self.channels[e.channel] or {users={}, log={}}
......@@ -179,6 +185,7 @@ function _M:event(e)
login=user.login,
name=user.name,
donator=user.donator,
status=user.status,
current_char=user.current_char and user.current_char.title or "unknown",
module=user.current_char and user.current_char.module or "unknown",
valid=user.current_char and user.current_char.valid and "validate" or "not validated",
......
game/modules/tome/class/UserChatExtension.lua
+ 9
− 3
View file @ a894565d
......@@ -61,12 +61,18 @@ function _M:event(e)
if not data then return end
data = data:unserialize()
if not data then return end
local color = colors.WHITE
if e.status == 'dev' then color = colors.CRIMSON
elseif e.donator == "oneshot" then color = colors.LIGHT_GREEN
elseif e.donator == "recurring" then color = colors.ROYAL_BLUE end
if data.kind == "object-link" then
self.chat:addMessage("link", e.channel, e.login, e.name, "#ANTIQUE_WHITE#has linked an item: #WHITE# "..data.name, {mode="tooltip", tooltip=data.desc})
self.chat:addMessage("link", e.channel, e.login, {e.name, color}, "#ANTIQUE_WHITE#has linked an item: #WHITE# "..data.name, {mode="tooltip", tooltip=data.desc})
elseif data.kind == "actor-link" then
self.chat:addMessage("link", e.channel, e.login, e.name, "#ANTIQUE_WHITE#has linked a creature: #WHITE# "..data.name, {mode="tooltip", tooltip=data.desc})
self.chat:addMessage("link", e.channel, e.login, {e.name, color}, "#ANTIQUE_WHITE#has linked a creature: #WHITE# "..data.name, {mode="tooltip", tooltip=data.desc})
elseif data.kind == "killer-link" then
self.chat:addMessage("death", e.channel, e.login, e.name, "#CRIMSON#"..data.msg.."#WHITE#", data.desc and {mode="tooltip", tooltip=data.desc} or nil)
self.chat:addMessage("death", e.channel, e.login, {e.name, color}, "#CRIMSON#"..data.msg.."#WHITE#", data.desc and {mode="tooltip", tooltip=data.desc} or nil)
end
end
end
game/modules/tome/class/uiset/Minimalist.lua
+ 3
− 2
View file @ a894565d
......@@ -1742,9 +1742,10 @@ function _M:setupMouse(mouse)
if not item or not user or item.faded == 0 then game.mouse:delegate(button, mx, my, xrel, yrel, nil, nil, event, "playmap") return end
local str = tstring{{"color","GOLD"}, {"font","bold"}, user.name, {"color","LAST"}, {"font","normal"}, true}
if user.donator and user.donator ~= "none" then
if (user.donator and user.donator ~= "none") or (user.status and user.status == 'dev') then
local text, color = "Donator", colors.WHITE
if user.donator == "oneshot" then text, color = "Donator", colors.LIGHT_GREEN
if user.status and user.status == 'dev' then text, color = "Developer", colors.CRIMSON
elseif user.donator == "oneshot" then text, color = "Donator", colors.LIGHT_GREEN
elseif user.donator == "recurring" then text, color = "Recurring Donator", colors.LIGHT_BLUE end
str:add({"color",unpack(colors.simple(color))}, text, {"color", "LAST"}, true)
end
......
game/profile-thread/UserChat.lua
+ 6
− 6
View file @ a894565d
......@@ -30,30 +30,30 @@ end
function _M:event(e)
if e.e == "ChatTalk" then
cprofile.pushEvent(string.format("e='Chat' se='Talk' channel=%q login=%q name=%q donator=%q msg=%q", e.channel, e.login, e.name, e.donator, e.msg))
cprofile.pushEvent(string.format("e='Chat' se='Talk' channel=%q login=%q name=%q donator=%q status=%q msg=%q", e.channel, e.login, e.name, e.donator, e.status, e.msg))
print("[USERCHAT] channel talk", e.login, e.channel, e.msg)
elseif e.e == "ChatWhisper" then
cprofile.pushEvent(string.format("e='Chat' se='Whisper' login=%q name=%q donator=%q msg=%q", e.login, e.name, e.donator, e.msg))
cprofile.pushEvent(string.format("e='Chat' se='Whisper' login=%q name=%q donator=%q status=%q msg=%q", e.login, e.name, e.donator, e.status, e.msg))
print("[USERCHAT] whisper", e.login, e.msg)
elseif e.e == "ChatAchievement" then
cprofile.pushEvent(string.format("e='Chat' se='Achievement' channel=%q login=%q name=%q donator=%q msg=%q", e.channel, e.login, e.name, e.donator, e.msg))
cprofile.pushEvent(string.format("e='Chat' se='Achievement' channel=%q login=%q name=%q donator=%q status=%q msg=%q", e.channel, e.login, e.name, e.donator, e.status, e.msg))
print("[USERCHAT] channel achievement", e.login, e.channel, e.msg)
elseif e.e == "ChatSerialData" then
local data = self.client.psock:receive(e.size)
if data then
e.msg = data
cprofile.pushEvent(string.format("e='Chat' se='SerialData' channel=%q login=%q name=%q donator=%q msg=%q", e.channel, e.login, e.name, e.donator, e.msg))
cprofile.pushEvent(string.format("e='Chat' se='SerialData' channel=%q login=%q name=%q donator=%q status=%q msg=%q", e.channel, e.login, e.name, e.donator, e.status, e.msg))
print("[USERCHAT] channel serial data", e.login, e.channel, e.size)
end
elseif e.e == "ChatJoin" then
self.channels[e.channel] = self.channels[e.channel] or {}
self.channels[e.channel][e.login] = true
cprofile.pushEvent(string.format("e='Chat' se='Join' channel=%q login=%q name=%q donator=%q", e.channel, e.login, e.name, e.donator))
cprofile.pushEvent(string.format("e='Chat' se='Join' channel=%q login=%q name=%q donator=%q status=%q", e.channel, e.login, e.name, e.donator, e.status))
print("[USERCHAT] channel join", e.login, e.channel)
elseif e.e == "ChatPart" then
self.channels[e.channel] = self.channels[e.channel] or {}
self.channels[e.channel][e.login] = nil
cprofile.pushEvent(string.format("e='Chat' se='Part' channel=%q login=%q name=%q donator=%q", e.channel, e.login, e.name, e.donator))
cprofile.pushEvent(string.format("e='Chat' se='Part' channel=%q login=%q name=%q donator=%q status=%q", e.channel, e.login, e.name, e.donator, e.status))
print("[USERCHAT] channel part", e.login, e.channel)
end
end
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment