From 337a15be936f9610e26a5b75dc667c9bfd3d8775 Mon Sep 17 00:00:00 2001 From: NovaBot <154629622+NovaBot13@users.noreply.github.com> Date: Wed, 7 Feb 2024 18:55:02 -0500 Subject: [PATCH] [MIRROR] Fixes Alien Hunter's Pounce Visuals (#829) * Fixes Alien Hunter's Pounce Visuals (#81322) ## About The Pull Request Currently on live, when an alien hunter goes for a pounce, once the pounce is completed the hunter will rise quite a distance slowly from the floor as setting body_position_pixel_y_offset now is done with animation as opposed to being instant. This looked extremely stupid, so I went and fixed it. Initially, I was going to add some form of trait to cancel out the smoothing effect from a shifting y offset, until I looked at the sprite for alien pouncing and realized it was 96x96 for no reason. For reference, 96x96 is the size of Bubblegum's sprites. So, I just made the sprites 48x32, got rid of the unused sprites (sentinel and drone both had pounce sprites but neither ever had that ability iirc) and adjusted some of the pounce ability's internal offset stuff to compensate and it looks perfectly fine now. Somehow made the image file larger by 243 bytes according to Github but I guess it is what it is. ## Why It's Good For The Game The alien hunter ascending from 2 tiles below where it actually was whenever it pounced was incredibly jarring. This fixes the problem. ## Changelog :cl: fix: Alien Hunter's pounce ability no longer has any weird offset issues once the pounce is completed. /:cl: * Fixes Alien Hunter's Pounce Visuals --------- Co-authored-by: IndieanaJones <47086570+IndieanaJones@users.noreply.github.com> --- .../living/carbon/alien/adult/caste/hunter.dm | 4 +--- icons/mob/nonhuman-player/alienleap.dmi | Bin 1560 -> 1803 bytes 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/alien/adult/caste/hunter.dm b/code/modules/mob/living/carbon/alien/adult/caste/hunter.dm index ed39fda2108..51d9a3bce1b 100644 --- a/code/modules/mob/living/carbon/alien/adult/caste/hunter.dm +++ b/code/modules/mob/living/carbon/alien/adult/caste/hunter.dm @@ -49,8 +49,7 @@ else //Maybe uses plasma in the future, although that wouldn't make any sense... leaping = TRUE //Because the leaping sprite is bigger than the normal one - body_position_pixel_x_offset = -32 - body_position_pixel_y_offset = -32 + body_position_pixel_x_offset = -8 update_icons() ADD_TRAIT(src, TRAIT_MOVE_FLOATING, LEAPING_TRAIT) //Throwing itself doesn't protect mobs against lava (because gulag). throw_at(A, MAX_ALIEN_LEAP_DIST, pounce_speed, src, FALSE, TRUE, callback = CALLBACK(src, PROC_REF(leap_end))) @@ -58,7 +57,6 @@ /mob/living/carbon/alien/adult/hunter/proc/leap_end() leaping = FALSE body_position_pixel_x_offset = 0 - body_position_pixel_y_offset = 0 REMOVE_TRAIT(src, TRAIT_MOVE_FLOATING, LEAPING_TRAIT) update_icons() diff --git a/icons/mob/nonhuman-player/alienleap.dmi b/icons/mob/nonhuman-player/alienleap.dmi index 7e10b8a5c5bfaf37d6d5c015a569a777a6a98ad0..551b664c1b251fc7cade17fe0a01ccfb70cd9abb 100644 GIT binary patch delta 1750 zcmV;{1}XWN42upWiBL{Q4GJ0x0000DNk~Le0001B0000$2nGNE0Od4t4gdfEa*=2> z4{$9_TBf_g6Hk=t{H;-Q3e3dx1JR$422_q{ds4i5Im23L*S2x_gcx1d?|=Fz~0O4 zPV=RvjWTJp6hs>U*jf;OVrbqEC_AVlKhl(Ch%x|QLh8+^uHf@8zAZOaW5VlwFSjni z^C62G0la#(J8|9bzx`6~Q~Ai3LjHGSZvY|S87#!@TN_T<*RNkKR#sMuot>RxeZ6qU z)pPn*KB4?4i%-jA|L*-W{<~{_ACXG=Ald-LdG*%8K0N;P>PC5gj^0Jj86tEbwC_&F zm($nGqxnqo4$!7(>7$V=#G@w=P z)2ru-k3amxr4(M@149Ikq8@(ov!iAS$5VAZm1qNuM}Tk9hC;b$diYXP4`S1!eQM-O zQGi$|zj`=iesAf2eW!4wT6@{sOC^7613&<5<6-^6-kSsEvZ;a4*Z}w0G&v)UuSY)K zBSk@C+yZ!XBlNl*~(?Gl~mHbh2LB4)7+e{z67ckq?KIVe7Uk~RPo%*uu z@vtT^1vHEf-eTpCssTtLT+>k@u4ke8tO4AoS3~(wI30z5?*Ja7ade!}OAQ#~s;-V~ zn{+Rsd=w5|1P?kaM3+6IQhquD<>$Lhdu}Kr29y}fP=4l#l|RXJH21an@l|0SCqtQz z)^n`QY?9dI@R*W9{v;z|q$mhqymsUWcn$-cA&mo6ejd{%iN8;rSf0w0g6JBc)R`X- z3Ex)@P$0j5^?EivJf2$qqysS(PCsb)&JPjD2PG?P_p6j2L$bLbqE(ucb3<3WqVmIe z*io3*^ODv83#xCXn&dTraGLixdB1Yp<P zg{JfHOCOB9_t|^1y?}E_+sc}fxlP73K^HuPg14-HVXQ%{!bA7DeQSg9{ev(Ee$QQET=CyRZ4_Q~98mZm7N!G}uWa z&Y%>=0f2D}f2$3B!~Q^ExwZQ-I2;(HcSTmzY~?~|E- z;|v{dq%ue=1B4V#k7CLfB2!)FQ)jW8#^AFCRV<3YvC?bVl+;;Pq`fchtL$1PmsS|0 zDYf4LI#+{->Y#?+#03mhXjhSiMLq<=GC$)m6&BP++UYw$6=K_V-jjERM5{1yYa zQLzTqVu3Zs5mjp#>_}SWRXM5Lki2|`8pHcQq0#_UWJu|uf8(MBqL=7C3pMNC#8`A~ zna==+<#C3nxX08pS#uz>PhLQoL;1^nkFKf=F=YU|;KKIRt9m2$KaDV-4y4$Bw6qEN zQ^m_Mds(a1DpaCRR$Hbjg{m=ptA}jf2?OYKur?ial*QP372LP@A$6=}>U9OGKq|`` z2j#2Nyf7b|GGJ>_X#k({n<#6ZO0J^Ig&jWQ)Xf(%!o+-fQ?DNaT^b+;TN`MEi7Ez; si{i;~F#u^>i!zx^CX>lz{$KnR2hD4?Z@jMMU;qFB07*qoM6N<$f*Gnt#sB~S delta 1551 zcmZXSdpOe#6vwCDkkQ;~Bq7&@W;XXSF}Ytd@`|=1a*0JtV&0#;M!74z&7D_ny-2x~ z%LqvduN^QH#}Cl~cQWq;mgjl~vthMWWNTO%h+G|`d>xA1 zac+Nif1<20Am_P~`1LVFXB< z9J!v{M#x@o&og=bkdMPoT=P9etkK!(rvLlFddZP6?Ill`KTCEN-c(#t`^MHOrwcg))tK#?(16m8Y;K5P9+q+7$umg6j1^h@_pt8anL?19xI zfcxUWN+NpOo?^#}5ry9k*?txLq`<4V`Z128>$=!lPn+Pr*b4OfK=|C_pfnnz>=+3rZO zIOKbd#)5BzZ>Fe?@*MKtKy6#JjaBA>Zp?km7%(1&z-y@LAO94Q7E~$Nlo4zLoFHUx zkPpx9vRLvWTjq!_374#Ui}q{d;Vf{l6NE15FjT>_v5+^l;Ca(;pqS?@ldU z_NF?|*|_yW6DuKS)nK&Q+x!jH8Ojo=IJ(8@HMFm3D$)q=-^Os~ouN7dw8E1dGR~Zu z{`lyY`7pT`DtV|j9ZqbN;E)F_sOi!i^6&P3kq>{{!#{+D`xg