From e995ca9de007cc5dbd978b3cbd86846609af0a23 Mon Sep 17 00:00:00 2001 From: hgn Date: Wed, 7 May 2025 02:08:31 +0100 Subject: [PATCH] blubber 1 --- content_skaterift/maps/dev_hub/main.mdl | Bin 2107432 -> 2115768 bytes content_skaterift/maps/dev_tutorial/main.mdl | Bin 4769872 -> 4768944 bytes src/menu.c | 2 +- src/npc_gino.c | 19 ++++- src/npc_gino.h | 1 + src/scripts/hub.c | 77 +++++++++++++++++++ src/scripts/tutorial_island.c | 39 ++++++++-- src/skaterift_script.c | 2 + src/world_load.c | 1 + src/world_map.c | 4 +- 10 files changed, 132 insertions(+), 13 deletions(-) diff --git a/content_skaterift/maps/dev_hub/main.mdl b/content_skaterift/maps/dev_hub/main.mdl index 2baa0f7143ccfcb54affe300ffd46c66c4ac4622..01201377bf97b60e8727b99e0094d0d17b628fac 100644 GIT binary patch delta 12718 zcmb803tSXc`^RTjRu*Cl}7o&76~- zJ$F8w$8jo^zbcID3V$zh(JFt_jIk8u4p*w5s0-$2F3d`S6ZnmrNKqQdp?Z>~yxFucif#T)6jCzC)==6eX4#2}vwDYi4dnO0KA;D0VWaAQzK(ZT9S} zIU*N-<0f;DRDSA%lQ}=N-_W&FD5@RMGDxB_Gd(r!NuiYIEQ(T#cRaZ^f7ZN|+4<=O zVukBwaoK7=wRIM^O0+VYqGB^_brC&QkdkXRLbaH^sE6O%>LOlC&z_S$`$?Od?{GhY zl?Nm0|4>)zJf68XEhIHPdw!p^g|nz#^{;rm5~?m$aUO$vsuKdZ!Gpuqx?pbB;BeKu z+^d5lRJGiPgCo?rq1+X?67(#$bZj6O8KoBw>8NmZc=!|I!mWwYil-Z*!c~{J!%-3N zcfpWg&U1)X<;Qi84(5z-G(kLa^P5RgrO?1t(pmMBvnEMp1=SzY(JeUY&z%8%M`*gJ zpC_G(ju6kbif3F-v{rRaI@%JgRd?*m-Hr-!cZar%lF_!)3OEe_FE8uMJ&F!jPmhEw zh#NChs~*}S5$f?K?h^2JH0NOqS6%0#jS;G!xfJ-@g^Mu-yR}_wtJ-++ zjJs&ms#iWIRYz~qs#Au8wO}{SCV4|V3v$~6r(%cwhRZTVs4j3D;qPJYDExh&`xX8+ zaBtJW97}6ecci0CTB{Bn#r0u>-8R|`C6AI?;I#=1xlt4u#hs?Z)tlqFKOp-)UM${i z>%VN;25vkP0hY!y!CVakmc~mBJOzizlhoZ_MXAfvEiy;x%Aiwbx0bw0T?rnYXWAi|0Q;cO0|X? z^<1jz_4>WfeWh{pqO_DZq)yzcqX%ew;K;ZB=;-Bb!+uN4jOEr>vNNVLhfi*9ALGls z$L5}DVZp`JUvr{q$ja^=DQ39tNpl9eP+dh%J%-<*ezT+-$G$nP=>*((Kf@5St~4=5 zy#A-N8=*%@H}1`?jlI{SQ_SVPYo!}2M%`xZH{L%Q#el3#7u{bfQ7@J#&In?O^>O28 zs62CY6xBwWDJg0f{J0$x#&z?A26cec5t0Zg$hA~km{i+RULfbR3BAA!*FT|;m`%53 zt8Cc;TXxBoc}$cfLv7hyTei-Y@wV)SE%TWqDPwI}wk_KTFO_k1d~Ecu+3czB zw{c8DcTbVE4_g`=v3d*pY>(6?j!l4C!>@S%p4jUqbeK%m{sD*8Hrg{W+-I9~2y-Xo&EhePoE~~^Xvc6>99NY%z#&4Q{|jjN{(nZMGX_Kj!kRSyaZl2yIi5;g0( zs~5XqNEL(hqyY?=5pWn#tJN|CL;n0qxH+MY*)eejU0^5{8b1BX5_&X*w->1N)#RrA z!aM&{&!jJSLvW@S2kDbXM{Z_oI_R;8Xy=13+8IlQNei2eqkp+>B5AEibGA}b4I1;8 zUo2q^m45WOl7SX`n}J=}+~I@6=dN%}`g7Ur9FFS9SKs}cT# zo}A3mbTD&gzNBvir!y~2Xlt@pLg~?K3!0e&E1zR4?`QMQ^vX(aoAxCgcq^T4U-z+7 zJ=E0RNO9){qj$<>y7J^cHn@DG_2aYa8n+b`GLud&BdNL2I}zZeVW&fc5Re!&LH7^k zo;EWBOaYEYxVyXC3z5ob+5e%XH0TX>-|z7P(v#3U=vN3h47~pO>oNmzz2`C;&aG$f zP&GokWz*;nVrMcF);Bx)ReE~5OyB>zdZys#C2Y)@ZdPY{^yo;&Ja`n&L`g|WGNahF z9uLma*GAl=XZglC1_LxzrpNuknI2c-P(D<`nMm2PMt^Uny6;RjY?_{(zPXTToSR4= z-QR(>_n#|QuE;8}XXk2W$Le{^m!m_R>d_QHbOlfeXGWEsve$XD@VIdkJ9StQ!*`!# zTzRRGIX>U)sD$$Qv!^~XUd!Ux(I>As)i*UY*(+_9It(>#&xdQfZ(;rRFivj>4Gp#5 zAn7Mk-i+J1GWMahpLOt`3z_&mcTGJ9mO1)|@=@;S<;9$-t$?Bh7_MB28UE8AU={uW(aLZ5~Y? z6vH%*2#J~x)3^+z0~qSzDlF(Uj{ol21ab_383D(VL8#U}N%bxSw`8Fr!JM810Ysi6V8H-3!3A9#5#P;hZjD3cW9{n5rb7Xmyf%Fy&MrX30u z_Kj+!jd#Kv0~a+%>P@#ccDJ^DelA6Y(vB zXM%vE3!Xc7PWDXRsSL2HMr>mu?yhH?={-F?W%{&N>xAEiEoYOr4Wd8p)L+=J?lL{5 z#M9xanKNhF^|mcF-iP2DNL(2#fSB0l4y7Ml3;eA!PA{_@KRSf@tV^))qLrAQPkqi& z_tj`!>hkDJzD+E(hW6BDeJZCyZHIf?4_OEpj_Ns-hWMq-8PpUGx9j|?U9?t z>boV(Bh_Dy6{2=9evN%H%q{oaD!RE_YvAsL*cH|*_@x&BI_fS3w?bLljWtU0p zf`#2#tS1%AU>Ays-LYk5Wim(M`OtlNFS;V|Azhz8g+#5;gcuQURN>5-Gcp4kF7*)( zZJolt|DY#}^`v?Q^w5^zeCC8^6F>c#DTl~|RwOJ(sj1F|Ui??;0%78s3G}wVUnah< zKrcqXF|#WdX51^C=~1tgo;Y5P+KtX&_EZ_^gOfjS*vHG!_iHsBbVx*8%V7eu|M9vmEX%Cb8&^ct_7yvU;IGm`g2Oh_7OwJKLp0JBA9l77J+ft6>yRYf3 zdG8M7mxcCYo#|a%TN0%|jH+K6^H?$h}Uw0cI#AXBuu3C*plCgV_4a0_q@>6kht~{edenE!QeQ})RmoiT=)rFa9Krg2c&~AF z|M&U5nK=$OpeaYv?|t-^;L*JY)A@0NQ@zq{x!2AKr!H)?ES?gp(7V|>8_YChK$T{v z!Sl0X`b7FM`eF2JN9oGN<#sB=e0|-8$!o}Dk)DiP2Tu_Jhk=NQ2$_F8uC^0?9|Q04 z`ia(&S(WsF$o+im#yO;63CtD<2zCc6XA8W=`v2+^Cj0PiBiadTLMJ%0Pl}6Rvxr5u zH}=+K#JDg%9-RM?+8HK5#YV*|l!mIxd6+%Q@+A>?ct zJTn9wHBc_Yc!TduuPiXs{GnjowS^tKzrXOHe2L(beAPI!G{l*G;-3!7FcL}4k^v&V znD__$Kwo;dh2NDl-1cIEfTJ%cxAXYD&6!^L-ZnEuCk%FD*|=N%tZaP^eR%l$e8+}a z&g>H%yw~fHh)5wl48)M0uE-iKWKXN)2L*R04N7oT4EiC3qafvO9`8&8|0kJFVltS7 zjyp)97{Eio7UNTpd|2s8^iMQbc9|Z1X9S5719%vm&4+3rz}N@C#*G_ggCEC9wr{^o zXYBl)o)aHKQo*7b0fzzQ;Kz{~XL@CU_(i&Ye26h2ZxFMgYM?XwWOt^fgW*4jq!}1j z0_lku$J8BNx6D!>-;-&%9YYe8pd5f6DPXH5#{VAG_7XC-?J;Fo4Fc)hio^jiV2$0q z=!He97=FR|2!_qbg+qWW?n`rvOu%oR56qApu%LSj^J%C1u`Pt)tU@=&CIMH zlw%r{eC=u;$5Xa82 zo*abM>E7t5V#Z`nVJ3HNCL@|SqUbtAh%1CL zTLJyI-xW5VFc&fI+(Mp&%>#ePi1-~shlmsq)yL@rEf;w+V`?~HB*)>+N=_aCF<_0| z19%_68OS&p)*wG&|OO+nGfdmB_oxf5P%UWoQ>C3 zL-E-6*-Y8i1GLMxjD=_y!jr_r-V9}E4o6L~o+K53_d1WC&akQnbk#S_Bx)f{QV2NS zPf&PJs??bFMyBG(RQBVvw;5-8Ww>(2=E+Q6?n&nMCu7(d5Hl4ZX1Wu_OwktV1*rfW zer%UKm$`ED8@k4oa=f1?+lVWK^&|}1XvW0uB`8KVapSPA5BOvh_@wxoW`_%uVcmch zqcCgwI(Bs8U(Aj!lZ+J*fo(z&SQId@MT7848^5iDVSDG8-ue5Xg%pXgNg2_KeO6Ay z5%s5Eu`q4*Tb7hJ2ivv)7?dx9E{8!B>=Vk@FcD?Qlg`sX>m5y{4^y#Q_K63m*TR8{_((I-~#J0xLZuDCL{j8rKT3(p&JMBSF zx9xRxh)9pZh`>{8VeK7lI=jY;-H;G(9df9E`F6l+OIn*1@Nq~CUn3&LUt0lvl1mUnlc6$1gad!h^vWvXH}ae27llL9>gcyVZFcOkk$tke6yA)mh#VJ# z%`zf>9@bYD^%oAkXrU7gT_M~BA#FJkL(~SWvG*qww2|gG9Dm*vUn2Zgq&Iar-JX=2 z!95r>05Blncmhg`I11Fad5N&&_cj*ya{=Tk7| zcjzOxT*!8avg;9mT^$6q4Vc(XDtGEQG!(scnD9$b9Gx|}D@k1n?Z$urFe2a>6Utp7 z-us90pI9zEpUu3LypJYDP$wNCByky38v&5OBXvK2y*K}^_C9^^A-S?l(-WWjEQff| zKi8+gh87;V&Lg9gu3LPMzAYq@!sSqL47MwQ7(38)zPy+on*6`C%Y-Cy78GU#96esS z%-}e)Grh9M<7KR6!&3U#iHr2}d#5_HPyAPCIvAaal*>J?1lCLYTHVfz1DW%ix(ny{ zcZe7fl>sqksz-_^&t%l11;UEK)99MOr6loXkRU)4F&b{b#NL&ZpEdD=uk=h2iVBT% zLfjY9zuM4Y&;Vt~z*PW-y2wnSY-B$DcHhm8DdFE0f%HVQXhgta04@B|FvoBDGj^5= zZg&qD|L{6xB5|+4)FC5ccQs&QZ}-0o;#=MGn1LZW))DrEu zq*~&c()6R7P|^3D#-Fw&l2kF`j{yN-M8MIrl#|h$;a|}QK1mTe%>GC?k@BnM+MyDm zX24>TZPAev@r6)M#DyvE_7F?6>LsCRoGU}baHbKHr-d`|X9TR5Ea+BzPMJO*F<1D& z?*b{WfVN@Kpai}vLDAl|gXQJda|COLS~3!V83Bhs(Mlruvq!iO|99XR;ZEC44Aws_ z8jWL^@6E2U)LLc;FJAc7nSHW)CB#*bh-?>Yg@EHOWmF#5>g}=cFDwV82urs9NdGsr z!g_nZM6DhpH5-2?aCU>TLO!d$VSM(D;g|RGWA7P<(q-`l!nHH;L~=X^WEFH|1fE)D z+{Ck|sY8GIqzI;^Kapc#Kqmt*GZ_$YI88aF;`QpWIZrtI-3GpQRwF524HhwI0ANPI z@$R4;8aU$q-IK2`_e1~r`l5`uwyg12Vg)7$0%1i2hSVD{U7kNd!B0Cd?uNc!zT+J2I5B$ z8IV3|JiO4xw0nPvFm9_0yx)uQ4jFl{LP^AFKsR806n(EbUU+S&2XS2sb}@(oU_d~y zcUGlW@n?ySJqPmDvjz&M|L9AOi54-quLKRSi_ncaGJ=os++%rR&|-46N&$Su1s^HO z3)g8NwT0vgNejshk~<_FBt4{dkUSu@hvW&V1Eh|SIyDro^O|;{VU3^n+BUtzVVGTo z6ancPr0bAwK>8WdO-NTD^@el{QXkSU(7S=GE%kOGW$*fGNm-Mx3t|1>lr4i(tJOck6mO}?I_MLfOuuCEsfIP9e-w|07al5SOSb=+aNFyv!jJ*hha_ts>2btYxo!PG_Z zv`m!LNs=Buo}^AZy(pe;+2!4Xmko+M9K3tSY(9mjW9jyvFDAs!rWEvVpu4QM`M;BNOs4W~sL6U^Zw1yRI{yx%^-Xu(&J zbJXD^8Zahe;tNRxBiy2m(I%E z|IGYnc5d&s!@hxS>8WPD@)(900}8Wyg#^`W8HR;INolbyKc@t8u1|~I6vD>Y7lefQ zPG^{r00TjJ%W^aFmXu}}+m_@KyG*-1gzdH;4dK3GF3npe zRlsG16+L8wxgIMD=7JMj(i!G4pw%E^nQO~gG1w^+oxw01@YKP&f~*&_mzLVf$$+~v zP(BAT-U-i5~WVnuy2u^SMU;sSr5bg zS}HXRmd2tDQzKCiSS^-vKSFL7$$34#)MfvnRH`2=d7${GB2o2I8rCS~jzF%I}VM2s=`8tNV1|GjmM9E18t}F@VL-HVrRHDu#4I7WnC&h4WM)WV>1tt`3 zG_b!!vy3rp3Mw{c zxJvQJ&m4&|%^KDw<+htOT=P7%e@cXR(;Kd_AAS~{GaIa+>ci=ew89h$Q+hMkI5Eu8G1 zMiv}CK8zlQ=lT@3on6?dMwwZuUL)Yd@Q2X{Y&@M+dpe5+ai9?(kM`49stX#+!gFtn zul}`7uodkSeZOBPZcdw(w7i(%OG7n6Nob+)2tI?3UCHQ9ak)pTIW1Hrv&Yx+RAYT8 z4>)IwYMhn=JZ@O28Y?Fkfyf$NfJQ#YCw$Cje6-uSJn#jaQmz2CTNNNGR{^X_P)op5 z`<@W3R=6^P#|hh^4Gk^;&{9CaEhMlM!B@ep45;%JAc25~b>sLqJN$&Tzn+V4 z{Z;|=bqau?Nfp&ZaBl#P<769P-7CjLb8wibDywrw-YXH`8)fKZ$2B_L_R0;@w1MgF z`|1s6!RS_gIQxeWAG-bHGj%FIAIb=;cfc@dU@cI9C;-|`^=rhN-}f31TuOpZ6+F`&nNGXKA zDbR(dr=Qo|%MzkK*=BNw5^gwmXry~D^=C$5^Sg`9zgy8PQ1&=yC-gysTO>*} zxBwQ~s}T=6KQ^oumIqm#u3beD9EFr7(YY`e+9aU}+|mF8(BAv%U}wkWDq+OGSrZQ2 z1rd=E3lJZQ;BTQ(6$OT-yKC1j*>uwwf5EG_+Weq9zWc_QYy8an>B4RC;LuJ>PfwTG zTP7|S_Vn&H|C4DFhqJfYY;JpeW|zuOOB>;9WaTJ=)w^M~&Gq|uOHrtBuQd@TC_#=A z=t~q$a>(60>$L)5+P;(gp86>!e36_06v5U#5Dp3qh2z}0bME0vtKS*oFEl){#2o#C z);yg3&6_u6_L+?fg_7bAggfu04r?D16XUiIlR7wZc$?6&?M30^+2dpla7zg+D%~Zv zU?qv(qZ(VqhtD@|{#%9cZb8-17f4i8l)D?Lm)O5liH|z>nio&66o#|+_V$+9hu$@c zS-;+Co^AbcSo_PDFT3rlqz=pSM#jk_!bHQE z66e5Gv*ZfM$&7Q zHXS5Rzkh#{sEs_u_x%u#t*?M%3JAFG6=))8Ex-&1m)OGRvRAD&# z{{DWqfBeA#c$%S%@GTgpkpe@#3=9moTS>kADX>rc_na5a-Ys{8)4rR#kfBmI@u-N$ zf#g|`A~@w$h%pT+0B9+|$ocB)vfBLFwy!NN^A^~69 z1~HeBO6XX-etjuF{oY;v?r%wRh)PkV%@l6ee(iioKZ?iXnaqbGSX~YCrvQ&Dl_pZm`bU(AVq-ji&{BgB zy$<7|0eNtjft*7MfR#YK4*I2hz;kE|giJBN{-!2f&dfhXr#vjJFTEHz0^oJGT z0=Sh~d`rN*-JBS>|5)d?(Ti~fX+ncTN??VjT_a^N6y>BH6=kbYPn}Y1U=j4nRu* z`1&E=a}>c9N0cU(DhM-W0t*f#i6$lRTecW}%QiMP%H|ue^@yj0X59^hyC9w~$_Cglsc8AxCdgL_?8y_nQOG5Ov4Ulbwf$hin}5p+ec? z+G7wP8ngqbqQL*<@zXJr#pIO{;-jdRp=TQEn3C=<`WPI}o;n7rqz1)zuZp)<*NNqo zyM^HzWM^l~rr7kgXLoC_Ra}qG4{P7r+A6a@+W(fbFno)1m3W%}UD`L!+9M0a4?E^M zi$n43%ml@Q;;g^(}>M1_)hQ=9SwhpZ`41?iX?V+OO8(L&S^*SC!xpw4*I*)om(} zCrAy_fV@E7ARmwx^cZL)=w~2bkRRxA(5QBGo9=}#@QIyztv`9Mppv5RdP6|U48Hud zzaDE71Jbd1gU$ozCI)D*xnCcLpFHQUW5clhwmu5?B?f4N3}7AuiUo}aMS}<%kDEUV z(BqzdeIPbZ)a%%I+}x6}3wkj9O5jC9i0R$eSlpPwGgS(~dy)D5wPl|Ee>jO!CJ-$3Z6s z)e7m!LA60j>Pg*6yhPBC+VcWzgtu_lyRfF$=lff*?-v1axSEHNn%BUXH}&Z1YaISH jj({46zQz$);|Qv81lKr1Y8;_8j<6a>_$kNej^qCU$cL@% diff --git a/content_skaterift/maps/dev_tutorial/main.mdl b/content_skaterift/maps/dev_tutorial/main.mdl index 79f458a2f7bfe37867bfa6ce1049392399ba1343..2765056846aa4afecdb2003348a2f331c94c5cb1 100644 GIT binary patch delta 1070 zcmX}qOH30%7zglgwq0nI;-gAy*Qy9=6-B@YRIL`D9E`z)lL2dOw{*3X+AeK1nn2W4 z;;T4HdoeL03O7xOcoR4nz3EBgfp{byl!GRCF!4VvagyJ@{@>2b&d$f|i1c!BM9S7W z`fWsvh!T2Si*_e)Rca<>=%7P>5+n)@b=f?wB#{+~9eRQhUyol`w{E}p2 z{d`bT_T_U#D-jzZq(xL8#@6)9zPK8qZ^*=uA`?@JXbB8hY703&D>)ePKj?%;iH

