From 552beb0af5d050f1b3fc7ba50c88dbeb38783a70 Mon Sep 17 00:00:00 2001 From: UniquePassive Date: Sat, 13 Jan 2018 04:42:29 +0100 Subject: [PATCH 1/2] SpecOrbOverlay: Use fields for position constants + adjust specorb pos --- .../plugins/specorb/SpecOrbOverlay.java | 41 ++++++++++++------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/specorb/SpecOrbOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/specorb/SpecOrbOverlay.java index a64a93cccd..36a61e66c1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/specorb/SpecOrbOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/specorb/SpecOrbOverlay.java @@ -44,8 +44,18 @@ public class SpecOrbOverlay extends Overlay { private static final int RECHARGE_TIME_TICKS = 51; - private static final int ORB_X_OFFSET = 33; - private static final int ORB_Y_OFFSET = 25; + private static final int SPEC_ORB_X_FIXED = 34; + private static final int SPEC_ORB_Y_FIXED = 26; + private static final int PRAYER_ORB_Y_FIXED = 73; + private static final int RUN_ORB_X_FIXED = 12; + private static final int RUN_ORB_Y_FIXED = 108; + + private static final int SPEC_ORB_X_RESIZABLE = 29; + private static final int SPEC_ORB_Y_RESIZABLE = 28; + private static final int PRAYER_ORB_Y_RESIZABLE = 71; + private static final int RUN_ORB_X_RESIZABLE = 12; + private static final int RUN_ORB_Y_RESIZABLE = 103; + private static final Color SPECIAL_ORB_BACKGROUND_COLOR = new Color(51, 102, 255); private static final Color SPECIAL_ORB_RECHARGE_COLOR = new Color(153, 204, 255, 50); @@ -86,36 +96,36 @@ public class SpecOrbOverlay extends Overlay if (client.isResized()) { - if (prayerOrb.getRelativeY() != 73) + if (prayerOrb.getRelativeY() != PRAYER_ORB_Y_FIXED) { - prayerOrb.setRelativeY(73); + prayerOrb.setRelativeY(PRAYER_ORB_Y_FIXED); } - if (runOrb.getRelativeX() != 12) + if (runOrb.getRelativeX() != RUN_ORB_X_FIXED) { - runOrb.setRelativeX(12); + runOrb.setRelativeX(RUN_ORB_X_FIXED); } - if (runOrb.getRelativeY() != 108) + if (runOrb.getRelativeY() != RUN_ORB_Y_FIXED) { - runOrb.setRelativeY(108); + runOrb.setRelativeY(RUN_ORB_Y_FIXED); } } else { - if (prayerOrb.getRelativeY() != 71) + if (prayerOrb.getRelativeY() != PRAYER_ORB_Y_RESIZABLE) { - prayerOrb.setRelativeY(71); + prayerOrb.setRelativeY(PRAYER_ORB_Y_RESIZABLE); } - if (runOrb.getRelativeX() != 12) + if (runOrb.getRelativeX() != RUN_ORB_X_RESIZABLE) { - runOrb.setRelativeX(12); + runOrb.setRelativeX(RUN_ORB_X_RESIZABLE); } - if (runOrb.getRelativeY() != 103) + if (runOrb.getRelativeY() != RUN_ORB_Y_RESIZABLE) { - runOrb.setRelativeY(103); + runOrb.setRelativeY(RUN_ORB_Y_RESIZABLE); } } @@ -125,7 +135,8 @@ public class SpecOrbOverlay extends Overlay // draw relative to run orb Point runOrbPoint = runOrb.getCanvasLocation(); - Point specOrbPoint = new Point(runOrbPoint.getX() + ORB_X_OFFSET, runOrbPoint.getY() + ORB_Y_OFFSET); + Point specOrbPoint = new Point(runOrbPoint.getX() + (client.isResized() ? SPEC_ORB_X_RESIZABLE : SPEC_ORB_X_FIXED), + runOrbPoint.getY() + (client.isResized() ? SPEC_ORB_Y_RESIZABLE : SPEC_ORB_Y_FIXED)); double specialPercent = client.getSetting(Varbits.SPECIAL_ATTACK_PERCENT) / 1000.0; double specialRechargePercent = tickCounter / (double) RECHARGE_TIME_TICKS; From e4a4be006976e7a5f804b5de4c9f7322b9f3bd26 Mon Sep 17 00:00:00 2001 From: UniquePassive Date: Sat, 13 Jan 2018 04:48:45 +0100 Subject: [PATCH 2/2] Remove extra pixels on the right side of minimap_orb_background --- .../specorb/minimap_orb_background.png | Bin 16755 -> 17196 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/specorb/minimap_orb_background.png b/runelite-client/src/main/resources/net/runelite/client/plugins/specorb/minimap_orb_background.png index 50b4192c19afe3f019a06a1f0ce37d9fdb5fb02a..efa939b4f0253339709186c8a8801c112b819100 100644 GIT binary patch delta 2412 zcma)6XE@snAGM{W#zhx3N~=wUgdixji%PA8d)rryQZr`k@pluO+mfJ0xgw>+j#&|k zYq!Q#dsBj_8g;co`}**HyIr+)#4Rt82 zu8*sLgE-G^#2M%mOqA!*{XaCsBp%g&=MC}Th!s5NFF$p6@^N!@(NVgq6o@qn#%lhL zsJq823*(ZuKMEl}Lnul1nHuV$LTBFRU{e2szS0XY+J@*VAtAx>it{ZaiNrdDvP8{A zC%zI$+yFI$s-i_x30!nI@mpUAo4#~j|0R)KLj-t1{IES+>yfa&eyN*zE<~W9B+Ha8i|(!Z7Qn5@|E>Rg*Zk;`DZ&HdlC$5tF|7wAOuW> zaD?>kb0p@|=b1@!Y;5yt>?SynTR5v=Q(Y1`{J0mu-WW36!6zAOvGc%?!ZJ7_hJO2w z08E8dLgvk(YGCHcJ_)#`U zPW*ZQ%fboP-Fn?>P z9Mr-Vm#kMV#$KA7Jn3zflk0Lqy^TX(svhn1s<(uTU64Z8jUdVDk%b!pOH@RbPkxU$ zM;mq}TZqG(kN+C@;*_?Q$t3(d1LVY*FUFdlOexJCrz~h57!x08Ndp$z4Ls0|`kn44 zSz#unW`{)~{g?g`Ptvpp+Yn<5Bot}3lX-8Rq_ANJ4PoYIzA*DE*q+|e!L>)M4{;^S zh|-dWHCu#u9g;kwgkEX99WG~;s-kKd>JofmX|UR4vfj*6Ts%I|yA;jxyjTcaY1Rp4 zf92a*_EVoy#XbKcCzu`lY^UYQI2@$?0?r?C@VB&gLzy{}z$KIZMJ#=iG6|ZoH(M1W zNMAQydGZND%F$#?XE=?&=HIav`TU)s&Lt6Yy!E-QLeNf%Iov-zt@BCUHwMZvoX`V? zKi)mQ4xjr&uR#t865k(2&w_!Bdas~IZVQPh17f>4J#5;2#oU6qL;C}y>#k2>aL4hL zHyZt7XjqW4iI9^GbP?Sh$hW5FYrPK0l3@>Q{!=IN{@xBmUAu=K!n6O@+83%2y4FB0 zT7FXJBO@a)7fs%t8U>EJ&E2Lr?|&;=2{F=>o#1&QNvSp|9K{eg+v3lhnCX{v7Qm@CPRmNRypnb`E+=Lm6k>2L5P~B+} z8@x@EBYRY8R;+9q1%iA;Jtv48b=Mz5MZ?j_$IP1jC zpS?XJyi1N~L$x}z2S_!|eVww*yI})`_!keMd!FK)hpN-Un+X+ z`j+NXVzN^OOhz^Kka*ofzc!sN;)ST`8<~N(9~ZmK&VO52Z6|&YP+^u&t5@4KGyF7O zHjYkoCSb;1PUK`a>qP9t$rdrAYt;5Nj=!cL&lWo*ZCs80Wq10!mvWk43S&rFz5Q0b zm6Rf27^dvIctB!ySwB$B*`NDoL^cZj?B{L@smKu!5?FE=KH-IapFY)Frr6)>IxMy% z7le&wNT3cDm97bYSWxa)>>xQjI$58j*3UICCOG_L*Lc_i#q#d#cINoHFp+e~Z62KE zM2_16E@@A=fw*c=w#sUf>dno#lP2Lkg0$1B`8eQS!QWIDx}!i74DNivYs8$SZac4e5YM-)es<9u@DoXm6k5)P2g zF^JR={wPo@V#Ery0=>S4t@T8s#@>0sQ|ynXF7)x%vV6$jq{v%BjWh0zrc=SS4%)S4 z_is!_T7i%qH43fk%DI^IZjUdPrt;g^5pO;ttI@%WB<6lQJ6pbpI?|9FqM)t;FE delta 2297 zcmVoBH!U$TEipG# zFflqYH99gjlLrK!lV=7bv&saV0<$0q{4fN}uF9s9AUZDr$&*kz7zJIrb)kxrZ8|c4 zP>axlX-jEkSxUPzJG(P;-(UQ2=H7YP7YahxCz;I6+NNbK?q7l7AJ&%u8%oZCUOG+blU_V2_l@CEjwqO;|_Mc zPW!ES6r+UD1pd-8x>dq-9D;Vc_#@RY(M$t>c?JE*OWCfS`__be<@n*EvsP(!hj)DP z+H5U#b5&=qSq-a|>QxNOqVvvqR6`@`bO8z#gH|g7P!$!g*`hK%#rPF}(*!FnUZaKA zXrX8-8a}FKp_@i;_(0L+z-4hP-8zle1$^cBVIc(A78p8IEUDMC*UmtCvt&696L0J>$O7$#{LpctkMI^*N$<#Mh4)_l`&98^;$ zSaC^1pU{(Y)1IsmyB8*0_QngwWo2CffY0Oy-< z@;{KOt3kJXx?O;Z*?Vq9H4Q?~BMrmeyfg?~Z7S1KBtb~zdqw26>NSFPm(qBJB#20o zxEFa#Xr>N8Z=)={=`g3w_t`GT*n;?w9^P#Z<%@(}5 z01bD2P%TLl!iM~F)wT+MCGA?B*6A~mYH0Fzqc<-bO`Mq--M!F=0E8x_dR|btuxeW* zK}6)an2tj-GDk)Muihrr+qP9IXBiSOhx^H+cNOp6cFPmoe|I3CEA@0~Zxjve~PM^^f*rQ)EA?zmF0Z5rxh*}8D8!>P=-*D3{nC_og$N(bgIz;myz zt)^CoTZdEjKRnC54;~Mm(dR1Gt56%4bFk>gItn&U9HVjK7ywT{^(H^QKPW&=19T0_mSA@K zAu*Uc&%Nek+Gt}lm)AcM!1;F@2y$>8&vu)FWAnXUMRqnbO z%PG4gqiL-=tm3H!a|mt}YWvopc&^m1MeqX&YL#H1M%g@nNJEFR-G|LbzE=Tq?*m5) z7%~@=(8_3dHSh0hoWl`O2FrjU6+A`TR3-?+T_QF zA(xh#ls}?8nYZux(Dh-lC6`QjZhPdhzAAIS|M^gVQ7{Mx@XzP|4Ve7&!Ju%}uAkxh zQm9eSyktras`;;14vJ=PnPit>|1T_l{VQ2oZr^!(0l1!WgMhh;&1HD$^w+adz~+TB zn^Oz~p{z4czYP=PBWfo{hf>G)?mUV$C08Ih*r1!PbYQWS(O4dCXW`sgcJwy4E;(e` z5PbfBb5hN+1!vzGt#0JEcV3p&)>K;5seT|6zu#jW1U&xsY85xNtScLWy?buVPMtg` zCLH+Mw>)OH$n~YJ$1^wkZI>*6_^fBkiwDJyD`Bc8i|l+GWO%nux~3OM zxX~QHaPBPPD>n$Gw@ZIj(O!7*{{r-4JZY`qvT*J!+4Wx%s;UvT+eBf6VU;i(r@y(Z+7`-x z^MBj4GrSKvzzgTj%BZ_%uh4W2>#|x6VEL_gnr6lBoy|mOLQ~~2!R|f6s5+>MO4#Y3 z+7_y!qV~dE=y@crSDbo3WC%?|H%zHyzE|ouTIiNZ z62_#7d^q1E28hE5&CrLyivt}+B@QE^P8X|IMKuk)Mzh#;kKKTL5W5!|#s3&php^Q~ zvrWRbi~aiX4LvHk?h8U_3WjCjHJ8wAi!4rihe|qOr-No&D2j?+wg_F9{|*2Yn*B`p TBF;If00000NkvXXu0mjfe%WL2