From 4c4255733231ebc5667638ff197e2f099bf0ed8d Mon Sep 17 00:00:00 2001
From: RedSparr0w <admin@redsparr0w.com>
Date: Sat, 23 Nov 2019 17:01:18 +1300
Subject: [PATCH] Tidy up number formating

---
 .../src/redone/game/bots/Bot.java             |  19 +++++++++---------
 .../redone/game/bots/Bot$TradeChat.class      | Bin 795 -> 795 bytes
 .../2006rebotted/redone/game/bots/Bot.class   | Bin 3662 -> 3790 bytes
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/2006Redone Server/src/redone/game/bots/Bot.java b/2006Redone Server/src/redone/game/bots/Bot.java
index 0e2ad95d..ec95ff28 100644
--- a/2006Redone Server/src/redone/game/bots/Bot.java	
+++ b/2006Redone Server/src/redone/game/bots/Bot.java	
@@ -9,10 +9,8 @@ import redone.util.GameLogger;
 import redone.util.Misc;
 
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Random;
-import java.util.Timer;
-import java.util.TimerTask;
+import java.text.DecimalFormat;
+import java.util.*;
 
 import static redone.game.players.PlayerSave.loadPlayerInfo;
 
@@ -85,12 +83,13 @@ public class Bot {
     }
 
     private String formatSellPrice(int price) {
-        if (price > 1e9) {
-            return (Math.floor(price / 1e8) / 10) + "B";
-        } else if (price > 1e6) {
-            return (Math.floor(price / 1e5) / 10) + "M";
-        } else if (price > 1e3) {
-            return (Math.floor(price / 100) / 10) + "K";
+        DecimalFormat df = new DecimalFormat("#.##");
+        if (price >= 1e9) {
+            return df.format(Math.floor(price / 1e8) / 10) + "B";
+        } else if (price >= 1e6) {
+            return df.format(Math.floor(price / 1e5) / 10) + "M";
+        } else if (price >= 1e3) {
+            return df.format(Math.floor(price / 100) / 10) + "K";
         } else {
             return "" + price;
         }
diff --git a/CompiledServer/production/2006rebotted/redone/game/bots/Bot$TradeChat.class b/CompiledServer/production/2006rebotted/redone/game/bots/Bot$TradeChat.class
index 09731f46b54c140a0205bd94486967d202e2a734..77bb9577c1cd1b2216917fd6855216629766436c 100644
GIT binary patch
delta 31
mcmbQuHk)lj1{0(4<V>b~UNZ)E26F}}1`7sV2FuA$nalup$p+^D

delta 31
mcmbQuHk)lj1{0&n<V>b~UULR^1`7r$21^EA2CK<Wnaluq3<m4~

