From 12ba779d88d7e6c8a7d1c205ef4564dbae0daf24 Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Sat, 13 Aug 2016 21:08:54 -0500 Subject: [PATCH] ->'/dps' tracker now shows the largest single hit dealt during tracking time. --- TwosideKeeper.jar | Bin 480541 -> 480654 bytes .../TwosideKeeper/Logging/DamageLogger.java | 6 ++++++ 2 files changed, 6 insertions(+) diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar index 23b99db6ae842160bc2f45fee3599200b637aa8c..519eba85d9eb9d2f8f105f4cc95b032d2247cb90 100644 GIT binary patch delta 4178 zcmZ9O2{crF|G*i;wPmSLBWonPv5m2eC1V*flB6t&Y?G{$T|;DxC~{4So`lqDfc z)MVe4WY6~45*7L1`OkZLo%fz|@66|OzuVo;`8_HUx>GE~X=%m;XJ=qwWnh36-sO~r zF&0LlZlM@&p&z z4U1u56uZ-|Oy*(Xk>QbuF^`Oia^hDSO-v!TO-rVcH8x_gpKAMSAD0ee6JJ#-l#aC? zz8N1{64*xwE4jApc&#*_sH+2QFQ4xI8=**k9~<}{9kS9%+WWmX-tc8lC+J7H6k`cb zMV&8Ozgvf4HA$CjmRacAR!E|ed; zN(p(pY!h3%$bRxJ(L1QOz|I(rk-awmKKPP>o+13h_e|3LzO)eM5Oe%Hf73DL$q?s+ zi$7-W#pFwFmZ*gmf2w?Ocv$Z1JbnR4;$%+7N__1)QcgVKO^#4KRhjw*Ki<`BU!rz4 z@1=#4x6*@7iKf>9Z{Fnbsas`u3bFc}H&`qRVm+*uHx(=5{c%u&S9 zfW;eX9zPaHumfpJ1Gf+#mIk1INNgFuXC_yJzyR!QTX27hsGC_?Drcb7cxI|8lg_@=4-nb+i6cOYn!qoJGha0B|cWl z+dCQgmJEpxXywKi#Fh@9utb>U%Z-`4RviIO7OX}(I9(qA&HgMS6tIG0r@)?$skLOu zkRB59$(3czb&8Od>QalVwaEEgp-^S_-x%>A#UWqjFP-pV+4<5iiRUJp!#C3#%le;l zoL}=I-D$K*W?GWhcZHvo8Tj1)K3}HObU8zK(N$SXKifbTwd@+Xu8@tjn(}>*D)4qP z&OFHWfbTr|=F?Myzj@kn2eYuBuNh_ZP(yo2vPuEO7WL_mS3b9I_e764=EiEsxis+I zIfAUffn;q#5|DCoV~DWvL)l6YZ3*XVL7q5WYDz7Mv3MaMe+r zH29C-yWv!s+uRmxao1H{Z71rt%kInV zST`v(g*Hf+zHH^0i5oulgKGJubV3PZKnmL`&`2p{0iJPhDfuzIWE8>R03frew}pbh zD7=>TQFwSJu@0YDx7WcDV*5QBJ_TObkUqdY(U+d1_N?6ORSi6+b?(jfv6a+-(cB4+ zZE?Ie;p(?Z`Hd4?sa7eT!G=O3-H7DvRms3+y~n4=1)g(woYqr*)UD(}l}wY+CKXMj zO9VgALOkh6#$>tiv%my9(zB0Y=9>@I;hEmD1d#qB-^sfFXogT9{b(cFqEJ{5$iIK++I?@OOQ zf9{!X#vjRk%&j{W&Kobw(R|_fyW2IyluFIwrgm?&%eb@t;ay72!?WT(GHH{Xf)t&o z>Z#oe_}!Ikkfdm0>#n+E)U=L8jJ{eTTulsK=sI?nwADVQ>#6CQV45?rX`%x!!T zz-c^Xf1ek9wDh3D>FSBguZAlw*jEv`kWXw62~Rx54>M|>Jz;095_aZi{E5+#kz<7$ zi3g*;#zaSz=4g_=v+!my_;eD%pqYhG=_0N6VlH0!0L#T`LSn3rN&C5)SZ|4bkM?l2 z$%SA3n}d1)hj_#j7 zyN;$b)Y;c$cBiIgvtKRT7|hy|m~)t|Lz@+$+B7z2yPtmP8>nBZR8baSmrjFW& z8yiR=Wvv5Y0n-#52DXk=oW?}`^na;DM7%9aV|}ETyyGBPgueB>k*$PNC-FA^>pkPc zy`dQJkf4$vw#CxmuxpFx8S8`1_L#W|?S5yjpR>;LMcwfm<=Ikh!?xX#2iW~$w0Om5 z4m2K8pIl6^H4##0z2!$@UC-+F>*sW)9JnM_^^Y{u`nJJ`LmS^FIBFi?Q{+W!Z}pe6 zG6qgF7rb-!mp_%<^mGIvWDo1`@axv5Jb`<0TVTTBX9{x|ULDhKzwiok>xVwEOrc1Q z{hf_~G{Lop@(t0V6^MzEPUIoph^xJGoF|F5u4Tc-R-iY!@gRYX)c25@DMn3L7cXgH z@BAh^PrlugIKb{6FD#XDdGA`B#R|vE(bHxQ+73}i&ST??IRl>cPJ4JKxmb?uy?=bs z({kA(deDk0salYoI@tG^<-v<67Pa2TClHnMB$fE5OGk)>5+9a8+gZ89_i_`28$IXD zQ^IlS(s}&2QGG4>AlHf{vKuyZjoDxl_nVnL^jq3 zyF_(8a&q|1k5}Wk<^p=oJbp&7y>y?VSY~k>r*PWHK{{|8k9vWs?#wdcrYaxRNv{lq)xk z$|b_Lc=gyW1?{7ts}ZkdaER^h!AuD$zx*q^q89{m?8bNOdZV|Mett;N_~^s?G+@CI z!?K3Nke>owez@6)E|Sl=<>%+71Xbhl(|7yRbww|sYFh0duBB}~x+dJK6WL|?fk8Nf z0K_H*ehhi6*RDj`^J^tpt?SONo=5MbP{-3G_1R6OWLBqB-Lnz+{=SfbOEaAe^<}JG z=sdO%h+t94`AJqeYb@bf3*lY|0`Hs69fFzcNr?q?BtgeY!w^rt;yV* zXRo`l?HCM@Ru^5EE5}DG#|3)-T~(DO3`h#+&aXg<6w4S`&<72Kk0}BTHl^?54;w zXoVfMxB5ua((23-{`=TyXF`3#r;beFJNQ-$K*D-`=!RPxD)wfJ4zAjOHcW#Ryo`aSsn-T{ zVb?_IfY1Td8B4%3I>1?25SH$Auy8(bL<8Uf2{v#Zj{mmq02wiWBO?)X!T>ffEg~&k z3>?7#D41v{9hO4iJYbvwl-qU_&a-c9nP__P)tgZ999=*L7LfSYaD$t=(CjCZ_nF-! zH~?PIg977H>H4uApvRaCPUu1RY&&CLXh#MV>Z=chQXlNoj~_s~gQjP*_UYpWP^;FQ zeI}A-)Sv7#V>GjqyU%Ezg3NqA-6++=xxxB;I1Bjb6jWZWWS`!k1umEEGnR&snXKGr zN@=F7YM)`pLWWxN*YJQISU?#@sQ+vD!453cOTGQC;RcTzL0PKQeI}A-d^`7~Q1~LkC*pp`lz>`om>cii>AW>4c6l5fIJIH}fGE8K)|0fyHhYer>fpY*4%YYaFeg6Lkl+78G delta 3958 zcmY+`c{o&k*avWCh7;LR)?}=StYaSr(`1<#W2~i_vXlo2*<~3^D0>YKks|vpl(iDF zWXqnk2rXJ9g-G5r?|H8Gx!$?v{PFqz?)x|Qnd_YE`lVJLx>a$A%gP*y;$&gj!@{Ch zcAZNefh~*Hj?-q1(?&FDBkxM{#OHAn`{<6deo)b;1B|)|G&qVz?g4pakb-oooygyB zgXi2Z5u|Yqd3o7@6CQf%w2};acO;Q;_~N)_uGZ;`l(*;K2X5WyZ+CuA5;C$1;%jQ2 zv^KWdM@{E{nPH9RGsau(n_lpoOF)}BhG9I^M^;2G_1M%61q5{DziA?lXmQ#G<&-CT3;D%A zuDB*9)MLsP{6crxTk&pp)v>d)?p}prk1oErjMdHN=TnPTz&Q*3{CT9Fez>4?e_W&Y z!G4NMu_KS**p<@aU+uWa3!ujb`8wL;T+-+5WHC0n&51;o9MZ(x_gG2trrZOkb%AN4@JeX7VEsAKc^5a)*dvA2rcHhk%o z4Vv!53T4g}4Omk`W&_rN-lbu?U1#L9h1y_KMK{PeoFuTd`!$&nWDz!XC<;1@bArrH z?!x5By)_qEccabP9pof8(h~L0b_GnJ>iC5=zq3cPG2V}4t8fds2vBVB;Psam7h8wA zjUM<(-m1f&@SadbHX+8}xjmhs3V)Gi45vR+J(=uYo3FkUeElQ6J~$`YLE|r4R&_z{ z9^xNM@gwhTUQhW4l_p|F%pX0~XzY)&lNpO2?k*c=^ph-P)pNBt#{I7B9pobYbX1%> zYTS5XCMpGC!*Bm|YRDq;ZhczJ0I$yEgz#(0-`XBC$vmwI%6D_gJ=)h7yQb8BeL6s5 zIXzlja1dvE+qUQoj!yFpM>E=9YP9crnZwd1+u>S@65LC!GT``P&F%9fH&pAiMBQF8 z>z6?Md6c@slQTZ!%( zQ%VZE;_7MIdH9>9^vK7hh#6Vmr<+%4)~e$~X(1!dhHzowd3s$+N05e_%pe}uF*U%w zd>Kd*H%=bB5GP zmXzV2**GeHgi0ss+*G)2SFbO6>BCTE-i?d3-8-9CczM4M=vI?N4X%+_7h8t~1vm1h zeWNnA?!=FjNrM61u90GH+Fa~(?*CVXDbx9`m51P4@Nc%4iV05`T^ zOzwu(qaS&Ha4OC_R$XZ_iu9^t|AnPn7u9^$o&ifM$}QXbxeYVhyqi{&ZY_Vf7}GZCTaHB0sRym#-D`d8g#|5nWVe8+4KQ!^(n(uQSfJvV{BM3wqGVVJ{u zmU^enhqCi$#>d579kxLu_pz|o&&jt2#fP&pb>y!crn;Ay$hBHapT7Ft{bLul<%g%4 zguFu}H~S6GD%UL$V&K7+dqu|&qm`bP7fpM*AJ4NXrZc{(5kP;pJI@sADAk%vG_8(s zo>K~>Zt8u_2Lpb6*Hg|K)KIJT5cifDk>wvYy$kbPrP+o1OW68Yo?jjkNhH5e{jACu zQQr)_>PQXOHcc%suns)Xuyhx1@V>8i?&|iD_r{h^f7e}4h8&P2CLb3()aw#`_oR3z z>S(IVuP!?0oN>6atfG^kzU^sZkDcvNfoU5Le!#vT{%6~ns=SMzwXh3HqY4KVyaJ@fw<9r|;q1*Li0 zNl@Zy95t>^*qP1L|A4^!o~oW!sjH>7icv}h9smzrN_kRQ^yyYCYEf~4?DR|(>kzt( zE9h28E1U`w$FHacd9|S@6ZsS(P4A;S^Q>aBWi5k6hI=ONUExXQU&R#ar4`@H^Z)TX zPt&0=c9@|f9e}CNn7hvgKA%5Utz4R^oL|!;Kn=Z9sqc5TtUt7M%Q4SF{E&t#H@9a2zFMQ~D_#96+i4B=N|_%tx%$B~+3EeAllmh9gNe@r z%B(Fu%a`Bc*UmWaOe2Qf8k27rJ#sBgsK>#)fZIBpaK%n7xP6hN-;zU|q8x5%m4UvY za)e5mw(XB{Sxt~5C-3sB(#)1Ml4VBf*(-SFl%^CFmeC`jgdwG_W+hAxpM3NwU#?)YshxAQ z@XHZv-u3aT-ajVWANBpgQUu8nQEAR|J#ypU*T?g2Tzj?q=CpwPsX))z_|*c6Op+)4 z+x6OmuL?Vz|MYdpy)+HronOenTp^n`@umpVG(O~GBxV052<-0br&sm8v05}#epE_~ zIp9+4dC8?)JuM~CMQCx|b79>v{PnDaZr4;rB8827;`v#b4}AGqg7HaG`IMsCfmgLe z<6iWK`shreL;yAd9t5LAMkj*+m%$p|+Bt))OxQ7U6JN%H?CHXFsCh8OVPP`)P(Xm2n zBNaUxykapvdkl4`CfoIdu=2ch^@Md_-LD^bzV`dgsvMeqw$$h#Haou5_(rGkjksH4 za%W#0$Paja>~F zRx1lT5*d_lSeDv~rY{Z@=k*NR(DevA&42d)rFsPgj~V+dU*(xsxxTR37FChRsO)HH zH$@4?#mAklZZ5M*x;#?%J!Sn#4i~#G&SruAOr!Q#Os)=kt}4CSDvT01PN+7y9ML%Q zxrINoVw&9hLQ0~fPtDBTLJ>HVp?~91Oek)n;D&Xr)NA`7hC}k)qD#dhKVY}Z&OE<@ z^}2v4Xp3VNfzPH}x&U8-jS3RFP|(Hpz($2V^#?+)3|x=|bfF{e192%pM+kf?51=^z zJKTcjbb(7qhB6YAR6%0EN@y2Q6bpzVt1E$Xd(2ZVZ6ox+6Z=I7&XQy0q~>!^J zpnyOm!ik#^poVym48uDG1%Lz0Wx;efk-$UC>I@hWOeAE%FaV)i9c$>%eR1>ujpuk1 zF3>&(RR`w5$Y8?uHjGs!dJ14z5&$*UBru8qP!S=eAjKFOQ>6?Vljk@zM_VPFoI4J+ zgxA36Wa3gI3~^(q9|u|)L;a2|a5iHMs3U%Nz^Ho&4QgNlZPwEZCmAMCf7bwvRVH?a zU|5<$n@NCCrqE``#^7v^8C1YJ#hg|iJjXpW8gN8t z#=^@cHqehnCBP_TVloNFUkI#mpsFo!3c2)~9qeSF(); @@ -38,6 +39,7 @@ public class DamageLogger { this.totalmult=0.0; this.totalhits=0; this.recordtime=TwosideKeeper.getServerTickTime(); + this.maxhit=0.0; } public void addMultiplierToLogger(String name, double val) { @@ -75,6 +77,9 @@ public class DamageLogger { public void addCalculatedTotalDamage(double val) { this.calculatedtotaldmg+=val; + if (val>maxhit) { + this.maxhit=val; + } this.lasttotaldmg=val; } @@ -95,6 +100,7 @@ public class DamageLogger { } finalstring.append(ChatColor.GRAY+""+ChatColor.BOLD+" Raw Damage: "+df.format(actualtotaldmg)+"\n"); finalstring.append(ChatColor.GOLD+""+ChatColor.ITALIC+" Final Damage: "+df.format(calculatedtotaldmg)+" (Average "+df.format((1-(this.calculatedtotaldmg/this.actualtotaldmg))*100)+"% Reduction)\n"); + finalstring.append(ChatColor.GREEN+""+ChatColor.BOLD+" Highest Hit: "+ChatColor.RESET+ChatColor.YELLOW+df.format(this.maxhit)+" dmg\n"); double elapsedtime = ((TwosideKeeper.getServerTickTime()-recordtime)/20d); double dps = actualtotaldmg/elapsedtime; finalstring.append(ChatColor.YELLOW+" Elapsed Time: "+ChatColor.AQUA+df.format(elapsedtime)+"s "+ChatColor.WHITE+"("+df.format(dps)+" damage/sec)");