> Fixed Looping Order for Enum Buttons

Author: Jayden Cosgrove

32Stuff/TrainerEnumButton.cs

@@ -15,36 +15,38 @@ public partial class TrainerEnumButton : UserControl, ITrainerUI<byte>
     {
 
         private byte value;
-        private  SortedList<byte,MyButton> buttons;
+        private SortedList<byte, MyButton> buttons;
+
+        List<byte> byteList = new List<byte>();
 
         public TrainerEnumButton(string title, params ValueStringPair[] values)
         {
             InitializeComponent();
             label1.Text = title;
 
-            buttons = new SortedList <byte, MyButton>();
+            buttons = new SortedList<byte, MyButton>();
 
             for (int i = 0; i < values.Length; i++)
             {
 
                 //   vals[i] = values[i];
 
                 var val = values[i].value;
+                byteList.Add(val);
+
                 MyButton butt = new MyButton();
                 butt.Text = values[i].display;
                 butt.Appearance = Appearance.Button;
-               
+
                 flowLayoutPanel1.Controls.Add(butt);
                 buttons.Add(val, butt);
                 butt.Click += new EventHandler((sender, eventArgs) => OnButtonPress(sender, eventArgs, butt, val));
-
-
             }
         }
 
         private void OnButtonPress(object sender, EventArgs eventArgs, MyButton butt, byte value)
         {
-            
+
             this.value = value;
             SelectButton(value);
 
@@ -53,18 +55,18 @@ private void OnButtonPress(object sender, EventArgs eventArgs, MyButton butt, by
             onValueChanged.Invoke(value);
         }
 
-         void SelectButton (byte value)
+        void SelectButton(byte value)
         {
             foreach (var item in buttons)
             {
                 item.Value.Checked = (value == item.Key);
-                
+
             }
         }
 
-        
 
-        public ValueChanged<byte> onValueChanged { get ; set ; }
+
+        public ValueChanged<byte> onValueChanged { get; set; }
 
         public byte GetValue()
         {
@@ -76,19 +78,22 @@ public void SetValue(byte value)
             this.value = value;
             SelectButton(value);
 
-           
+
         }
 
         public void AttemptShuffle()
         {
             if (!LoopBox.Checked) return;
 
-            int index =  buttons.IndexOfKey(value) + 1;
-            index %= buttons.Count();
 
-            byte newValue = buttons.Keys[index];
+            int index = byteList.IndexOf(value) + 1;
+            index %= byteList.Count();
+
+            byte newValue = byteList[index];
 
             SetValue(newValue);
+
+            onValueChanged.Invoke(newValue);
         }
     }
 }