Merge pull request #738 from DanielNoord/bugfixes

Bugfixes

src/Cache/Dragon/Dragon.js

@@ -46,7 +46,7 @@ export default function CacheDragonCost() {
             cost += price;
             SimObjects[target].amount -= 1;
           }
-          CacheCostDragonUpgrade = `Cost to rebuy: ${cost}`;
+          CacheCostDragonUpgrade = `Cost to rebuy: ${Beautify(cost)}`;
         }
       } else {
         let cost = 0;

src/Cache/PP/ColourOfPP.js

@@ -26,7 +26,7 @@ export default function ColourOfPP(me, price) {
   else if (me.pp === CacheMinPP) color = ColourGreen;
   else if (me.pp < CachePPArray[10][0]) color = ColourYellow;
   else if (me.pp < CachePPArray[20][0]) color = ColourOrange;
-  else if (me.pp > CachePPArray[30][0]) color = ColourRed;
+  else if (me.pp < CachePPArray[30][0]) color = ColourRed;
   else color = ColourPurple;
 
   // Colour based on price in terms of CPS

src/Data/SettingsData.js

@@ -84,7 +84,7 @@ const Config = {
       "Game's setting scale",
       'Metric',
       'Short scale',
-      'Short scale (Aabreviated)',
+      'Short scale (Abbreviated)',
       'Scientific notation',
       'Engineering notation',
     ],

src/Disp/BeautifyAndFormatting/BeautifyFormatting.js

@@ -30,6 +30,9 @@ export function Beautify(num, floats, forced) {
     return BackupFunctions.Beautify(num, floats);
   }
   if (Number.isFinite(num)) {
+    if (num < 0) {
+      return `-${Beautify(Math.abs(num))}`;
+    }
     let answer = '';
     if (num === 0) {
       return num.toString();