Merge pull request #783 from DanielNoord/fix/upgradesorting

Fix upgrade sorting on firefox #780
CookieMonsterTeam · May 1, 2021 · 76c6d58 · 76c6d58
2 parents 4222e2d + fa70faf
commit 76c6d58
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/CookieMonster.js b/CookieMonster.js
diff --git a/dist/CookieMonster.js b/dist/CookieMonster.js
diff --git a/dist/CookieMonster.js.map b/dist/CookieMonster.js.map
diff --git a/src/Disp/BuildingsUpgrades/Upgrades.js b/src/Disp/BuildingsUpgrades/Upgrades.js
@@ -72,6 +72,7 @@ export default function UpdateUpgrades() {
     o.name = Game.UpgradesInStore[x].name;
     o.price = Game.UpgradesInStore[x].basePrice;
     o.pp = CacheUpgrades[o.name].pp;
+    o.color = CacheUpgrades[o.name].color;
     arr.push(o);
   }
 

diff --git a/src/Disp/VariablesAndData.js b/src/Disp/VariablesAndData.js
@@ -23,7 +23,6 @@ export const ColourGray = 'Gray';
 export const ColourPink = 'Pink';
 export const ColourBrown = 'Brown';
 export const ColoursOrdering = [
-  ColourGray,
   ColourBlue,
   ColourGreen,
   ColourYellow,
@@ -32,6 +31,7 @@ export const ColoursOrdering = [
   ColourPurple,
   ColourPink,
   ColourBrown,
+  ColourGray,
 ];
 
 /**