From 2c0c1df7f31d4928623a4f150c06757e3379afd5 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Wed, 14 Sep 2022 19:25:48 +0200 Subject: [PATCH] Mortal Rifle grenades now implemented. --- gldefs.ammo | 24 -- gldefs.dlcammo | 52 +++ gldefs.mortalrifle | 48 +++ language.version | 4 +- modeldef.dlcammo | 4 +- modeldef.mortalrifle | 25 ++ sndinfo.dlcweapons | 15 + sounds/dlc1/mister/mr_gbounce11.ogg | Bin 0 -> 9875 bytes sounds/dlc1/mister/mr_gbounce12.ogg | Bin 0 -> 9341 bytes sounds/dlc1/mister/mr_gbounce13.ogg | Bin 0 -> 9196 bytes sounds/dlc1/mister/mr_gbounce21.ogg | Bin 0 -> 4021 bytes sounds/dlc1/mister/mr_gbounce22.ogg | Bin 0 -> 4167 bytes sounds/dlc1/mister/mr_gbounce23.ogg | Bin 0 -> 4529 bytes zmapinfo.txt | 4 +- zscript/dlc1/swwm_ammoitems_dlc.zsc | 6 +- zscript/dlc1/swwm_mister.zsc | 17 + zscript/dlc1/swwm_mister_fx.zsc | 543 ++++++++++++++++++++++++- zscript/swwm_thinkers_player.zsc | 1 + zscript/utility/swwm_utility.zsc | 1 + zscript/weapons/swwm_blazeit_fx.zsc | 11 +- zscript/weapons/swwm_shot_fx.zsc | 2 + zscript/weapons/swwm_splode_fx.zsc | 4 + zscript/weapons/swwm_tastytreat_fx.zsc | 2 + 23 files changed, 711 insertions(+), 52 deletions(-) create mode 100644 gldefs.dlcammo create mode 100644 sounds/dlc1/mister/mr_gbounce11.ogg create mode 100644 sounds/dlc1/mister/mr_gbounce12.ogg create mode 100644 sounds/dlc1/mister/mr_gbounce13.ogg create mode 100644 sounds/dlc1/mister/mr_gbounce21.ogg create mode 100644 sounds/dlc1/mister/mr_gbounce22.ogg create mode 100644 sounds/dlc1/mister/mr_gbounce23.ogg diff --git a/gldefs.ammo b/gldefs.ammo index f6f2e72e5..fa1f731d5 100644 --- a/gldefs.ammo +++ b/gldefs.ammo @@ -18,10 +18,6 @@ HardwareShader Texture "models/Shell_Gold_Used.png" Define "ENVFACT" = ".6" Define "RIMFACT" = ".9" } -Brightmap Texture "models/QuadCell.png" -{ - map "models/QuadCell_bright.png" -} Brightmap Texture "models/SparksterAmmo.png" { map "models/SparksterAmmo_bright.png" @@ -175,26 +171,6 @@ Object GoldShell Frame "XZW1" { light "GOLDSHELLLIGHT" } } -PointLight QUADAMMOLIGHT -{ - Color 1.0 0.8 0.4 - Size 20 - Offset 0 16 0 - Attenuate 1 -} -Object QuadravolAmmo -{ - Frame "XZW1" { light "QUADAMMOLIGHT" } -} -Object QuadravolAmmo2 -{ - Frame "XZW1" { light "QUADAMMOLIGHT" } -} -Object QuadravolAmmo3 -{ - Frame "XZW1" { light "QUADAMMOLIGHT" } -} - PointLight SPARKUNITLIGHT { Color 0.25 0.15 0.3 diff --git a/gldefs.dlcammo b/gldefs.dlcammo new file mode 100644 index 000000000..5142b714d --- /dev/null +++ b/gldefs.dlcammo @@ -0,0 +1,52 @@ +Brightmap Texture "models/QuadCell.png" +{ + map "models/QuadCell_bright.png" +} + +PointLight QUADAMMOLIGHT +{ + Color 1.0 0.8 0.4 + Size 20 + Offset 0 16 0 + Attenuate 1 +} +Object QuadravolAmmo +{ + Frame "XZW1" { light "QUADAMMOLIGHT" } +} +Object QuadravolAmmo2 +{ + Frame "XZW1" { light "QUADAMMOLIGHT" } +} +Object QuadravolAmmo3 +{ + Frame "XZW1" { light "QUADAMMOLIGHT" } +} + +PointLight MISTERAMMOLIGHT +{ + Color 0.5 0.2 0.4 + Size 20 + Offset 0 12 0 + Attenuate 1 +} +Object MisterAmmo +{ + Frame "XZW1" { light "MISTERAMMOLIGHT" } +} + +PointLight MISTERGAMMOLIGHT +{ + Color 0.0 0.5 0.2 + Size 15 + Offset 0 16 0 + Attenuate 1 +} +Object MisterGAmmo +{ + Frame "XZW1" { light "MISTERGAMMOLIGHT" } +} +Object MisterGAmmo2 +{ + Frame "XZW1" { light "MISTERGAMMOLIGHT" } +} diff --git a/gldefs.mortalrifle b/gldefs.mortalrifle index f12b2bd5b..0a47c1fdf 100644 --- a/gldefs.mortalrifle +++ b/gldefs.mortalrifle @@ -111,3 +111,51 @@ HardwareShader Texture "models/MortalLED2.png" Texture "scrtex" "MORTLED2" Define "ALPHA_KEY" = "vec3(0.)" // key out pure black } + +PointLight MISTERRIFLELIGHT +{ + Color 0.5 0.2 0.4 + Size 20 + Offset 0 10 0 + Attenuate 1 +} +Object MisterRifle +{ + Frame "XZW1" { light "MISTERRIFLELIGHT" } +} + +PointLight MISTERMAGLIGHT +{ + Color 0.5 0.2 0.4 + Size 20 + Offset 0 4 0 + Attenuate 1 +} +Object MisterMag +{ + Frame "XZW1" { light "MISTERMAGLIGHT" } +} + +PointLight MISTERGRENADELIGHT +{ + Color 0.0 1.0 0.4 + Size 80 + Offset 0 3 0 + Attenuate 1 +} +Object MisterGrenade +{ + Frame "XZW1" { light "MISTERGRENADELIGHT" } +} +PointLight MISTERSUBGRENADELIGHT +{ + Color 0.0 0.75 0.3 + Size 40 + Offset 0 2 0 + Attenuate 1 +} +Object MisterSubGrenade +{ + Frame "XZW1" { light "MISTERSUBGRENADELIGHT" } +} + diff --git a/language.version b/language.version index f5e4d61ee..4f4ad7779 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r451 \cu(Wed 14 Sep 00:48:31 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r451 \cu(2022-09-14 00:48:31)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r452 \cu(Wed 14 Sep 19:25:48 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r452 \cu(2022-09-14 19:25:48)\c-"; diff --git a/modeldef.dlcammo b/modeldef.dlcammo index 290c48c06..444b6276e 100644 --- a/modeldef.dlcammo +++ b/modeldef.dlcammo @@ -367,7 +367,7 @@ Model "MisterGAmmo" Model 0 "MortalGrenadeAmmo1_d.3d" Skin 0 "MortalGrenade.png" - Scale 0.06 0.06 0.06 + Scale 0.03 0.03 0.03 ZOffset 16 AngleOffset -90 RollOffset 30 @@ -381,7 +381,7 @@ Model "MisterGAmmo2" Model 0 "MortalGrenadeAmmo2_d.3d" Skin 0 "MortalGrenade.png" - Scale 0.06 0.06 0.06 + Scale 0.03 0.03 0.03 ZOffset 16 ROTATING diff --git a/modeldef.mortalrifle b/modeldef.mortalrifle index 26405b681..7680ef7a4 100644 --- a/modeldef.mortalrifle +++ b/modeldef.mortalrifle @@ -55,6 +55,31 @@ Model "MisterMag" FrameIndex XZW1 C 0 0 } +Model "MisterGrenade" +{ + Path "models" + + Model 0 "MortalGrenade_d.3d" + Skin 0 "MortalGrenade.png" + Scale 0.09 0.09 0.09 + AngleOffset 90 + ZOffset 3.3 + + FrameIndex XZW1 A 0 0 +} +Model "MisterSubGrenade" +{ + Path "models" + + Model 0 "MortalGrenade_d.3d" + Skin 0 "MortalGrenade.png" + Scale 0.03 0.03 0.03 + AngleOffset 90 + ZOffset 1.1 + + FrameIndex XZW1 A 0 0 +} + Model "MisterRifle" { Path "models" diff --git a/sndinfo.dlcweapons b/sndinfo.dlcweapons index 2525a7757..34636e3b3 100644 --- a/sndinfo.dlcweapons +++ b/sndinfo.dlcweapons @@ -129,6 +129,13 @@ mister/fireover sounds/dlc1/mister/mr_fire_over.ogg mister/chargeover sounds/dlc1/mister/mr_charge_over.ogg mister/magout sounds/dlc1/mister/mr_magout.ogg mister/magin sounds/dlc1/mister/mr_magin.ogg +$alias mister/mag1 explodium/mag1 +$alias mister/mag2 explodium/mag2 +$alias mister/mag3 explodium/mag3 +$pitchset mister/mag1 0.8 +$pitchset mister/mag2 0.8 +$pitchset mister/mag3 0.8 +$random mister/mag { mister/mag1 mister/mag2 mister/mag3 } mister/grenade sounds/dlc1/mister/mr_grenade.ogg mister/grenadeopen sounds/dlc1/mister/mr_grenadeopen.ogg mister/grenadeget sounds/dlc1/mister/mr_grenadeget.ogg @@ -175,5 +182,13 @@ mister/gcasing2 sounds/dlc1/mister/mr_gcasing2.ogg mister/gcasing3 sounds/dlc1/mister/mr_gcasing3.ogg mister/gcasing4 sounds/dlc1/mister/mr_gcasing4.ogg $random mister/gcasing { mister/gcasing1 mister/gcasing2 mister/gcasing3 mister/gcasing4 } +mister/gbounce1 sounds/dlc1/mister/mr_gbounce11.ogg +mister/gbounce2 sounds/dlc1/mister/mr_gbounce12.ogg +mister/gbounce3 sounds/dlc1/mister/mr_gbounce13.ogg +$random mister/gbounce { mister/gbounce1 mister/gbounce2 mister/gbounce3 } +mister/gbouncesub1 sounds/dlc1/mister/mr_gbounce21.ogg +mister/gbouncesub2 sounds/dlc1/mister/mr_gbounce22.ogg +mister/gbouncesub3 sounds/dlc1/mister/mr_gbounce23.ogg +$random mister/gbouncesub { mister/gbouncesub1 mister/gbouncesub2 mister/gbouncesub3 } // TODO rafan-kos diff --git a/sounds/dlc1/mister/mr_gbounce11.ogg b/sounds/dlc1/mister/mr_gbounce11.ogg new file mode 100644 index 0000000000000000000000000000000000000000..e25dafdc8c63658cbedf7e16a7e6027326371a23 GIT binary patch literal 9875 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 MzrW+c!0_Nb0IJsXW&i*H literal 0 HcmV?d00001 diff --git a/sounds/dlc1/mister/mr_gbounce12.ogg b/sounds/dlc1/mister/mr_gbounce12.ogg new file mode 100644 index 0000000000000000000000000000000000000000..a75552a7cd723f3d1b2c942e39054f1a6b56915a GIT binary patch literal 9341 zcmeZIPY-5bVt|6;g=KCa=I4)ros4pfW%)%(nZ+OhMx`(i#lR477(%aP1nY!w7#J8p zIvE)l7}8kQ{o!}{j|?6#L(DN@U|@*IEXdIFFG^R)$xI3Zo37xgU}RuqU|?=wqM#9! zno^panU}8Mnpc)tl%JQInpdI;vV)NoVup&7a~LCo0|SGElYkcM+T=c~6QYVel8Y8N zozgrm>vTbJv5Iqt)iKlK63Om6Q@Wf^HeQ$z$^g=^L?%3-$W!KaAdy9$>}JfBm%M8>_Va0Q5!Yq)(<(K*ZK zbBdoSv?r1KSVgG@OFGVe9WifF3saI#b*qUD>U;My;v~W&+6ooNq$zRR2KIIWovE~3HI6eR4jSz)@yT$ z*E?z^_ZS|NKoH8{U}#`q5MYx`nc&Ew*dhWpwCIfCaT$oW8W_NtLB=&m#l1+yeUi$_ zNjjdBZBB0nA>S)5zM`R5Lvycx%Z>k*d;e}oTQdHExmHu^2%8&I_1Dh7+4qt zK#8BBVG%gmR3fJ>%bd3y6xpj*buC-DYE{;(WtsR9(?Z473=EtM46?@yW!wv8ju(P_ z1rA{aW(EZY2IoK-*CL(clT5rf+nm1aa{fz9pjl~fcrI880|!V6$PLGfZH^b)oSbZP zy4dFUWE;=RCcZ=>P{1-Vq%bhZ9Gy`e6)cb#L0*|_r(BA9 zCNq`K$xF6nikFw}v?)<%=1jii=)SahLXfBGwn;%fs#9-xc^OWdl9Z!+>{ikm(y0dpl}AB#ER~4v*}CmU)|(|;#DY3?r(8Z@jM{!9Ywgx=am8=8GB7kSvNJR=2%mCTsHn}@puxa!NMfl(^96+^Q<4RwTBaoN zIV}}QKIge|O41oi&6&yP96eN%&slP)whDN8sxB39(o|goZ@pJiF20E zK@!jBK&mD_CoqeBA&9HcasgCv2{>smFswMh$e?h*ZQ@x@wb^0~C-wvMpe)gf+*~B~ya34a-1r zvh-S#4oEiJ@LCi|@wKEirc19x^%!1@%Jy2hRU&!K)@w`*2ZUu98n|*IWFIcc(Afa? zBOAj30fqyN3=GVC3=E8FQyQI|!Ys zEDEGpD*NnK28I?kP^e3Xxm##TaqF0*s4`4oXK+wBB9Yu<**+x+)DUp?GCVc|6xtG? zKm|!WpHmEyC_ZNil7P1h`aq!#ZXqBMoD2+F1q=)v8v;{`n;^npW=rl|9rAvZ>yw)D&a{?#F9>X#La1u@G*$VQ! z?$LoRG zE`jU_fJkVng6x3km=ffL(4o0>3d|0$EF@cltXw)J2x>W4VkxK$fUu?nd2ud;DghZU z1R_8o2oh5T5pZ=HaF*uMDKNKy#gGjM;$mR10>!7nqDxM1Odg+7E^tvi%o37u!izyc zhJnF>#R}wNCl0}4P?)s{ICabb1r4}q1SY^n(uELVD4qF`LBcliF^{%qdh6nYt!-;q z7%nj}FeFPP_h_D2vRN#7EpM`b6Z_m2k*pP}%i0V%6iWiUymYrk6tgW{66EEndn}^) ztZg$WIF^VdueB6^?C7Do^h(m|tib332M^a$E56-!>X^SfM) z-k~3llFnFuf7Hxx$C21G!SLCQ;tzYplY96Noro#cJ0$VA+u+a-g`BlJ+2eZz-6WE0 z-kbhdP;GdKL%GNB5Xar(i>^PCdJNqp;#(LQb_((_ba1-~1*J=dNfkcklu()gZVekU zFt8XNQ&=(~$V>AmQi~JR_MDRp%D4;+2UtKgo%W5Xkx^R%?_BYW`{MXO*ec1`=t+=P zT9ML=iBee`h2C7?%KN|sF3K1r85o`{nKC6xSIX&>W2R}x35BOBM^%)PCp2AZT0X(B z!}FAEGM6Ij%CZZFts;x1g1BY|ab>NtZ0j>zVW|Evh;u0$1A~JAgMxwz!vO}zgFFld z77h}Y0xvie3Nn}(cwA2SBm{8q@)Z_bX7M|jms zGMYiHKZXW|27ZQy7N(Alw6t}H9x*99CpRxX{FqtAB}E0Sz=7cbGlPO6qtc?8Ggoie zap1&-8xLN5_`$#_D9H&{03w)}AU#b`N0EsM(t&I+1<61*^OSugF-s zcuiJ(%%TZXr%r3Dt#9dW>27GMtt-wiN(t6oXz*rc&&dN%?7MfabTYGMcr4@a_T1ge z#>=-qpLOn5go)cmYx%m@x~qQPskZLF+Oykbqix0tfs<*Ti?u4fw_mRgO%=GWvhT~f z!nm~F<@wv@miCsO>~-fm>HIZr^^Ru?>MD-OOV00p+I>BxX4&G># zGo%E&I2>K)Cv&|~WGmNg#pcqxuNL!upQJYZ)w`45I>Ro@M9iNic`S6#mw&TG`BsP8 zWrzK9ELph!N~X+}Q-0fD8HcX?Q!O2{F68I`^PO`2Ws08;mGSr8GriW^_(QaQ|4a8) z?Xbs|-)*Een)lpVw{R|(?9zqb{!VQ^s^7FSEX-B7YSvX&29X0k9!`hKc9hsMEMN{j z!tilg`ab2meEq@tb90|hJ%0RE=90%>6}&&5iQnjU<<}eK)~V-Q1(+B)f#U z`kQ%sbz3NZKr%m_G5)4!n zwEcMTR(iOY>k$uO#x)anzniYLW%8Sldyik_=S$a1W%r02@|V0ikLNIR5~G;ZQdS0w z87tiwJii4TW?LQ;!nlCvb=opdSCuLKhUrhXlz(yH&^+@qk=@DZ0mrLT(cNmD8#<5u z*jL3CelNly0 zYfEEHKdJI>S1jaUv~dk$`lNQD_?|KET(Ra?#ViM!BN%!XH`Q@6XSB0ugiNikj~11_ zEgH#Te#9_Kdy}6o=k&#K%T6fgu}J=n-l)v`@yPir*MojrJ~=pL&c?vqb}H3%2EQZo zHw&HTUiWdU@6iVI7>o3URut$by!_V(7b>7P_Pw@T|z zXkaKPT)cjcKC8fEl|Pw+_S}mP=smu&Pf1-c>%T>;&q{M?qrXhMB&G;5Fh!*0x&*Rm ztS?ts&0yJS%n*0If}!E@Coi$T*}5%vYDEHnBrjrNIK+^4q;USTZB@Dq3=9SWDGD)f zwRA5^bUa|G+hg-A>D+V1YO^_F_uu$zIsa+(&%Ot32X$R{{>Vu^5p?95)x_7y;g^`Z zyZtH(U0MVbPu-aQ?75`l6bHtCwObfibNHMuES+$@g^9sOjOkIx%5IV1sk++A(VohO zKfGeR*RjTwL1V)*U5-_sVm}J-GH%vmoDjSGq3MElE50kK+zb_SxeiQl-(6LI>zcNp z^Z&TTIYyoiHLTzEQ-Afq@}GN&2C`CP$MXgTn>W zlUbshCmb^MIb7Sdv@P4@lzrB=mbx=8Cr!_;ta4=tQ)aSw+VI(;#W=a8kJnLDcftDY zcQ0rd|6V)Mf3m6l!m?irEji0Nmxv`OH7wP+w>2y{F1_L2gk#f7GZ;#08p2t#a&Pqd zGOd$gW7u$Ffu&52%e?&3%Y9;JE5g$>MP1K}&f-jNNne_Mdar_T{QYY$t-BNiIP4Po zY#qB6E)f&>D8eYf#uPE(x3$~bb7o6_U+JB5S#{%s$g|uo2WNcdU$Q}OCdVPq&1-d( zCth@6U~rIr*uI)sgu#Yg*{{;Yp*2R$$7lBgZuW>DZIz*)f)36OSRiBTdhr|Qw*1r& z)qAHc)Ao6>;#l-1}zp@|mzS*!( zWt)y8>$7SlhCQ*Nk_YyD{~tq0si=dGXhkzUZVro*=yR zUmnwnQuaM*3y%8<_o> z4%oRcMc-qL;9y{?U$abxp&>GK6aT{JMUmgccchm1Bh7A9{ zuQp|1*|5xRk8H$qh6#U{J}j5zaAIg!{`D~fgTSSZM~&@|Y^^7BT~_sxoqjl_vS{+6 zInxij?hp3hVc}t5VCe9wInB)Az+xmWFFz?m<5ctiH$vgxul0qke)g*~H0@yIm&%4I zCp5Ib`t}GdQ@h-1V{Xcxs%8I@kwJukp+S4citeK9=&g5L?q09U`q#Ey){f(hAcIoG zC7yqcE(LMVSs4C2wu^bz!s0NepS@x4EF%U6r@D(OGQW?md*|ExudKzd|FViwreu0R zZL;fZ^(bZSlk>8USZ}?0A^t$a5r#YJ=k94d0kr`bYPc_dT*t}4z{04%+kai`a=GG-bI}McgM!vkjCHd3P>DD>EoLLfW(Ee13zwBrbeEWZEn1a)nNRSA0$&n?kc3%gFQd!O zQmHe}mUSi$Pq`Qv7&v%4!qe-@Mw9A}!e-&YPp#PUcfU!U#g0Ens z)AY2jaf^T5vOJcv|Jq{JIac21=X{rrYgf9|y!(dY#CIDxCQevj&CGD5C31DnuC3EH zsI{c*xc-9m0E2>oT4$NSnOc9K3T_Jje&uIp{2tpkBh;%r}B_Nz|$qiN_ZWv2;8Wh&AZf`bppdb zvCU!3pIy2XFVu+W+S1qm!GLCpvPe8=W|2 z|2?#Uqt?gyMn&|ps1qARYy=q&Ffh10$qi0oSz+wpQOWa28`QF8E1ELn_g<~QCYA#( zXLwkah1^}Y!Ap6OWy4HWmeK&uXRNi|yEGa0iEU=Rux@Gd(^A72-nlgiJ*lsj)n8ZeNK97r$w*JnZLzC-tuMfM{77l)$J+N& z>MTr+j2a9lHdGWa{AJ)_QI34hz`(#f@!_fDX$%q!Mg}kT1}2K=9(IWD?hTGLJ9#K@ z&*tb1-j@wb407t-fsEI$9jx;Ic3b$sYewEU*$&ABmhaQ9ho^`BNi)$}+P3rk^X2E* z6h&)VY%jm?UOOeMf#K2=$)#Iz)0rENFgS=Zi26RCbUi6+%f)a81y*ZCrX!6D7BDne z*n0Ki6^MLVB@`N!sM-t_FJq1~~|O83IF zZ35OUZ4Q6O=IOs;RYPjS1hpT1Q&d}$PJ2B0w(QTJpot7j3J1#f*REP<9lyBhd~7NE z{p;&X1cf`eZOKC{=E3^NYSIsB#eMiIk|fAQLT zxE2`6FdSJBlRj^0de&ZPU+pb(&PDo6a*{U={}@~MS0{3sV}}BRQlbI_gTqd(Z$>(- zJsoO4@0uGW^nA$GIXW$BO}etj+Nr;}7z*Z@YcS+1Z2FRR&>ECBH&hc=jJ*2$`DvF76#KK_Vj97)t>8yu8kdR3=S%G8yOkI9(;)BZgm57 z?gAtV>NUPf&6F%xUpn77wNv7bL8X`f3PA?D=acRni#atld6W9>cPtwwFA-I62?&{c zDExdyy79w@=l}Y&cdDk{c*wovJ%>}Unx_QA@_(0SF!hP?8Ghooh?Cv%>T=rdi!+vV zDj0esWXtmVcCC8N>mqo5dI>0xGAK#f?PXwQU~o9nJ1hUF>9LfZ&#msNCu;8J;$URU5FdRtV z3z|Js?-X)dXTW9Udh^{a<^?(zIt^7=LmBGKjjWQ^eOr{W*JzRk2Rp-K;Y0=o4yJ_V zm2ahQozjY_mMDn(*p}M)GxCGrk%)WSPW5z6JSW&Y@!9ijBD@!64`&;AEU7tRv%h@G zd=VuVhLCvkkfRdO2Lzfu#Do|a4$Wm=+5FrvEF$4o2Pj<% zn;8(wc$rIaW2q3Q00YB;m3sI032fi>@$0>p+GdwZI=jp|M1R@u&6e!+a5#2%dlZ9+ zm)D}t0@gdW^NWbQk6~cgpvoXnxVl0d30d^ zyzMhfr!uI`>ok5C&t%f}nxSQuzPFN>2LnSHNZ*2of!FU`cyH~vORV{jT zsr~RQjwL#aMLvEK-gEO?oZbqST~_DA9t0`GvE+n2lhQRXZQ5rdowC@2fq~(HsyxGF zi536P@@Otldgl6bYA1MTf#sYZ$au)m0y6^xgYJYDF5ZfglJcVB;-dVLyhNQk_E(GS zZ%vFnr@r#xL)VPUb6FHrq=U-b5+mH%91jKRF)}bPUbu0-=YMjYzgDQ!tVgbS+9y^A=|&0Y2S&8xVq zJrgYBq-NJ&bW`g5f30_`qldu7qklFlyE9pE{a35^JQ;Z9zny0j2NTN!FUR#~#26y# zl~+h!i=4;EP$L2I_Y-#Jve?JVySXjhCA7R58Rmr--C!qIOeQFsIoR=PI(pR3EZQv)xjd($r-CKUJ?K)i z(bLeRnR|b-@d>i7?GTueytx0}`+4P>OIPZzQLfaRI6Zcc!i`r`b~Xz~G_4z;NOeLw3qj z^~F=y81{V0NDY%=h$}a`BmMM&>$yGEm)jVkLR~nX$wkfG68ARQ)hx>*O*uKwW&K+1 zMUMNf$$AO23SN{*-naDci|m;4eeQ+MA7^Ihx0EP!3NlXNSn*#pl<{HQfdkS_ouEb; z1J9n~b|Fw(i-BR&_YDjhjIF;FyR^kb=Y@Oil|SXZZ$-tLy9zf2XR$qGQFzjuVXf=Q zwrzq-p(7}DB%J=rAEUo@{j*n@EZ5`T32hEE>FI2kV86ZZfWqG|_mAb)NNdlij+bu{ zaAR^{N&3W+aFDg&h_&iz1_lQSN5xqMZo5{bsJ(9Lny#vD0L`UcuRZgXwB(?biqM>?4zQI2XJQ6H3e3ToXM z7#M;a7J1mp8AM&bu}zn&=Z4))ZF8l0$8Vmr67`Xp9Q&Gq!O!VZ5XVb3)kzvl9a%~n zG}iVNUf%iJ@BFvwRj2)u-u0`Tcr%-~AZ7_)`9|eOrecSUW&ck$<6?FZU|=W~R2E@o zJ}lv~i63O4$AtH`f(#4{jY*MjAA4P0@k;zyj85vMM{N^tciGoXxBR4a>rLa)lu&+- z45`DM4jz+NKVTPd`0qqV@0->e3~^SE4xQ!;=TX|28~93?N!fa z`&>U}&B4IQV6f`xbzU7k#=seseZN6TG@{M@toB+DpVVNH%#N28k`hHpH>t-^xBouZze9bbZ6)D49gF2<#JGp6vB^_4jt4SV;@jnRQ= zkzw8s@3XqKZdtB#9&87tk~?2Qr?E09Fx`BoWiYASFsCR}X_+qiDdVkDP2w{8!t=1^BIDjwxB|q=HQYX_=$z&A zImOQu+JlPLnSx{`()o(GL8cr7nfDrGa*yfuD-d;H#bBZbWIULaXZT#Kcpb=;bC%C# zios$ECMlu}6Brm4EY#?Fq`@a3wTX-21OtPBL!pTKL=o?eGN&)9@N)1*vNA9*GH@_3 zEbwSs;?cD(f!3>K6 z4n-+R=ea>bF$N$> z>m4n+dF8AXopN9$3@i)+ zpv2G6um~J&Dv{HcWzJg;itJUZx|Xe6wJK}YvP}GlX`$k31_n+B2HE3+S$(Zf(Z-TIi!mKn48M4f!1bj?yaB-GX( zzoh9jVeu@l6B7)(vNV?lb7-zyI^}}lu_eo{MQJVFBFDiSDahc$$iTp%cuXLsIT7;ZDCnobau`4zU1aU4*5pdE}oXW(&z$C-Kz@*dS zBZuk|5hoALBp#<{bEcfJ)Lc5{nv>>A*B-|cb0$x+R9BsH zDM)ka)&Q?;u*BM}*Rp)q9+mRS)SYrEN^|MfD^a~`w@N7=Q%E`Id2-I=Ag|1|Q!Yh4 zlbOorb0%MMbYI#$A;?p8+oYf#)u}hUybPyJNy^bZb}MO(>6A-R z5DDFFQqeu8?mdnt!Im!t*|Bo#8B0ysmMK>3s#B*V>8Ngid}K(q@Wztr8k^3 z*Fq$2B%Rs1^+uM)%A+7VmP$nTY~6Mv>&=oaVnLm{Q!XWSZ@hLbYVE=)65e3TdknAL zNm^q$aj^d-MZUiqI*o2Un|Phy>=(*jOnqM>a|;+Ux`|~a%)s{kLhu#;x${J z-E+*;ogx&ivGVA(sI|JsqMS81f-OG^wmhO(17uW>D%kR462*RNuii*HW4bjgd+pZe z64`GcMs2^5wRY>bxZ*ck85kNE*%=xbgikpvRMci{&|qLVB(YSY`GUfdDais-EmM;C zoR*3tpYvQfCFzW%=FH@CjvlJX=PWr?TLrv4RhJ4lX{s&_VPJ4*WM*(^;GHGZ%`76d zNr-`ilR-fssLSxV!jwrtUV=_OmTZbGK|xu%P9B=iWLg5eyw-;L7(SC}5%BU{xz)?? z*qmkoCr!<*(=4BZ#Wa^*GkOLQTY4pmU9m;LOH*~}wW!yi5=nFEk}FZ!V6ml3rbKlc zwg@akPMI^8T#CwA$iT3HnVn$+ zGxx#^6Q(ja$T2W9P6+C;d@d8zWq52(F`wpAiR5#Z%O#S}SU#T<+++A`PVqUA#5v37 zAc^O5AXO8e6PU%m5X4nzxd5uT1e`P&7*-r$WKcNZHt{T{TN4*=BqzfXCI*HR2G8ac z2L)wKN#b$hSi0nj#!(4SFl!d`fw@t~Bua!pq0Z-|0Sd?-*%mNY!kT00k|{yihGn2Q zS$Zu=2PB(qcr6N~_*&8$)1_CUdJL~cWqYmMDv`Wq>oq2Z1Hv*44O}@9vJaPJ=xhM{ zk&WSi0K)-B1_ow61_nm8DUD9fVN47wLBR*|cuSDfQgFPkH1V=z2c?Nqb0!CPfuml1 z>6D}&TCi`|Zk5R91w})S;k8-C8lW7|v+>$2Z?Cl=B|D$R1ZC-Ni^yJU`WzfJv$D_a zU4AVIq@?)WUIvEA?CcCHSftYHAkEOAaAZdDIZ*8js@%bu6jZ}2P6_f_ zB9aW3Xz4M0zMxsaiDT)MATLcxsDzis(iR~rummSqVrj`aOHdQR3zXTsUV`!`M90!8 zmq2y|KqNF(L3TiNObPNr=+Im`1!f0W7Lu(&RxX_q1hpJ2u@qDWKv+|Pyf_y^m4J*F z0ui7P1c|AF2)H^8I7@Ts6qsAUV#o#raWODhf#TC((IuxhCXY`k7q}=MW(mnS;l-dJ z!@%IcVg+)s6Ng|iD9l;}oH}NJf(G0)0ux{(=|YGwl+Jv}AYq&Mm`B?)y>;=y*0wb) z440S~7?LHDdo)ih*({d4mN!|ziG6O1NY)C~Wo?EWiX{PFUb@>NirE$}3G(vPJr>b? z*0vcG981KK*IJ4{cJxqPdL?P~*5@)k@4!ViD80Sgn{mO@bLG~k;&-;}@irVwmt2eL zv1OOcdmHGeQ|ssY?Wke^dv|t ztw`y`M5(NeLT@f`<$YiR7iA2R3=B_}Oqmj;E9G>`G1Ii;gu+vmqbf?t6PhkHEuUc6 z;dx3nnM;v%W!VM8R*}V0L0mI~xUyDRw)GjVFjRjS#JQA>fx$t5K|w)<;Q)iF5lbaVGe$1@mlA;1u;K1;JnL$C3QEAc4nX5PK zIB?>^jR!A2{9xb|l;i{}01-?~ke()}qsYVr=|DD^fn*>ZNRVvL(|tX1<#j6-l_yS` zK6A>{DbprRnKFIywBGKH&fbQGn#S6Sl+YcDKPP!s75#txR^^&+nMVBlz3Y#aUMeYj z`KtV@xQRv8Y8x-hq~$*M^}`R}wCKKDoSYt;d^Uk?`JaD=Hmz^3d+Et++cNk3Uz_}J z=hUiCDf6qZ`y?A~G5+trp51!I*|)P(wdci5cs=#my*cbwn|Tvw1#<0lI~fytM8Wd( z|HRV_ZQJKhSKPhus^;-6g6A6CjvBlO?9Q*)wRJ{OpGwi5{4)amzn0G`+OPFPAUbw! z?!#rdw-(N?xIgFO3Efhatu1G`gmL zebRAH$m`VCe`oD4f2+NF#XVmBm-%I_S*xbnGDtK`yx`(^RQ&?;E87hxX0%VOESppM zeB-5vZ#I^djf`#K{j!HVqL~;OTsHJK1gR?xIm~T$1nLp`UzvIFO2mC_BGERxjQj^O{N&a|Sc4hTM%f8QV zn3nHfQ+|Qb#ND%@M#ZyEvFoDPpAbeFKd%D~mA=nC7$TUiTnpSh<=!sq#mlu$g$h1u z3fm{s)}7%gqr9}ZUVAsU(k_)H4ynJ3^z@o$TK|z#pOV6vnIrsT(VzG4&#tbjtt{X5 zX7|0Nu`d^O+vY5m$~O9XNaN>*x10T3?c|TKe=&&*yE^H#5zDhbmIn_o$Q%@DSamgO zhTfK+=|`3n2{xHj%5|y7N`^7Eyl7v@%iy4JLhZl9@4u-}>lI|+F!pfE{cFa+u;If(W&=frm)jUDL{mPW>i=?6`0HYcn`eUd z-uk;_dPw{$Exsg^`ST_jH68R?)BE)r{{sd4qAEe=Z~EU|br_Z`c*>-8U^C}pRt5&= zl#>QYH`XvbcrfWmUntL92B(99F;QEX?^Wn%FlcO;GOw1uW!HlSh7E_3oyrWU=U!4iao^P;H7BUW9re6 z-B!3D%D2;F=DltEKdxZPJf@R+Fl^7hN4NT}dkQl$6fY9AiM+rdxQF?Jx^P+s1H*zY zr79VYvx`a@szN@S%V>&6J1*2vJ=SNyu&+Z$g+U|1Hc9@whtv0XZ6gK+>jfIJ8*cB{ zZsv z`wxaSW~jX`(LUg)Hvr?NAiq} z=?6s_82*?n(6L-;zv30Y#;OgR3_YJt+jwiU|I0Wd#UNtPzd+k#l?a1EGJnc+n+AEI z1XW4Dj>7e~HD7PBS(zVc_&rQys(?=Clt~f_j!av=&w0ppz~zw6{%Z^tPoGA=4v}mQ zoN(#O-TSO})e<*5xun%^`tBneFp*J7yH)d_@6Ads773Mv4VP-fHT%uXD<2dTJ)4lo z%F4iy&>^TM$#g(bx?iXv=%_FQmqc*eB=&h3X9N?N5^R%xH|%6Q&LC_3;ASl2pU+K< z+xSv{mzSm93wblgV`U0U^y=xniV90|L)J{#ZY31ta*(6vAO`~j$M>qPScXMflN8r8 ztXOh<@vNyCumA6tVcWLrC_f{MfL4N3(5k=ldM|RYaIkP3*fW{+zSG)w(JoE%8h!Et z7*^;A$NUml%(O>PwtEw6O)W#i;nhMxl6-X$Ym^SOG^VaiUXhlR=AJH)A*-<1nO$Tl z`yW;Q2i^=R?lK#jZe^~%oxMdV*}8$H>0_%#L$1N++HgGs0fmMm3inD=rm* z%_rKhfVX<1I79vC;MzXZySo?eJ7M_hmGL=tPp&oHdXKVLw={%36`gvZM{e^?K?Vy3 zh95_5BHA8Yl5bkwti7E{M8lf@&*9_T_bPeD;n zH6e*V$4<@&4C!%kY0x=S7|vATe}wM>sGRiEn)vLcz_Y1peKW70W)MXbhYA}5LsqToa^~Zz>xIpVMQ$@Nh_EtfGnBAs zFeQh)-)+^fN4ksQKw^wrL7c}LQ-+KUOQOsc*eqpea9G7RVZC<4eKUrY9~Zp&sg`oJ zhK_Kq-KSRb29gF?iiV7l^x!;HVf4_da{?xf!OIDTUR=q3e zote|xyKI?l;*#&*7EL}h^JS&&dkM*nE&&=cHjB5#KkH{t;}g5RnVo?_IUs1K7@yz8 z^;-LXZEokCq~{iTX&y`ANxsFP!*+RMLe|a?h4c5$e&M3r;a#kv@iu7|Yskx7uc#?A z7?vN{!uHi)=WE-Yk6!bhibu!FS%8CTuU3g&B?E(^Lv6#1#2XG*JY|!PobZ@@B0b~c z<7K8y%n_6Byi5LNy-SF>;M--D$1FRTiZ z?VaLz>)UAoO;!a}1yu$Ql~3oCv(|1^iF?VW#BgCBr+Xv=14F|@IlaB5M>jpQ)?doD z=ef<31kuJx(ep}+mdM?^zFMclf${Xc9t#nt>9*1gv)(Xxv1{CC2u%5D5Ul=r_bV55 z+u-b3QH}jgDF%kKSeOndG>b4>GBGqP+&5w0cac@{&)2rww{<=Gc0JXnM}SQ-HKn5S z!V2}kp2HW~Hsurwu6^mPvMeO~_!X;l#%8Px3>GKW30(Z6oX?j~7`%IH2Fv*gzKI)_ z{nz*}y|?&{!qNL1yx;ELcYU=ngT#%ZR=(vT3=DG48~6lvx7!Qo*4KBQkZ$g9k`jnm z-h0b~Q^A2jh=W@;nX!N`(b-=~b;I8uXT1D7`J3WaXNa87RP9v?(2(!d(BcUhX-+MCrQQ(~BA|dFKVl`V$NP*+k`i%@3ER2H87biBqi9Orx z5*Cxs>A{d-@$7}xc7_IK1`mf!kCXLb3=B&=)_i&Tc3t3o&)Dkoy^1=8OC~YIU04p+qb`*%dDkCq4}fgA@f6a%dhY= zHS#}LoiIW8CIAfp<&LB6|jDz_Cype|uDpCl@9MeGLW@7wJPbB#T6e6uy5scM3+_!)k{wU}7SH4L zP!aH%!R%6;dFD(s!=DTn2IuIy!86VJ#F1qU zENqjNJA|ikUGDyIO~EjMM<`)J(x1JzyyHx#sA)1VT;Pvu)MI8~*m0^$Q8(&QO2-~4 z#+tAR6Ivp<1DyA-?P8({(H6pDlaJfBWa;%sj8~%O1B*a*DHQ#eJ`Ci|#V&{0xtst&k^%d1_o1xJ#7LSr}VfQ{CeL{XZ-i=Q=oDa z=bPhgMm|S8EBz+eGiGovdB`YfsCZpw+YjwcTHc?6w)U)<=%MMtFoDf!s#wGKTPgkL zR|KtfGP$JKet(-cyLd0}%9xsyI$jMLt?q2oXVq&mg>kU3$tWz+-*Wb~myv|QBQ|aZ z27}pd^TZieH0&1P%Gk`n$58A3A#f_A-SbJUY<*%geylq6lR=oFU-gJY8!t!cLqX9J zRi=mR26c^z91T+xog}0Wv`ns)=45E#X*kWxP;u(q_P4j^e+rl1{l#DNW4q4M*zEm< z*Png#t!4;kVPM!`8dkg9XA_&?pEeN&h6z;R%r?d|_f>crTsU3mSG% zXz0GecwoVXo%5o%^D=Y|~S5(?PKXi*h z{Jqb%5)11|XLw&UY*FCh_h_u2YPcv+$fWr0?vO;WnQ3f?gbtaRDg4>lDR8VsLFcv@ z!=bhd84L^7zR0v)&f~X#lUZ}d(#-jsJuE4QzHlFUbYd^htP2acG`^HC*8Nzv@Zl#$&4}Jq9g024UHNza_aZI`TW-J*QPfi#V_^D8CaYhx*QB9ZjClN zc#I>FL7?FpW?oPBm{t|JQ% zgTU$*KL!H^l?zEKH#8k|X6EuT*ezGO*;|xp+#f$_p>@kgh7TGJsx1#013&avrj z`?H>|JsoxB=n4IXd`@YGM*W39*WO}MVUUn^N@ZgRU%FwQli^{vR!^qSZw?BuCNKz} z{q*(z0tXg`)l+UdUHB9~SMw7C1H*r_xE(A!zZkOnt}=cTNcdDY$vduH=~i!bruf9` zzV`HF>bohCF$a`&WF;U8pv`TV{g7O zhiAHzgaU^^huWnXK}%NUu{1DlT>hr^?Z0D3WzDzhRfjQ6Tx(#&s=cV7=+6HRcQyqt z7Z;}B7=MNZN*WCuH-+mzz4?DtREvRwp=oN27(;@=f!0z62IgH!?j|v%bGIMi-8v!f zO^;q(c+s_fhDDQfC65F;*s)az9RARtF{A&T|IfL3U5ozsZBKbQ$E}e;i6hgAN5EC! zPXvR_qDNv}O5emLx=iw398^%c`QfI_FB4f+8=9;OlYaduY+-w#z|i2R@^R07P49=S z6BrmA1>$-b7#KtxCUPDyG+i`_cfpa@u_X+3;a+R)cT7`ApUYgGZ0Eo}p^-~~X`0b4 zao^)X$r1lvn~5l$W_4p@nxP=&n#tqAC^XYv;dt4JOM3%~OVqwTYg}OMBC(`%?(&{h zESyZ73`bNR@Acc3etbRy1M32Lw*4#&4OU+6>qQwHR2imod@V}a>++(>4I>GORkiu~~NW2Rjx9hUVHs^D1YCf=aOkQ#11SJV3;v=>NIYb|1hwX8DfSB0|P@uW~$X|l>D z2SmHeCSS31Q%n&E?(mdcTJ5hjHNxwJU{Hjnt8B1Ou;-xhSu>$=3{BWs`$~JQo&ASf#0^h*-HDeUVgSU^R7- zlg7T|_kv#Pwsu8#?Y%A){93m~!aMUIM`H2Ytyk}OWgV4B?lC-e^ii-z(}fA4Aa^o2 zurPw%%*DWPD1gT`umL3Dz{b$PAmUmma=cK+eUi#)Ca@9*22d<$^gYy=r0h8aDstBqD`^=p68hf!4o{yG(*o=axDDHXZchl z`^>6p_s>uO|huY^Mr!SIZMsCQ+&KM)^3^R$*DW_n$q(*Q~bQtmTnOXI=y7dH79LW z1_l-j1_qW0j@Gs{91M#X7zCOp1bJv4nUdsZ*ghqwPxJVMpfi?7XB71qzEB7`V|YTQ z#Y6L`M6sXcGldi$t!FYVJVu~6=Aw+uSsGQ#R;*g2 zv1--R%4IKSE?ZT#XyvM9t9GqhxoTZb<-AOg>^#j?t5&XBm%VD$>#kKj5%2lssE_+?I?B%XiuWxO7wQJMc znaf^xt}4-^En0nR-O62?-kt*KUGsa{>sQ-eo!YhT)TVd0 zx2^lVX)X8e7rVBtJGE}z>P>52Z_<6eE$6n=$4>omv`Oni~Dx=W?lU_|(+Pp{bEmQ}33ghEI3BzBM;=T5W7;YW(!vyWdkI zuh(8KEsdU!CNVwT4bB zy??DXbw=r2gI(*^t={(L^(vj$`_{caX7GBK!J1vUf7Y$#KD_$%v5l|yt-G_YKkN3s z53jZv?%9-4S-w>GUmy-Sa0_d4mrS+@_pyS1y}%qBga?eDdZujh8Yx~=u$)zZbQ zZy(F&K77f%Y##$d10y>_1B37>2UrxdDRPJ=3uqlvXb}kFQd|;Z$flUg=XFeGih!4= z;*?8T#}rcfJWt3>7VyegIpua>}KsXLF|T zS!vB|p5&#ua_Xd@H8Un(a@0_5?(yZ!N>EV#&E{k4kuDu3aJ&t-123Sak2& ztr5ZArqd=R<*dDW!%NrlT2!`|?zKxnJ!`kli1yieG$NZ<6>QX$OHp2Hk6w#f3$k2m zYeaO8>9T1_IUBD=1a%u8izxQqdUZ-v_u8!y-rAaA@F6U2tK-R0anT28INlHj+YAzLt)=*t~ElP)hVZi}L289D`zMV%Ixp*Tv8C)0{6pm>e zm1sGpuvDV?g2ZBxWC5+E62*K@OGT2;Ii8RxKIf<@nS9PsUA0BPNpoq7fRo13DNGCu zTrvy{OgR^(M93_-FhP_N;-DlR!#0JIAS+G579TJ5r4xmsxHVI!d3C8CI}_Ep_Q(wn z&b6)AjIvdaT}pCWdn6)Bi-FL+itAK%lV?$s{anr;FPR?OW43!KF4TfHp>Z(iKG><7P5s3zQI4Emv5|5MD+M^MM zY>G>-CB0EtawV!~Yneb$mhQ1AXOKkpIgrE})9WCKXLqVW62<3sGBDg>WoOvHEbVHh zF2Sh<^Mt|@k>noB_9;m{hR^3Xdl?>^QG8DGm_+e8%jY18=W~id62<2%K@yhF=YS*@ zG*1ArE;zmbaXA!A&RIT}X%WEYiH9IhObPPRTskGlYsF$Hi%Aj01&h&|m^4J=r6qn|o~oujjv7mgg@U{^n=eFV zEnRXc$V;+iN)or?)G1M1OSgn&Yp&cnB}hZ_sFb(Y%B9zgo~taG6y?2k+YC$grAw|w zWvx9b;N-P&>$RZljio_Bo@=*Wi^|nqG9@Zo_t>?h9Mz@MqOw;Wy%y!Oa;sRhH%QET z?a>=a-G;}cxEUVg6)-e-Y$$A-x@7aAix0r*L6MPx#mLL@`5aI>QVi-ce7*q8a`7^J z1`%uNF$AYKj)hYufK#IrD5+UJS7-_F;sk{_D3(BJFvyEj5t2QEyfhVC1R&9)3CcGb zAa$_J0}eZIHUhJRoH!OjV-R8rI8Ze}$r;SzRE5fVX)3~5OBom%m_a4A@(Y#4r<8I` z9v)&AU;s5mn0y!-8Jn5{Iha}mIY6y21`dWF3=AGz4ILdB&v^I*gha$7q-5k2lvKd7 zP=W>ADr7O?hVVhHLQvy!bYj(^LxGBKm!`+wjAi(H=QM1tT_h+Baylx+UTxZSGB1`sWCFa*R!GJ?sjdTFyoC~ zWmQpCoXWKrK|$poucqB~{(nK{>{T`Eoyy9q%GUeN39)?8mExYZHr=Cb^AF#UfNLtN z7A3#iBpuW0r&*r)ZT$p>tW{wV*$Jzq3L7{ltZ4qe`gQ#MzU<}tla1p$7pGd9$WJol zyQmQU?Y#THFE`|NNHuLx@z%V{@4oE3x?1#VroZJI~Yb`32J{8Hd)dYCGO--qs zdP;WdCB|3F)Ska6tULEq;I5CI|D{}(vK5>Qx$Vpt56C}gXOq!rP-n34mjAWJbH0Av z{-u^*_MHE@_3oU-aYleGN zz;wZv?D`W=vn^#QaQ~pfFW+*e*Z#y+CgI%Vp7g8SWh>@QYz@n0xWmA3CGNpWMvu!g zGyiV5fBs+NIq%ogyrrMd7gG6tX6vM`DdE#o=DagwS%2={?E=GF&)38o{WkKdt#R{o zIsE^Xzi1!tCAO3m?KA5Co8F&yZGZH#LyS)*St#x+eiGTaSl8#AB6pcOqiIjV<8@3+ z7(80mGAOKH`gP0VZohx8DsTOrK3BZjGx+M7(CgRpWdBaSTvsW!*+El_{j@@Zt(!NK zBg2nu!`B~0BQ6Kczkkokd0Lly<8kY`)6Hj=d^pVzdZplb`0{-=t3Jm@GnOsO>$)N} zSFO>HX@bHGrVoX;FP`O}-u(0NmuInus`L$w3d+uvzCLxU{#nH9=lj+@on$oY5z{i! zg8{RHS~I&88m}+C`_tIr$;q{4A7YzzV!9K3&*`98kQmRh&8v%Zy*_L4!lzfbZ~mOBp1jfg z?vl6bi^`VUt#P~jIB|2lq`1IY{r+{+zAGN#sM(bz)Yd)Y@02Ghe*f#7)sjWuG0uE^ zR?DCB8Z%Sel64agHs}g}sBK^gN-$=V)_k_RvpMzgr(Z`tzO1kMHE-^_>Zfz2?|Zbz z^ViRk*2A}^OwcHP=FG_(8LA`amic7rIWLwyzn?6yWcZM=e#yM~0;yja=QoF|#~X1l z?2U4t=Kq8#Zjr+4jFb?@XN&s_1MFZ zn|SoXx_i6~X?K3bt#MeX%D~IeYRJH_-e$|Z{o(fa&orl9w<(FQ^#1Q<@N;WwP8tIP w!-xIfMHm_)UQ7~MD(kmL=1BGX-_8YIMJw~T*E6nL%+n?Mse0O(gSz?*0L7o==l}o! literal 0 HcmV?d00001 diff --git a/sounds/dlc1/mister/mr_gbounce22.ogg b/sounds/dlc1/mister/mr_gbounce22.ogg new file mode 100644 index 0000000000000000000000000000000000000000..cb9d1ddc1cdffd875f050aee8106ee14f5ebde56 GIT binary patch literal 4167 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 On6k>T`Axj*Tq6KW$@$s< literal 0 HcmV?d00001 diff --git a/zmapinfo.txt b/zmapinfo.txt index c7ef3e833..bf76769d2 100644 --- a/zmapinfo.txt +++ b/zmapinfo.txt @@ -87,6 +87,7 @@ GameInfo "FrispyCornGesture", "SayaBeanGesture", "MothPlushyGesture", + "SayasMugGesture", "DemoPlushGesture", "KirinCummiesGesture", "MilkBreadsGesture", @@ -135,7 +136,8 @@ GameInfo "graphics/M_DEMOCHAN_THUMBUP.png", "graphics/M_DEMOCHAN_HAMMER.png", "graphics/M_DEMOCHAN_SHEEN.png", - "graphics/M_DEMOCHAN_QUADRAVOL.png" + "graphics/M_DEMOCHAN_QUADRAVOL.png", + "graphics/M_DEMOCHAN_MISTER.png" } ClearSkills diff --git a/zscript/dlc1/swwm_ammoitems_dlc.zsc b/zscript/dlc1/swwm_ammoitems_dlc.zsc index 2291452ec..a6897e55f 100644 --- a/zscript/dlc1/swwm_ammoitems_dlc.zsc +++ b/zscript/dlc1/swwm_ammoitems_dlc.zsc @@ -379,8 +379,8 @@ Class MisterGAmmo : SWWMAmmo +FLOATBOB; FloatBobStrength 0.25; Accuracy 90; - Radius 4; - Height 21; + Radius 2; + Height 20; } States { @@ -394,7 +394,7 @@ Class MisterGAmmo2 : MisterGAmmo Default { Inventory.Amount 2; - Radius 5; + Radius 3; } } diff --git a/zscript/dlc1/swwm_mister.zsc b/zscript/dlc1/swwm_mister.zsc index 8c067276b..49eec4be9 100644 --- a/zscript/dlc1/swwm_mister.zsc +++ b/zscript/dlc1/swwm_mister.zsc @@ -473,6 +473,7 @@ Class MisterRifle : SWWMWeapon b.angle = atan2(d.HitDir.y,d.HitDir.x)+180; b.pitch = asin(d.HitDir.z); b.target = self; + MisterBulletImpact(b).A_BulletExplode(); } else if ( d.HitType != TRACE_HitNone ) { @@ -500,6 +501,7 @@ Class MisterRifle : SWWMWeapon b.angle = atan2(hitnormal.y,hitnormal.x); b.pitch = asin(-hitnormal.z); b.target = self; + MisterBulletImpact(b).A_BulletExplode(); if ( swwm_omnibust ) BusterWall.BustLinetrace(d,444,self,d.HitDir,d.HitLocation.z); } return ResolveState(null); @@ -557,6 +559,21 @@ Class MisterRifle : SWWMWeapon A_QuakeEx(4,4,4,5,0,10,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:.6); A_BumpFOV(.96); A_AlertMonsters(swwm_uncapalert?0:5000); + for ( int i=0; i<9; i++ ) + { + let s = Spawn("SWWMSmoke",origin); + s.scale *= .4; + s.alpha *= .1; + s.vel += vel*.5+x*FRandom[Mister](1.,4.); + s.SetShade(Color(0,3,4)*Random[ExploS](48,63)); + } + Vector3 dir; + dir = swwm_CoordUtil.GetAxes(BulletSlope(),angle,roll); + let p = Spawn("MisterGrenade",origin); + p.target = self; + p.angle = atan2(dir.y,dir.x); + p.pitch = asin(-dir.z); + p.vel = dir*p.speed; } action void A_GrenadeOpen() diff --git a/zscript/dlc1/swwm_mister_fx.zsc b/zscript/dlc1/swwm_mister_fx.zsc index c987a6963..6c5160c85 100644 --- a/zscript/dlc1/swwm_mister_fx.zsc +++ b/zscript/dlc1/swwm_mister_fx.zsc @@ -56,7 +56,7 @@ Class MisterMag : SWWMCasing Mass 10; BounceFactor 0.4; WallBounceFactor 0.4; - BounceSound "explodium/mag"; + BounceSound "mister/mag"; } override void PostBeginPlay() { @@ -77,6 +77,39 @@ Class MisterMag : SWWMCasing } } +Class MisterRing : Actor +{ + Default + { + RenderStyle "Add"; + Scale 1.5; + Radius .1; + Height 0; + +NOGRAVITY; + +NOBLOCKMAP; + +FORCEXYBILLBOARD; + +NOTELEPORT; + +NOINTERACTION; + } + override void Tick() + { + if ( isFrozen() ) return; + if ( !CheckNoDelay() || (tics == -1) ) return; + if ( tics > 0 ) tics--; + while ( !tics ) + { + if ( !SetState(CurState.NextState) ) + return; + } + } + States + { + Spawn: + XRG9 ABCDEFGHIJKLMNOPQRSTUVWX 1 Bright A_SetScale(scale.x*1.08); + Stop; + } +} + Class MisterExLight : PaletteLight { Default @@ -86,6 +119,14 @@ Class MisterExLight : PaletteLight Args 0,0,0,200; } } +Class MisterExLightBig : MisterExLight +{ + Default + { + ReactionTime 45; + Args 0,0,0,500; + } +} Class MisterBulletImpactPop : Actor { @@ -151,7 +192,7 @@ Class MisterFuzzy : Actor } override void PostBeginPlay() { - special1 = Random[ExploS](4,8); + special1 += Random[ExploS](4,8); vel = SWWMUtility.Vec3FromAngles(angle,pitch)*FRandom[ExploS](8,24); } override void Tick() @@ -346,9 +387,8 @@ Class MisterBulletImpact : Actor +FOILINVUL; +NOINTERACTION; } - override void PostBeginPlay() + void A_BulletExplode() { - Super.PostBeginPlay(); A_AlertMonsters(swwm_uncapalert?0:4000); SWWMUtility.DoExplosion(self,444,80000,150,150,DE_EXTRAZTHRUST); A_QuakeEx(6,6,6,10,0,400,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:150,rollintensity:.6); @@ -389,10 +429,27 @@ Class MisterBulletImpact : Actor let s = Spawn("MisterFuzzy",pos); s.angle = FRandom[ExploS](0,360); s.pitch = FRandom[ExploS](-90,90); + s.target = target; } Spawn("MisterExLight",pos); Spawn("MisterBulletImpactPop",pos); } + void A_BulletSubExplode() + { + if ( special1 && (special1 <= 10) ) + { + SWWMUtility.DoExplosion(self,44,20000+special1*1000,50+special1*15,50+special1*15,DE_EXTRAZTHRUST); + int numpt = Random[ExploS](0,special1); + for ( int i=0; i 1 ) + { + ExplodeMissile(); + return; + } + ReactionTime--; + if ( ReactionTime <= 0 ) + { + ExplodeMissile(); + return; + } + // proximity check + if ( bNoProx ) return; + // "safe delay" for main grenade + if ( !bAMBUSH && (ReactionTime > default.ReactionTime-30) ) return; + let bt = BlockThingsIterator.Create(self,100); + while ( bt.Next() ) + { + let t = bt.Thing; + if ( !t || !t.bSHOOTABLE || (!t.bISMONSTER && !(t is 'BossBrain') && !t.player) || (t.Health <= 0) || (target && t.IsFriend(target)) || !SWWMUtility.SphereIntersect(t,level.Vec3Offset(pos,vel),bAMBUSH?80:100) || !CheckSight(t,SF_IGNOREVISIBILITY|SF_IGNOREWATERBOUNDARY) ) continue; + special1++; + tracer = t; + break; + } + } + + // quicksort (seeking candidates) + private int partition_candidates( Array a, int l, int h ) + { + Actor pv = a[h]; + int i = (l-1); + for ( int j=l; j<=(h-1); j++ ) + { + if ( Distance3DSquared(pv) > Distance3DSquared(a[j]) ) + { + i++; + Actor tmp = a[j]; + a[j] = a[i]; + a[i] = tmp; + } + } + Actor tmp = a[h]; + a[h] = a[i+1]; + a[i+1] = tmp; + return i+1; + } + private void qsort_candidates( Array a, int l, int h ) + { + if ( l >= h ) return; + int p = partition_candidates(a,l,h); + qsort_candidates(a,l,p-1); + qsort_candidates(a,p+1,h); + } + + virtual void A_GrenadeExplode() + { + ReactionTime = 0; + bForceXYBillboard = true; + bRollSprite = false; + A_SetRenderStyle(1.0,STYLE_Add); + A_SprayDecal("BigRocketBlast",50); + A_SetScale(4.); + A_NoGravity(); + Scale *= FRandom[ExploS](0.8,1.1); + Scale.x *= RandomPick[ExploS](-1,1); + Scale.y *= RandomPick[ExploS](-1,1); + SWWMUtility.DoExplosion(self,444,120000,250,250,DE_EXTRAZTHRUST); + A_QuakeEx(8,8,8,20,0,900,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:300,rollintensity:1.5); + A_StartSound("mister/hitgrenade",CHAN_VOICE,attenuation:.3); + A_StartSound("mister/hitgrenade",CHAN_WEAPON,attenuation:.2); + SetOrigin(Vec3Offset(0,0,Height/2),false); + int numpt = Random[ExploS](30,50); + for ( int i=0; i candidates; + let bt = BlockThingsIterator.Create(self,10000); + while ( bt.Next() ) + { + let t = bt.Thing; + if ( !t || (t == tracer) || !t.bSHOOTABLE || (!t.bISMONSTER && !(t is 'BossBrain')) || (t.Health <= 0) || (target && t.IsFriend(target)) || !CheckSight(t,SF_IGNOREVISIBILITY|SF_IGNOREWATERBOUNDARY) ) continue; + candidates.Push(t); + } + // sort by distance + if ( candidates.Size() > 1 ) + qsort_candidates(candidates,0,candidates.Size()-1); + // distribute among spawned sub-grenades + int k = 0; + for ( int i=-45; i<=45; i+=45 ) for ( int j=0; j<360; j+=60 ) + { + double ang = j; + double pt = i; + Vector3 dir = SWWMUtility.Vec3FromAngles(ang,pt); + let p = MisterSubGrenade(Spawn("MisterSubGrenade",pos)); + p.angle = ang; + p.pitch = pt; + p.vel = dir*p.speed; + p.target = target; + p.ReactionTime += Random[Mister](-10,10); + if ( candidates.Size() > 0 ) + { + p.seektarget = candidates[k]; + k = (k+1)%candidates.Size(); + } + } + Spawn("MisterExLightBig",pos); + Spawn("MisterRing",pos); + } + + virtual void A_GrenadeSubExplode() + { + if ( special2 && (special2 <= 20) ) + { + if ( special2 <= 10 ) SWWMUtility.DoExplosion(self,44,25000+special2*500,100+special2*20,100+special2*20,DE_EXTRAZTHRUST); + int numpt = Random[ExploS](special2/2,special2); + for ( int i=0; i0)); + if ( !seektarget || (seektarget.Health < 0) ) return; + // check proximity to seek target + if ( SWWMUtility.SphereIntersect(seektarget,level.Vec3Offset(pos,vel),80) ) + { + special1++; + tracer = seektarget; + return; + } + if ( !CheckSight(seektarget,SF_IGNOREVISIBILITY|SF_IGNOREWATERBOUNDARY) ) return; + // sustain reaction time as long as seek target is visible + ReactionTime++; + // "subtly" steer towards seek target + Vector3 dirto = level.Vec3Diff(pos,seektarget.Vec3Offset(0,0,seektarget.Height/2)); + double distto = dirto.length(); + if ( distto <= 0. ) return; + dirto /= distto; + double spd = vel.length(); + if ( spd <= 0. ) return; + vel /= spd; + vel = (vel*.7+dirto*.3)*spd; + // extra oomph + if ( spd < speed ) vel += dirto*max(2,speed-spd); + } + override void A_GrenadeExplode() + { + ReactionTime = 0; + bForceXYBillboard = true; + bRollSprite = false; + A_SetRenderStyle(1.0,STYLE_Add); + A_SprayDecal("RocketBlast",50); + A_SetScale(2.); + A_NoGravity(); + Scale *= FRandom[ExploS](0.8,1.1); + Scale.x *= RandomPick[ExploS](-1,1); + Scale.y *= RandomPick[ExploS](-1,1); + SWWMUtility.DoExplosion(self,444,120000,150,150,DE_EXTRAZTHRUST); + A_QuakeEx(5,5,5,10,0,500,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:150,rollintensity:.8); + A_StartSound("mister/hitgrenadesub",CHAN_VOICE,attenuation:.5); + A_StartSound("mister/hitgrenadesub",CHAN_WEAPON,attenuation:.4); + SetOrigin(Vec3Offset(0,0,Height/2),false); + int numpt = Random[ExploS](15,25); + for ( int i=0; i