From 85564f45d01fbf46033cf74dea8c5386ff192408 Mon Sep 17 00:00:00 2001 From: KikooDX Date: Thu, 13 Feb 2020 13:46:28 +0100 Subject: [PATCH] Fixed a glitch and modified elevator speed The on ground state is now only refreshed when the player isn't raising, holding the jump button doesn't cancel the on_ground buffer anymore. Elevator substract twice GRAV now. --- platform.g3a | Bin 53876 -> 54004 bytes src/main.c | 5 ++--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/platform.g3a b/platform.g3a index 4d2a072c9ec423c9577c47d17caf9844e76b4adc..45d3e1dd8db442227d3cda94fed9c12f640557ea 100644 GIT binary patch delta 2542 zcmZV=Yfx0@^?bV^yWT}v_Q4{?T^?E|Eai)$NhUPhB`8Eu79@sO&4SBAAt@N3YK^;z z_=rG}euh9olI@_u$uPm@VoGQ1lo>Kj&2*Z(!hp4Ox=T_szp#FooL#PdxjsMG*3MT`|u-Uu9%* z#Gr)h3!RQx<>s`_LO!XDWDXJ`TwQgv!c`Haii)?RjT>lr{Vhw#+Jf}_EvT1W(Tb>B z?t8MD(`!@BK z#CFm^{On4@$Kh9jmL>^Bht4V#24FLdZ<0EpsOe`4GR4M!TCviA?q8_`s`oJda9^xX zqFlk?0?_<2pm~Kr_nrs3$H^WXE|479k7Q^u8YzO8hk))x;jTvJIkL_*2dQ7)h1B1t zPNd%c2gyt5{C4U6Q13^)T#Q8up8 zTHJCA#Mfrv$0y5K1L^w0WaK&1WTjFpEe|y4CrfTaYBbNyfVbF&@97oh#Qb;SO&tn9 z{8A6-1vo@2P zX||}^75VqeM;l0;&YP3oTNN;Co2`{&HqJR}QRUxng#)AFOSi$Sodstf&s7S%wgW9Z zzN&!u;w((OxWqNI5|?M%*;f!q*x0T(6!d^Ov84swM^pv8TcsSEO-(w?GP>oow5g=m zN<7~D6E~@UYPPU6{40@in zs1zFLw8gH-ZY+9>o6v8ZiUZFamT94$_(_T<-?TI}lVO(wNeSwh?YK zKCaE1f!d;Q7>{9QZ_Vx#ORzvC%Vld<`Z>>WXP=*YJ_hA)V{;0tN4q`>_21IdgSA=f zwI2^UzpD(`xF)N2_v6X%=7#8vsFNh_m^~;b!OO`-_=tCVRlx0P!On$BC1&B6G-8<} zeenJp8OQQAys`NDV%=ix;=#oOi@?<^LR{V0=hLr`O2u>HyfhJuszWioV$cZc!6a-% z+QgR0EmFS^DhG|Vx_DE&&JW@b&*w-}g`PEj$Uoui6H_XMhTufXQT88QXQ_ZK2D@MWJ-02 ze4-AVT!+Ra8~1n3;89S+x7a|eCAQ<)VP5VBp3LQ5M%WyWiSI!qF((!n%*Y8ZX^NMQBFbi~wy$CAN5*ugw^aSm(woD3?XK;=(1$ zDNq-uboqdW>j8p6pv5Dh`;HcU1+?fMuJs5!0?v>=2k{*QyvK?c5HO|^9G4Q*DcOi% zMMy))LTE&|@DSV<#Fr6nAfS&@4e}g_P4Y|@^#U~(7oxKogfm_;2v`fOMsY6_-{~Or zg5yLSAw%p~OLDBw9`GvvKw818uqDfCF_+NZ$3|LWNG`k4^0!!rS2+u!@)mRvKG_)! zJ~^KR2NO?z7byaL1|xdLj^Jh^r@kih?9Az8GA|6BRubZ7!)G!gF%9YX#EeVFM+keD z5n^TCXA|*#^=!3zDz(|KNv-k$n?I{(e5;vE369oMMSNMCQSSu09c!+~6t|BcZbR(G zx+fv_u&MTch9l>>8%+H9ECxK>@h0wRJ(nGx4)ob$!r^oHfx5%ooxdY^ng1dX>p>SH z!uSyO6jefMh!{ZLY9*Kayb`Pingq#mMmaOG%VPXO zZv)_|1xmw&0nZCcw7JulNV=Kk!hY%N=tyFX7yhlTkw+`-JZrpIO={TG#h>6i_tXAZ z)X|jzO~V;;U4_s+|YGKNZwrk;FK?BFiVSuhP;idA+tKgaOX98I723 zoEu?5mN^P#y!9|nj)-(kn=uAc+R_VjYiK(>kLj|G3D2qNkLcTAruZe79%|_hVE`4{ zWdV)H5l+Yw?7#jrwyHD-ZF837sJkBb{Xy=d^)eyxX!3H5%Usmo_yA~%<`IK#u!m@g Uzx*K0%DgX-9M4n91`Iair|2=${6W3$_r8Gk zG5g(p`}V!v&+fi=EMJi?kI1)wdhJi{{+ELIpV)#mpo^nAr5|4M)f?ra7SdXMi431FiJ4mCj1>0MnZVF&K>)!B2C6mf~XBGIPC|V%6W! zfAx^)?>q|EKPXQd_~!4;1={9-k7zZW(F0#K1Z?(ps#W_+Y-erVTKRrX8|O7Q1T2Ae zwUKM1HTDJY{LBwW&eXG3GUV2344n4M2DzuEKG3SYTk`<)Dg);S?_nc;eQ+Q6SU#iT z?Nn`_%m*K*fK_?0TdQgkyrxEW&t&AP&U#D+4wT+Al-7@hVF!pV}B`5O#ANRHvwXT=B#KKaUkP9n`{hbL~W@ zI7eLndKB)-UxYjPRRIHcaM=)NbwqgbsseZN?&gUKUe2p4PN!;}vYgp-@K(@n$88bb z9e5C8?nr8nN7Nd7w@%?CIkOJpx>a#{I>)#1cFrTv#`5WWt|#k+ARRuf`$;4(YYgzI z9kgM1H)mmDV9vM$PYPpvK?nHA2_fH_#H&_KFm}-dkp(Iruchj535y-*e7J+Uwpy4h z8U~Dsa0aLntEn&mP3Z)h{2k7*zfxv_M)-klnE)Dx^DWp!5&MA_d^ah!CM_r``1*Zu ze1Q7iNp1%Y>y8~j4cMUJU8SK!JHr=`)!6St?U`>u#3MPkuu`rqh^Q@#$2?`2z_Qf@ z#yA>%Twc8MRMW7xc&I1T85!@}F-y9xAkJ>?=h~^a@L9)rjUhQ3Eiyd?i#aDG2Zj)K zXT&`5<~L%~i77Lp&a)HSrwtuP&BJ@O%+#f^o)A8pJvr>ovfHsvDjy8)lUl?X>4S>X zo*%Uas{#j??_}Q1#9oZ$3#>4@K>zT?=YzbLn!MJGg74@ z?uki8c}1#F!C=83rD_y>E&SrGJtPb-=Ux{Z|Lx(><5P|1v{wVrtC3^z_LzG$VaQ|6 z_@HDnYE29ir6R#(<>b~$pkZo&U=V1HA@q9D>LQ@kr;rAbaJ|NYk3=T&W~3IRHYALv zrXLAyYOW$(L%NQ13uzgjpp2(r(;=rw7*H*qQQM0;bX|*0BX(JJ5>QR`3<}tWH3~0r z113RGty;FV7i2Y6-1EXgds2lr31d3!v`W)#iKX?XRhaG^hfkSXRG_%pFF z^X~%*;!z%?nd^83(IjMse1@H3C-G6AWrZXRQ@L|o(7nr(7!}a;DMU<>a)G`8%rx}< zx;9r_5w$|udlyL@8fRd9p$*TLRxXswl2N^B?X2}Bpmi90olR)I*tfb{awEA6xr@Af zGtPuYgQDT{fe8M~`v_67?2m3Lu|J~F2&4PqqXU@LGFO^R?`JKp6p{72(zfXRr55jHsTA7!!BTe)p)@JbUY zW-C{IiQiM7j3%H>>@J|W#b`T$rNHupN@8Q#qorXOY;G~@8ZAZZsnINQlr4|GCTWGE zR}aa;>z05TGllU_W$W_fwGU;ox;bWcmuxJY0=mnECOz!>|4+?hmEq!Q(I7LA?P32N zi&~pTe|}b0I3-;8+^~Vof6Nj9+1sH;%-30Pz0-TIUk0j;%VzDoDa%T6;^H zCl!Y{Ku@nmgK!cNPU4KTR=3Ju!3+2580wmPHSsM#U+zNkOE$F=64#Cc)n3E1<9J$U zk#xGw5C>4;z9OKhSn{+C!Sm%O35~Ug1Zi#17trrZ*=y5vF6wC3T8!&zpqX<(vmdT2 Z=!-NYi~6;JGMn?}lT4= 0 && collide_solid(player_x, player_y + 1, level)) on_ground = 6; else { if (vspd > MIN_VSPD) vspd += GRAV; - if (jump_hold) - if (on_ground) on_ground--; + if (on_ground) on_ground--; } //vertical movement if (UG_CAN_JUMP) jump_test(&jump_pressed, &jump_buffer, &jump_hold);