From e5a40ae329a232611d74af2f2a14896129f6ba66 Mon Sep 17 00:00:00 2001 From: Matthew Cech Date: Sat, 6 Apr 2019 23:22:13 -0700 Subject: [PATCH] = Doodle, Map, Perish, Ping, Manage --- localization.config | 38 +++++++++++++++++++++++------ src/commands/CommandJDoodle.java | 3 ++- src/commands/CommandMap.java | 11 ++++++--- src/commands/CommandPerish.java | 3 ++- src/commands/CommandPing.java | 4 +-- src/commands/CommandPollManage.java | 2 +- 6 files changed, 44 insertions(+), 17 deletions(-) diff --git a/localization.config b/localization.config index f2268ef..e8bbecf 100644 --- a/localization.config +++ b/localization.config @@ -25,6 +25,9 @@ Better not tell you now. = [CommandColiru] Will try to compile any c++ code you put in! Supports up to C++14 standard, uses g++. = +[CommandPerish] +Adds a red, 'a n g e r y' overlay to your icon or the icon of a friend you mentioned = + [CommandBeansShow] Displays how many beans you have = You have %s beans! = @@ -37,14 +40,36 @@ Sorry, you didn't win, try again! = Allows you to bet your beans, set your amount after the command! Warning! House always wins!\nSets of 3 will get 5x, 4 will get 10x, and 5 will get 1000x = You don't have enough beans! = +[CommandPing] +Pong! = +Will respond with Pong! = + [CommandChangeIndicator] Changes the command indicator to any single character. By default, it's '!'. If more than one character is provided, the first one is used! = Indicator changed to `%s` = +[CommandPollManage] +'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 = + [CommandHelpBuilder] commands = Emit help for all commands as formatted HTML = +[CommandInfo] +I'm made by `Rin#8904` and `Reverie Wisp#3703`!\nYou can find more info about me along with a Patreon link to support us and GitHub link for filing bugs https = //www.rinsnowmew.com/bot/ = +I'm made by `Rin#8904` and `Reverie Wisp#3703`!\nYou can find more info about me along with a Patreon link to support us and GitHub link for filing bugs https://www.rinsnowmew.com/bot/ = +Provides author info and a link to Kitty's website = + +[CommandJDoodle] +Will compile any java code you put in! Supports Java 1.8 = + +[CommandMap] +Invalid arguments provided! = +Seed = +Using mapgen v0.1 = +Height = +Width = + [CommandDoWork] I finished with my work! = D = I finished with my work! :D = @@ -56,20 +81,17 @@ Woah! %s booped me! That's %s total! = Kitty will react with a counter = %s booped several others - %s! = +[CommandHelp] +You can get help with a specific command by typing `!help command`!\nYou can also look at \nGeneral Commands: `boop, roll, choose, help, info, vote, results, showpoll, wolfram, cplus, java, beans, role, bet, yeet` = +You can get help with a specific command by typing `!help command`!\nYou can also look at \nGeneral Commands: `boop, roll, choose, help, info, vote, results, showpoll, wolfram, cplus, java, beans, role, bet, yeet` = +Lets you look up specific commands, or get a link to a list of all commands. = + [CommandInvite] Provies a direct invite link for KittyBot = -[CommandInfo] -I'm made by `Rin#8904` and `Reverie Wisp#3703`!\nYou can find more info about me along with a Patreon link to support us and GitHub link for filing bugs https://www.rinsnowmew.com/bot/ = -Provides author info and a link to Kitty's website = - [CommandBlurry] Blurs your icon or the icon of a friend you mentioned = -[CommandHelp] -You can get help with a specific command by typing `!help command`!\nYou can also look at \nGeneral Commands: `boop, roll, choose, help, info, vote, results, showpoll, wolfram, cplus, java, beans, role, bet, yeet` = -Lets you look up specific commands, or get a link to a list of all commands. = - [CommandGiveBeans] That's not a valid number! = Gave %s %s beans! = diff --git a/src/commands/CommandJDoodle.java b/src/commands/CommandJDoodle.java index a2add42..9d7b146 100644 --- a/src/commands/CommandJDoodle.java +++ b/src/commands/CommandJDoodle.java @@ -1,6 +1,7 @@ package commands; import core.Command; +import core.Localizer; import dataStructures.*; import network.NetworkJDoodle; @@ -11,7 +12,7 @@ public class CommandJDoodle extends Command public CommandJDoodle(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return "Will compile any java code you put in! Supports Java 1.8"; } + public String HelpText() { return Localizer.Stub("Will compile any java code you put in! Supports Java 1.8"); } @Override public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) diff --git a/src/commands/CommandMap.java b/src/commands/CommandMap.java index d4fb4a9..02aca37 100644 --- a/src/commands/CommandMap.java +++ b/src/commands/CommandMap.java @@ -3,6 +3,7 @@ package commands; import java.util.Random; import core.Command; +import core.Localizer; import dataStructures.KittyChannel; import dataStructures.KittyGuild; import dataStructures.KittyRating; @@ -22,7 +23,7 @@ public class CommandMap extends Command public CommandMap(KittyRole roleLevel, KittyRating contentRating) { super(roleLevel, contentRating); } @Override - public String HelpText() { return "Generates a map! You can pass additional information if you want with the flags `-s -w -h`. 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\nDefault seed: Random,\nDefault Width: 35(max "+ MaxWidth + "),\nDefault Height: 25(max " + MaxHeight + ")"; } + public String HelpText() { return String.format(Localizer.Stub("Generates a map! You can pass additional information if you want with the flags `-s -w -h`. 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\nDefault seed: Random,\nDefault Width: 35(max %s),\nDefault Height: 25(max %s)"), "" + MaxWidth, "" + MaxHeight); } @Override public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) @@ -59,7 +60,7 @@ public class CommandMap extends Command } catch(NumberFormatException e) { - res.Call("Invalid arguments provided!"); + res.Call(Localizer.Stub("Invalid arguments provided!")); return; } @@ -75,8 +76,10 @@ public class CommandMap extends Command } // Response header creation - header += "Using mapgen v0.1\n"; - header += "Seed: `" + seed + "`, Width: `"+ width +"`, Height: `"+ height + "`\n"; + header += Localizer.Stub("Using mapgen v0.1") + "\n"; + header += Localizer.Stub("Seed") + ": `" + seed + "`, "; + header += Localizer.Stub("Width") + "`"+ width +"`, "; + header += Localizer.Stub("Height") + ": `"+ height + "`\n"; // Response body creation body += "```\n"; diff --git a/src/commands/CommandPerish.java b/src/commands/CommandPerish.java index 475c099..b51080e 100644 --- a/src/commands/CommandPerish.java +++ b/src/commands/CommandPerish.java @@ -8,6 +8,7 @@ import java.io.IOException; import javax.imageio.ImageIO; import core.Command; +import core.Localizer; import dataStructures.KittyChannel; import dataStructures.KittyGuild; import dataStructures.KittyRating; @@ -22,7 +23,7 @@ public class CommandPerish extends Command public CommandPerish(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return "Adds a red, 'a n g e r y' overlay to your icon or the icon of a friend you mentioned"; }; + public String HelpText() { return Localizer.Stub("Adds a red, 'a n g e r y' overlay to your icon or the icon of a friend you mentioned"); }; private static Long num = 0l; diff --git a/src/commands/CommandPing.java b/src/commands/CommandPing.java index 137d3a9..51b6212 100644 --- a/src/commands/CommandPing.java +++ b/src/commands/CommandPing.java @@ -15,12 +15,12 @@ public class CommandPing extends Command public CommandPing(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return "Will respond with Pong!"; } + public String HelpText() { return Localizer.Stub("Will respond with Pong!"); } // Called when the command is run! @Override public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { - res.Call("Pong!"); + res.Call(Localizer.Stub("Pong!")); } } diff --git a/src/commands/CommandPollManage.java b/src/commands/CommandPollManage.java index 33230a0..a1d9976 100644 --- a/src/commands/CommandPollManage.java +++ b/src/commands/CommandPollManage.java @@ -14,7 +14,7 @@ public class CommandPollManage extends Command public CommandPollManage(KittyRole level, KittyRating rating) { super(level, rating); } @Override - public String HelpText() { return "'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"; } + public String HelpText() { return Localizer.Stub("'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"); } @Override public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)