From f5f0541a1b903c9c6243bee824db5baad077e9e3 Mon Sep 17 00:00:00 2001
From: Sagittaeri <sagittaeri@me.com>
Date: Sun, 22 Jan 2017 14:07:50 +1100
Subject: [PATCH] amb and bgm and fixed camera

---
 .../Assets/Scripts/AudioController.cs         | 233 ++++++++++++++++++
 .../Assets/Scripts/AudioController.cs.meta    |  12 +
 .../Assets/Scripts/CustomSmoothFollow.cs      |   5 +-
 .../Assets/Scripts/TestMoveController.cs      |   8 +-
 .../Assets/Scripts/UIPanel.cs                 |   1 +
 ...f167c9b1594cec30b8e540.meta => Sound.meta} |   5 +-
 IronToad_UnityProject/Assets/Sound/Music.meta |   9 +
 ...22-1245ironToad(attack).wav => attack.wav} | Bin
 ...nToad(attack).wav.meta => attack.wav.meta} |   4 +-
 ...-1245ironToad(spotted).wav => spotted.wav} | Bin
 ...oad(spotted).wav.meta => spotted.wav.meta} |   4 +-
 .../{22-1245ironToad(tense).wav => tense.wav} | Bin
 ...ronToad(tense).wav.meta => tense.wav.meta} |   4 +-
 IronToad_UnityProject/Assets/Sound/SFX.meta   |   9 +
 .../Assets/Sound/SFX/assassination.wav.meta   |   4 +-
 .../Assets/Sound/SFX/createWave.wav.meta      |   4 +-
 .../Assets/Sound/SFX/createWave_2.wav.meta    |   4 +-
 .../Assets/Sound/SFX/createWave_3.wav.meta    |   4 +-
 .../Assets/Sound/SFX/oceanAmbience.wav.meta   |   4 +-
 .../Assets/Sound/SFX/rockWater_1.wav.meta     |   4 +-
 .../Assets/Sound/SFX/rockWater_2.wav.meta     |   4 +-
 .../Assets/Sound/SFX/rockWater_3.wav.meta     |   4 +-
 .../Assets/Sound/SFX/runAground.wav.meta      |   4 +-
 .../Assets/Sound/SFX/shipSpotted.wav.meta     |   4 +-
 .../Assets/Sound/SFX/sinkingShip.wav.meta     |   4 +-
 .../Assets/Sound/SFX/spottedDialogue.wav.meta |   4 +-
 .../Assets/_Scenes/LighthouseTestScene.unity  | Bin 136944 -> 137496 bytes
 27 files changed, 303 insertions(+), 39 deletions(-)
 create mode 100644 IronToad_UnityProject/Assets/Scripts/AudioController.cs
 create mode 100644 IronToad_UnityProject/Assets/Scripts/AudioController.cs.meta
 rename IronToad_UnityProject/Assets/{Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta~927ced4c4317bc1f86f167c9b1594cec30b8e540.meta => Sound.meta} (54%)
 create mode 100644 IronToad_UnityProject/Assets/Sound/Music.meta
 rename IronToad_UnityProject/Assets/Sound/Music/{22-1245ironToad(attack).wav => attack.wav} (100%)
 rename IronToad_UnityProject/Assets/Sound/Music/{22-1245ironToad(attack).wav.meta => attack.wav.meta} (92%)
 rename IronToad_UnityProject/Assets/Sound/Music/{22-1245ironToad(spotted).wav => spotted.wav} (100%)
 rename IronToad_UnityProject/Assets/Sound/Music/{22-1245ironToad(spotted).wav.meta => spotted.wav.meta} (92%)
 rename IronToad_UnityProject/Assets/Sound/Music/{22-1245ironToad(tense).wav => tense.wav} (100%)
 rename IronToad_UnityProject/Assets/Sound/Music/{22-1245ironToad(tense).wav.meta => tense.wav.meta} (92%)
 create mode 100644 IronToad_UnityProject/Assets/Sound/SFX.meta

