From f4ea14f2bf28444c3b6cab23a8513dfbdddabeda Mon Sep 17 00:00:00 2001 From: RedSparr0w Date: Sat, 23 Nov 2019 16:47:32 +1300 Subject: [PATCH] Fixup rounding for millions --- .../src/redone/game/bots/Bot.java | 2 +- .../src/redone/game/shops/ShopHandler.java | 1 + .../2006rebotted/redone/game/bots/Bot.class | Bin 3653 -> 3662 bytes .../redone/game/shops/ShopHandler.class | Bin 6219 -> 6228 bytes 4 files changed, 2 insertions(+), 1 deletion(-) diff --git a/2006Redone Server/src/redone/game/bots/Bot.java b/2006Redone Server/src/redone/game/bots/Bot.java index 3f07e508..0e2ad95d 100644 --- a/2006Redone Server/src/redone/game/bots/Bot.java +++ b/2006Redone Server/src/redone/game/bots/Bot.java @@ -88,7 +88,7 @@ public class Bot { if (price > 1e9) { return (Math.floor(price / 1e8) / 10) + "B"; } else if (price > 1e6) { - return (Math.floor(price / 1e8) / 10) + "M"; + return (Math.floor(price / 1e5) / 10) + "M"; } else if (price > 1e3) { return (Math.floor(price / 100) / 10) + "K"; } else { diff --git a/2006Redone Server/src/redone/game/shops/ShopHandler.java b/2006Redone Server/src/redone/game/shops/ShopHandler.java index 31a5e88a..54949106 100644 --- a/2006Redone Server/src/redone/game/shops/ShopHandler.java +++ b/2006Redone Server/src/redone/game/shops/ShopHandler.java @@ -74,6 +74,7 @@ public class ShopHandler { ShopItemsDelay[i][j] = 0; DidUpdate = true; } + refreshShop(i); } ShopItemsDelay[i][j]++; } diff --git a/CompiledServer/production/2006rebotted/redone/game/bots/Bot.class b/CompiledServer/production/2006rebotted/redone/game/bots/Bot.class index 628933ae0ef8f25c877a6c5dde27c9164600b706..24a23ee365cee15f91362b74751b7f604c955d01 100644 GIT binary patch delta 1162 zcmYk5d2Ccw6vlsVw)^IC8wf!{=piaN4wFoh9H--QK0*tS@gbjwweusf)Yw=??m;Zozqh+Vk>ybyizR0$)?J*(eV&M=j_Y2n zfmrgNR`vKi8B4BB7V%R)Pb>Es!?Tu@imK*0!}Eq0hEDeOdyziF#^8u>W2}}YkLf|$ zn?BP~%Yfr7&UOq^?|6}V54Skq*}N>>(XlGu-r^XdKG+^kWHvfB@seTKv6(H7m)YtV zA*<*W$E$2}yrxaIv%~Sanw@HPsTpO5;SI-|yk&UXv72`s?=oiC<9Ltv4Iel@r?g`K68A|7mhFa%JDVd7`}CU$M=RG96zdtpJ*`bbNtMH4}W1M zm&>*-Df95k99NL_2$yBjj$ioI@SEdz{!rb23ZY8YJXtj!XzVYKiLL3C>53Jd*<6LK z&o0fhJIV>S^P5D=nHY^)GG9zDd36N-m; zTtt%=%@0N=tQRfK?v#R-SyE&EH0?J zta#KozeV`^e5Vrq7i+lOn{j}sIY`1YEb&C9j9xf;hke0eC9@k(&2Qm^DV&%e=A_A| z4Ks0=Ndu)lQ#ieU14oV!U$hxpI;kbsa|mx%kylJlK124U!z8slmgM zrrG=dtb1t{-Qy~wgpZzilzgx&3$syC%PLk|)^LS}Yc;%5*;NWxt8|^h zH41r!9))Wau8VR#y_OreQBKOU-m-z4EH`tD;Z{qW+Z6f?{g$K2>Ym#z8@WTnK;cfy zCN^8PaF1ov*P=Hp9ge^2P28m(Xy-+B+~)}$=t;vnOX{EVh2cxb zUcPdC%{Pv3`OfgY;|G2;>~s92E`O%Q@QdSD_IvmX(%Ecgd0Ul-SLL{jHjhwMI_3C{ z1BU6pJO1EL9qlhsB;{$6r_lq={p~T~u$7j~vUJXI24{MdtNVcy!Us#Mlk%k^FStZ6 zx$ve$A!`^N8LK4+-Nx?&^c+$9jspv12Oa{lVne>|jPL7MniEgh7tjR=K{M8Ns?(>{r&$f0bQI%!=$Kw`V3Jq}-=cI=Q` Q370clRx8!GT*GPbA8~l%0ssI2 diff --git a/CompiledServer/production/2006rebotted/redone/game/shops/ShopHandler.class b/CompiledServer/production/2006rebotted/redone/game/shops/ShopHandler.class index 9472fadf6efca36fff0e7792248310cc236b3940..04cdb5f9cf4f91266282857c3605697b721f3932 100644 GIT binary patch delta 1560 zcmZXUdr(wm6u^HUcOQ2zEb8it>+T{Nn8HGUin@YkV>8b5PczMw+PMqaIL)2!ywADcd3{Io&*m?i z8!;G7+(iS8F1}=!1)40d+Ys=TlV&G-oP6zMuR#XuboNxv0rz~*V0%vr-(>ZIA-y6dPw&?s|aX%WI$SPKWL@eKKkNKr;ma1dB0lv6s;lOfJ5ESk^RWE4e!Q(t*;81?^7#tqdCNAY zCpP&|xmvNUBoHHcqsok-2lA>__ZZGVUJZ_@O4f!4V`#NB#Yhbl2J_bPS&U8=6{GV8 zO!I6?WhBr@TDx>|o~?Xbg{GpnM)|85ZL_?4G}jUq6f8VMD1mq2tEP7c*)y;nZ-Tb% z#GfDnaRP}T2ejgfBo)2c`URlzxWENc1PGJFFp?=2uEcD04~~>_f^kx=654o>%an1Q zhxmhsRSFZ7mq%1OWh#?NsxQM-NMb!9aRy?SzU`r$2PFPgM(|96vZ;Pd5h}^55L0v9df2cPIioi(-d4G^I%#e?BN@fr((Y+IMUGmcs?-X>D^-p9 zNbn}LMQtUgW4KxvB(0q-+zU9EgTafWGFO`R5`N|pNoT$Ud`&{WB73-i$-F9|7fSF& z5)lELT2O zs4PrX%t|$$Rcbn`)ohW^W6cn?kPp=&)~Y3}S5?$XE*sQJK2bG%D)~g!IyS3Xwx~_i zsV!`i+_tLiY_EUJV^?EKinIMY87}SdYgS(p(B8!)5{5H+BGFalE&6m<$Bhy+vwlt@MA z3x@+Pm}~@jiA5Y3I_QAOWH_h1K>>LP$SaY=KlEP}^!&P^Au-K8?{oV5{m%EClZA&0 zm(7iNNz&kD7rQmtqe-JJx)z;SB4yPV(P4|^5^yAjXG7I=BZK!%UHf~sp%e*jUhi& zKUb+SJd_}PqsmQSg$invFM$~NfI#Z=L9>2MQ6slZ<- z^(R#!`wyqK;GH4uB_zae z)~eo-R+Sq`5*Zuu4MywB{eh$Jg(wh3@Nb_c>Q+3V-)-D^$nHaa>0o$6!iw%F_*uC5gK+Q+hAAj(u+Zcf1nJ1us9^{ z`$7e}lWocGB`*Mhh+C1ma#iR5l3ZEk1>|xQsaaS?*XQ9%9-!4^q-Lq zouvckB;&kn-?QX#(aGvEKmY#!_CQ(yk3lVNO+q=vvObuiI hJ1?H(ff`IBjv)}by?i{f5a3s*EaxK?a<1ph{s)g9a^e60