From 67d356265977bc4746e8d4e83d4e7f10018e6775 Mon Sep 17 00:00:00 2001
From: Tom Rogan <37197580+tsr488@users.noreply.github.com>
Date: Sat, 8 May 2021 02:13:27 -0400
Subject: [PATCH] Update Upgrades.js

---
 src/Disp/BuildingsUpgrades/Upgrades.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/Disp/BuildingsUpgrades/Upgrades.js b/src/Disp/BuildingsUpgrades/Upgrades.js
index 0477b0b..7bf7b79 100644
--- a/src/Disp/BuildingsUpgrades/Upgrades.js
+++ b/src/Disp/BuildingsUpgrades/Upgrades.js
@@ -77,14 +77,11 @@ export default function UpdateUpgrades() {
   }
 
   if (CMOptions.SortUpgrades) {
+    // Sort by pp group, then by pp. Put gray upgrades last.
     arr.sort((a, b) =>
-      ColoursOrdering.indexOf(a.color) > ColoursOrdering.indexOf(b.color) // eslint-disable-line no-nested-ternary
-        ? 1
-        : ColoursOrdering.indexOf(a.color) < ColoursOrdering.indexOf(b.color) // eslint-disable-line no-nested-ternary
-        ? -1
-        : a.pp < b.pp
-        ? -1
-        : 0,
+      ColoursOrdering.indexOf(a.color) == ColoursOrdering.indexOf(b.color)
+        ? a.pp - b.pp
+        : ColoursOrdering.indexOf(a.color) - ColoursOrdering.indexOf(b.color)
     );
   } else {
     arr.sort((a, b) => a.price - b.price);