diff --git a/IronToad_UnityProject/Assets/Scripts/AudioController.cs b/IronToad_UnityProject/Assets/Scripts/AudioController.cs
new file mode 100644
index 0000000..2502665
--- /dev/null
+++ b/IronToad_UnityProject/Assets/Scripts/AudioController.cs
@@ -0,0 +1,233 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class AudioController : MonoBehaviour
+{
+	public AudioSource[] bgmSources;
+	public AudioSource[] ambSources;
+	public AudioSource[] sfxSources;
+
+	public AudioClip[] bgmClips;
+	public AudioClip[] ambClips;
+	public AudioClip[] sfxClips;
+
+	void Awake()
+	{
+		NotificationServer.register("play bgm", playBgm);
+		NotificationServer.register("play amb", playAmb);
+		NotificationServer.register("play sfx", playSfx);
+
+		NotificationServer.register("fade bgm", fadeBgm);
+		NotificationServer.register("fade amb", fadeAmb);
+	}
+
+	void Start()
+	{
+		foreach (AudioSource s in bgmSources)
+			s.volume = 0f;
+		foreach (AudioSource s in ambSources)
+			s.volume = 0f;
+		foreach (AudioSource s in sfxSources)
+			s.volume = 0f;
+
+		NotificationServer.notify("play amb", "oceanAmbience:0.5");
+	}
+
+	public void playAmb(object audioNameObj)
+	{
+		string audioName = audioNameObj as string;
+		if (audioName == null || audioName == "")
+			return;
+
+		string[] tokens = audioName.ToLower().Split(':');
+		audioName = tokens[0];
+		float volume = 1f;
+		if (tokens.Length > 1)
+		float.TryParse(tokens[1], out volume);
+
+		AudioClip clip = null;
+		foreach (AudioClip c in ambClips)
+		{
+			if (c.name.ToLower() == audioName)
+			{
+				clip = c;
+				break;
+			}
+		}
+
+		if (clip == null)
+			return;
+
+		bool foundEmpty = false;
+		foreach (AudioSource s in ambSources)
+		{
+			if (s.isPlaying)
+			{
+				LeanTween.cancel(s.gameObject);
+				LeanTween.value(s.gameObject, s.volume, 0f, 0.5f).setOnUpdate((float val)=>{
+					s.volume = val;
+				}).setOnComplete(()=>{
+					s.Stop();
+					s.clip = null;
+				}).setIgnoreTimeScale(true);
+			}
+			else if (!foundEmpty)
+			{
+				LeanTween.cancel(s.gameObject);
+				foundEmpty = true;
+				s.clip = clip;
+				s.Play();
+				LeanTween.value(s.gameObject, s.volume, volume, 0.5f).setOnUpdate((float val)=>{
+					s.volume = val;
+				}).setIgnoreTimeScale(true);
+			}
+		}
+	}
+
+	public void playSfx(object audioNameObj)
+	{
+		string audioName = audioNameObj as string;
+		if (audioName == null || audioName == "")
+			return;
+
+		string[] tokens = audioName.ToLower().Split(':');
+		audioName = tokens[0];
+		float volume = 1f;
+		if (tokens.Length > 1)
+			float.TryParse(tokens[1], out volume);
+		
+		AudioClip clip = null;
+		foreach (AudioClip c in sfxClips)
+		{
+			if (c.name.ToLower() == audioName)
+			{
+				clip = c;
+				break;
+			}
+		}
+
+		if (clip == null)
+			return;
+
+		foreach (AudioSource s in sfxSources)
+		{
+			if (!s.isPlaying)
+			{
+				LeanTween.cancel(s.gameObject);
+				s.clip = clip;
+				s.volume = volume;
+				s.Play();
+			}
+		}
+	}
+
+	public void playBgm(object audioNameObj)
+	{
+		string audioNames = audioNameObj as string;
+		if (audioNames == null || audioNames == "")
+			return;
+
+		audioNames = audioNames.ToLower();
+		string[] tokens = audioNames.Split('/');
+		if (tokens.Length > 1)
+		{
+			foreach (string t in tokens)
+				playBgm(t.Trim());
+			return;
+		}
+		string[] tokens2 = audioNames.Split(':');
+		string audioName = tokens2[0];
+		float volume = 1f;
+		if (tokens2.Length > 1)
+			float.TryParse(tokens2[1], out volume);
+
+		AudioClip clip = null;
+		foreach (AudioClip c in bgmClips)
+		{
+			if (c.name.ToLower() == audioName)
+			{
+				clip = c;
+				break;
+			}
+		}
+
+		if (clip == null)
+			return;
+
+		AudioSource foundEmpty = null;
+		foreach (AudioSource s in bgmSources)
+		{
+			if (s.clip != null && s.clip == clip)
+			{
+				LeanTween.cancel(s.gameObject);
+				foundEmpty = s;
+			}
+			else if (s.isPlaying)
+			{
+				LeanTween.cancel(s.gameObject);
+				LeanTween.value(s.gameObject, s.volume, 0f, 0.5f).setOnUpdate((float val)=>{
+					s.volume = val;
+				}).setOnComplete(()=>{
+					s.Stop();
+					s.clip = null;
+				}).setIgnoreTimeScale(true);
+			}
+			else if (foundEmpty == null)
+			{
+				LeanTween.cancel(s.gameObject);
+				foundEmpty = s;
+			}
+		}
+		if (foundEmpty != null && !foundEmpty.isPlaying)
+		{
+			LeanTween.cancel(foundEmpty.gameObject);
+			foundEmpty.clip = clip;
+			foundEmpty.Play();
+			LeanTween.value(foundEmpty.gameObject, foundEmpty.volume, volume, 0.5f).setOnUpdate((float val)=>{
+				foundEmpty.volume = val;
+			}).setIgnoreTimeScale(true);
+		}
+		else if (foundEmpty != null && foundEmpty.isPlaying)
+		{
+			LeanTween.cancel(foundEmpty.gameObject);
+			LeanTween.value(foundEmpty.gameObject, foundEmpty.volume, volume, 0.5f).setOnUpdate((float val)=>{
+				foundEmpty.volume = val;
+			}).setIgnoreTimeScale(true);
+		}
+	}
+
+	public void fadeBgm()
+	{
+		foreach (AudioSource s in bgmSources)
+		{
+			if (s.isPlaying)
+			{
+				LeanTween.cancel(s.gameObject);
+				LeanTween.value(s.gameObject, s.volume, 0f, 0.5f).setOnUpdate((float val)=>{
+					s.volume = val;
+				}).setOnComplete(()=>{
+					s.Stop();
+					s.clip = null;
+				}).setIgnoreTimeScale(true);
+			}
+		}
+	}
+
+	public void fadeAmb()
+	{
+		foreach (AudioSource s in ambSources)
+		{
+			if (s.isPlaying)
+			{
+				LeanTween.cancel(s.gameObject);
+				LeanTween.value(s.gameObject, s.volume, 0f, 0.5f).setOnUpdate((float val)=>{
+					s.volume = val;
+				}).setOnComplete(()=>{
+					s.Stop();
+					s.clip = null;
+				}).setIgnoreTimeScale(true);
+			}
+		}
+	}
+}
diff --git a/IronToad_UnityProject/Assets/Scripts/AudioController.cs.meta b/IronToad_UnityProject/Assets/Scripts/AudioController.cs.meta
new file mode 100644
index 0000000..b4a3ecb
--- /dev/null
+++ b/IronToad_UnityProject/Assets/Scripts/AudioController.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 66e9541bf46304a888e3e492fda8055d
+timeCreated: 1485043076
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/IronToad_UnityProject/Assets/Scripts/CustomSmoothFollow.cs b/IronToad_UnityProject/Assets/Scripts/CustomSmoothFollow.cs
index 76a0265..ee23660 100644
--- a/IronToad_UnityProject/Assets/Scripts/CustomSmoothFollow.cs
+++ b/IronToad_UnityProject/Assets/Scripts/CustomSmoothFollow.cs
@@ -42,7 +42,7 @@ public class CustomSmoothFollow : MonoBehaviour
 		RaycastHit hitInfo;
 		if (Physics.Raycast(wantedPos, target.position-wantedPos, out hitInfo, (target.position-wantedPos).magnitude * 2f))
 		{
-			Debug.LogWarning (hitInfo.collider.name + " -- " + hitInfo.collider.gameObject.layer + " -- " + layerMask);
+//			Debug.LogWarning (hitInfo.collider.name + " -- " + hitInfo.collider.gameObject.layer + " -- " + layerMask);
 			if (hitInfo.collider.gameObject.layer == layerMask)
 				isBlocked = true;
 		}
