diff --git a/mfile b/mfile index 2f8239a..45c406e 100644 --- a/mfile +++ b/mfile @@ -1,4 +1,4 @@ { "package": "lotj-ui", - "version": "v2.0.2" + "version": "v2.0.3" } \ No newline at end of file diff --git a/src/scripts/chat/chat.lua b/src/scripts/chat/chat.lua index 2434f0b..15756a3 100644 --- a/src/scripts/chat/chat.lua +++ b/src/scripts/chat/chat.lua @@ -10,7 +10,7 @@ function lotj.chat.setup() autoWrap = false, color = "black", scrollBar = true, - fontSize = 14, + fontSize = 12, }, contentsContainer) -- Set the wrap at a few characters short of the full width to avoid the scroll bar showing over text @@ -23,12 +23,14 @@ function lotj.chat.setup() end end -function lotj.chat.routeMessage(type) +function lotj.chat.routeMessage(type, skipAllTab) selectCurrentLine() copy() lotj.chat[type]:cecho(""..getTime(true, "hh:mm:ss").." ") lotj.chat[type]:appendBuffer() - lotj.chat.all:cecho(""..getTime(true, "hh:mm:ss").." ") - lotj.chat.all:appendBuffer() + if not skipAllTab then + lotj.chat.all:cecho(""..getTime(true, "hh:mm:ss").." ") + lotj.chat.all:appendBuffer() + end end diff --git a/src/scripts/layout/layout.lua b/src/scripts/layout/layout.lua index bc71a15..a198229 100644 --- a/src/scripts/layout/layout.lua +++ b/src/scripts/layout/layout.lua @@ -116,6 +116,7 @@ function lotj.layout.setup() local lowerTabList = {} table.insert(lowerTabList, {keyword = "all", label = "All"}) + table.insert(lowerTabList, {keyword = "local", label = "Local"}) table.insert(lowerTabList, {keyword = "commnet", label = "CommNet"}) table.insert(lowerTabList, {keyword = "clan", label = "Clan"}) table.insert(lowerTabList, {keyword = "ooc", label = "OOC"}) diff --git a/src/triggers/chat/triggers.json b/src/triggers/chat/triggers.json index 787a63c..0aa6b50 100644 --- a/src/triggers/chat/triggers.json +++ b/src/triggers/chat/triggers.json @@ -1,4 +1,34 @@ [ + { + "name": "local", + "patterns": [ + { + "pattern": "^.+ (says|asks|exclaims|whispers to you)(, in .+)? '.*'$", + "type": "regex" + }, + { + "pattern": "^'.*' .+ (says|asks|exclaims)(, in .+)?.$", + "type": "regex" + }, + { + "pattern": "^You .*(say|ask|exclaim)(, in .+)? '.*'$", + "type": "regex" + }, + { + "pattern": "^'.*' you .*(say|ask|exclaim)(, in .+)?.$", + "type": "regex" + }, + { + "pattern": "^.+ speaks in your mind '.*'$", + "type": "regex" + }, + { + "pattern": "^You speak through your mind '.*'$", + "type": "regex" + } + ], + "script": "lotj.chat.routeMessage(\"local\")" + }, { "name": "commnet", "patterns": [