Alex/KittyBot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Alex
2019-07-03 03:28:36 -04:00
parent 8daeedd1ce b0948303d1
commit 97d6e843d6
9 changed files with 76 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/config.csv
+2 -2
View File
@@ -82,7 +82,7 @@
"Localized Strings","BoopInfo","Kitty will react with a counter"
"Localized Strings","BoopMultiple","%s booped several others - %s!"
"Localized Strings","BoopPerson","%s booped %s!"
"Localized Strings","BoopStandard","Woah! %s booped me! That's %s total!"
"Localized Strings","BoopStandard","Woah! %s booped me! That's %s total! "
"Localized Strings","CatchInfo","Play catch with yourself or with a friend with @!"
"Localized Strings","ChangeIndicatorChanged","Indicator changed to `%s`"
"Localized Strings","ChangeIndicatorError","Please specify a letter or symbol to use!"
@@ -185,7 +185,7 @@
"Localized Strings","LeaderboardInfo","Shows you the 10 users with the most beans on the server"
"Localized Strings","LeaderboardTitle","Server Leaderboard"
"Localized Strings","MapHeight",""
"Localized Strings","MapInfo","Generates a map! You can pass additional information if you want with the flags `-s<seed>`. If one of the fields isn't provided, its default will be used. Note that adjusting the width and height impacts the map outcomes.nn**Defaults**nDefault Seed: Random,nDefault Width: 35(max %s),nDefault Height: 25(max %s)nn**Key**nLand: ~nMountain: ▲nBeach: "
"Localized Strings","MapInfo","Generates a map! You can pass additional information if you want with the flags `-s<seed>`. If one of the fields isn't provided, its default will be used. Note that adjusting the width and height impacts the map outcomes.\n\n**Defaults**\nDefault Seed: Random,\nDefault Width: 35(max %s),\nDefault Height: 25(max %s)\n\n**Key**\nLand: ~\nMountain: \u25B2\nBeach: =\nTrees: \u00A5\nVolcano: #"
"Localized Strings","MapInvalid","Invalid arguments provided!"
"Localized Strings","MapSeed","Seed"
"Localized Strings","MapVersion","Using mapgen v0.1"
1 Type Key Value
82 Localized Strings BoopInfo Kitty will react with a counter
83 Localized Strings BoopMultiple %s booped several others - %s!
84 Localized Strings BoopPerson %s booped %s!
85 Localized Strings BoopStandard Woah! %s booped me! That's %s total! Woah! %s booped me! That's %s total!
86 Localized Strings CatchInfo Play catch with yourself or with a friend with @!
87 Localized Strings ChangeIndicatorChanged Indicator changed to `%s`
88 Localized Strings ChangeIndicatorError Please specify a letter or symbol to use!
185 Localized Strings LeaderboardInfo Shows you the 10 users with the most beans on the server
186 Localized Strings LeaderboardTitle Server Leaderboard
187 Localized Strings MapHeight
188 Localized Strings MapInfo Generates a map! You can pass additional information if you want with the flags `-s<seed>`. If one of the fields isn't provided, its default will be used. Note that adjusting the width and height impacts the map outcomes.nn**Defaults**nDefault Seed: Random,nDefault Width: 35(max %s),nDefault Height: 25(max %s)nn**Key**nLand: ~nMountain: ▲nBeach: Generates a map! You can pass additional information if you want with the flags `-s<seed>`. If one of the fields isn't provided, its default will be used. Note that adjusting the width and height impacts the map outcomes.\n\n**Defaults**\nDefault Seed: Random,\nDefault Width: 35(max %s),\nDefault Height: 25(max %s)\n\n**Key**\nLand: ~\nMountain: \u25B2\nBeach: =\nTrees: \u00A5\nVolcano: #
189 Localized Strings MapInvalid Invalid arguments provided!
190 Localized Strings MapSeed Seed
191 Localized Strings MapVersion Using mapgen v0.1
assets/plugins/forbiddenword.lua
+1
View File
@@ -8,6 +8,7 @@ function plugin(message, user)
hours = ((timedif / (60*60)) % 24);
mins = ((timedif / (60)) % 60);
secs = timedif % 60;
return "*GASP!!!* \n" .. user.name .. " said **THE** word! It's been " .. round(days) .. " days, " .. round(hours) .. " hours, " .. round(mins) .. " minutes, and " .. round(secs) .. " seconds since the last time!";
end