@@ -51,6 +51,8 @@ public class CustomSmoothFollow : MonoBehaviour
 		{
 			wantedPos.y = target.position.y + altHeight;
 			wantedPos.z = target.position.z + altDistance;
+			wantedPos.x = target.position.x;
+			wantedPos = RotatePointAroundPivot(wantedPos, target.transform.position, offsetAngle);
 		}
 
 		float currentHeight = transform.position.y;
@@ -73,7 +75,6 @@ public class CustomSmoothFollow : MonoBehaviour
 		// Set the height of the camera
 		transform.position = new Vector3(currentSide, currentHeight, currentDistance);
 
-
 		// Always look at the target
 		Vector3 lookTarget = target.position;
 		lookTarget.z = transform.position.z;
diff --git a/IronToad_UnityProject/Assets/Scripts/TestMoveController.cs b/IronToad_UnityProject/Assets/Scripts/TestMoveController.cs
index adf5328..94168c6 100644
--- a/IronToad_UnityProject/Assets/Scripts/TestMoveController.cs
+++ b/IronToad_UnityProject/Assets/Scripts/TestMoveController.cs
@@ -9,12 +9,12 @@ public class TestMoveController : MonoBehaviour
 	void Update ()
 	{
 		if (Input.GetKey(KeyCode.S) || Input.GetKey(KeyCode.DownArrow))
-			transform.Translate(Vector3.back * Time.deltaTime * speed);
+			transform.Translate(Vector3.right * Time.deltaTime * speed);
 		if (Input.GetKey(KeyCode.A) || Input.GetKey(KeyCode.LeftArrow))
-			transform.Translate(Vector3.left * Time.deltaTime * speed);
+			transform.Translate(Vector3.back * Time.deltaTime * speed);
 		if (Input.GetKey(KeyCode.W) || Input.GetKey(KeyCode.UpArrow))
-			transform.Translate(Vector3.forward * Time.deltaTime * speed);
+			transform.Translate(Vector3.left * Time.deltaTime * speed);
 		if (Input.GetKey(KeyCode.D) || Input.GetKey(KeyCode.RightArrow))
-			transform.Translate(Vector3.right * Time.deltaTime * speed);
+			transform.Translate(Vector3.forward * Time.deltaTime * speed);
 	}
 }
