From 3e5809a98e74ebca1605c2fec8a4c8feb4e35e8c Mon Sep 17 00:00:00 2001 From: Talon Date: Wed, 14 Apr 2021 16:33:05 +0200 Subject: [PATCH] Satellite explosions --- .vs/EvilSatellites/v16/.suo | Bin 94208 -> 95744 bytes EvilSatellites/Objects/Satellite.cs | 17 ++++++++++++++--- EvilSatellites/sfx/satellite/1/explode.wav | 3 +++ .../sfx/{sattelite => satellite}/1/loop.wav | 0 .../sfx/weapons/LaserMG/spindown.wav | 2 +- .../sfx/weapons/LaserMG/spinning.wav | 2 +- EvilSatellites/sfx/weapons/LaserMG/spinup.wav | 2 +- 7 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 EvilSatellites/sfx/satellite/1/explode.wav rename EvilSatellites/sfx/{sattelite => satellite}/1/loop.wav (100%) diff --git a/.vs/EvilSatellites/v16/.suo b/.vs/EvilSatellites/v16/.suo index 9273a82193e837d44dfd6d4dda0e7602cffb2a23..cefdcea02b1d48155a53d4db986f3c94958a668e 100644 GIT binary patch delta 4195 zcmd6p4Nz3q7035Hc5xRLUHMSH6-p3=!17%cC~=p?f(na*m`ocmQKU%>)+LJ3_|(*x z3=;R9=u09hT|b)|gZmhtHLax;Q=29#HL-0>tDW>CnL17E;51kxJ?HJis7+IwOlG_@ zzrE+4d-vY^&iUW_o_N6|UNmj8CkY0<*bIid$P6N`4Gj&km+jPp?l>W=VahX?r)2*I za>yfMn^0+bg;$>kSNZ1zi6pTPHMy!saE}CU%j9$l69Y@3vp+pF=m3Wol zX+{z}p35ghG_|d|&q8$?kw_#HMZ{==x4E5a{tw%+WM>E3-nn7LCcTTh!^j>-j3Vs1 z{|ME&L_U$A`wI2C#_NuNbgz3ZPB)cCy-3~%i3P+$qKR1Hbywp1rYFPfPygjAhh{1{ zKQ}awNA08`&qdG=72Xw>a4lSHP0+m@CTx#4=(z(MD|Xy5ppfZX<6MdqNIpyi3kM5q}`g6Bh{XWZu*5 zKU4iNfzOA|fNS2yI4Qc%4CLU4<}-i;(IT9~)|k~6UXV3yz)vj7mtCg7X{K#xdC`vA zacnJE4g2wO!EC&CZw9ntYvC+BCS(V59AW{ljD7vTY|MInV>D8-p1|o*88~3AHgdvw zGW10FmDDlsfIsgTSPWkyH;abX4dqm64`nbYL&araW(lV2z3BNyyJT}3Sx$k8Y*iLu zP4PXz|5pZVR*)qJ6vzi=Lab7q*d64L_dw*gX~6vi2fIc~9k9tDy$ zTnW$ggPBh*Ur_v@Cf2zb2eT`U;q0QYnjRoy6}IJ6np3%x-I`)@sPO^YXCZb}~*Flq-e7f>h%`M_#ca)`;LM5+qNb z_7EH{9;ytaTESN;_)DDsp^-Vp;R&@s(mxD_gYH+r+cHP8pD?=gDR97E#hXG;cDrx7 za2vwHlz5wBi+}Ko%gM14I=$|(_iUp*>>xPpH!6YSyNlRO>>>6N`-mS9FA+Z^_7ik9 zq-ziNBWjRJ;yzy`F%^7t(Gy#ZeS#eaVygn}xIitgG=f#rl9q7RQU%Q$&=PM^li0A9 zI0ZLr$<#ouI+9HV1m?X(EhbGZIGA2x(Qfua8Xk~U#wiQ%{m$>yfM;2?Ig%RD!;XPv zHpO`FRg;wLyiJjX-XJn%s1c0*JyuAW;99?H`?daa{v-BjN{MsHnUe*x`+Drt-ahlWW-xh$H~$1s<+^tn&!T4vIpliEpVjD%i|Z9 z)W33Q;e`EoaBrb+k?^UShYwzOK+W_ZRP1r<(_ZVrzqh60_!W6d!%JNt#XA01R!mm@ zFRoc0hvLde4ZC2xZj(>y_vm4`(@_CAfS>$owm_!i8CY*&PR<6Wcd_FKVfwk>0=y=q>%Qp;@ys z4G-X8M?L=f*-R9lt;2t8n&jVfQHb!+$Yy$rFQ7L!jiGmUk=$PkljVyuz-28mtSS$D zlEfS2H51`=oVV=^PTcLo&dpn}>$$7AvGWb01MOEzU>pAIqXpP<@|66>7|5p~9cb$= zR&wP2AQWHdz;AWhm5lAb4Dvl8?EI-u@QDI8Znfk1U1t2}t{nW;?tHYrJWt*f3>NGj zFw4KsgLGx{zK1~G5e)y*);Go*oc-wiU^9NWtyn!W4iZ77eeDC^T4PcmK>QnR0Q$7% zFN8q3tCvsDO!eg)*Z`(PvLoe@2{2oM^_k{7I&}2{y0<=|ZW#?GkbAShh$MBvd7NXQ z?idB>a6Rmk<#T2@uZAbU+kj~6L3M_~arSj6wr&Ste}5Ksb={A>a=yAM z1fB%BD*?k8@h zT~6py*ET@A8J-FBCDuT!oKr>rr7zS-44D%`e@v9!74S5^wlJ0&k@9L6w8;l*AX8mC z8)gZx;`&XMD2tCkntHkxoODVmXsQFXkQ^A0b;oV9dNFhZHkB8|E~dMA5#7Hl3>ywj za5T<4n?FC&wEpChb!$~^kW}Amp^MDGxG?E=Q!u(V4bxpwSURuQ*8n)qm0)5;RB4?p NaumsA6pD@FzX5LkYW)BJ delta 4323 zcmcgv4NO#57Jlc=49pCJ3^KG+7%74RvIq|u21N_3P7%c)23-{EZWsR`73FWn#vhic zHmvDdBXc6pTB{U|yV)u#&w|}FhTYZH-MCtxBu_l_7uF9VCWE%>wqg-46W9fN*dEX zfnw6+;YzU(of--Ljkm>h5RNM~zlSIUZA3#7jnm>@W1x+sHk$AhA%vhMj3WGkU?L15 z@Ynd^HkkT0LNXzSKt>5x!qWsDA)N3GVGN;fO+3lz{(jS((B}*!rVxe_G6~NT!Uz(9 zmsqIHAdDsq3+Pe6CxjHHPJXtDZ?`?W_&hX;*^QrLXPWl~%rTqX4BJ|7_S+i^?CG`t>S zZK~G#QikGCONW*NPd4X565g^D>3P57`ZexR2QkUG{>i^(b8--)+cpy?Y0{NjHWT

