From 4c4835e342572c36d303786dda86c42bf8226905 Mon Sep 17 00:00:00 2001
From: Alex Stewart <contact@alexstewart.app>
Date: Fri, 27 Mar 2020 02:22:37 -0400
Subject: [PATCH] =Fixed Bug #6 Roll improperly formats when providing single
 number

Edited roll function, array index had incorrect variable assigned
---
 src/commands/general/CommandRoll.java    | 14 ++++++---
 src/core/ObjectBuilderFactory.java       |  3 ++
 src/dataStructures/KittyStartupMode.java | 36 ++++++++++++------------
 3 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/src/commands/general/CommandRoll.java b/src/commands/general/CommandRoll.java
index 498ebe8..a5c9373 100644
--- a/src/commands/general/CommandRoll.java
+++ b/src/commands/general/CommandRoll.java
@@ -22,7 +22,9 @@ public class CommandRoll extends Command
 		{
 			KittyEmbed embed = new KittyEmbed();
 			embed.title = user.name +"'s roll!";
+			System.out.println("HERE");
 			embed.descriptionText = rollDice(input.args);
+			System.out.println("THERE");
 			Random numGen = new Random(user.name.hashCode());
 			float hue = numGen.nextFloat();
 			float sat = .7f;
@@ -41,10 +43,11 @@ public class CommandRoll extends Command
 		Stack<Integer> values = new Stack<Integer>();
 		Stack<Character> operators = new Stack<Character>();
 		String steps = ""; 
+		
 		for(int i = 0; i < thing.length(); i ++)
 		{
 			char current = thing.charAt(i);
-			
+			System.out.println("ROLLING");
 			switch(current)
 			{
 				case '+':
@@ -122,8 +125,11 @@ public class CommandRoll extends Command
 		{
 			steps += "\n" + calculate(values, operators);
 		}
-		
-		return "Roll```" + thing + "```" + "Steps```" + steps + "```" + "Final value ```" + values.pop() +"```";
+		if(steps != "")
+		{
+			return "Roll```" + thing + "```" + "Steps```" + steps + "```" + "Final value ```" + values.pop() +"```";
+		}
+		return "That's not a roll that's just " + values.pop() +"!";
 	}
 	
 	
@@ -173,7 +179,7 @@ public class CommandRoll extends Command
 		int roll = 0;
 		int dice = first;
 		int sides = second;
-		int [] rolls = new int [sides];
+		int [] rolls = new int [dice];
 		
 		if(dice < 1)
 			return new int[0];
diff --git a/src/core/ObjectBuilderFactory.java b/src/core/ObjectBuilderFactory.java
index f01912d..b7adeef 100644
--- a/src/core/ObjectBuilderFactory.java
+++ b/src/core/ObjectBuilderFactory.java
@@ -387,7 +387,10 @@ public class ObjectBuilderFactory
 		// Determine token based on config. Default to test token.
 		String tokenToUse = Ref.TestToken;
 		if(ConfigGlobals.getStartupMode() == KittyStartupMode.Release)
+			tokenToUse = Ref.Token;
+		if(ConfigGlobals.getStartupMode() == KittyStartupMode.PoguRelease)
 			tokenToUse = Ref.PoguToken;
+			
 		
 		// Construct bot based on token
 		kitty = new JDABuilder(AccountType.BOT)
diff --git a/src/dataStructures/KittyStartupMode.java b/src/dataStructures/KittyStartupMode.java
index 3f9f8a7..bd205d5 100644
--- a/src/dataStructures/KittyStartupMode.java
+++ b/src/dataStructures/KittyStartupMode.java
@@ -1,18 +1,18 @@
-package dataStructures;
-
-public enum KittyStartupMode 
-{
-	Dev(1), Release(2);
-	
-	private final int value;
-	private KittyStartupMode(int value) 
-	{
-		this.value = value;
-	}
-	
-	public int getValue() 
-	{
-		return value;
-	}
-}
-
+package dataStructures;
+
+public enum KittyStartupMode 
+{
+	Dev(1), Release(2), PoguRelease(3);
+	
+	private final int value;
+	private KittyStartupMode(int value) 
+	{
+		this.value = value;
+	}
+	
+	public int getValue() 
+	{
+		return value;
+	}
+}
+