diff --git a/IronToad_UnityProject/Assets/Scripts/UIPanel.cs b/IronToad_UnityProject/Assets/Scripts/UIPanel.cs
index 3135ea3..8df274b 100644
--- a/IronToad_UnityProject/Assets/Scripts/UIPanel.cs
+++ b/IronToad_UnityProject/Assets/Scripts/UIPanel.cs
@@ -162,6 +162,7 @@ public class UIPanel : MonoBehaviour
 	public void startGame()
 	{
 		NotificationServer.notify("show GameUI");
+		NotificationServer.notify("play bgm", "tense:0.75");
 		unpauseGame();
 	}
 
diff --git a/IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta~927ced4c4317bc1f86f167c9b1594cec30b8e540.meta b/IronToad_UnityProject/Assets/Sound.meta
similarity index 54%
rename from IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta~927ced4c4317bc1f86f167c9b1594cec30b8e540.meta
rename to IronToad_UnityProject/Assets/Sound.meta
index a8292de..f9c1bfe 100644
--- a/IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta~927ced4c4317bc1f86f167c9b1594cec30b8e540.meta
+++ b/IronToad_UnityProject/Assets/Sound.meta
@@ -1,7 +1,6 @@
 fileFormatVersion: 2
-guid: 599e1530282487c46b63fa0f00f5c846
-timeCreated: 1485039717
-licenseType: Pro
+guid: 0fbabcae9313543ffbf1429aeac3664d
+folderAsset: yes
 DefaultImporter:
   userData: 
   assetBundleName: 
diff --git a/IronToad_UnityProject/Assets/Sound/Music.meta b/IronToad_UnityProject/Assets/Sound/Music.meta
new file mode 100644
index 0000000..44ebcac
--- /dev/null
+++ b/IronToad_UnityProject/Assets/Sound/Music.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: be2c14b0c562c483bbe057367939b479
+folderAsset: yes
+timeCreated: 1485052376
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(attack).wav b/IronToad_UnityProject/Assets/Sound/Music/attack.wav
similarity index 100%
rename from IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(attack).wav
rename to IronToad_UnityProject/Assets/Sound/Music/attack.wav
diff --git a/IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(attack).wav.meta b/IronToad_UnityProject/Assets/Sound/Music/attack.wav.meta
similarity index 92%
rename from IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(attack).wav.meta
rename to IronToad_UnityProject/Assets/Sound/Music/attack.wav.meta
index b58e257..a556686 100644
--- a/IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(attack).wav.meta
+++ b/IronToad_UnityProject/Assets/Sound/Music/attack.wav.meta
@@ -5,11 +5,11 @@ licenseType: Free
 AudioImporter:
   serializedVersion: 6
   defaultSettings:
