From 5fd785ecbfc4b18fd23dc42d0b63af46fb52ccef Mon Sep 17 00:00:00 2001 From: Kasi Date: Wed, 4 Aug 2021 18:58:19 +0100 Subject: [PATCH] Release 1.64 --- Include/Game/Globals.hpp | 32 +++++++++++++++++--------------- Library/libAlpacaLibrary.a | Bin 7747188 -> 7747188 bytes 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/Include/Game/Globals.hpp b/Include/Game/Globals.hpp index 80799e0..e51f8a1 100644 --- a/Include/Game/Globals.hpp +++ b/Include/Game/Globals.hpp @@ -208,21 +208,23 @@ namespace Globals // 0 - Fixed; 1 - Resizable; 2 - Resizable + Side Panels - 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 } }; + const WidgetDef TAB_CLAN[3] = { { WIDGET_ROOT_FIXED, 39 }, { WIDGET_ROOT_RESIZABLE, 46 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 44 } }; + const WidgetDef TAB_ACCOUNT_MANAGEMENT[3] = { { WIDGET_ROOT_FIXED, 40 }, { WIDGET_ROOT_RESIZABLE, 47 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 45 } }; + const WidgetDef TAB_IGNORES[3] = { { WIDGET_ROOT_FIXED, 41 }, { WIDGET_ROOT_RESIZABLE, 48 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 46 } }; + const WidgetDef TAB_FRIENDS[3] = { { WIDGET_ROOT_FIXED, 41 }, { WIDGET_ROOT_RESIZABLE, 48 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 46 } }; + const WidgetDef TAB_LOGOUT[3] = { { WIDGET_ROOT_FIXED, 42 }, { WIDGET_ROOT_RESIZABLE, 49 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 38 } }; + const WidgetDef TAB_OPTIONS[3] = { { WIDGET_ROOT_FIXED, 43 }, { WIDGET_ROOT_RESIZABLE, 50 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 47 } }; + const WidgetDef TAB_EMOTES[3] = { { WIDGET_ROOT_FIXED, 44 }, { WIDGET_ROOT_RESIZABLE, 51 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 48 } }; + const WidgetDef TAB_MUSIC[3] = { { WIDGET_ROOT_FIXED, 45 }, { WIDGET_ROOT_RESIZABLE, 52 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 49 } }; + + + const WidgetDef TAB_COMBAT[3] = { { WIDGET_ROOT_FIXED, 56 }, { WIDGET_ROOT_RESIZABLE, 62 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 59 } }; + const WidgetDef TAB_STATS[3] = { { WIDGET_ROOT_FIXED, 57 }, { WIDGET_ROOT_RESIZABLE, 63 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 60 } }; + const WidgetDef TAB_QUESTS[3] = { { WIDGET_ROOT_FIXED, 58 }, { WIDGET_ROOT_RESIZABLE, 64 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 61 } }; + const WidgetDef TAB_INVENTORY[3] = { { WIDGET_ROOT_FIXED, 59 }, { WIDGET_ROOT_RESIZABLE, 65 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 62 } }; + const WidgetDef TAB_EQUIPMENT[3] = { { WIDGET_ROOT_FIXED, 60 }, { WIDGET_ROOT_RESIZABLE, 66 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 63 } }; + const WidgetDef TAB_PRAYER[3] = { { WIDGET_ROOT_FIXED, 61 }, { WIDGET_ROOT_RESIZABLE, 67 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 64 } }; + const WidgetDef TAB_MAGIC[3] = { { WIDGET_ROOT_FIXED, 62 }, { WIDGET_ROOT_RESIZABLE, 68 }, { WIDGET_ROOT_RESIZABLE_SIDE_PANELS, 65 } }; //************ Combat.cpp ************// diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index f74ec2099bac8b3be654cdd2d29e7cff7b71d1df..b3d188d5ecf933753a2ef47314b450cd3a26f758 100644 GIT binary patch delta 3488 zcmY+H3s6+o8OIff1lbo0%e@y6mUVYke84VmWew}Xg5lxrs)z^(s3a&LqJUL8N_5>M zO)NWX8yzQJKy=v zch2{H=Ug7%9rk~S)gBp`mXMyFlA6?}bL*zMb$)K0zgrjJ*1h1?O>^r4-MSaux*)f1 z`bk~zndQ@naRNHm5W)4W2#%R00W4T{1`p{eaWYBv$vdZmSx{yvq8Ctd&MspiuTc?Yr^M<^rl|3O}Wk?7IMR!7O&G8{6 z8ubrxLgGy(r210NLT#qHC02?UDA=SL41%FeY8txJKi+xCCU+8r2EMoJB9@dSrGwbEI9S$xo0 z5GGayS&DSVGi{HjavV-^xQaWY&cc8y3P zZ-rNj{VI}94HKRwnZ>~60;Y3?gs|}QBaGi1A&+KL$Av})jtw$@G*AK+6U@JBy?;5% zS<_rPANM>5hu>hE$|xbpP5hQMr&2=hh1a6Fc=4pnh>$Pr+)c5>C~4rni+_P!Y^eQo zFbDrQ%uN%k#*8X&XW<_B7uWB3Zo0MRXeH_7kBV&zwIsU?^RNea!~t(6VjS!Lij4j?F-uLMS|l*AxpW6SXfH;fG;^u zRB=(MCPciF zW%V8)$;nS{XWeAbi!Mh3YAACBpmx7(8Nb3AbgaYDhR&9|vOpV<{j5^xp=1-%9>iZj zmg?+Xd1!2sA=YI6-e$nO!hTVQ`mg56P{bvN<9Wbvuf@J^uf&#x zcP8yx@f}D;OY>HfDT=o^A}Igcn(%B)>7yhf4Qw+EEE-=!~Cwih7`GJ z%9JV3@Xzn?ZzGyWvn>O5I8VNxu0;GUsm>p%m1jvzt-R?>PvMn(tOBe;D7>=luhn!K z&MgPVg^nAHJV`Rm#82ym&s~l;t0bl@Y(DAej6|h=IC52yQ^*lqxa8>AK+Q<^?M`)8 zM5E{{`3Zo{KCSZ^eDI0$Yy=v(nIrLm@Ub!Iy34T<)o-__!`v}vyI37Ualx?7^#>01 zUU!B=N14mw-2r~q8TkGa*VG?`MN)*`R={$P0#;zH#3}*>tjb$LEl4LcKUw8zeo~CJ z8k(P!IIsAOjt{Nzj1QG!mBIK>`SE*n3*?}C|F(AiVQNpB_kSf7eeY4i$K<(qzXGcg zs|qgOU+4Uqj`AKni_fpe+JIFJi_gFE-3T4!`w?F5e$^@VZHjP-pVHKv>!3EoL&wn? zPsh=XSeu~ZXziL|I!d}z;ja5rs}K2VYQ4Xk67q8WXJ36?y+Bg=Raj5kqk62(SPjtj zXv_AibQJ%O!UA)lkrh94Q;>6)o`b@P#vjEyHH9y24qlzL^;`OwJ6bIq)GgcE-bUS= znOe_68kXLGTz=-1o)-lVh0k(B70?$uC2K6y9nZwePb Zc~gZ?)L#uW`H7uIHpIZG|2Fko{tvCWcsu|A delta 3508 zcmZXW3s6+o8OP-js9_(xmV0+WSXOpH5Lsb?U1Svm77`G5S3%^l0t$)|f+(QTR)|?Q zZK5G@3JF$gu}taNbI;lAPMG-*v%mX2 z&i%ggopYZ&8uodD)fMiqGibHx21BRHuJW?0yzMF2CqGG@QEeGR{fT0*aVvvkBkA`rdIUG$H1j=311IfY;zl^ot&%>ZYfeGgvS1D}Uy}yKG8;^I zc%@fbyvU8nVfeN*Jf1d3D~XmvkbhvHD{!_(%)=5>;CHlLIIu>{ovIBUnhktw;CbHN zb7pT~TcJDHe=~5vl^^$+hqYco_p(@ifh-NOE%YEGTY}bQFk<1PJk<0DeVOS&N*)IN zW1a_DEen1^E1iO{7Y7@&g11LA8(e$mvJbclL>e~mMzFNN&4h=Mq2N;2l1al>JPCf_ z3S6^O$w7HkNPZdfBIHbah<&jKsXi4F;OX_|XvkekbVB1D0in;c1uud8_Rz9Wx)XHh zoJk~yGy6mTN|&Q^_LPUCpM*}+4idt_;Iq&W4GUx06~n{$99eOk8<9h~N%juit2%^j zIPiN-_KBIf06ru4yg_WNtHabPjc5b zF)z}q^)_CSKm%7l$mOBur+j;rhe^sed~&+G$?K8wq&RnQ*(AU3N=@2(xmo@#oqZi5 zIg>s8~SHBI@;A68@JL zS)5*30}o%x!;9Jkl16elOkLqv5mP(F9rkW+YmfpV^t*^twG(<WD%!`n;_mxv}4^jlmky1v;2p34A;U$5jkyFnRQ5Fpm zWvXl+Mx8s?v7AMac!TdNqwhNmjX9 zP4@&Pudh?z7qQ4>GIwuQd#5tu%W`Q`>F=HQ7W&YPY3N*z zm4})9Hf>J&cgCUu{YGg5Cyrop_fzGIyt7>9A5Eb9dULD+}rV%jxNx zU-ekka9=tM_vxSQV$^w5IL0*wtPHG0SeY=cG1^L)1)1LsJB`L4GeRcj&r`;)DA5Zw z8*E?f7;ImHm4%fJgY8TGk1-!IL3fooK0G?;o%b0WHRMdxvWH|W`VZ#386{4fHEY%k z{`)olpMWOyIm^*#w4?xaSk3w9=GSXD(0`gU$F+Ro*^-$niWeK*JTnAO8*I%2#roWA zTG(_%nzj8w?tKnPu9~%|xytH`y1es5KTJG;PIMbP(OH`{7nHtvGc|0rWcV`c^EwLA zh5Pwh6j*ARkIX#=JG?)Tx2@O1EP18riVBVCb1J`o4H$1X?Rmq^jE8rpO-g!k=!J{p za(w>uX*6)hqD4J7=l#*qKbDVGfb|mekGP2D5{uSRe7y*38CEeAUtj)ly<1EsUInaXQj1)sblM!@NrLhw}juNclH|AJ|GQ?TsF0k3YAZ zRiKV4YZ!X2&pC#0i8yq}YTk&NwwVl&Fly;q%N)q|8_u!*PL6(3pBo0WGRf1It5?EEZRIo4zw?^C4Do5K?8P;lOn<}?l_wXMZs&I@A zRbo}a*pThRarTsKz=1!lNj%I5neXZHYS_=>I~VM@GEt3HgH;PxCe~VRv8T=mj>YHK zVbx*P!{YPnzrD?(k*mD0Z-bf6u^!=u^YF2(;cPdH;LPagKHh+}5$hG`KEA19m^~$J zkk}hP*vSa_`u)3_R4ZYWtO w!e4In`5E&fHK~Ycebm4R`Mjyy*BVB@gAIs~UtDPQrekFgZlTlvX&p5FA5P7W)&Kwi