From d82cc192c35cc6729330910b2f740a02d17fe847 Mon Sep 17 00:00:00 2001 From: Kasi Date: Mon, 28 Jun 2021 02:55:07 +0100 Subject: [PATCH] Release 1.62 --- Include/Game/Globals.hpp | 41 +++++++++++++++++++------------------ Library/libAlpacaLibrary.a | Bin 7747190 -> 7747190 bytes 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/Include/Game/Globals.hpp b/Include/Game/Globals.hpp index d97b9a7..80799e0 100644 --- a/Include/Game/Globals.hpp +++ b/Include/Game/Globals.hpp @@ -152,12 +152,12 @@ namespace Globals //************ Minimap.cpp ************// // 0 - Fixed; 1 - Resizable; 2 - Resizable + Side Panels - const WidgetDef MINIMAP_MIDDLE[3] = { { 548, 8 }, { 161, 28 }, { 164, 28 } }; - const WidgetDef MINIMAP_COMPASS[3] = { { 548, 7 }, { 161, 26 }, { 164, 26 } }; - const WidgetDef MINIMAP_CURE = { 160, 6 }; - const WidgetDef MINIMAP_QUICK_PRAYER = { 160, 14 }; - const WidgetDef MINIMAP_TOGGLE_RUN = { 160, 22 }; - const WidgetDef MINIMAP_SPECIAL_ATTACK = { 160, 28 }; + const WidgetDef MINIMAP_MIDDLE[3] = { { WIDGET_ROOT_FIXED, 8 }, { WIDGET_ROOT_RESIZABLE, 33 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 33 } }; + const WidgetDef MINIMAP_COMPASS[3] = { { WIDGET_ROOT_FIXED, 7 }, { WIDGET_ROOT_RESIZABLE, 32 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 32 } }; + const WidgetDef MINIMAP_CURE = { 160, 12 }; + const WidgetDef MINIMAP_QUICK_PRAYER = { 160, 20 }; + const WidgetDef MINIMAP_TOGGLE_RUN = { 160, 28 }; + const WidgetDef MINIMAP_SPECIAL_ATTACK = { 160, 37 }; //************ Trade.cpp ************// const WidgetDef TRADE_SCREEN = { 335, 3 }; @@ -207,21 +207,22 @@ namespace Globals // These are the "Sprite" widgets, these widgets' sprite IDs change when opened or closed // 0 - Fixed; 1 - Resizable; 2 - Resizable + Side Panels - const WidgetDef TAB_COMBAT[3] = { { 548, 51 }, { 161, 55 }, { 164, 53 } }; - const WidgetDef TAB_STATS[3] = { { 548, 52 }, { 161, 56 }, { 164, 54 } }; - const WidgetDef TAB_QUESTS[3] = { { 548, 53 }, { 161, 57 }, { 164, 55 } }; - const WidgetDef TAB_INVENTORY[3] = { { 548, 54 }, { 161, 58 }, { 164, 56 } }; - const WidgetDef TAB_EQUIPMENT[3] = { { 548, 55 }, { 161, 59 }, { 164, 57 } }; - const WidgetDef TAB_PRAYER[3] = { { 548, 56 }, { 161, 60 }, { 164, 58 } }; - const WidgetDef TAB_MAGIC[3] = { { 548, 57 }, { 161, 61 }, { 164, 59 } }; - const WidgetDef TAB_CLAN[3] = { { 548, 34 }, { 161, 39 }, { 164, 38 } }; - const WidgetDef TAB_ACCOUNT_MANAGEMENT[3] = { { 548, 35 }, { 161, 40 }, { 164, 39 } }; - const WidgetDef TAB_FRIENDS[3] = { { 548, 36 }, { 161, 41 }, { 164, 40 } }; - const WidgetDef TAB_LOGOUT[3] = { { 548, 37 }, { 161, 42 }, { 164, 32 } }; - const WidgetDef TAB_OPTIONS[3] = { { 548, 38 }, { 161, 43 }, { 164, 41 } }; - const WidgetDef TAB_EMOTES[3] = { { 548, 39 }, { 161, 44 }, { 164, 42 } }; - const WidgetDef TAB_MUSIC[3] = { { 548, 40 }, { 161, 45 }, { 164, 43 } }; + const WidgetDef TAB_CLAN[3] = { { WIDGET_ROOT_FIXED, 39 }, { WIDGET_ROOT_RESIZABLE, 45 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 43 } }; + const WidgetDef TAB_ACCOUNT_MANAGEMENT[3] = { { WIDGET_ROOT_FIXED, 40 }, { WIDGET_ROOT_RESIZABLE, 46 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 44 } }; + const WidgetDef TAB_IGNORES[3] = { { WIDGET_ROOT_FIXED, 41 }, { WIDGET_ROOT_RESIZABLE, 47 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 45 } }; + const WidgetDef TAB_FRIENDS[3] = { { WIDGET_ROOT_FIXED, 41 }, { WIDGET_ROOT_RESIZABLE, 47 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 45 } }; + const WidgetDef TAB_LOGOUT[3] = { { WIDGET_ROOT_FIXED, 42 }, { WIDGET_ROOT_RESIZABLE, 48 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 37 } }; + const WidgetDef TAB_OPTIONS[3] = { { WIDGET_ROOT_FIXED, 43 }, { WIDGET_ROOT_RESIZABLE, 49 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 46 } }; + const WidgetDef TAB_EMOTES[3] = { { WIDGET_ROOT_FIXED, 44 }, { WIDGET_ROOT_RESIZABLE, 50 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 47 } }; + const WidgetDef TAB_MUSIC[3] = { { WIDGET_ROOT_FIXED, 45 }, { WIDGET_ROOT_RESIZABLE, 51 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 48 } }; + const WidgetDef TAB_COMBAT[3] = { { WIDGET_ROOT_FIXED, 56 }, { WIDGET_ROOT_RESIZABLE, 61 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 58 } }; + const WidgetDef TAB_STATS[3] = { { WIDGET_ROOT_FIXED, 57 }, { WIDGET_ROOT_RESIZABLE, 62 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 59 } }; + const WidgetDef TAB_QUESTS[3] = { { WIDGET_ROOT_FIXED, 58 }, { WIDGET_ROOT_RESIZABLE, 63 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 60 } }; + const WidgetDef TAB_INVENTORY[3] = { { WIDGET_ROOT_FIXED, 59 }, { WIDGET_ROOT_RESIZABLE, 64 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 61 } }; + const WidgetDef TAB_EQUIPMENT[3] = { { WIDGET_ROOT_FIXED, 60 }, { WIDGET_ROOT_RESIZABLE, 65 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 62 } }; + const WidgetDef TAB_PRAYER[3] = { { WIDGET_ROOT_FIXED, 61 }, { WIDGET_ROOT_RESIZABLE, 66 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 63 } }; + const WidgetDef TAB_MAGIC[3] = { { WIDGET_ROOT_FIXED, 62 }, { WIDGET_ROOT_RESIZABLE, 67 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 64 } }; //************ Combat.cpp ************// diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index 5aeec97faf3ebfabc6a829a2edce2741988d13d5..075e1636c9f2d69adb974d6f82919d35d387c80f 100644 GIT binary patch delta 3694 zcmY*c3s6+o8J0)HxKGwy?!C)vS$9DZ1s2_hvdGH?1In^0Cs;vTv6=I8znfn#VNIkR1CiTnJW}Dxyq<%ge_)N zEEF^-qg^!NKdEfB(1iILWkQlj0CG7udvuY3>7}as(oWGL1L>Po8mY*s$~YEQA5ay| z8g*ge`b|}IqM%{w3$l7jC#K;0y13cN2Zs|H4_8#R;za!CFaaclWu{y!@~QYtGmS9R#EX~LE%H0lnDdNv%|fqcsIo4R%3Y0OhRP2bSzXK3BR6B6N|nH z|8g=-EYWEmiM}K(;v@@1oLHvm5Q~Bg1jUcNrBUTe209G~gMFG3X{X3S z4~xFn{5vsJC<XYGHDms;+??>cU}^Vii2Ou zv_ED^E`rwk=4pdOt*ty3|I`lcd1)J%IMl6uE{bL4-#aa1pyvmzHlD=jb;&sxj@Hee zLs7;~1@6$1i9dFFWG}%@%N7Y1`dv1WIhy|&L*n3;URNv4GDlxLTx1*DR#1r?-jam?>lUBg=8V82Ib6SeJ$-CaDaDSLq}xS;HMAR@LU7Y0y?BZz}dTeSF%SVW|7pC1| z#03e@L4KIoBHliB@o03+GP6=?@Oiu7HkU~;knkL2mzhnX@Wf^73iFVh1jT2ib)7k6 z1|}ThNjTJL4jk%?M@WD}os;$*rx(3TCkMPs6A`9>cWKhGE)oirhlOO-)M_VI*Y4o4 zx`zv=UfWLl@3}oSu;=zPgk;!rJH>pAEMlc^ZBGrAvWYizp2g5AxeIsa%!`)bw+VqS z1~p_vkYT9@=vbEGL$D;2znX(-OX&g1{_g_i;QshpV2xa1DfVvXs!AIZm?QM7ZprqKOkc;BOpNXVa? zn;5OIlUxVTr<1?4sJNW3g7ul8ug%SFm7-wbn!nB+V7Mg8-a`Ht_Lxa)W%n**i{7QctPKxio84jjnw?B)~> zDo6$&d$mvp9TlDosVYM2!Gp7&;Qt6cZ{g3>>)C)379cD{ScFglN+_M5O|3VNlm?nd z79%Wy=8-bbRch^CUwPnO-%^AMxYt+N^(}cW+?XGK;(ehFlJjksywUvS&%8Z+?PYHa z|KTNXPmme2;J@rm3l7r4pRRfv)j*k>o3C+`ffmz*8maa-)8S^b9FsW)>E%Sl=f`v5>*DYklaiMtxYQFg1O< giV*k$scmaw(rMy%7n(xEF@YXL_yN%Uw5i+qKgBKb2><{9 delta 3700 zcmaJ^dr(x@85bl_WnUo6y?1#n>#`uA?y|tL${L;v2F2Y)g`lvAih=3|K_XE)6m{Kc z5|xlkCycIdQ2No&;4`f3uVHNHkInTo~{YRF@JkZP-u)M(G^cJK6$GV>dDf9HFh z?{UuA$M=RNK1S$`4>wyaW?OEL!EXrh8$$htiGD+v-|&Lp5bifb_zgeu8z%V;laCl8 zKdK5dTg`S+qt^5AtSZuw`U3uL6GJYw@!;4PdCAC#LZ_Ak)Beb_KSZ%;?YX9o!m zZa<7Hni?c{D2!EXG&91T+AhEir$Up#h@Spt9wOQlZ?+O5Pb}0%^YFoK#kS%g!9k5l z*_0wDZd52A8))QaRk8s0eab~M>33JRQ3nnClmphF0uLE~RsNzZNChl(~;f|C($PR)b=m}+yDoJhH=O3kDMAc?atvc)L1o`dXa^*w`}$lsuj zrrFICiA2i*wQIIq;%_(AiBe37dUWAw#Iz;|fQ z^Td!{T-JqrKij71tdJ8suWJrd-$ajxYx#0w(cP%8r^$(zwb74g{B{wgkb{?m(#`Y z@oFA^XpFt)VFc;X2S;L+Gv!3wm$9qxv|$yJ!1uKrm&XW_z`^<4`wQg~I}UOaaT&1+ z$>_iZt{+bu2^~-UYY({3RtE_lR@L)yc!Vux3(e@hpYfe_j3C`({hGJh7(o)WB~h3` z6J!wyam6Xzrfw~C>Myqn-_pG>;`9AN1nv&(#f{nro_`~p3IqubhFWzhnlTG*I36bM z*6pBKM>d>Vbd+4s%`8TxwV1_*@oEA7t&02eWM+b#Xg7tp%GU^yCH{S@PY9Iv#v#Nb zBp@V0d2iBVX=^B>9Mp~_xm3&q$=6?=COMM@M1=gy_BnxkIf~7l~gtmUy}^+HHM;zjKqx@*to=iFcmf~F;<7k)yKTX z`Xok>f;4vq1uORyk4Qwtk9F zZ;Lq_&oCcwY_=j~BjkW%bM6Dl0l9E1Y__$pGHG-+@qz1oHn`rG_gy!glwNfH2kx2d z2(u7oBjm$9lcQmgq=Y;4l`hAepGXAmu204tw9su z9BR4&))jzmRY?&o2kI1jK6c(I8REp=&{BmmQ>K%Sb*74~b)K;QAMzpbgI$gu@uPZA z$*=WcrHxWjvF-e((sdPr6beq!Y?%u?4a>F9?uYjdmA-y}sOI3&<-xkpdBz|ZnK)LR zCR0uO-(;y;l8(R7&IO}n}*+{#+ z08Ie+j<|jvCzxcWGh`c@hBtHwE?sqrE16YtA@$hYRf)BaxKimdDj1qEgr)W5oS79fKTv5uzt_v1gAU zWXp_5F<>LPu&vHh)Bvh~jK>Okjs z4Z_RNIbQ1-B%98~FA6U3)x{+UOA+eetBduA?z2VIa{?Sa?)@PqBwXBn#hV~rz3e?1 z5{o}y7q?yUCW8N}*BTn4fx;0=y71O~^JAvD6^*mCy`wustQ2o#-Lfv^&x35w3G8oS9B$-``3 z-zy$^8s^fM+Hr03C%cG*joyK~`YRFC7XxMsIZgn*J_1F%;qp^RtTM z>+8u@pU=n4kpymfAs55rl lZ)OBhS+%``!>@hxI}-OC2Yb$UgwZnq5xA*NJn1;$_z$%C&&&V-