From e20d9197c6f77c4a8bcb4f12edc690b444f83fc4 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 8 May 2019 00:58:07 -0400 Subject: [PATCH 1/2] =Fixed Roll precedence --- src/commands/CommandRoll.java | 2 +- src/dataStructures/KittyTrackedLong.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/commands/CommandRoll.java b/src/commands/CommandRoll.java index 5a9ef7e..1cb7ba7 100644 --- a/src/commands/CommandRoll.java +++ b/src/commands/CommandRoll.java @@ -166,7 +166,7 @@ public class CommandRoll extends Command private boolean hasPrecendence(char op1, char op2) { - if ((op1 == '*' || op1 == '/') && (op2 == '+' || op2 == '-')) + if ((op2 == '*' || op2 == '/') && (op1 == '+' || op1 == '-')) return false; else if ((op2 == 'd') && (op1 == '+' || op1 == '-' || op1 == '*' || op1 == '/')) diff --git a/src/dataStructures/KittyTrackedLong.java b/src/dataStructures/KittyTrackedLong.java index 98f450e..588d64f 100644 --- a/src/dataStructures/KittyTrackedLong.java +++ b/src/dataStructures/KittyTrackedLong.java @@ -1,6 +1,5 @@ package dataStructures; -import core.DatabaseManager; import core.DatabaseTrackedObject; import utils.GlobalLog; import utils.LogFilter; From faa2ef567129d608c5b0f1a4412b3f2e777f89c7 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 8 May 2019 01:16:35 -0400 Subject: [PATCH 2/2] +Added mentioning capability to beanshowing --- locStrings.config | 1 + src/commands/CommandBeansShow.java | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/locStrings.config b/locStrings.config index b5a11cc..9034ab8 100644 --- a/locStrings.config +++ b/locStrings.config @@ -19,6 +19,7 @@ CatchInfo= [CommandBeansShow] BeansShowDisplay=You have %s beans! +BeansShowMentioned=I looked it up and %sbeans! BeansShowInfo=Displays how many beans you have [CommandGuildRoleList] diff --git a/src/commands/CommandBeansShow.java b/src/commands/CommandBeansShow.java index 16d3f62..b3e2493 100644 --- a/src/commands/CommandBeansShow.java +++ b/src/commands/CommandBeansShow.java @@ -14,6 +14,16 @@ public class CommandBeansShow extends Command @Override public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res) { - res.Call(String.format(LocStrings.Stub("BeansShowDisplay"), user.GetBeans())); + if(input.mentions == null) + res.Call(String.format(LocStrings.Stub("BeansShowDisplay"), user.GetBeans())); + else + { + String mentionedBeans = ""; + for(KittyUser mentioned:input.mentions) + { + mentionedBeans += mentioned.name + " has " + mentioned.GetBeans() + " "; + } + res.Call(String.format(LocStrings.Stub("BeansShowMentioned"), mentionedBeans)); + } } }