From faf3a38e934aa1edaa0e901528bc775cffc70e00 Mon Sep 17 00:00:00 2001
From: Talon <talon@iamtalon.me>
Date: Mon, 19 Apr 2021 17:22:14 +0200
Subject: [PATCH] Add tap sounds for actions

---
 .vs/EvilSatellites/v16/.suo          | Bin 104448 -> 103936 bytes
 EvilSatellites/Objects/Player.cs     |  22 ++++++++++++++++++++--
 EvilSatellites/Screens/GameScreen.cs |   7 +++++++
 EvilSatellites/sfx/ship/taps/1.wav   |   3 +++
 EvilSatellites/sfx/ship/taps/10.wav  |   3 +++
 EvilSatellites/sfx/ship/taps/11.wav  |   3 +++
 EvilSatellites/sfx/ship/taps/12.wav  |   3 +++
 EvilSatellites/sfx/ship/taps/13.wav  |   3 +++
 EvilSatellites/sfx/ship/taps/14.wav  |   3 +++
 EvilSatellites/sfx/ship/taps/15.wav  |   3 +++
 EvilSatellites/sfx/ship/taps/16.wav  |   3 +++
 EvilSatellites/sfx/ship/taps/17.wav  |   3 +++
 EvilSatellites/sfx/ship/taps/18.wav  |   3 +++
 EvilSatellites/sfx/ship/taps/19.wav  |   3 +++
 EvilSatellites/sfx/ship/taps/2.wav   |   3 +++
 EvilSatellites/sfx/ship/taps/20.wav  |   3 +++
 EvilSatellites/sfx/ship/taps/3.wav   |   3 +++
 EvilSatellites/sfx/ship/taps/4.wav   |   3 +++
 EvilSatellites/sfx/ship/taps/5.wav   |   3 +++
 EvilSatellites/sfx/ship/taps/6.wav   |   3 +++
 EvilSatellites/sfx/ship/taps/7.wav   |   3 +++
 EvilSatellites/sfx/ship/taps/8.wav   |   3 +++
 EvilSatellites/sfx/ship/taps/9.wav   |   3 +++
 voice-lines.txt                      |  15 ++++++++++++++-
 24 files changed, 101 insertions(+), 3 deletions(-)
 create mode 100644 EvilSatellites/sfx/ship/taps/1.wav
 create mode 100644 EvilSatellites/sfx/ship/taps/10.wav
 create mode 100644 EvilSatellites/sfx/ship/taps/11.wav
 create mode 100644 EvilSatellites/sfx/ship/taps/12.wav
 create mode 100644 EvilSatellites/sfx/ship/taps/13.wav
 create mode 100644 EvilSatellites/sfx/ship/taps/14.wav
 create mode 100644 EvilSatellites/sfx/ship/taps/15.wav
 create mode 100644 EvilSatellites/sfx/ship/taps/16.wav
 create mode 100644 EvilSatellites/sfx/ship/taps/17.wav
 create mode 100644 EvilSatellites/sfx/ship/taps/18.wav
 create mode 100644 EvilSatellites/sfx/ship/taps/19.wav
 create mode 100644 EvilSatellites/sfx/ship/taps/2.wav
 create mode 100644 EvilSatellites/sfx/ship/taps/20.wav
 create mode 100644 EvilSatellites/sfx/ship/taps/3.wav
 create mode 100644 EvilSatellites/sfx/ship/taps/4.wav
 create mode 100644 EvilSatellites/sfx/ship/taps/5.wav
 create mode 100644 EvilSatellites/sfx/ship/taps/6.wav
 create mode 100644 EvilSatellites/sfx/ship/taps/7.wav
 create mode 100644 EvilSatellites/sfx/ship/taps/8.wav
 create mode 100644 EvilSatellites/sfx/ship/taps/9.wav