IBToaEw!JzwPU=RXH#^q)bL93k_bO|7?24)I?ehE*d*{}tGoQbYw|c@) zr!V|4w7z{k=zTZ()ywB@=yEwZi33l?Be}d z6Q3JyU;(}+*K7%5B4UGz1?=QqxjKvZaPdU6PW~uYhsx>P7CxWb?kq3vL?fzYGUI4L zWhMUm3Y;U?-T90=&p-kL7(s?IC5kh0vp(24LCr7 zwcvzxupTx*HEe_$sD(|i8Mc56w!${3gYA><{Ek#Q*Ird`%uHD8VJ9>|BQ(J-*bRGN yFEm37xM3gchXa!nR*!z@HEU>LnW+vB9E3yQg;qEWN8l(NgX3^wa;l>(oA?LoGCOtv delta 1635 zcma*lUrbw790%~3{dx2`#L3{Z# zUsj@9!RTyrpqGbbAz6uHvZ(0;OAO3yG10^ao}7Eo=$rG2s1J~6^n181j49ERd~SQs z?|1(F?)h}`sqJ$cc#QGEXr?*vmrqgaphl%<#r>)-Z5u$2DY;YzV z4V($8N<0#bie$?eQK|SX#8hQW9gZs^L}|oIGM`!5kD0F>PTO00RudvhObsLkgQKza zJj~1)bC?D$5S8;9W@Qt+ojIJ{9}r2%c%d*NG!TqNl~})+{bxSJ9PB0jKAy9Do;li= zIniN6#0W9}U{DWW;2oOe?O z>cj7Ie0;dBYz1#Q>@&l!;ceI1sVn;!O{`($HJ7UMzL6P* zL);xrF<(A77GU|6b1UUG-zS4nXkU1n#|-RmLIxs zN7}zPH+L)BdfESCB6E`{DR068w?ALPI!X6|nEZOaW@2|K3+4UkBW9!60#9c5u`r*{ zw&M9ywzX1}L|kT3>>j>HYp4{b6Fs8!@Y7lYGAFhAk}|5IN;30LG>=nECB_)3gm&P$ z6C*6RE296Ex7W1Pn#Mo^0~o;sW+;JDD1&m?0ToaQ55Z2bz{5}l)vya5fk(j#Hh2u| z;DE=$2~WUoa6t{!LLIna5A20{*a!RJ05rhCg*DAHI%X6fUYlC<9IPl_0rAs6)u>VeY5{R@(Y*n!Tgrn z^}X_g3#@Nw`vL#R-@2istj#WZT$W<5IH)+zeZ7U_i{9)~F?C}>z4QFm@x_fNZ){hV zVj1=I{%8KiPPXQwEY1IZ%status ) respawn_map_draw_icon( &world_map.final_cam, k_gui_icon_tick2, challenge->transform.co, scale ); - else - respawn_map_draw_icon( &world_map.final_cam, k_gui_icon_tick1, challenge->transform.co, scale ); + //else + // respawn_map_draw_icon( &world_map.final_cam, k_gui_icon_tick1, challenge->transform.co, scale ); } for( u32 i=0; ient_marker); i ++ ) -- 2.25.1