-    loadType: 0
+    loadType: 2
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 1
+    quality: 0.7
     conversionMode: 0
   platformSettingOverrides: {}
   forceToMono: 0
diff --git a/IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(spotted).wav b/IronToad_UnityProject/Assets/Sound/Music/spotted.wav
similarity index 100%
rename from IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(spotted).wav
rename to IronToad_UnityProject/Assets/Sound/Music/spotted.wav
diff --git a/IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(spotted).wav.meta b/IronToad_UnityProject/Assets/Sound/Music/spotted.wav.meta
similarity index 92%
rename from IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(spotted).wav.meta
rename to IronToad_UnityProject/Assets/Sound/Music/spotted.wav.meta
index 8a9a1eb..a4aa32b 100644
--- a/IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(spotted).wav.meta
+++ b/IronToad_UnityProject/Assets/Sound/Music/spotted.wav.meta
@@ -5,11 +5,11 @@ licenseType: Free
 AudioImporter:
   serializedVersion: 6
   defaultSettings:
-    loadType: 0
+    loadType: 2
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 1
+    quality: 0.7
     conversionMode: 0
   platformSettingOverrides: {}
   forceToMono: 0
diff --git a/IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(tense).wav b/IronToad_UnityProject/Assets/Sound/Music/tense.wav
similarity index 100%
rename from IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(tense).wav
rename to IronToad_UnityProject/Assets/Sound/Music/tense.wav
diff --git a/IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(tense).wav.meta b/IronToad_UnityProject/Assets/Sound/Music/tense.wav.meta
similarity index 92%
rename from IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(tense).wav.meta
rename to IronToad_UnityProject/Assets/Sound/Music/tense.wav.meta
index 7a09aec..be52b85 100644
--- a/IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(tense).wav.meta
+++ b/IronToad_UnityProject/Assets/Sound/Music/tense.wav.meta
@@ -5,11 +5,11 @@ licenseType: Free
 AudioImporter:
   serializedVersion: 6
   defaultSettings:
-    loadType: 0
+    loadType: 2
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 1
+    quality: 0.7
     conversionMode: 0
   platformSettingOverrides: {}
   forceToMono: 0
diff --git a/IronToad_UnityProject/Assets/Sound/SFX.meta b/IronToad_UnityProject/Assets/Sound/SFX.meta
new file mode 100644
index 0000000..2d35fa0
--- /dev/null
+++ b/IronToad_UnityProject/Assets/Sound/SFX.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: bb5698073b8d847298f0287fcfbdd0de
+folderAsset: yes
+timeCreated: 1485052376
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/IronToad_UnityProject/Assets/Sound/SFX/assassination.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/assassination.wav.meta
index efbf86b..d6e8833 100644
--- a/IronToad_UnityProject/Assets/Sound/SFX/assassination.wav.meta
+++ b/IronToad_UnityProject/Assets/Sound/SFX/assassination.wav.meta
@@ -9,12 +9,12 @@ AudioImporter:
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 1
+    quality: 0.7
     conversionMode: 0
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  preloadAudioData: 1
+  preloadAudioData: 0
   loadInBackground: 0
   3D: 1
   userData: 
diff --git a/IronToad_UnityProject/Assets/Sound/SFX/createWave.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/createWave.wav.meta
index ba6ea07..c28f259 100644
--- a/IronToad_UnityProject/Assets/Sound/SFX/createWave.wav.meta
+++ b/IronToad_UnityProject/Assets/Sound/SFX/createWave.wav.meta
@@ -9,12 +9,12 @@ AudioImporter:
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 1
+    quality: 0.7
     conversionMode: 0
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  preloadAudioData: 1
+  preloadAudioData: 0
   loadInBackground: 0
   3D: 1
   userData: 