diff --git a/.vs/EvilSatellites/v16/.suo b/.vs/EvilSatellites/v16/.suo
index ca4f3884af18d394601a79ea961d563966b2975f..5064af05f9f76ea5fd1a58103d7643fa7d882185 100644
GIT binary patch
delta 949
zcmb`DYe-XZ7{>qa*_><AaLWd@Ou7(JGN()hp-i3ChY{NcgG_A^l?kra$`p!}ObcdA
z-?<fn+JqT3umA9bp;;hmQKV)ULNE#{5HH<7*iQeWRz@F!@I5@7=RD`U=lsr7+$t*$
z$Xxn09GRbRLR8F3n1X^Jh^gq+Z5AyTa!g^#i=lQd6u?c3Bp<nuo^MrGSR$KCLWO8(
zq(z3|Rl2M1-rg$aOHSRrsZUjp+j4JTdzjP9yn;^a8+_*;_jl@3zf^485s3VHvHS(v
zEE{OO<@s81{e(O`%s~#2<K!SaZ0Iaq2WD(7ZGl>}o<F&H!9C(2S>!O;Px9H53v(UY
zcaRKUnL^I!foW%z%Y@x74b5|TBw>xa2wBF`C^CSr>MHQ^$QB%Qd$8Uei!nYArq#r=
z>pqNbzJ%s#B?_K|cC!io<F~NhV#P}T1?>7hMGI?85%BAa(kNma@K$P}nxE8wQ>t+?
zqPfxav@)Y*GWIjT1YZY-Deir!tToWgp?vUl$}rZy9=p78H1f%HXunsYT&&WtZ$!}K
z&Vz`jqfASgjDxeVG}yiu#CE9f*#i!TM}JnNr<rX^z_Ges8u#-4%0+3O3Ny_>3k8$<
z&)()x_+SK_k*WUbjdyAxDP(!MNIyGMcUtD1@!#Zftn^qhJCMku4vqk(yiUY|&uO&a
zP1zEJrfhys5;REA-j;;j<8r!nq8p_8ctb+RHkg5inMux@Y=jlwr|GZ>$A(nA`49xa
zza5llKfPL9!AH|7te#+R{7?q|-5|xYqsiFxUP048@!-z_?l(aWgv<FGM#x~r4oUsF
Gp!)$Nlx!RT

delta 884
zcmb`DT}V@57{{OI?CjH;n~5xKek4R>tc9yxM9{^8RU<q?f}l3jETYJCQ4^$NS=}rh
zJ!9uWHs=QO#!7vqV|7zO6hbhPh%5*ps+*?k<FZa?mh^EE7`^cDK0F`q|Ns8PF`YQB
z3p;7C-e|J`R0DuUjjxKLs289bn<j)ZPAlG;x?IIhaeBlM3u-=c+C;_q9<`$TUePO?
zF~x$e*>$u^u$e~Qy`2{2zBBixs7KgfG_jmBmAsI7#A3pW_4&bo!BTJ%4#6=v3~dmg
zP=7UgX}tdiM#+Eibj>e4=!PcfgyYZ(L3O$d9O_0l9QfhSo4jNqL)b^5u#1UdQB#oG
z53ok<R=@+AAHG7FxIr4U;Z`~leMno919WadPs5Sz%<(0LlXX7)t7VD_ZIm1CCGU_^
z-HuYzvu*6`kgphjf1R%Y&&-nE;+&agBqwWoZbnu-n?uQE#{pJ3u@;jzIoik-N|igY
zNZwb1uP}LAN7h7h-lVLWEJ3orH0c4%>IdA?;6V&b-tRO2FIF@^SH2`wSBeSV+M$Xp
zpL}j*_%y1aC!ZbE8TT_~4$IVp|7W~=xu3)oU(w2mMfg8)TwRHMt&wnyWT^#DAkC+0
znfvu)BMAw+^nM3gsrFip-0a6u4GCE<^JS-zce{F5OO3m*Meb<FIMSVkde*Rb9VOm_
zDZaHm&?S$0u(6P^x0IECc!TK%<Y^?ko9+1|V;)wz3Atrei(zRRDRY-kA4Nwxg4{Pa
CUqc%J

diff --git a/EvilSatellites/Objects/Player.cs b/EvilSatellites/Objects/Player.cs
index 3a270b5..a1bba33 100644
--- a/EvilSatellites/Objects/Player.cs
+++ b/EvilSatellites/Objects/Player.cs
@@ -12,19 +12,22 @@ namespace EvilSatellites.Objects
     {
         private Vector3 _PrevPos;
         private Vector3 MaxSpeed = new Vector3(0.2f, 0.2f, 0.2f);
-        public Vector3 Acceleration = new Vector3(0.002wf, 0.004f, 0.004f);
+        public Vector3 Acceleration = new Vector3(0.0035f, 0.004f, 0.004f);
         private Vector3 Deceleration = new Vector3(0.0025f, 0.0025f, 0.0025f);
         private ISoundEffect sfxEngine;
         private ISoundEffect sfxWhine;
+        private ISoundEffect sfxDamage;
         private SoundPatch sfxElevator;
         private SoundPatch sfxVacuum;
         private SoundPatch sfxTurn;
+        private AudioAsset sfxTaps;
         public IWeapon CurrentWeapon;
         private int Turning;
         private int Elevating;
         public bool Vacuuming;
         public float Health;
         private Random rnd = new Random();
+        private bool IsDamaged;
         public Player(IScreen screen): base(screen)
         {
             ShouldDestroy = false;
@@ -56,7 +59,9 @@ namespace EvilSatellites.Objects
             sfxWhine.ConnectToEffect(Screen.Manager.EnvironmentEffect);
             sfxEngine.Play();
             sfxWhine.Play();
-
+            sfxDamage = Screen.Manager.Sound.Load(@"sfx/ui/alarmDamage.wav", false);
+            sfxDamage.Loop = true;
+            sfxTaps = new AudioAsset(Screen.Manager.Sound, @"sfx/ship/taps", 1, 20);
             return;
         }
 
@@ -131,6 +136,7 @@ namespace EvilSatellites.Objects
         {
             Turning = dir;
             sfxTurn.Start(time);
+            PlayTap();
         }
 
         public void StopTurning()
@@ -143,6 +149,7 @@ namespace EvilSatellites.Objects
         {
             Elevating = dir;
             sfxElevator.Start(time);
+            PlayTap();
         }
 
         public void StopElevating()
@@ -155,6 +162,7 @@ namespace EvilSatellites.Objects
         {
             Vacuuming = true;
             sfxVacuum.Start(time);
+            PlayTap();
         }
 
         public void StopVacuuming()
@@ -166,6 +174,11 @@ namespace EvilSatellites.Objects
         public void TakeDamage(float dmg)
         {
             Health -= dmg;
+            if (Health < 25 && !IsDamaged)
+            {
+                IsDamaged = true;
+                sfxDamage.Play();
+            }
             string dmgSound = @"sfx/physics/collisions/";
             if (dmg > 60)
             {
@@ -180,5 +193,10 @@ namespace EvilSatellites.Objects
             dmgSound += "/int/" + (rnd.Next(2)+1).ToString()+".wav";
             Screen.Manager.Sound.PlayOneshot(dmgSound);
         }
+
+        public void PlayTap()
+        {
+            sfxTaps.Play();
+        }
     }
 }
diff --git a/EvilSatellites/Screens/GameScreen.cs b/EvilSatellites/Screens/GameScreen.cs
index bf69667..5675a23 100644
--- a/EvilSatellites/Screens/GameScreen.cs
+++ b/EvilSatellites/Screens/GameScreen.cs
@@ -106,6 +106,10 @@ namespace EvilSatellites.Screens
             {
                 move.X = _player.Acceleration.X;
             }
+            if (Input.IsJustPressed(Keys.A) || Input.IsJustPressed(Keys.S) || Input.IsJustPressed(Keys.D) || Input.IsJustPressed(Keys.W))
+            {
+                _player.PlayTap();
+            }
             if (Input.IsJustPressed(Keys.Left))
             {
                 _player.StartTurning(-1, gameTime);
@@ -142,6 +146,7 @@ namespace EvilSatellites.Screens
             if (Input.IsJustPressed(Keys.Space))
             {
                 _player.CurrentWeapon.Shoot(gameTime);
+                _player.PlayTap();
             }
             if (Input.IsJustReleased(Keys.Space))
             {
@@ -149,6 +154,7 @@ namespace EvilSatellites.Screens
             }
             if (Input.IsJustPressed(Keys.R))
             {
+                _player.PlayTap();
                 if (ObjectRadar.Active)
                 {
                     ObjectRadar.Stop();
@@ -159,6 +165,7 @@ namespace EvilSatellites.Screens
             }
             if (Input.IsJustPressed(Keys.T))
             {
+                _player.PlayTap();
                 if (ObjectRadar.Filter == ObjectType.Satellite)
                 {
                     ObjectRadar.SetObjectType(ObjectType.Debris);
diff --git a/EvilSatellites/sfx/ship/taps/1.wav b/EvilSatellites/sfx/ship/taps/1.wav
new file mode 100644
index 0000000..ac7c5b6
--- /dev/null
+++ b/EvilSatellites/sfx/ship/taps/1.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9fc1a3aaf2ba7392e51fb0b07552d8a2d6e4f2fa3edfd38c7a2aa465841cdf7c
+size 298330
diff --git a/EvilSatellites/sfx/ship/taps/10.wav b/EvilSatellites/sfx/ship/taps/10.wav
new file mode 100644
index 0000000..7dd69ed
--- /dev/null
+++ b/EvilSatellites/sfx/ship/taps/10.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:50c1f5d265c92c48faad3527be9cdbd3264490d27ec13957ebae98068789cec1
+size 316672
diff --git a/EvilSatellites/sfx/ship/taps/11.wav b/EvilSatellites/sfx/ship/taps/11.wav
new file mode 100644
index 0000000..04a8638
--- /dev/null
+++ b/EvilSatellites/sfx/ship/taps/11.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e2a6f6cc9d5c1a8b3d9e52cef6df342201b23136be8cc47d43239db664e943f7
+size 313852
diff --git a/EvilSatellites/sfx/ship/taps/12.wav b/EvilSatellites/sfx/ship/taps/12.wav
new file mode 100644
index 0000000..0a337b9
--- /dev/null
+++ b/EvilSatellites/sfx/ship/taps/12.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d4c07bda07d89bc143896b0be5d54bcd858b33a4fc3424b7b8ef9dd5e9a8bebd
+size 316672
diff --git a/EvilSatellites/sfx/ship/taps/13.wav b/EvilSatellites/sfx/ship/taps/13.wav
new file mode 100644
index 0000000..a4d5790
--- /dev/null
+++ b/EvilSatellites/sfx/ship/taps/13.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:29c8622b26e7f29b3a05f1f0dbd16ffa7d652aad22068231b8ec404d1c33f9f2
+size 316672
diff --git a/EvilSatellites/sfx/ship/taps/14.wav b/EvilSatellites/sfx/ship/taps/14.wav
new file mode 100644
index 0000000..8929a6a
--- /dev/null
+++ b/EvilSatellites/sfx/ship/taps/14.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:15316535e23ae1af08413987d682f5d88ed0d7442da5ecba781cc37212dc2e3b
+size 322318
diff --git a/EvilSatellites/sfx/ship/taps/15.wav b/EvilSatellites/sfx/ship/taps/15.wav
new file mode 100644
index 0000000..016cb51
--- /dev/null
+++ b/EvilSatellites/sfx/ship/taps/15.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:68ed08f51df07ec7789e7af24a19d0d203067037f434959e681ec8c738028323
+size 316672
diff --git a/EvilSatellites/sfx/ship/taps/16.wav b/EvilSatellites/sfx/ship/taps/16.wav
new file mode 100644
index 0000000..e5c0911
--- /dev/null
+++ b/EvilSatellites/sfx/ship/taps/16.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:816f5c25f41a0cf579e2887aa0407fe1506361d2c7769ab404b85853c7970f72
+size 313852
diff --git a/EvilSatellites/sfx/ship/taps/17.wav b/EvilSatellites/sfx/ship/taps/17.wav
new file mode 100644
index 0000000..a29ecc2
--- /dev/null
+++ b/EvilSatellites/sfx/ship/taps/17.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a4bac6b51a5f85c041e688eeb98d250767a29d8ce00ebc045128022f76c55eb6
+size 316672
diff --git a/EvilSatellites/sfx/ship/taps/18.wav b/EvilSatellites/sfx/ship/taps/18.wav
new file mode 100644
index 0000000..abb7f66
--- /dev/null
+++ b/EvilSatellites/sfx/ship/taps/18.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:77a2d3cc8b742cfb5ca3e1b8c1402f2218aa8af6df0c7d9752b05434f684cb39
+size 312442
diff --git a/EvilSatellites/sfx/ship/taps/19.wav b/EvilSatellites/sfx/ship/taps/19.wav
new file mode 100644
index 0000000..0423376
--- /dev/null
+++ b/EvilSatellites/sfx/ship/taps/19.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5a7c136b79f07794ecb61e4f20850fb30552782e56855b62469b9ec193ca5fde
+size 306088
diff --git a/EvilSatellites/sfx/ship/taps/2.wav b/EvilSatellites/sfx/ship/taps/2.wav
new file mode 100644
index 0000000..a791f2e
--- /dev/null
+++ b/EvilSatellites/sfx/ship/taps/2.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f707efd1374db5be1ce337c4a1a3318a58a93942804224522c75a58e8c691961
+size 302560
diff --git a/EvilSatellites/sfx/ship/taps/20.wav b/EvilSatellites/sfx/ship/taps/20.wav
new file mode 100644
index 0000000..8d6da61
--- /dev/null
+++ b/EvilSatellites/sfx/ship/taps/20.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2232380f08345b695755110074067c5a538cdb5f20f72769e8f69e46619579fa
+size 301150
diff --git a/EvilSatellites/sfx/ship/taps/3.wav b/EvilSatellites/sfx/ship/taps/3.wav
new file mode 100644
index 0000000..d687f35
--- /dev/null
+++ b/EvilSatellites/sfx/ship/taps/3.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6fd611afbae79c5416e5a0fcef28f4f019027e12609d4edb49b56caab3ecb7b2
+size 297976
diff --git a/EvilSatellites/sfx/ship/taps/4.wav b/EvilSatellites/sfx/ship/taps/4.wav
new file mode 100644
index 0000000..2e1f2e8
--- /dev/null
+++ b/EvilSatellites/sfx/ship/taps/4.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2a0e8b5c39e15abe2e50eb87752d7aa0231a8f6acfb274f2f4dc6f8f215b2d82
+size 309442
diff --git a/EvilSatellites/sfx/ship/taps/5.wav b/EvilSatellites/sfx/ship/taps/5.wav
new file mode 100644
index 0000000..f139966
--- /dev/null
+++ b/EvilSatellites/sfx/ship/taps/5.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3b7cf8f2b04afb2687e7b9fcf17295cddd6a2972d2362bcfaae421fec9b27981
+size 313852
diff --git a/EvilSatellites/sfx/ship/taps/6.wav b/EvilSatellites/sfx/ship/taps/6.wav
new file mode 100644
index 0000000..58631bd
--- /dev/null
+++ b/EvilSatellites/sfx/ship/taps/6.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:10d16dd9149536f13077a68d39dbf2692a6528cbdb7115d7078748b9c0fa51c9
+size 301150
diff --git a/EvilSatellites/sfx/ship/taps/7.wav b/EvilSatellites/sfx/ship/taps/7.wav
new file mode 100644
index 0000000..49505e9
--- /dev/null
+++ b/EvilSatellites/sfx/ship/taps/7.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7fd9f42c94478189272965f1bcbc28faa5b450d384c673f15f07e6be3f2d6aa6
+size 300448
diff --git a/EvilSatellites/sfx/ship/taps/8.wav b/EvilSatellites/sfx/ship/taps/8.wav
new file mode 100644
index 0000000..d73acb1
--- /dev/null
+++ b/EvilSatellites/sfx/ship/taps/8.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:71fdb116a979e6a78f10e9ec798fcd16a95212f0ed457f28b4f45840798a22f0
+size 311032
diff --git a/EvilSatellites/sfx/ship/taps/9.wav b/EvilSatellites/sfx/ship/taps/9.wav
new file mode 100644
index 0000000..6d2628a
--- /dev/null
+++ b/EvilSatellites/sfx/ship/taps/9.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2f80475b3f8d57e30e8016d25dd06d884851b7a0ac94c5ea59f116f08a1e89c4
+size 313852
diff --git a/voice-lines.txt b/voice-lines.txt
index 0dbc387..c9d0697 100644
--- a/voice-lines.txt
+++ b/voice-lines.txt
@@ -1 +1,14 @@
-Hits, Near misses, far misses, shoot into void, crash into debris left by shooting satellites, crash into random planet, low health, pick up ammo.
\ No newline at end of file
+5 Hits, eg: "wow. good job."
+5 Near misses, eg: "A near miss is indeed still a miss"
+5 far misses, eg: "Um... it's over there."
+3 shoot into void, eg: "I'll let you know if that ever actually hits something"
+3 crash into debris left by shooting satellites, eg: "Now if only your shooting was as good as your ability to fly into crap"
+5 low health, eg: "Why didn't I fly this thing instead"
+5 pick up debris with vacuum to be turned into ammo, eg: "Ah yes. Someone's gotta clean up space junk after all"
+Switch object radar to satellites, probably just: "satellites"
+Switch object radar to debris, probably just: "debris"
+3 game over, eg: "I'd love to say I had faith in you, but I mean... look where that would have gotten me"
+
+possible ideas, not sure:
+spin around without going anywhere, eg: "do you really enjoy cleaning your ship this much?"
+staying still for a while, eg: "Did you fall asleep?"
\ No newline at end of file