From b1b485f47d0acd3b054aefd6f7a9ed46818566a2 Mon Sep 17 00:00:00 2001 From: Joe Vaughan Date: Thu, 20 Oct 2016 00:07:24 +0100 Subject: [PATCH] Fix HPS Meter Fix for #1 where the HPS meter was overcounting (massively) --- .gitignore | 1 + SVUI_!Core/system/_reports/dps.lua | 12 ++++++++++-- SVUI_!Core/system/_reports/hps.lua | 15 ++++++++++++--- SVUI_NamePlates/assets/UNIT-AGGRO.blp | Bin 0 -> 23060 bytes 4 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 SVUI_NamePlates/assets/UNIT-AGGRO.blp diff --git a/.gitignore b/.gitignore index 72aaefc..93e3fac 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ Thumbs.db [Dd]ev*/ +*.txt diff --git a/SVUI_!Core/system/_reports/dps.lua b/SVUI_!Core/system/_reports/dps.lua index 233dcb2..c1d6aa8 100644 --- a/SVUI_!Core/system/_reports/dps.lua +++ b/SVUI_!Core/system/_reports/dps.lua @@ -26,6 +26,14 @@ GET ADDON DATA local SV = select(2, ...) local L = SV.L local Reports = SV.Reports; +--[[ +########################################################## +UTILS +########################################################## +]]-- +local function round(num, idp) + return string.format("%." .. (idp or 0) .. "f", num) +end --[[ ########################################################## DPS STATS @@ -108,7 +116,7 @@ Report.OnEvent = function(self, event, ...) local DPS = (data.totalamount) / (data.totaltime) self.text:SetFormattedText(TEXT_PATTERN1, HEX_COLOR, DPS) self.TText = "DPS:" - self.TText2 = DPS + self.TText2 = round(DPS,4) end end @@ -126,7 +134,7 @@ Report.OnClick = function(self, button) local DPS = (data.totalamount) / (data.totaltime) self.text:SetFormattedText(TEXT_PATTERN1, HEX_COLOR, DPS) self.TText = "DPS:" - self.TText2 = DPS + self.TText2 = round(DPS,4) end end diff --git a/SVUI_!Core/system/_reports/hps.lua b/SVUI_!Core/system/_reports/hps.lua index 4458613..1e6b5f4 100644 --- a/SVUI_!Core/system/_reports/hps.lua +++ b/SVUI_!Core/system/_reports/hps.lua @@ -29,6 +29,14 @@ local L = SV.L local Reports = SV.Reports; --[[ ########################################################## +UTILS +########################################################## +]]-- +local function round(num, idp) + return string.format("%." .. (idp or 0) .. "f", num) +end +--[[ +########################################################## HPS STATS ########################################################## ]]-- @@ -84,7 +92,8 @@ Report.OnEvent = function(self, event, ...) if data.thistime == 0 then data.thistime = newTime end data.lasttime = data.thistime data.totaltime = newTime - data.thistime - data.lastamount = data.lastamount + (lastHealAmount - overHeal) + -- JV 20161019: For some reason this was lastamount + (...) which meant that it was over counting since lastamount wasn't necessarily 0 + data.lastamount = (lastHealAmount - overHeal) data.totalamount = data.totalamount + data.lastamount data.overamount = data.overamount + overHeal end @@ -100,7 +109,7 @@ Report.OnEvent = function(self, event, ...) local HPS = (data.totalamount) / (data.totaltime) self.text:SetFormattedText(TEXT_PATTERN1, HEX_COLOR, HPS) self.TText = "HPS:" - self.TText2 = HPS + self.TText2 = round(HPS,4) end end @@ -118,7 +127,7 @@ Report.OnClick = function(self, button) local HPS = (data.totalamount) / (data.totaltime) self.text:SetFormattedText(TEXT_PATTERN1, HEX_COLOR, HPS) self.TText = "HPS:" - self.TText2 = HPS + self.TText2 = round(HPS,4) end end diff --git a/SVUI_NamePlates/assets/UNIT-AGGRO.blp b/SVUI_NamePlates/assets/UNIT-AGGRO.blp new file mode 100644 index 0000000000000000000000000000000000000000..35ad289e6eb08c982d42fac4e36f739ca598bad9 GIT binary patch literal 23060 zcmeHP4|J2|xqp*TNr6IC;&8wv)s}zC0X&q+0hY9*j5xVAkT+?&M$(qdDOT!b@!+i- zLJ^%#ZHo}_x_$Q{l28-y4qD7 zo|EsKl>Yj@-}~qJ|2*#-GVaW}O~n{fYX_@5_?JGFgYcP$j}@P6d~z5&iq9#0KF4QJ zE@LDA&WD*Whz=i&!!WoE=}+zKlQ{Zw6B=q{zRgSflzM=+S(ao(@jB(D_ zEm%l6sbNfugl(+X`VCL{ibneiyIyNVyPoru6P`_n#D#I~dy=);nfgHQ{&9SD%Y$IA zmaCJ?RkPkp)><5#YcH%>b)q&{KV=zXIXRi`-ux5nV7Vq)$EH1+tmQd5{LYWXh0UT> zJhOr^uQy;Fds9SygplON`v1J|9eU$5wy`c*n`v>_ceFkpYN!nzdwUjR7S0{L`^WLX zQg&~`Pmfn`jp1@bgeZnJNqJA z_)5whr4zolmoXdoIp&h@-WJ<4!40qv0k_50DeinWW#Rgi*Xq)>oVy>a{-`W;V)H7A z|2a7pOPt>W<9BcRIV(C2i_S7JF@rHXw;ioGQ5JezTo5&j7<0JwwwlwIHbX1~@uS|W z*RupdLhNnN*Je3QOuUfIv{+I)emF8Y?-XDj_`MhWPDpzF-{k(QATL?P@CWA~58a0M zKg~5TvL}Bzc}W`Y%~6aA_zSteqs73omT)fAPIVE+cTJb{pR4|hRi)q!nF>V}zD*1` zAM^77=c@2E`@*ZkSf7DaVEl{B{9?+=QoKU)Y{B^Qo8A9j<+$kei2t=bMeFDLSFVcK z&sQS;_%i=H%t!6{vvcdIzdj%sm~l??^26^D&h+-)|JX$xO`@v|6inCJ?KaqBi5+57 zyFqKqF80fq_^sEcrOH@{CLtwM-Tj+HverHaH0{Q@EgoG~wzX2mexm=*XuDq+v|Js< z&7ye}Czf=-4?L?E?$PdS!TXFU>pNFsVB8+i`#z!dw~l-Gy?hyErd85pEF&glH*&z2-JW z|6s&R)M|}N=7$jO9Z5vCZvH45sNniNX!XeLe?9Hgjl3Z$FV(^%Sd9qC?bX6bSeeg% z8TOz(q_j5+!qNWKkS9}dcAh-m^X-i3Q=dLKyH&J}TOIsh^cnI$-2H9icklI1eZ^Ne z8uB}e_^apK5I($F1j~ZtpWE~{_{)1GdkcH16)d ztF$ie+W*}%WDkFPIRUbP+lju} zF1M>UKmOTRup7%Yi4|jV>fmoJZWrRK^%O5PiUOS~DIqONk7RAJ2OCrL6Z^AYiox0p zVsEq^ztf}ikHG$5XK_}R+~4zsN2k)jz;}=54|{s>zxgs;-J_j}p1Ar8()X-vdAz-n zz9%HfnE08MomKp9`wznqe?k5Z?tf^sJstLKin1Q~GaaAeFHS`73F5i$j6wYBu=BKQ zDt3--*j3a(^5THQ_-FIG_xyu*MeKnu0Q(MmFl`$)+d=+2U#Ew@%lmB-MX>m&P!52f zk_3Fk_x~WO4S7e8D*hha3%?wW+G}Un5N6w>_FTd-_S{45HNq{g7wr^QdStxjoJwo8 z@qmnvM{j1ND1n3a|q;h`u$iMCiRni|YzO{|>Yr?)M z?5H7x)-=dpR5T*=ys}s@jgBRkYbicMz6^ULEf)DrfsScZ z3cW9g z<$-W)JWw5SLLQ8IxxYW;)a60pWlZZqIPtZ~GwBD+ixNN1Ia8{;URZ@7Lda$p32zk$CB!rnI`UrW^o z>{0q0K}Og!o|BgN5AwHf{u`Ld=`5D#Z~ok4P^nZJ85=_WAov@I;%34MKTRPC$Fw_j z9)C1`l;X31S1-Tc*LwQf{ygGgYhE!s-6BZ2#rjI{H^B3ThIh?9Hlo5f2l0S)v6~m~ zr}%N~vF`jk=SuTGNcsA~&8j@eC(7-P5aHh^u}J<_&Bulh6rMh^`4rV>td=DTJ%xBt zr%6nR$?53T{`u#x@ z>IHd9{ek$O8e>oT%isR@H{apJ@)1vOjMT3{|7;H{I2-X7RKE&vd$C}5mCj{@m>2oA zZDD|qIS=_L4ZZ&>slKw{-IlDDMCM@h&}IQC@BrO!w!?$_;XVa5wle1ti_?n}B2Wo!VouDd@y$yT>H= zzvW}pn>bhYNBLZ=JbnH9X+TAYDfUZ<|3n3n-7T+&;sHnl>Y30#(EoYVGnt3;Rw=s> zgUMdx-Hm*ac)+UDbWag~c$)T&HKF6{BKd>Gu^9BA_L!#+yvPn?50RqtHZKN*+jFX3 zEnn)Odb-ULSr76(s;_F2^a{O&Xs7zi*XAGlqW7dfF*aky%n35Rn!7w*vHITJRoxZK zZx*cX8WLmwo4cH&OwMRNNA&jU)Ba98(@n##D4&1@69RC>V%|h@cz}5*6fsydPfkm9Z%$hfoeYh3pU)O;@!>>p3KrRCI0OiGg z^SdwkSo?DtylC_s*dGiZ5Nb`i>YxE@Lp?L^XA1vG9#pAbugnjrJ{x0?FQ-R;>3Ikd zkjF2NZ)k<7K)@$sPnV%mhvmg7hvz5s?T?geMfYO)+*>z2=M-GcKuM^2z4i~#j;nfR;#>-9$Uze&6}DoxE4eh~kO{qp_>PS0V5 zCR230bsuH0q@kuHOKIKANarbG&Tr97pzwb)YitL)jD*T+}BaPcF5r1_A{=vYQCJpPO{m?@ZE&GS{ zYi~RJqd!ZjFYRq#W5|~5U1W6AMbw`;PIS8Gb9NdifAYwf9U*Cm)~CjtLH-i+KEK zJ$0a7k=XXGKuL&c1CP-8tN94kgXu&R;gph(Q+<%iu`)mUwg=GPnEFd|hXMMUrq~zO zX&RLjGoGolxg*x!n>tx1t7%i@&(LYm7W<>~`;XK5?J@B_<+IWA<-XU4vFK6cI|9E9 zlf7Y{Xg!I}JJ~G~y`*@b;>|qg6#hhbL~z_;VWfON)5~pxKScd!P3S;F80)oKT>a(O zK>NFJ|BCYe&k8UHEU$y z^}W9KL+4Y)CX*j(!;Uh|L@D0e&)vZ9t6)zX8lnFVy%hhks`69a=b>J4vqx=WUz~fT z3h`+m@ajPMInehFsgeAE_N#}%(l!)I=Y#G0;ScZ!!PMm?=1SeI%b>4M2N0h`>@&%` z7x!_Z7=)llX>Y=a9)pZiPh_x}qvd_?BTq2jazWOSlE+mzEsv_<{}#gcwZxe;V?#;|#&g!&)KF)yOBh?MKQc z*vF|c_IFM@TTpj2PpQ8*U-F!1H9M7hF6*ei6r0Zx27lc${aJ^futI-!!7$2W%2MpT zgX$^zgc$$SO>#vZ`@*ni=dDUSBE+C%zyHnGogtj(886h|dk6WKR96z!OIJS=ZbZEt z=Fu9BkMecaYzNOh_q(wTkB3fJkk8w>t+6t|A4=)mhp^t+3le=+j$u~ag+>yqVN~efu~u) zTmKi@xRR&I{gK~mc^XdI75=vGq3|J!3E)xMBT&Xv?}B6ub!3&2V%81Tc)1F*pVCy&^Z_Fk8P!=>J zzJRzamg!#$dm4Mb)7YMpjC5JyR} z98`?Sc_`10bRPA!)SZoL=bgIO1-D#@VgxcCPVG(K) z6=TRhB0k3aw8)qzj$??y*syCUpC}ql_5l3WuL!@@61>!OhU5N_gWCc!|B3#n&cyJW zhVeUpDb>#^4%7V!+{baRB71wOCG19itPj}u$I^W~F^=p#%KP?xXcq^T&+S6IrRR2j zAH9FLYaIE1I*$k2Ot{~&)I#;tTo>U%evf(vtuGL`Tt9C*H?v?gwm|$wd4><|T3!CZ z#-awwcJ=PNd7S?}*bV;m#NX}k7p9Im_TLfuyDWA-F5FmnYUc7T%AavRiQ?%Y&3^UmWM2bbo_X!jx0bih zENGzni5B;MuIXAGI*@$7#6P!tA?m4-_?D{kFxUM1KU_od*+BIUlwafg?8U#{{Om6l z?1^&Cjm7L&bL%}fM3X$G98!2%Zsxk z{FBa8!LJ4HMEFPbwI9d%cbWe6mtO{oAI8O|C^^y2^ zBm6C_dvP}WE7RVZT{@xtUD#i@BmVu1uUY>F%Fq73kMCzy=$e^&Y7B!|$cz{;)f9o;h;9Me-22f7H`|^mqPv|9>w1M8dVjY!IDo z;{J=>&I@7R=ZFgjC?Bxf^{$a8*Cdg@rTfKj=W&1gt=D(+#(4)Th83+v{gQLnk0^fY zXdUcE`~`RHopB^`-}wXh=d1C)bKG7G%w7mKt6V+3yqxkgizBB^^R_W`0xC}V65KiB zy@8D%e}7=~GfMaUDs*P4Ug_d$BaAQV(e!;t9G6;*?BMk$Rd<@GJ=06~J$ueKr562d zPw#sP-;d_}!OPlv_wS8q{zuIf!?YQAU+?BA-SekT0=C*6TI2lB1}*qy3f+gfHc;7_NiF-=_s0AJcVV%HV|mw7%@jDaMDKG(Vk&B_#0udgDXt2@kGMq51hwyx-9npQxCK zEgi=E?l1DPG+lgS$NH3y45**YujfCnHE(*~T!HtYPmkF6BAV~H z@)R^ME16ot#p<&gc9-gM zYicGFzJ#v;uG@W+);4wLuWR>3wpP8zq~$d=H8OVYuGYok6#D*GZsUeKY7?uDy|C$c z<|G4i4%TuPdB& zp6#nTX{ejJBUzcRvU<_>nEBZw{*oHh`{nj6EAV}sVdYFzZhPQiW?FofFwPE&t zP>5RKwJ0BD*M6kJ9X`gEBAh7rb~q+NV7V`O2a1BT?^|Cyrx?fnVeF zh|?pM0&#hWrAAyo;_?uehgb^4nWqFqzsU%>8I zRxsU~b;Q4JYO?vd(XUqgX$#u7Zadqucy+1kji0d3N(!d`IroFfE2kdcweZNcqF+>f znEtn|HO(yx!--4Zbg~g!GbS}Ql?;!^_p!o>->)+HjIZa)^5+~gUlb4grQqyZs#l4V zA2D-SJkXF)Q$P$r{$$ UCd5q>BK&)&(8Q=d)qA}E10-fLPXGV_ literal 0 HcmV?d00001 -- 1.7.9.5