From c0f0b16892f31236834d6d57ae980608552a8d12 Mon Sep 17 00:00:00 2001 From: Matthew Cech Date: Fri, 21 Feb 2020 11:06:46 -0800 Subject: [PATCH] + Added trade back in and regenerated config file --- assets/config.csv | 8 ++++++++ src/commands/general/CommandBetBeans.java | 2 +- src/core/CommandManager.java | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/assets/config.csv b/assets/config.csv index 437a63e..685c3cd 100644 --- a/assets/config.csv +++ b/assets/config.csv @@ -17,6 +17,8 @@ "Localized Commands","dbstats","" "Localized Commands","defaultdance","" "Localized Commands","derp","" +"Localized Commands","derpi","" +"Localized Commands","e6","" "Localized Commands","e621","" "Localized Commands","eightball, 8ball","" "Localized Commands","fetch","" @@ -48,6 +50,7 @@ "Localized Commands","stats","" "Localized Commands","teey","" "Localized Commands","tony, stark, dontfeelgood, dontfeelsogood","tony, stark, dontfeelgood, dontfeelsogood, snap" +"Localized Commands","tradebeans, trade","" "Localized Commands","tweet","" "Localized Commands","vote","" "Localized Commands","wolfram","" @@ -110,8 +113,10 @@ "Localized Strings","DBFlushInfo","Takes all objects queued for the database and writes them to the database, then says how many were written." "Localized Strings","DBStatsInfo","Shows current statistics for the database" "Localized Strings","DefaultDanceInfo","y'all know forknife, get ready to dance, or make a friend dance with @!" +"Localized Strings","DerpiError","" "Localized Strings","DoWorkFinished","I finished with my work! :D" "Localized Strings","DoWorkInfo","Occupies a core for a few seconds" +"Localized Strings","E6Blacklisted","" "Localized Strings","EightBallError","Hmm? You'll need to ask a question!" "Localized Strings","EightBallInfo","Answers a yes or no question! Warning: Kitty can not actually tell the future, she claims no responsibility for any lion mauling, lack of lottery wins, or felony charges." "Localized Strings","EightBallMaybe1","Reply hazy, try again." @@ -271,6 +276,8 @@ "Command Enabler","dbstats","1" "Command Enabler","defaultdance","1" "Command Enabler","derp","1" +"Command Enabler","derpi","1" +"Command Enabler","e6","1" "Command Enabler","e621","1" "Command Enabler","eightball, 8ball","1" "Command Enabler","fetch","1" @@ -313,6 +320,7 @@ "Command Enabler","stats","1" "Command Enabler","teey","1" "Command Enabler","tony, stark, dontfeelgood, dontfeelsogood","1" +"Command Enabler","tradebeans, trade","1" "Command Enabler","tweet","1" "Command Enabler","vote","1" "Command Enabler","wolfram","1" diff --git a/src/commands/general/CommandBetBeans.java b/src/commands/general/CommandBetBeans.java index bcb14b0..29b65ad 100644 --- a/src/commands/general/CommandBetBeans.java +++ b/src/commands/general/CommandBetBeans.java @@ -20,7 +20,7 @@ public class CommandBetBeans extends Command { String call = ""; - int min = 50; + int min = 20; int bet = 0; int win = 0; diff --git a/src/core/CommandManager.java b/src/core/CommandManager.java index e532e79..fc4dd6b 100644 --- a/src/core/CommandManager.java +++ b/src/core/CommandManager.java @@ -108,7 +108,8 @@ public class CommandManager this.register(LocCommands.stub("music"), new CommandMusicMain(KittyRole.General, KittyRating.Safe)); this.register(LocCommands.stub("defaultdance"), new CommandDefaultDance(KittyRole.General, KittyRating.Safe)); this.register(LocCommands.stub("getsauce"), new CommandGetSauce(KittyRole.General, KittyRating.Safe)); - + this.register(LocCommands.stub("tradebeans, trade"), new CommandTradeBeans(KittyRole.General, KittyRating.Safe)); + this.register(LocCommands.stub("e6"), new CommandE6(KittyRole.General, KittyRating.Filtered)); this.register(LocCommands.stub("derpi"), new CommandDerpi(KittyRole.General, KittyRating.Filtered)); }