diff --git a/IronToad_UnityProject/Assets/Sound/SFX/createWave_2.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/createWave_2.wav.meta
index 90bcef1..5e664e8 100644
--- a/IronToad_UnityProject/Assets/Sound/SFX/createWave_2.wav.meta
+++ b/IronToad_UnityProject/Assets/Sound/SFX/createWave_2.wav.meta
@@ -9,12 +9,12 @@ AudioImporter:
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 1
+    quality: 0.7
     conversionMode: 0
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  preloadAudioData: 1
+  preloadAudioData: 0
   loadInBackground: 0
   3D: 1
   userData: 
diff --git a/IronToad_UnityProject/Assets/Sound/SFX/createWave_3.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/createWave_3.wav.meta
index 35d4d69..25a6976 100644
--- a/IronToad_UnityProject/Assets/Sound/SFX/createWave_3.wav.meta
+++ b/IronToad_UnityProject/Assets/Sound/SFX/createWave_3.wav.meta
@@ -9,12 +9,12 @@ AudioImporter:
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 1
+    quality: 0.7
     conversionMode: 0
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  preloadAudioData: 1
+  preloadAudioData: 0
   loadInBackground: 0
   3D: 1
   userData: 
diff --git a/IronToad_UnityProject/Assets/Sound/SFX/oceanAmbience.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/oceanAmbience.wav.meta
index 465f525..3846181 100644
--- a/IronToad_UnityProject/Assets/Sound/SFX/oceanAmbience.wav.meta
+++ b/IronToad_UnityProject/Assets/Sound/SFX/oceanAmbience.wav.meta
@@ -5,11 +5,11 @@ licenseType: Free
 AudioImporter:
   serializedVersion: 6
   defaultSettings:
-    loadType: 0
+    loadType: 2
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 1
+    quality: 0.7
     conversionMode: 0
   platformSettingOverrides: {}
   forceToMono: 0
diff --git a/IronToad_UnityProject/Assets/Sound/SFX/rockWater_1.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/rockWater_1.wav.meta
index 9472e49..00b8793 100644
--- a/IronToad_UnityProject/Assets/Sound/SFX/rockWater_1.wav.meta
+++ b/IronToad_UnityProject/Assets/Sound/SFX/rockWater_1.wav.meta
@@ -9,12 +9,12 @@ AudioImporter:
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 1
+    quality: 0.7
     conversionMode: 0
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  preloadAudioData: 1
+  preloadAudioData: 0
   loadInBackground: 0
   3D: 1
   userData: 
diff --git a/IronToad_UnityProject/Assets/Sound/SFX/rockWater_2.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/rockWater_2.wav.meta
index a3e20ce..2d79e6c 100644
--- a/IronToad_UnityProject/Assets/Sound/SFX/rockWater_2.wav.meta
+++ b/IronToad_UnityProject/Assets/Sound/SFX/rockWater_2.wav.meta
@@ -9,12 +9,12 @@ AudioImporter:
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 1
+    quality: 0.7
     conversionMode: 0
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  preloadAudioData: 1
+  preloadAudioData: 0
   loadInBackground: 0
   3D: 1
   userData: 
diff --git a/IronToad_UnityProject/Assets/Sound/SFX/rockWater_3.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/rockWater_3.wav.meta
index 44f4631..79c3a48 100644
--- a/IronToad_UnityProject/Assets/Sound/SFX/rockWater_3.wav.meta
+++ b/IronToad_UnityProject/Assets/Sound/SFX/rockWater_3.wav.meta
@@ -9,12 +9,12 @@ AudioImporter:
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 1
+    quality: 0.7
     conversionMode: 0
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  preloadAudioData: 1
+  preloadAudioData: 0
   loadInBackground: 0
   3D: 1
   userData: 
diff --git a/IronToad_UnityProject/Assets/Sound/SFX/runAground.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/runAground.wav.meta
index 61d8e34..0d018fd 100644
--- a/IronToad_UnityProject/Assets/Sound/SFX/runAground.wav.meta
+++ b/IronToad_UnityProject/Assets/Sound/SFX/runAground.wav.meta
@@ -9,12 +9,12 @@ AudioImporter:
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 1
+    quality: 0.7
     conversionMode: 0
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  preloadAudioData: 1
+  preloadAudioData: 0
   loadInBackground: 0
   3D: 1
   userData: 
