diff --git a/OutputLog.txt b/OutputLog.txt index 2d1b8f4..939bf86 100644 --- a/OutputLog.txt +++ b/OutputLog.txt @@ -226,8 +226,3 @@ [Log] [Core] Command registered under key blur [Log] [Core] Command registered under key eightball [Log] [Core] Command registered under key 8ball -[Log] [Plugin] Created new PluginLoader lua environment -[Log] [Database] CreateGeyKey: key-392895005024452620 -[Log] [Database] CreateGeyKey: key-392895005024452620147407528874082304 -[Log] [Database] CreateSetKey: Key-392895005024452620 value-! -[Log] [Database] CreateSetKey: Key-392895005024452620147407528874082304 value-273,4 diff --git a/commands.config b/commands.config index 257a7e9..a74d196 100644 --- a/commands.config +++ b/commands.config @@ -39,3 +39,4 @@ guildroleremove=1 guildroleadd=1 guildroleallowed=1 fetch=1 +guildrolenotallowed=1 diff --git a/locCommands.config b/locCommands.config index 93af80c..6bd349a 100644 --- a/locCommands.config +++ b/locCommands.config @@ -12,6 +12,7 @@ blur= choose= poll= rpstart= +guildrolenotallowed= bet= perish, thenperish= teey= diff --git a/locStrings.config b/locStrings.config index b6e48f9..78593ee 100644 --- a/locStrings.config +++ b/locStrings.config @@ -1,6 +1,11 @@ [CommandPollManage] PollManageInfo='start' will start a new poll with the query of the line you put after, 'choice' will add a choice to the poll, 'stop' will end the poll +[CommandGuildRoleNotAllowed] +GuildRoleNotAllowedFailure= +GuildRoleNotAllowedSuccess= +GuildRoleNotAllowedInfo= + [CommandBeansShow] BeansShowDisplay=You have %s beans! BeansShowInfo=Displays how many beans you have @@ -33,8 +38,8 @@ GuildRoleAddInfo=Add a role to yourself! [CommandRole] RoleInfo=Will show the current role you have, Admins can change others roles with input of 'role x @y' with x being blacklist, general, mod, or admin. Blacklist will not allow the user to interact with kitty anymore, general mod and admin will give the user access to those commands. -RoleStandardResponse=Your role is -RoleError=You aren't allowed to do that! You must have the KittyRole '%' or higher! +RoleStandardResponse=Your role is %s +RoleError=You aren't allowed to do that! You must have the KittyRole '%s' or higher! RoleChanged=Changed %s to role `%s`! RoleNeededRole=Please enter `general`, `mod`, or `admin`! diff --git a/plugins/forbiddenword.lua b/plugins/forbiddenword.lua index 8d81326..ebdbb46 100644 --- a/plugins/forbiddenword.lua +++ b/plugins/forbiddenword.lua @@ -2,10 +2,18 @@ local time = os.time(); function plugin(message) if(string.match(message, "purple"))then - local response = os.time() - time; + local timedif = os.time() - time; time = os.time(); - return response; + days = (timedif / (60*60*24)); + hours = ((timedif / (60*60)) % 24); + mins = ((timedif / (60)) % 60); + secs = timedif % 60; + return round(days) .. " " .. round(hours) .. " " .. round(mins) .. " " .. round(secs); end return nil; +end + +function round(num) + return math.floor(num + 0.5) end \ No newline at end of file