2}$xnSdE}m%s4i$Exp9J?TQZZGIewDXctK$R`aClsVVvbt`7UuUw z(r{Zw?E)TMA3s83#WLzFCsYxt34PA+43JllyoZ37;z!87Dd3RXTo9!c#q8Jk>`pC* zoZn{qOoJLDoY?_4*-tWw2F`KSEah&zMr?J9K0nJrFVnzXEv~Xn=_gyxV+SXQR`dFf z#7SkP=Q0;qbd4u!)~!XzorLCG`y>i8sWLFaMafklMgj^3@lhd-4Wfs#D8(!@JfkA)y#orWWcsKe@UD=BF0v zIn%hts2cb!deRznzoCAK()08`!2n#MxTN{N?IMX|gdd;TsplFHOYpD$7Cq($xP-UO zv$SLTwKeDopJ4zl2~mB@pi1t6@?BPt*gnPyc*H{CoKd7Ff2(<{zEHuEGw8PbyyJ$kcxfs(OqJ%8E4Zd2Z{&|`bOi-PmxU)CF?y&&) zwqlhvb+qHWanRN7_&bG8KFylmH&eHPq+@bV4SdL6rEISH9*5Q>PfOLE((|76Z%#}| z$UclUH}>+p-rl(<{fzgg*v*~8ncOfruMWCe=LPL{1B`z#5v!Mp7`NH$U3PJYf(uxYvS1}zbiL@BJCx_wcig6|>MOu?z zR#~@Lk|d?8A`b@H%;s9~K3sl^=1YT0uP=E~_*Qbmn}qGEJ19Z1JLK7>>R3FOY(G$K zRilFQmP<(>HM3`H`wCVHdaL#AbsP{JI{mdoca3@{)Osn2dUSev{dKWFV$ePJq(QxT z@R1XEacPmBi%9hi(MRUM^rD^`}z#^Xz@ks*`gju?Z_L>@gTO;mE6 zH6NdF%sPVqD9;)yMK>mWK-$Fo#$DU*ox0fm7YwRQFrGbhW8=96z`gS5#qlDOyAT7Htc%chV@Oq!f;=j&sT!ynvxZ-?<-NhS_BsPbSad` zMi(VSqXR7H+nlN)3uTuBB2=|$f>1_$a8-;J@Rjanyt3sEezt9+(z5M>7B9ZB5%W&x z!26iK<8=&fl}K|O&oqCmWPN*HgD>sbh%MXn*wSoQ!tT5v;veN!Qf9Uo8xQO%#Z7I7=FyO$*!M04G*!k9ph!usJO{X=?LPtg zGqurz^RH~NQgZb@z^+R{${#L22g;aBM*)uF+vl6{oi`+$b!Ir;+-Rl1urQRo>Mm&Y zidb_k1zXPS?Q9Q*L}*`|Hsq&pZI*{Ppw?JC*-x%b!0BgqFtI9O_estIym0!@Iu08F z>$|rS|C!3t3m=NgE8UlZWU@hBp_F}+3vh~T->lr-{{p~ab$?%8kJiI6togdR^M)3N z!&4@HkN@dPp_VJD^KUd4JGUmnNv$&S(5qnNt0~`ooySza61N>`VAJ3)x4o!1wolUh z6u&Dk?U6LRNw6t}XT1RblLx+ImQTUYuzzLi%@`4(WgUf5PUmN1AQ!N#AhGkxD0oeL z3@zz8{H7obW95lBf1f1pw8KStK^<&Y>l<+>f4{V=;zuuR|U-?vCo&jxYd8N`_za}#yCDZONc99Rtj;QMayA7{1?4ReBl59 diff --git a/EvilSatellites/Objects/Satellite.cs b/EvilSatellites/Objects/Satellite.cs index 1e2fde3..97b50a8 100644 --- a/EvilSatellites/Objects/Satellite.cs +++ b/EvilSatellites/Objects/Satellite.cs @@ -12,10 +12,13 @@ namespace EvilSatellites.Objects public class Satellite : AbstractGameObject { private ISoundEffect3D Sound; - public Satellite(IScreen screen, Vector3 pos) : base(screen) + private int Health; + private int SatelliteID; + public Satellite(IScreen screen, Vector3 pos, int satelliteID = 1) : base(screen) { Type = ObjectType.Satellite; - Sound = Screen.Manager.Sound.Load3D(@"sfx/satellite/1/loop.wav"); + SatelliteID = satelliteID; + Sound = Screen.Manager.Sound.Load3D(@"sfx/satellite/"+SatelliteID.ToString()+"/loop.wav"); Sound.Loop = true; Position = pos; Dimensions = new Vector3(5, 5, 5); @@ -29,10 +32,13 @@ namespace EvilSatellites.Objects Sound.Play(); Active = true; ShouldDestroy = false; + Health = 100; } public override void Destroy() { Sound.Destroy(); + ShouldDestroy = true; + Active = false; } override public void Update(GameTime gameTime) @@ -42,7 +48,12 @@ namespace EvilSatellites.Objects public override void OnCollision(IGameObject obj) { - // Sound.Stop(); + Health -= 10; + if (Health <= 0) + { + Screen.Manager.Sound.PlayOneshot(@"sfx/satellite/"+SatelliteID.ToString()+"/explode.wav", new System.Numerics.Vector3(Position.X, Position.Y, Position.Z)); + Destroy(); + } } } } diff --git a/EvilSatellites/sfx/satellite/1/explode.wav b/EvilSatellites/sfx/satellite/1/explode.wav new file mode 100644 index 0000000..83768e9 --- /dev/null +++ b/EvilSatellites/sfx/satellite/1/explode.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d67a5591a021c4f05ec01ce8d5f034fb0cf23b68fa8d9dc8130d6117ff3e754e +size 1870856 diff --git a/EvilSatellites/sfx/sattelite/1/loop.wav b/EvilSatellites/sfx/satellite/1/loop.wav similarity index 100% rename from EvilSatellites/sfx/sattelite/1/loop.wav rename to EvilSatellites/sfx/satellite/1/loop.wav diff --git a/EvilSatellites/sfx/weapons/LaserMG/spindown.wav b/EvilSatellites/sfx/weapons/LaserMG/spindown.wav index c639b0b..8a54a9d 100644 --- a/EvilSatellites/sfx/weapons/LaserMG/spindown.wav +++ b/EvilSatellites/sfx/weapons/LaserMG/spindown.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98706fa6dbbb6e0abb61a8db064d2b99c567379dda060111ea244c7a6a791657 +oid sha256:67adab95fa1cfc1ca99f8405790dea19276e8026c199c7140ece6195e181832b size 149636 diff --git a/EvilSatellites/sfx/weapons/LaserMG/spinning.wav b/EvilSatellites/sfx/weapons/LaserMG/spinning.wav index 7e490e1..fb78b4c 100644 --- a/EvilSatellites/sfx/weapons/LaserMG/spinning.wav +++ b/EvilSatellites/sfx/weapons/LaserMG/spinning.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f729f67450f4a269dcb1a174b59abb3164596fbd4dc527ebcb54ccf82edee263 +oid sha256:b0cdbed9b6065ceb09cbf304c03816e666c30d7a5611e4d9d631dc1bc078a4f8 size 21212 diff --git a/EvilSatellites/sfx/weapons/LaserMG/spinup.wav b/EvilSatellites/sfx/weapons/LaserMG/spinup.wav index 3019192..386f89f 100644 --- a/EvilSatellites/sfx/weapons/LaserMG/spinup.wav +++ b/EvilSatellites/sfx/weapons/LaserMG/spinup.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7edc195ba058b3213ea6b544d737e454311901fc16c5bb84741dd39981633f1 +oid sha256:e09e2fe70cbbaf7aa331b7ab084b03f11137e98f40b71f35305e3c911eed05e7 size 159344