diff --git a/IronToad_UnityProject/Assets/Sound/SFX/shipSpotted.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/shipSpotted.wav.meta
index d4ebbdd..15eed3e 100644
--- a/IronToad_UnityProject/Assets/Sound/SFX/shipSpotted.wav.meta
+++ b/IronToad_UnityProject/Assets/Sound/SFX/shipSpotted.wav.meta
@@ -9,12 +9,12 @@ AudioImporter:
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 1
+    quality: 0.7
     conversionMode: 0
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  preloadAudioData: 1
+  preloadAudioData: 0
   loadInBackground: 0
   3D: 1
   userData: 
diff --git a/IronToad_UnityProject/Assets/Sound/SFX/sinkingShip.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/sinkingShip.wav.meta
index 148c11c..e6eafc3 100644
--- a/IronToad_UnityProject/Assets/Sound/SFX/sinkingShip.wav.meta
+++ b/IronToad_UnityProject/Assets/Sound/SFX/sinkingShip.wav.meta
@@ -9,12 +9,12 @@ AudioImporter:
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 1
+    quality: 0.7
     conversionMode: 0
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  preloadAudioData: 1
+  preloadAudioData: 0
   loadInBackground: 0
   3D: 1
   userData: 
diff --git a/IronToad_UnityProject/Assets/Sound/SFX/spottedDialogue.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/spottedDialogue.wav.meta
index cf7471b..fa08255 100644
--- a/IronToad_UnityProject/Assets/Sound/SFX/spottedDialogue.wav.meta
+++ b/IronToad_UnityProject/Assets/Sound/SFX/spottedDialogue.wav.meta
@@ -9,12 +9,12 @@ AudioImporter:
     sampleRateSetting: 0
     sampleRateOverride: 44100
     compressionFormat: 1
-    quality: 1
+    quality: 0.7
     conversionMode: 0
   platformSettingOverrides: {}
   forceToMono: 0
   normalize: 1
-  preloadAudioData: 1
+  preloadAudioData: 0
   loadInBackground: 0
   3D: 1
   userData: 
