From a11f55c493c07562957f5c9f262269e25bfc107d Mon Sep 17 00:00:00 2001 From: F16Gaming Date: Mon, 4 Feb 2013 00:05:13 +0100 Subject: [PATCH] Added more facts and made some other improvements. --- ChatManager.lua | 2 +- CommandManager.lua | 17 ++++--- FactsLoader.xml | 2 + FactsManager.lua | 61 ++++++++++++++++++++----- PlayerManager.lua | 12 ++++- facts/chuck.lua | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++++ facts/rules.lua | 52 ++++++++++++++++++++++ locales/enUS.lua | 39 +++++++++++++++- 8 files changed, 292 insertions(+), 19 deletions(-) create mode 100644 facts/chuck.lua create mode 100644 facts/rules.lua diff --git a/ChatManager.lua b/ChatManager.lua index f076fa6..7c8da42 100644 --- a/ChatManager.lua +++ b/ChatManager.lua @@ -50,7 +50,7 @@ C.ChatManager = { CHAT_MSG_BATTLEGROUND = "BATTLEGROUND", CHAT_MSG_BATTLEGROUND_LEADER = "BATTLEGROUND", CHAT_MSG_CHANNEL = "CHANNEL", - CHAT_MSG_GUILD = "WHISPER", + CHAT_MSG_GUILD = "GUILD", CHAT_MSG_OFFICER = "WHISPER", CHAT_MSG_PARTY = "PARTY", CHAT_MSG_PARTY_LEADER = "PARTY", diff --git a/CommandManager.lua b/CommandManager.lua index 0741392..f073b40 100644 --- a/CommandManager.lua +++ b/CommandManager.lua @@ -192,7 +192,7 @@ function CM:HandleCommand(command, args, isChat, player, bnetInfo) end local result, arg, errArg = cmd.Call(args, player, isChat, bnetInfo) if type(result) == "nil" then - return "CM_ERR_UNKNOWN" + return nil end return result, arg, errArg else @@ -675,7 +675,7 @@ CM:Register({"invite", "inv"}, PM.Access.Groups.User.Level, function(args, sende if bnetInfo then pID = bnetInfo.PresenceID end if type(args[1]) == "string" then local player = PM:GetOrCreatePlayer(args[1]) - return PM:Invite(player, sender, pID) + return PM:Invite(player, sender, pID, tostring(args[2]):lower():match("^f")) else return PM:Invite(sender, sender, pID) end @@ -687,7 +687,7 @@ CM:Register({"inviteme", "invme"}, PM.Access.Groups.User.Level, function(args, s end local pID if bnetInfo then pID = bnetInfo.PresenceID end - return PM:Invite(sender, sender, pID) + return PM:Invite(sender, sender, pID, tostring(args[2]):lower():match("^f")) end, "CM_INVITEME_HELP") CM:Register({"blockinvites", "blockinvite", "denyinvites", "denyinvite"}, PM.Access.Groups.User.Level, function(args, sender, isChat, bnetInfo) @@ -1213,14 +1213,21 @@ CM:Register({"fact", "facts"}, PM.Access.Groups.User.Level, function(args, sende if #args < 1 then return false, "CM_FACT_USAGE" end - return FM:AnnounceFact(args[1]) + return FM:AnnounceFact(args[1], tonumber(args[2])) end, "CM_FACT_HELP") -- Alias for !fact cat CM:Register({"cat", "c", "meow"}, PM.Access.Groups.User.Level, function(args, sender, isChat, bnetInfo) - return FM:AnnounceFact("cat") + return FM:AnnounceFact("cat", tonumber(args[1])) end, "CM_CAT_HELP") +CM:Register({"factstats", "factstat", "fstat", "fs"}, PM.Access.Groups.User.Level, function(args, sender, isChat, bnetInfo) + if #args < 1 then + return FM:AnnounceLoadedTopics() + end + return FM:AnnounceTopicInfo(args[1]) +end, "CM_FACTSTATS_HELP") + CM:Register({"factsettings", "factsetting", "factset"}, PM.Access.Groups.Admin.Level, function(args, sender, isChat, bnetInfo) if #args < 1 then if FM:IsEnabled() then diff --git a/FactsLoader.xml b/FactsLoader.xml index e59c8b9..b9e9bab 100644 --- a/FactsLoader.xml +++ b/FactsLoader.xml @@ -21,4 +21,6 @@ ..\FrameXML\UI.xsd">