diff --git a/CompiledServer/production/2006rebotted/redone/game/bots/Bot.class b/CompiledServer/production/2006rebotted/redone/game/bots/Bot.class
index 24a23ee365cee15f91362b74751b7f604c955d01..ca31186942cbbea0f8fa59b1022f984d9d1a6971 100644
GIT binary patch
delta 1587
zcmZ{k2~^Zo6vltgf%(t;eJ4p#QppH#DHW_R+f)V-FflDHqbwR_RA>+z#x1L%w6M*k
zsYo;1tZXw4LzA-A7E9W*)oitWvCTT=>E2;ZW#@D_^Zmc~-hKCe-@Wh9mf3c2Y}>xg
zTYv(7b15V0Fw3O_v;CAZ$1iNI!aN`6>vz7x1ulM~E*El<ON<6xUaZSYlr2zLsG*lC
zT&B>dut?!@g)97A$yF{_vsfy{SmLsjWiHnccevIilj{_&cW81sgs9%R!DTrsba|t~
zN|&2h<#IE(=;^I4w{g3V)jsZUMfaUP?otzL9PajUk4ql+dIQ_Hhr}n|K+}$eN?h*a
zes6hUt}b+$$66l`cmsJ08+5~4xVJ{X_*myHTvC|i>wP?^CYv2LxD>0tQXX<>aoE^A
z-0U_fO%9vlhkFXLJ5)_IbT6+7&JN~BLvy3~#i1$HwZU*nU8FV`JzmtsCwY2%$5LtN
z5w9^l`dh~Guw^vmmd#AGv@+3PC)Y(QX9nx*=hQ{2ERX13Mtqk)qed!O9%YNeW0uEx
z!tx|fS)L}WY^&uNp0zxunVx5x<pqTo6}Bt1vCZKn%gemt@T%oCUbno#n+`iHZ}GOn
zJC=8O&(JGA&X*p`oe&9Dg+@#dMpfwhmYpiSOTyr+XmvP05Qzlml~>ox`3LNB_|WnZ
zA6q`*Q_E-UcKF=#1z$RRW%*iFenW-Bx0dht-ryS_3Wuv_Ov^HuEX%os4W6t}(DDO&
z43!!G(@H~1PF_xqirVAwqva=lw*11clBY<1W8^p5fHq~Xq0>KtCsfylB9<|nWJp(!
z%>z@{rdaRP#E1-C`xVCnp01wEexu?${XP0{s7$*|o<axtlQ9YN>23L@Vx;~!!IR@d
z-L0`xWUqt+1v5zDAkyeA*pn=I+<Ek3h_ExsW(qmtG?#jMGoL;zpf8I#jFt3f4FhOq
zAmb%VfmDDEOyE@cDm#sdQcc<EREQpBX9)8sOOxakQrIwwvl60~b?nwxMR^mK1|^c(
z1W!#SHJnXlBDSsL@`QmSrDrfqOb!<Vg(5vbzVN|}V5q$QB1TF>O5}d2lrE!Dn2H@H
zRa`M}PEy#SWCb4$1eq)~isaUm#A&JItP(38i76nIP(2m--=gB$FH93QUD9?V^-o-f
zYLojrsm?w!jYEwQ@A6huIG6*Zw02;1D|r>2^EWbROwY!2j%Zp%-&Xt;8*vBd#!+>f
z7@W@0buApzLZ{Bh3bc^6PS1{$;MjiAC;TUR*uSEOOLU*VQ>Rsh8~4u~NX8~ZIv2^h
zXA2{=nh5ovQ^^*qNEcigW*6zfkeD>IP=;6~1FV%1E|t+}YqQ$jB^xR}<+MV)yR2Xa
zb<zv%l#AyNhB(X|&|eat*FIL+&q=%!=-5iJv|?m4CF^C|Bs8?YjII(Afpq!Qb7CTw
Kk-?WT3jP8Ok~_En

delta 1440
zcmZ9Mdr;I>6vsb5_HlQA-5JRoEnJIQOvHjB$Z0CwCCXB;R5DS^Rw3dcYk(SBEhU9L
zglsLchrP?*7=|WgS<%Ci-r4(Y_U_-NnVim9wqlx{J@<RhJ->6l=X>t&H#lxEl-PY>
z$4;P#-(60p(GYjZU|En-E(r>1QqvruMc3tq6)r&<T~>0bODn5%yIQxGDY{(E6&jjQ
z)28N1HCL%wqozH`)m-D!!CI-5;98gKxZdRk))_ioLUgIQ(Xig-2paX7n_QA?(Cy7?
zZgJ`6R+o+3rl+^N+`*jzHU+rL72bCTxJR3~*B{-pr&^lBAMM`TuE6C!?)OJ>6zeV+
z<$(YX`lI>nZR+ty{;1QH01x>iU6C~29N=N?>=DDGE>R^_%43Gd4Nvq=clJBp^@b;t
z#h#+%I#1YN#zKdzWS7aBWGSP^awcb4woqYtiV6q2INq{oS**EvWxT1%(yP8P$%KDQ
zjij+`<!M8oWgFWq&#=SNPpzV7Ezhyj^1NnxfnAmt)x4zUWi<orGQ47WmDdcfTXyq?
z<xTb&1}$&#w&5MiyS$fd^@bB=yl?qHxgJs%TM;W*-cs985N&FTwU*U3w^%-8ui+!h
z$9!V>l+P@m^M&C{%U67D_{Q?B()y0MhJBXr+3ygTQ{B)|+gOwB;AC4arq;oeT^+Oh
zz>kKXEI;#$w(_f!hf^X^<?^55fI5G381WyKirS^sO_u4*=&kn+cs-%q(qz;hO3re#
z!=-Xrkr`*Gw1NT}CaVue6fYM$Gr7SXNSrOcGdNi6p?EorOtJ)p$Yvb*a+M}?Bnt?$
zgdFM_PcuienhC5SmrnBJVjaU~j+GJRbB<&wk_yOxW-(h<MRTZ-YKqQfuJBQGo*<8+
za^?y2N<by^m6SLOWYq_Jd0X-J2*^NL`cuy1Q&sFxK)Q+}3>S)LW^%mUnChrd)Pkwf
zbwoOfN<Sr%HbSvn%Tq;}66txG{3=A9`JzvUa8veEq>9TV&QCL4o30R`jSE;LHT1~~
zQ>W7;Z%i_H<X^<%R2xemA*E%^sRybA>H9Sr-(R?fi=3Q4@tFgJ97ByGjmi9#xWw!e
z;Z&T?u^pqx@7_eXpJ3%ST-_fR-%jBuPKftWJo3aoM)Z-{qX(1!7kE-UF)Z@rVUedu
z<Wc{m%&cnY7#24r9hW{HIaT&!`-o^2q2x*Fe>g_)JbBA2nJB6iit4jP_XVQXD$z#u
z8%>6O9y<RWe<yV!%#aE`JQH&#h&1&>(~`h&s%1E+pQ!X&(#vUE#O(|lxTK^(d>Jg2
Of$2BNk#UyF82B6f3JiGw