From 9989d6db75a8656ad794fb5d5aaba4941ea68b42 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Thu, 12 Apr 2018 23:56:43 +0200 Subject: [PATCH] Updates submodule (#56) * Adds audio to the content repo. * Content repo updates * I forgot this AGAIN. --- Content.Client/Content.Client.csproj | 6 +++--- Content.Client/UserInterface/HandsGui.cs | 2 +- Content.Client/app.config | 4 ++++ Content.Client/packages.config | 4 ++-- Content.Server/Content.Server.csproj | 6 +++--- .../Ranged/Hitscan/HitscanWeaponComponent.cs | 5 ++++- .../Ranged/Projectile/ProjectileWeapon.cs | 5 ++++- Content.Server/app.config | 4 ++++ Content.Server/packages.config | 4 ++-- Content.Shared/Content.Shared.csproj | 6 +++--- Content.Shared/app.config | 4 ++++ Content.Shared/packages.config | 4 ++-- Resources/Audio/gunshot_c20.ogg | Bin 0 -> 10344 bytes Resources/Audio/laser.ogg | Bin 0 -> 12962 bytes engine | 2 +- 15 files changed, 37 insertions(+), 19 deletions(-) create mode 100644 Resources/Audio/gunshot_c20.ogg create mode 100644 Resources/Audio/laser.ogg diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj index 19c65e36ac..59d37c9658 100644 --- a/Content.Client/Content.Client.csproj +++ b/Content.Client/Content.Client.csproj @@ -63,8 +63,8 @@ $(SolutionDir)packages\OpenTK.3.0.0-pre\lib\net20\OpenTK.dll - - $(SolutionDir)packages\YamlDotNet.4.3.0\lib\net45\YamlDotNet.dll + + $(SolutionDir)packages\YamlDotNet.4.3.1\lib\net45\YamlDotNet.dll @@ -107,4 +107,4 @@ - + \ No newline at end of file diff --git a/Content.Client/UserInterface/HandsGui.cs b/Content.Client/UserInterface/HandsGui.cs index d966235416..d851fab8dd 100644 --- a/Content.Client/UserInterface/HandsGui.cs +++ b/Content.Client/UserInterface/HandsGui.cs @@ -37,7 +37,7 @@ namespace Content.Client.UserInterface base.Initialize(); var _resMgr = IoCManager.Resolve(); - var handsBoxTexture = _resMgr.GetResource("Textures/UserInterface/handsbox.png"); + var handsBoxTexture = _resMgr.GetResource("/Textures/UserInterface/handsbox.png"); handBox = new StyleBoxTexture() { Texture = handsBoxTexture, diff --git a/Content.Client/app.config b/Content.Client/app.config index b1e9c47917..aabeba76c1 100644 --- a/Content.Client/app.config +++ b/Content.Client/app.config @@ -6,6 +6,10 @@ + + + + \ No newline at end of file diff --git a/Content.Client/packages.config b/Content.Client/packages.config index ad225f30e9..7d168b6762 100644 --- a/Content.Client/packages.config +++ b/Content.Client/packages.config @@ -2,5 +2,5 @@ - - + + \ No newline at end of file diff --git a/Content.Server/Content.Server.csproj b/Content.Server/Content.Server.csproj index b6f61fe713..400a41d82d 100644 --- a/Content.Server/Content.Server.csproj +++ b/Content.Server/Content.Server.csproj @@ -59,8 +59,8 @@ $(SolutionDir)packages\OpenTK.3.0.0-pre\lib\net20\OpenTK.dll - - $(SolutionDir)packages\YamlDotNet.4.3.0\lib\net45\YamlDotNet.dll + + $(SolutionDir)packages\YamlDotNet.4.3.1\lib\net45\YamlDotNet.dll @@ -135,4 +135,4 @@ - + \ No newline at end of file diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs index 199e08793c..0a78c59c7b 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Hitscan/HitscanWeaponComponent.cs @@ -1,5 +1,6 @@ using SS14.Server.GameObjects; using SS14.Server.GameObjects.EntitySystems; +using SS14.Shared.Audio; using SS14.Shared.GameObjects; using SS14.Shared.GameObjects.EntitySystemMessages; using SS14.Shared.Interfaces.GameObjects; @@ -57,7 +58,9 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan Color = new Vector4(255, 255, 255, 750), Shaded = false }; - IoCManager.Resolve().GetEntitySystem().CreateParticle(message); + var mgr = IoCManager.Resolve(); + mgr.GetEntitySystem().CreateParticle(message); + mgr.GetEntitySystem().Play("/Audio/laser.ogg", Owner, AudioParams.Default.WithVolume(-5)); } } } diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/ProjectileWeapon.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/ProjectileWeapon.cs index 7482a2015f..84e758b31c 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/ProjectileWeapon.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/ProjectileWeapon.cs @@ -1,5 +1,6 @@ using Content.Server.GameObjects.Components.Projectiles; using SS14.Server.GameObjects; +using SS14.Server.GameObjects.EntitySystems; using SS14.Server.Interfaces.GameObjects; using SS14.Shared.Interfaces.GameObjects; using SS14.Shared.IoC; @@ -23,7 +24,6 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile var theta = angle.Theta; - //Spawn the projectileprototype IEntity projectile = IoCManager.Resolve().ForceSpawnEntityAt(_ProjectilePrototype, userposition); @@ -35,6 +35,9 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile //Rotate the bullets sprite to the correct direction, from north facing I guess projectile.GetComponent().LocalRotation = angle.Theta; + + // Sound! + IoCManager.Resolve().GetEntitySystem().Play("/Audio/gunshot_c20.ogg"); } } } diff --git a/Content.Server/app.config b/Content.Server/app.config index b1e9c47917..aabeba76c1 100644 --- a/Content.Server/app.config +++ b/Content.Server/app.config @@ -6,6 +6,10 @@ + + + + \ No newline at end of file diff --git a/Content.Server/packages.config b/Content.Server/packages.config index ad225f30e9..7d168b6762 100644 --- a/Content.Server/packages.config +++ b/Content.Server/packages.config @@ -2,5 +2,5 @@ - - + + \ No newline at end of file diff --git a/Content.Shared/Content.Shared.csproj b/Content.Shared/Content.Shared.csproj index c538cc8029..24981255e4 100644 --- a/Content.Shared/Content.Shared.csproj +++ b/Content.Shared/Content.Shared.csproj @@ -58,8 +58,8 @@ $(SolutionDir)packages\OpenTK.3.0.0-pre\lib\net20\OpenTK.dll - - $(SolutionDir)packages\YamlDotNet.4.3.0\lib\net45\YamlDotNet.dll + + $(SolutionDir)packages\YamlDotNet.4.3.1\lib\net45\YamlDotNet.dll @@ -97,4 +97,4 @@ - + \ No newline at end of file diff --git a/Content.Shared/app.config b/Content.Shared/app.config index b1e9c47917..aabeba76c1 100644 --- a/Content.Shared/app.config +++ b/Content.Shared/app.config @@ -6,6 +6,10 @@ + + + + \ No newline at end of file diff --git a/Content.Shared/packages.config b/Content.Shared/packages.config index ad225f30e9..7d168b6762 100644 --- a/Content.Shared/packages.config +++ b/Content.Shared/packages.config @@ -2,5 +2,5 @@ - - + + \ No newline at end of file diff --git a/Resources/Audio/gunshot_c20.ogg b/Resources/Audio/gunshot_c20.ogg new file mode 100644 index 0000000000000000000000000000000000000000..e3b9b87c8b0e0db851e71a011d621eaf5ab190c4 GIT binary patch literal 10344 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 QHjqi5-{pXLvCF`J0hG?Q$p8QV literal 0 HcmV?d00001 diff --git a/Resources/Audio/laser.ogg b/Resources/Audio/laser.ogg new file mode 100644 index 0000000000000000000000000000000000000000..4e566c1cf59ea63fa2d13037d094c6afb62f90e5 GIT binary patch literal 12962 zcmeHucQoBWx9CqVK@dHN8l7m-;3m;&6&*X*|Yb|E;D;3KgwoissJ+ZH>K;|R?t6pN+D4rIosI3 zws5!xAwMhri(+?+T#KZ9J@TLFdL$CqTKy=ROptZ;Zwcj=5*3J`WnpX1scdgXV`cGL z8lrx87fD5G5`YN~;(kuk=`$Rq4gmN7@QQ&2FV<9!B`@wH zvujeE>~*d4QAko;NGF+5ICs}S3K~9RVgNt|e3-E!a#rLl2ZhYYm?G@6ge;T<3urJx zRThM>+7BNZz0LoU|K{x=3nM13HX0~f03u5pKm@%mUI)_#l7U4KrF{==L7F`_>!+;u z*gQQne$RQ|a9J zDE@)P$bj*+NNBKP=vZQMF;SgBhX(H z(dN^}QaeWC#b$B$u;fyIh>(^q^m_p%XUcPYf3tEL0Px4ZvEqLeH>P}R#knz|tbNRt z{XB5?>!P@0P4@@lUFsN!Wj;)yTi(q2H7$gp6Pw;o(r_6;oGJ*L1elPIQ{73DBEz znxFKXpZs7z8u;&q^-s?MK&SD)@yWQ?;oRM6eo7Kpw+jA;=hzW-M^pAjGbmIrD1Kuf z*ymF|;2XIorNXDEN~||R>@-SZqWV~Gl;31j-DKR^WV+f!x5iVu`me*>y3PEg)4zDm zwTsXRMJ&q3p#F#FWHCql5{#gii($}?dFYy87Lrn!oUvY*js0()V;)+N6j~4*x*8n8 z9FkxWk^-yCw(2Y0tp9KGKRrjro&n6D=SbNz{EO$ba#Koz-c-S^cyPN$u@O+9j#8xm zssI3Jjlxm5*+*2M9OF>_aVUqnn%IBsF<|dFpW-MVDA;%aAP0b@-25>&Ji^yeLLpDh zG3CBecD@u|Ps@239u!3{Ew@dp+K-P~l{73DKs5GC$CAoHE$l;yvFuZh>Mkhl@+S;% z+rtDtk^^|%NR)~wlnU3!$#s$&1r&*p2JT%SP+)2u;e*^0gWQw4ZT`DwzM0 z0U3>`A&v0;+(3Ggw|&cFbG7!z0O|D4SKJ@nrgBKa@_Kv1?8 zi7h1@Il@RA62pGyl{TP=@{R&RgmjIJd_BASe2gR*%zVa-06rS9U`qu5#;39*n2=|Y z-DAhDF#0Uo1Pp>g==i`YLB^_UKGx6yxNhdqYzt)Ycmc(Zb}jbD=JM=#FU))70U8FN z^`~IMvTHVTC>TG%`s~=@2hUW96jjyr5*M`+RztFxQ}SW;oFJp2nH`XIfSqZtO0E3m@0WnAU6hX{Mv~2T~{6ZLbl0a?{$DQ;@gRfyQ@N_}GMpDa@Szd}e_EIUfyJo6J{av8#l7wqT4j)s=Uz#3Af(MB1H+p_BBSdVCoYB? zjFXk*dy_yIQ=T!1mlg{Z24Q$$z~Km@{GR(hjv!dPJypBW_}# zb>UiF8BCzK8GmJLuLo-5T2PGeYaJEBVAx=56ckjz zb-W9MZMIim%YV|zaOPV0oAs@r+?`CwYp;)Q_B#NeYzqLapADV-W3$U!!GjL@`n>e# z#$*9wE_B*ldXXF+TWzZzzw$4gc2cu>bYe@*nq?|ChBXoi`;_8UWc~ z018Cg{{wF^LppH;Iw?g3A%KYmYW-<2_ZmZ7jJ!OtM7R($V|;>6Xo*BHH)dY$n2r@U z$&e7n$J{ubP?qXnpn^acxD=h2cWCqCbiz2Q$x^LoL9M+3VMe_2RUiyp${Tk1IuKUg zN%rQ06mzQXb?=)JewJkih4OJ7qvEQEIpHzau;Qu-x;Q9L7m+GhOYwiyg&;F3=3do_ zC2T*YR^lz zVnDpSza1bWkpABekP%4cb_7_t4#DHEajz>kW#M%VY~Gf)9eE%l5O@o^W&}3>(z{_4 z2W7o&g4-|3_3lT{%JEf+w^S5ahKT1m z+A1vt6Pl-ea`Nf#FSK8jB#TA&BeGdv~RQ0v2q@^ZLS4?_Y|0{^`hB?JjeQ1E9U)7+l_ z{j@AqwG9YJ0syFi1#oMd2I%OrlNZE@J#07#gax0liDHYVonLkooFX8g@$ujAUW)}PaqNH>XD&CbTg z%KB>iYVoS?YUQf_su%qC7JZ3wcN*946-;QSQW7UHgcsQtgj4eJ9t@5>xKdK15?!9`;@?AWm#iK^!j}kN#n*fqzqH%Q;>zQ(~ zX|{P;aF){mU+$QH`^x=NdHngx+?fMQEDje}!)ulspa#kr`CROqWu9Q#0?Rd6s}OtkxU4cza;Ml1nDuyqIJinBhRQT<)XBn|PJ7T~5Uw4>&~P)({OHq?948Y@&<5 z1&E+dU%guR{XOV$uv4Fmjq2BC@S#$q&kE?ri@3#>RPl`mT%N|x{n)mJD_qoHY(LTa zt;t|-B^FF4a%N8_4||h6t=D|foFKe5j3Dy7a`)12H2KY{gks^C_j0bxT(6#LKhcenk!Si69Zh%L z-wG^Il^H&hdq7#;RB?BX5(BeqakY+pW7;!ta;#u?{`}R>fk2N;fl9UbWqOVKf`G*G z`hdGfErt%BSx8GG3JoAbN&vArHJg1#hxM4IA(zQR4I9%E#g;?5Y24Ar}FCW#m$56#<8m-cx2*a-1P2XWoRGo^X%7Zt>$!j zUu0QAlfe1Z>XE`#4jckJT@lr=Sd$cIQ~N;#C#h36La$`)dvn9oSk394XQ7wbp?evk z`3qZBYNWBvhuLqr4SfCll_3pEL#G$trEw&gaG45OO2g5Wts1tlCQZ2aorrf#HiWw_ zi0>LK<-ZMz%Uxxya2{Mdo(gz z41riOo2)4fgXQ8&OAEeUTkoshnYAM_(@}ZX-Z(dX(BSXmo|G!*LasG} z0hLbq3A&SDH}!@f71M_WJAGFZg-`TpfYEh-{-hc07z-%+5kcY0@AOSokM;+cE)OmoymxZ<=cuaE6%_pjbk;kEmY(xh za!&}jA?K6LA!S&dx>EOU6Hd0-%WgeZfUoxt^c^jn_xA4CmI;eaO*55ju-Q@OCqC+J zuzU9z6{~bX%IBG+pYtwoGjL2Ov{c0pa`K6+J7}9)ZG2(vI5LBKL z?A2u&`8ATj^`Zwx5wE5Wv-D%6q&RCJSJWgdy?F3UuS8`hGw@wW+n3|gFKdz6i9tIH2Ot%-<#7ix-B%Jr_zIZ(MPXYDS6a7B|-D(N>T6pD+_w*6XWg_<9gcwAo&y!aR z5Jz>|yygD8HoL;1?>H`x7bl;dE+bO+7UQI`Oyz72?Cz$_#WNxl%lq3GEcsDz`4~Dz z$pzr-H7%nd)h6nfx>$3k^;UW$XZ94M_Bl1s zB!3jj*b0g+%DlX)d((A+;!gZx3k7+QY_IgJ@euy~Id-6aQsU0c=+CZ!PB&B5Lc%8H z`uVvJS(OJ{@-77L`ir77+EZc&L+d}Wx6#x>0HEt-A*$@L4su2GGxQf(-(SV#qaI54 zP9G&P`Je$|{DEjhksq10$LO(r+e!m{Wwvp}@(rbGG4Ro;*|j*L%Ik)5an^0QHlnP6 zx!xsvOdd#?sm>x@_R^m|Ho~Y_Hn~=JjOhrw-EZ654GjT0_7jo*Bh#V>l~mSWN^}_W zV8rLzzk74v1+>kxoft3j%7kmdDdyr~p2(T&V14uI z&shfu?vu*hOl5Izw_IZOQ4OrX_2NzAJAey!6G;a$4#K3^g(-+V20BoRN%Ca{qOu+M zzOUL@cTHc(M>s9t zA^AAYzS``$9#1VJT^Udwumk?6*=-P>tq;4#QUXo{n7AqZMgWaEuKc$$GIY9y%5^J7 zOY-#ZY#&5%Dj+_t(Kz>8<*)#1*cU4x1;QnB1V3DBT#>-i7kKYKs_@OTXEJphkvAi5 zM&DjUp*Ac!uZ|wgySc_c#`xfEt*V8X}x1DRPZIa zO!JVi@KkC!OKF*QPAJOE$Cut-OWrIzgm!UM=aemXMpb>Ny3^shPv`4|j>y*6II^3c zt#QS!ip0C={wA!kW7F%M#$CdRyd0nODEoHRpUew^O4Y698F5t!S5YK3JlP!T{Jlq~ zbkNb?>YJ~#Lpc%zo8k9Dm~DQuZ$ETvOgz)GH6}blAVyn#?dpW%>t4Dt#_j&+o7~( z&+9B&(>utQ-%2%#3+oXZp5~)N^Av3CI;j46LAjD%6zPC)sZcf{JxLFX9m}YknVfze z6JJ@sP>*6h1=#+n#1`$502aMlHZ@ioeBb0AYbWVQzaYK9_mtL&=b@4D4UwRUG5MkpwJOfo_ujLE zYfZUE2~!n%y9-tk^Rxo6={h!&qNQo~LE&KBv!TX$G5TFgJ`IgBs<*{gM-QKb6&V-A zGfH#bUB~T$Q~t3_P^|IFq;7?D2u3DYKAj339V^r^YfDx-I%nFQ2_bbsa($XEeBe>v z==yN-pdekzMT_$zOd3(e>v>4{r(u2$=kA8|G?ZcI_`>Pp{L-WOVv}joWNkLHUV2nj zNR6Lcj>pJUBM$b;Y^+eaaqry08*kDDaaK#q)`l*vHvWB)iYsz=I$ONHE_tr@$E8i* zhD$_bP)*10>7c}4T3Tdvsrs;nR-{$!=}#TcInaBeY+otl zp)_oIKy-;*k;HVhW%}}ts4AL0$zjHd5y#mXg5=XcEBw)-e{z$y(hLi;$giV#X&hg{ zLd7{o);)+-G;-Tt@DjlHM3i zZBetfOd;h1W4ZyNWaQ7ggy^xdxEor|U!AT`q%QY1QWSQtAd87L;9_BU zxlh?V(5PlBVvp5RHcTPLC+N53OPh_gov+b@S8BAlSeV^c5NH=zM(iveBSz=D)mt5Q ztn=V9HW`eOv%3SY%56^ekAo10XL^xV++Sz6?rO(}5c4)4cCCIxt2)bl(J;qYgq|9!tEe5uBgpZItOMtdvYO*KMVnZW+T8YN5(2C$VBQDRy2pdl2S)@yC0A*mUKa3|6m` zjM&FSqB&VCV_a2amLO& zA=9{?gPsqh%5!Y(=$R`JiIMPiZADL0Pmd2SyWm?|p^)^-X;;}2z6_5up2 z&eAqt9%6j2G~7({)LEi4bc*K)?VL9D-0{5J5SU-i^r8u-#N$R>G%XJ){IMeV3Su}6<-yBm;Fxg zH>j=xeXasEFjOb95QQn{09{As>S|n?2ojpVz!&&X46N&=@<* zl{W1$wVYOPd|)Q-{)R1IUp8_q9pSv(7OM?A_@uo-3!Ki?S6z_3Dt&iv_5G>qWLUN^ z7oiXNkmoTJzQI=8h^-|V?DLI8ckgL7!z$L^BiC*o`bZu^My!sF7jRi*Ui8)PKHS5c zFZYYCM7p=-F(qbHvV#`_H24JC>D2L9W02Z<_SMxrlvO`MqcMPHH%1hc4^)oPPbJP@ z*T{YtUdCv>cw0DSuB4?T5GIBwKhap~xNFTU6`(>9#}o2)yWQ3PRG(e~t>0|o#MzLzweo7D&AVE;#(L3m5r=Yd*VP{}F~HH;#>r7r zv)nyifldcc7X)9rrz^{NcjdmlLZbuJtQDx}%|GE^YgG33IzGLuFdqoA za&M4VAp|6Yro+iY=Q640s9qFGmLyX5qo$+HK2q1WcHghBWs{FU4|qzcRjEeG?--kG z{B1R(*Eu7ysmN>lp`82v!(Wcu1~#?rqv!L>SOR*>zted;e@8)-ZRWC5G7Lkt{8Ib9 z8N`^_3g*Mh*$nnE9V@L5s%%`mUF%jB`(}sjD%4z!gkz;QpF+@i!s`xH(Ihu5no1|| zls|i-VvT0@)m(`;UiY+z37gZGdrIdZvM@@+*aXcU&qKU!;{j9 z^T3hq!!w+Of>XMJeAJ(njApiVzf-oyD%Lw9SZ0jk?V1 zABc`f_yoW5Xk?!h$%tgA@tUb6-OKFTrRxpZ>o3@_S<%kq->WRD3;iB&w5FI@FZ$d< zG|pgix~8CxOSQ>~a^F8v#kkrbyI=Wo{z_D=fnT^`)r&WEj4itzMbv*QMuHW4L@ zjR$t7o8%?-8NR5aHuq>;j^Cm9uuRs`Cc_R~NjNl{4KwAOiEYaP4xUMdE@oD_7c985 zclUL(qKog)*pJf~hV3)b`spT^a=+(h16bPkH7yve^5zYcbZOwZKOd?Dh*#P|bexO* zG(8v=072W~EKK0ZojiynDMn_Nk0(4n%jbYsGwSQr$2SuqM)RbL^Fxg(&bET=2eM0> zTfct4lr=Th>YnoO^i-=dmA7D4h0z9wDjMk5EzfTcA3xkUSl&F`u8Pd@0uKt)ZS@k} zgo1f;Z&yh|phU&Bd8O9*Pw+?N15})FR`pQJ+Qu<=?|tf=vNiV*-ua=8vp<1~5)ZIF zN4h;YBd!b{pCuQ>Y~BC#&@JPKfK9WA=q1TrnMzNO-OO!V3Z4RziXVEO$5jUB-Ermg zKA)pQNO#!Lg&ihm6Hnr7yK2*iJ2IRmob)p9EXS}N79G#kaSeB*dC1#_zBS$bvC-Sj zOLU;d8>P%C+qwBOQkB}ED`;Be-Q~niHlZbjgX&!oQ$~4N0ltFf)dFn$%hJ(g*OS@y z0Sy}r#@(|dMKaD-Yu~WhjM--GF%vrVr-O!>eWBuJZgk(UCQ_=_Yx>lGjE~O}9roMv z3UcX^;XsUezWG+8MeAg2e{A?1I&M%!Qux)!Kk+}2@7H(tj4-e_e!2?(W7dcje}-I zgE_}^vgQ}WlG0$uU{`y)j)=0<%RGystkGcKjm6TX0T)v&oW`QKv)(@fb@UW?zq&~h zD=)6-FosSWlCPK!9W0$=)HX{p#@y8OM!90u8WiMsPm;PyH+Gh_%`IAViTK%hMkvk0 zWOZ|?n0Q?8p9ujx5lM21W+YO z6up*I;d94V*~ceDf0OsyZ&_O#Qm=>VkEH(y&{sfv=4<5g2>D!}BQfO(qZ|%l*NGPZ zEOM@{9N=nR8VexEA}oVb^_W#S&ez6Rub$q>xT@F>&EM+7_R`LW`4%xhGJnzwa1Pm&txidrrcecM zT`Vr{k6Q`ri0C9%6(UDRMa49(@W*4&Xgp0Ou&r?W#B7(?_fyZ4+&-)~|7Xn1L3#u0 z8oimP%TdE=cGMlVU3(WUG;OsFsp^c7516mRoJcEqH)v_->q}dn98Le>pmEJiJP^Oy z3^EAe7ikQ#E8VPCT**6IN~0cB8$3CmW1xGeF&|e~dypDiUe}-Tq>+Bb`>NkG+nPuE z;$7pr%qI1{#oA2lR=Z`h!Tyo&xba1S>>FsuIZL_*;kHE$P)636_IhR%^e^l&ND9R| zUAe8LXKFrq&eh?pO1XkS^u#z+KGsv8qVK(OS}Mr|>@D^$W{j~jrm1upL(=hnLTUO_ z8#1&PNC1fr?g_fOhR) z9PJPjb)bIF#O0P6UbUIuaD=5=868RMw(>3W+~y-nV$fve5QCick+GO#5Yu*GuHpM& z%QwIaA{I%u_;wr!Z#rTNws}=ow0t@AfLM*+toaSnNkq$9Sdfw1Oi9hwTYuT$G^N~k zCX?!^?>-i?1J%jB^FIX2-Ql}st5>yVKp?Af=+9!(D4G689cRtw=UzKrFE76cdP~Ch zYq!=S3!k3e!xz<`bk}@7e&Wdkb9cF0e@A-PC|WU^?-hUgnx#@^gXwP3%;vyI~m zKa$6!^(Is2^Kv=Q8eBHur905mU`@zVEEfysy4!U=c1#YW53`AL!uRas#J_BBPj&}L}K=Zjz7@WsXXz*VMEv6d>z~NI1vq8N3fI*#0WcYchUj`P0F#RIsjYEiqJ6nqVrcNy%e193gycfBf*{*ns^xBL?O?eU7{Z?9Kcd?S`t;FvXeTFNMmUv6wVnT$RkOho_|@_@s1YbYEtY zn?6QrZt3r`#18(6^hKfxOAzw~G&!3;X06ytP`IF3RNqC2uB75Mq(sd5T}mTmsT@~+ z{iWC)-1cu}fh|zV0|q4;?1%+1i|Q%E#D)1`{El4(Ogq0(AHS8OVB|RI3%T;0?`YqF z52jV?g(-!maN}*HBsjKjn$4>PE(&hMAEHd$4TCnFy~eA#3B_M?aZgG~nny>Tpy+%8 zZ@30by77(awj*Sy)ug`X7#i(J{=$Xk49VYwNQz$I<6_#+F3fXrWh7Tt1cW3kWV%|X zb7bT;7N4%FC6pzea4tJMXdWAFahSlw;65l;SzP5k^qvUWN1QiK79ERZe>h+wJt#&d z&T8?zO!RiV!z_l)N8(GL8O|=pL7FJjA?iZ_&>{|1FPpjPX4;=;+sS%sKHC38&3kzv z>UipA)`RGBkZS_xF20^2;J!*#886wr`BotG~#P@C#o(m~nNZjY~>|zs#iGeVG`vTr%~tX6>_m+8lX| zqrLY}%_ils_T$~|3frc;(8ZOruU{p^L(x^`iW>Kk>(zhgvmgR9RZ4mYLd%M#GGkn# zxOjL!QIHY;VTxOHU3J>*e0;uF9Xc9C0$U-Bic^S2%|#u4tE``KA#Oc4Yr7bhSajbG zumzt2dZ~M<rBpZe&~!#bl!bNUWWF1?S)r&h1d zCU*^5ye}>f&kinr1R1G>G8%43X{&3hSLqv5&~?04RNk!|THUI2|E`nhgyr`L6U^}k z>o4Pi7HN$#Gn(t`>)-3J!0nYg(mcJyes~`o3K+DwUaY*+VJEd9lu0mos=G<(Ol&_W z6q?;pM^h|dqXWTFDBY;PQHQ{`vy<9l}aP^P#yr})B4y^E`> zlPhp`x6?fLo?F$MFadMCiK07rji2iV6Nc60&7XC&)Ya8l0E6SidzL2JM*uLKkmv+{ zS*=Y9rvNw)G*pvHbhT|}DUgi+TwR`AoqJ!3pKWDOFC({3m|I#}vOWy0emj76e15_^ kyzJrNP