diff --git a/IronToad_UnityProject/Assets/_Scenes/LighthouseTestScene.unity b/IronToad_UnityProject/Assets/_Scenes/LighthouseTestScene.unity
index bf45fe9f6f096713ad6ddea96de5727a558f3bb0..e7d48fee00e970c5de43b6cb2cc295fd82917dac 100644
GIT binary patch
delta 3725
zcmYk84Nz3q701t_#!avYNz|o{$r55k6T@N@i3(YuErc4Rr8S^N78Qhv%8G{KN6Ly(
zNDJ18@vedj)-Ys@xPlEEKM-OQA!&3GY#drL>(Dk-qk}Z9s7>wvzIWbScIM2v_jm65
zzjM$1*f)60>~1m#lPMvS0zxfB6oR(%MDT;s3AdlUe&@5np`xWRU!+&0osW({w4yn_
zGbx~|Hg<G#!FGo!#6%{lBXYSA8x5OURhclm>bo634=l*dU7xcde(kE&InAkMg$*HZ
zAuL}|IPa-haO4+Vk*3FD9ZQLN(0vHDfkQE`5!p;cL11q%%UebypBoSR{Cd@ka8xV8
zY><e^B07Vvl=y-}17ODRi_EMJC3}fknph_#EGvle@%R|n^PYqA;HVtz2)vZd9$FA9
znQbM}I(Rv5IkN`QE+y<ay82jzR&vOhOC-x?hMnphj)NmN*t_sj;xsdx2#JD3?JA-z
zqlmtb&{+;yUxys}KY+C|D+hC;{{-wDvtf}fB`j-*HUewvVre{@<OXxY%ZZ#}W?M^S
zM~P*&XPG(02`S+&AbJ~EN_1_xod`z}c%4y;%glUWs{@E0M!cJuU6^J<B5i}3w^()W
zCsLvq%qX3k*&vva**<3F;%8FATcjjbMLu|0O8CKy$>lL~{EFx;#GZuZGaC?fQo>%W
zmuVbAM@FTjz>x>65?)U3J!W=j%5uta^~N}HTS_EvB1!`egEer-4JNnN)3EoM`M?&S
z9}Zh|V~1>#Rm8sl3HN3-#|#eHwy3?5$;|Pln()=Hyst=!a`BFo7)I!EELI>;FNcCl
zRMJ(S7N*MKF0ifea&mi^nZ-3Jk>S#ZPeEuehdRI(qW?pfU}nMd-=Ht|O5B0obT~4L
zs9BIGE+u*g-3hQn4h3&hSy;tTh8*q!GtN>Nvq7;{N|?8+;amT8I8zQU274b~CSA%b
zVuz~PHfC+2OG*ru5jik)Dr`H4(#naRLw)3C-oecEwkl^Cvj!11TW0YabvL{=;M20O
zgBeLLW99)f%AUonL#&e$F%@bj7B}2oj2Dv^%-GBunWbT`jYej{h;L$+A=;&cYo~hS
zx_1+BUl9$08E-6PX5OW0He*?lHm+ENM9Ya_IgC>o$srGzk58qInQIR+Ko*bS6;aG~
ziEK!ecySdOr!wTrYE9j?7dsEbr(yV`%)EkV0R3^W=-7X1<7zS6H_(?WH;0*JpDIEO
zGY^>Y`WKnC?bntkNV^)xl(l9<g9e0Y4sxokCTbg{UxQ;g<T#|NU}ok6!^+ci*u%^+
zYKd}?<g;LpFl+lje^y?Xfy`{ja6mD~$zbD{r8R0-ZIE`?CLQk4a`K8gnUnRnD)nEj
z>C5pLb%0smpM&)=^MiTNp8@kT+XW!UJrBFatN~1JmPlAXGy4g3+4v3|%0-BFfgK<!
z(Td!~(AGqhjGzs6nOQLymYJ-uZf3#FO0b8S1I)O+t}t_hIq{ra+&?ojpTr*o`cbg8
z?U7k|@RST_oRWfeoq55GJ?muV6W3x;H2a6@lw1%S@vnu21(Oq(7fc7Uj25E#SPXf7
zJDIt?>ijmH=w6KwwSgI%wV7GWM@sJ`Ganf4gAz^f4-DzF5=@DjxJC*_fEj{6WmXGj
zB)EWC%o!Ao6MTi4^Q_Vv*E>npkKAAz;pK_=UT>rhEv-s0hzEMWj2Vw-HYmd8qG*;j
z{hE~;wLj|BbUk2u(6_?sm?gLCi#rqSFf%vUEcBm-{hpZ*%vjtb%<LayXJO0>u%ic`
zD1;*)7}j=~miz|{?dR3v9%GjAM<uvFNN5jtfEg37W|sVkns*H|zX+L!i_3CB)vo*2
z?e+5gb}(aa^)T~*8GGvrvks9BiISL3qBrrFEK_RP@**kW1?zy9dut&x*Jt`)Z4g)*
zGtcMh58$_xpTQRd?jA7XGOJ+b_>-DJC9`2Le4FZfYbV2qi)ucfhJUOHrhyqHxxmZ^
zX6&sFW_g#??bykz*r)U|`or*XfxQ4`?A6TvNF7?bl;C0>=mC>o&+;@aVdfWg^G%QC
zn7dU@|6a3gv(zmIGjjS5Gi#6fI=sWoaYf~1d1)=aVDKzhHoRPfP-cTIp|PfPlWBU(
znmE($fRg%G%g#HS`s}3(cZa7(U!H)A9lv`sPY>ih$V#ec`sUW5q5K0njm{dsFQ;`%
z;<4j*R@B{ys@G}ZxBX4u{bE7lzN0g)oO|`rCY@H^yt&!C|I36Azb^c0sIo6or$-Am
z#XnSfHTBfV`uw^5Gf$5y(O&ma_Ha$bFH?WKxA92PHp|78`rzIK=cI-A>r<=$VYypV
zon55UzRbMZl*W|!)<u0s+uU=`>9l#8>HOtxf6DJxK8Txq|1Y<6dZxW*Zs@7TgxyJj
zNw5DeZ<0=Te%(|w;S+!A!TdwBU!Gn))}rG@>w7W-t}nJ9uR6D6MVRHLPAA^5nESfM
zq%_`*tX#4GQman?o|`_}R34t<GT$$HJoIllpe^_8CjXLvvP2OQZ?X#i!~k>4e``$N
z&MlFT$Uis#d%xCZJ9$L=$q{XA3VLcpKM-x}h<@0Jw!A_Nz3>t3XGXNA=<WG%`d6g!
dz*Ie;@rV)aX(QV5UmN4)WTv!OubO;u{|6xU2jKt!

delta 3186
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