diff --git a/SCHIZO/Creatures/Ermshark/ErmsharkAttack.cs b/SCHIZO/Creatures/Ermshark/ErmsharkAttack.cs index b3ca2d0a..55cb473e 100644 --- a/SCHIZO/Creatures/Ermshark/ErmsharkAttack.cs +++ b/SCHIZO/Creatures/Ermshark/ErmsharkAttack.cs @@ -8,7 +8,7 @@ partial class ErmsharkAttack { private void Awake() { - attackSounds = attackSounds.Initialize(AudioUtils.BusPaths.UnderwaterCreatures); + attackSounds = attackSounds!?.Initialize(AudioUtils.BusPaths.UnderwaterCreatures); } public override void OnTouch(Collider collider) diff --git a/SCHIZO/Events/Ermcon/ErmconAttendee.cs b/SCHIZO/Events/Ermcon/ErmconAttendee.cs index 32f5d223..0c5e28eb 100644 --- a/SCHIZO/Events/Ermcon/ErmconAttendee.cs +++ b/SCHIZO/Events/Ermcon/ErmconAttendee.cs @@ -50,7 +50,7 @@ public override void Awake() // "meta"-priority - this number determines the order in which actions get *evaluated* // and the priority obtained from Evaluate() actually determines which action gets *performed* evaluatePriority = 99f; - pickupDeniedSounds = pickupDeniedSounds.Initialize(AudioUtils.BusPaths.UnderwaterCreatures); + pickupDeniedSounds = pickupDeniedSounds!?.Initialize(AudioUtils.BusPaths.UnderwaterCreatures); } public void OnHandHover(GUIHand hand) { diff --git a/SCHIZO/Items/ModItem.cs b/SCHIZO/Items/ModItem.cs index 782c16a0..5e7c2cd2 100644 --- a/SCHIZO/Items/ModItem.cs +++ b/SCHIZO/Items/ModItem.cs @@ -99,6 +99,11 @@ public void LoadStep2() unlockTechTypes = new List {this}, }); } + + if (ItemData.itemSounds) + { + ItemData.itemSounds.Register(this); + } } public static implicit operator PrefabInfo(ModItem self) => self.PrefabInfo; diff --git a/SCHIZO/SCHIZO.csproj b/SCHIZO/SCHIZO.csproj index c0fb5c57..3dffd1cc 100644 --- a/SCHIZO/SCHIZO.csproj +++ b/SCHIZO/SCHIZO.csproj @@ -37,6 +37,7 @@ + diff --git a/SCHIZO/Sounds/ItemSounds.cs b/SCHIZO/Sounds/ItemSounds.cs new file mode 100644 index 00000000..e66604be --- /dev/null +++ b/SCHIZO/Sounds/ItemSounds.cs @@ -0,0 +1,36 @@ +using System; +using System.Collections.Generic; +using Nautilus.Utility; + +namespace SCHIZO.Sounds; + +partial class ItemSounds +{ + private static readonly Dictionary _registeredItemSounds = new(); + + public static bool TryGet(TechType techType, out ItemSounds itemSounds) + { + return _registeredItemSounds.TryGetValue(techType, out itemSounds); + } + + public void Register(TechType techType) + { + if (_registeredItemSounds.TryGetValue(techType, out ItemSounds existingItemSounds) && existingItemSounds != this) + { + throw new Exception($"ItemSounds for {techType} already registered by {existingItemSounds}"); + } + + _registeredItemSounds[techType] = this; + + // If multiple items share the same sounds, Initialize will return the same SoundCollectionInstance as long as the bus is the same, so we don't need to worry about not calling it. + + pickupSounds = pickupSounds!?.Initialize(AudioUtils.BusPaths.PDAVoice); + dropSounds = dropSounds!?.Initialize(AudioUtils.BusPaths.UnderwaterCreatures); + + drawSounds = drawSounds!?.Initialize(AudioUtils.BusPaths.PDAVoice); + holsterSounds = holsterSounds!?.Initialize(AudioUtils.BusPaths.PDAVoice); + + cookSounds = cookSounds!?.Initialize(AudioUtils.BusPaths.PDAVoice); + eatSounds = eatSounds!?.Initialize(AudioUtils.BusPaths.PDAVoice); + } +} diff --git a/SCHIZO/_old/Sounds/Patches/CreatureSoundsPatches.cs b/SCHIZO/Sounds/Patches/ItemSoundsPatches.cs similarity index 58% rename from SCHIZO/_old/Sounds/Patches/CreatureSoundsPatches.cs rename to SCHIZO/Sounds/Patches/ItemSoundsPatches.cs index 63e38a4e..165aa90c 100644 --- a/SCHIZO/_old/Sounds/Patches/CreatureSoundsPatches.cs +++ b/SCHIZO/Sounds/Patches/ItemSoundsPatches.cs @@ -8,26 +8,25 @@ namespace SCHIZO.Sounds.Patches; [HarmonyPatch] -public static class CreatureSoundsPatches +public static class ItemSoundsPatches { [HarmonyPatch(typeof(Pickupable), nameof(Pickupable.PlayPickupSound))] [HarmonyPostfix] public static void PlayCustomPickupSound(Pickupable __instance) { - if (!CreatureSoundsHandler.TryGetCreatureSounds(__instance.GetTechType(), out CreatureSounds sounds)) return; - - sounds.PickupSounds?.Play2D(); + if (!ItemSounds.TryGet(__instance.GetTechType(), out ItemSounds itemSounds)) return; + itemSounds.pickupSounds!?.Play2D(); } [HarmonyPatch(typeof(Pickupable), nameof(Pickupable.PlayDropSound))] [HarmonyPostfix] public static void PlayCustomDropSound(Pickupable __instance) { - if (!CreatureSoundsHandler.TryGetCreatureSounds(__instance.GetTechType(), out CreatureSounds sounds)) return; - if (sounds.DropSounds == null) return; + if (!ItemSounds.TryGet(__instance.GetTechType(), out ItemSounds sounds)) return; + if (sounds.dropSounds == null) return; - sounds.HolsterSounds?.CancelAllDelayed(); - sounds.DropSounds.Play(__instance.GetComponent()); + sounds.holsterSounds!?.CancelAllDelayed(); + sounds.dropSounds.Play(__instance.GetComponent()); } [HarmonyPatch(typeof(PlayerTool), nameof(PlayerTool.OnDraw))] @@ -36,12 +35,12 @@ public static void PlayCustomDrawSound(PlayerTool __instance) { try { - if (!__instance.pickupable || !CreatureSoundsHandler.TryGetCreatureSounds(__instance.pickupable.GetTechType(), out CreatureSounds sounds)) return; - if (sounds.DrawSounds == null) return; + if (!__instance.pickupable || !ItemSounds.TryGet(__instance.pickupable.GetTechType(), out ItemSounds sounds)) return; + if (sounds.drawSounds == null) return; - if (Time.time < sounds.PickupSounds?.LastPlay + 0.5f) return; + if (Time.time < sounds.pickupSounds!?.LastPlay + 0.5f) return; - sounds.DrawSounds.Play2D(); + sounds.drawSounds.Play2D(); } catch { @@ -55,14 +54,14 @@ public static void PlayCustomHolsterSound(PlayerTool __instance) { try { - if (!__instance.pickupable || !CreatureSoundsHandler.TryGetCreatureSounds(__instance.pickupable.GetTechType(), out CreatureSounds sounds)) return; - if (sounds.HolsterSounds == null) return; + if (!__instance.pickupable || !ItemSounds.TryGet(__instance.pickupable.GetTechType(), out ItemSounds sounds)) return; + if (sounds.holsterSounds == null) return; - if (Time.time < sounds.DropSounds?.LastPlay + 0.5f) return; - if (Time.time < sounds.EatSounds?.LastPlay + 0.5f) return; - if (Time.time < sounds.CookSounds?.LastPlay + 0.5f) return; + if (Time.time < sounds.dropSounds!?.LastPlay + 0.5f) return; + if (Time.time < sounds.eatSounds!?.LastPlay + 0.5f) return; + if (Time.time < sounds.cookSounds!?.LastPlay + 0.5f) return; - sounds.HolsterSounds.Play2D(0.15f); + sounds.holsterSounds.Play2D(0.15f); } catch { @@ -97,12 +96,13 @@ public static IEnumerable Injector(IEnumerable private static void Patch(TechType techType) { - if (!CreatureSoundsHandler.TryGetCreatureSounds(techType, out CreatureSounds sounds)) return; + if (!ItemSounds.TryGet(techType, out ItemSounds sounds)) return; + if (sounds.eatSounds == null) return; - if (Time.time < sounds.EatSounds?.LastPlay + 0.1f) return; + if (Time.time < sounds.eatSounds.LastPlay + 0.1f) return; - sounds.HolsterSounds?.CancelAllDelayed(); - sounds.EatSounds?.Play2D(); + sounds.holsterSounds!?.CancelAllDelayed(); + sounds.eatSounds.Play2D(); } } @@ -110,10 +110,10 @@ private static void Patch(TechType techType) [HarmonyPostfix] public static void PlayCustomCookSound(TechType techType) { - if (!CreatureSoundsHandler.TryGetCreatureSounds(techType, out CreatureSounds sounds)) return; - if (sounds.CookSounds == null) return; + if (!ItemSounds.TryGet(techType, out ItemSounds sounds)) return; + if (sounds.cookSounds == null) return; - sounds.HolsterSounds?.CancelAllDelayed(); - sounds.CookSounds.Play2D(); + sounds.holsterSounds!?.CancelAllDelayed(); + sounds.cookSounds.Play2D(); } } diff --git a/SCHIZO/Creatures/Components/HurtSoundPlayer.cs b/SCHIZO/Sounds/Players/HurtSoundPlayer.cs similarity index 80% rename from SCHIZO/Creatures/Components/HurtSoundPlayer.cs rename to SCHIZO/Sounds/Players/HurtSoundPlayer.cs index f96eb40b..aebaa9fd 100644 --- a/SCHIZO/Creatures/Components/HurtSoundPlayer.cs +++ b/SCHIZO/Sounds/Players/HurtSoundPlayer.cs @@ -1,4 +1,4 @@ -namespace SCHIZO.Creatures.Components; +namespace SCHIZO.Sounds.Players; partial class HurtSoundPlayer : IOnTakeDamage { diff --git a/Unity/Assets/Ermfish/Cooked ermfish.asset b/Unity/Assets/Ermfish/Cooked ermfish.asset index d180972f..52bd2e4a 100644 --- a/Unity/Assets/Ermfish/Cooked ermfish.asset +++ b/Unity/Assets/Ermfish/Cooked ermfish.asset @@ -23,6 +23,7 @@ MonoBehaviour: isCraftable: 1 isBuildable: 0 craftingTime: 2.5 + itemSounds: {fileID: 11400000, guid: bfb77f100ed7e6e4fb42c9b05bcb00af, type: 2} registerInSN: 1 recipeSN: {fileID: 11400000, guid: 902e1464a3d91ad4a9dfb020ab4770a8, type: 2} craftTreeTypeSN: 1 diff --git a/Unity/Assets/Ermfish/Cured ermfish.asset b/Unity/Assets/Ermfish/Cured ermfish.asset index b4a768ea..2419643a 100644 --- a/Unity/Assets/Ermfish/Cured ermfish.asset +++ b/Unity/Assets/Ermfish/Cured ermfish.asset @@ -23,6 +23,7 @@ MonoBehaviour: isCraftable: 1 isBuildable: 0 craftingTime: 2.5 + itemSounds: {fileID: 11400000, guid: bfb77f100ed7e6e4fb42c9b05bcb00af, type: 2} registerInSN: 1 recipeSN: {fileID: 11400000, guid: 9636d4aefaf6b714fa2a2035b9ea0e0d, type: 2} craftTreeTypeSN: 1 diff --git a/Unity/Assets/Ermfish/Erm.asset b/Unity/Assets/Ermfish/Erm.asset index ece6c449..5a09b57d 100644 --- a/Unity/Assets/Ermfish/Erm.asset +++ b/Unity/Assets/Ermfish/Erm.asset @@ -23,6 +23,7 @@ MonoBehaviour: isCraftable: 0 isBuildable: 1 craftingTime: 2.5 + itemSounds: {fileID: 0} registerInSN: 1 recipeSN: {fileID: 11400000, guid: 9ef8730f2922d8047bfb88e7e6edfebd, type: 2} craftTreeTypeSN: 0 diff --git a/Unity/Assets/Ermfish/Ermfish regular.asset b/Unity/Assets/Ermfish/Ermfish regular.asset index c79fc00d..b858c5f1 100644 --- a/Unity/Assets/Ermfish/Ermfish regular.asset +++ b/Unity/Assets/Ermfish/Ermfish regular.asset @@ -48,6 +48,7 @@ MonoBehaviour: isCraftable: 0 isBuildable: 0 craftingTime: 2.5 + itemSounds: {fileID: 11400000, guid: bfb77f100ed7e6e4fb42c9b05bcb00af, type: 2} registerInSN: 1 recipeSN: {fileID: 0} craftTreeTypeSN: 0 diff --git a/Unity/Assets/_old/Erm/Sounds/Cook.meta b/Unity/Assets/Ermfish/Sounds/Cook.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook.meta rename to Unity/Assets/Ermfish/Sounds/Cook.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/Cook.asset b/Unity/Assets/Ermfish/Sounds/Cook/Cook.asset similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/Cook.asset rename to Unity/Assets/Ermfish/Sounds/Cook/Cook.asset diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/Cook.asset.meta b/Unity/Assets/Ermfish/Sounds/Cook/Cook.asset.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/Cook.asset.meta rename to Unity/Assets/Ermfish/Sounds/Cook/Cook.asset.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/NeuroRickroll.mp3 b/Unity/Assets/Ermfish/Sounds/Cook/NeuroRickroll.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/NeuroRickroll.mp3 rename to Unity/Assets/Ermfish/Sounds/Cook/NeuroRickroll.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/NeuroRickroll.mp3.meta b/Unity/Assets/Ermfish/Sounds/Cook/NeuroRickroll.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/NeuroRickroll.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Cook/NeuroRickroll.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/evil_Oh_nyoooooo~.mp3 b/Unity/Assets/Ermfish/Sounds/Cook/evil_Oh_nyoooooo~.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/evil_Oh_nyoooooo~.mp3 rename to Unity/Assets/Ermfish/Sounds/Cook/evil_Oh_nyoooooo~.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/evil_Oh_nyoooooo~.mp3.meta b/Unity/Assets/Ermfish/Sounds/Cook/evil_Oh_nyoooooo~.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/evil_Oh_nyoooooo~.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Cook/evil_Oh_nyoooooo~.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/evil_bleh.mp3 b/Unity/Assets/Ermfish/Sounds/Cook/evil_bleh.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/evil_bleh.mp3 rename to Unity/Assets/Ermfish/Sounds/Cook/evil_bleh.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/evil_bleh.mp3.meta b/Unity/Assets/Ermfish/Sounds/Cook/evil_bleh.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/evil_bleh.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Cook/evil_bleh.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/evil_i_am_very_real_wink.mp3 b/Unity/Assets/Ermfish/Sounds/Cook/evil_i_am_very_real_wink.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/evil_i_am_very_real_wink.mp3 rename to Unity/Assets/Ermfish/Sounds/Cook/evil_i_am_very_real_wink.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/evil_i_am_very_real_wink.mp3.meta b/Unity/Assets/Ermfish/Sounds/Cook/evil_i_am_very_real_wink.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/evil_i_am_very_real_wink.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Cook/evil_i_am_very_real_wink.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/evil_i_dont_care.mp3 b/Unity/Assets/Ermfish/Sounds/Cook/evil_i_dont_care.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/evil_i_dont_care.mp3 rename to Unity/Assets/Ermfish/Sounds/Cook/evil_i_dont_care.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/evil_i_dont_care.mp3.meta b/Unity/Assets/Ermfish/Sounds/Cook/evil_i_dont_care.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/evil_i_dont_care.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Cook/evil_i_dont_care.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/evil_im_a_schizo.mp3 b/Unity/Assets/Ermfish/Sounds/Cook/evil_im_a_schizo.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/evil_im_a_schizo.mp3 rename to Unity/Assets/Ermfish/Sounds/Cook/evil_im_a_schizo.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/evil_im_a_schizo.mp3.meta b/Unity/Assets/Ermfish/Sounds/Cook/evil_im_a_schizo.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/evil_im_a_schizo.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Cook/evil_im_a_schizo.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/evil_miaow.mp3 b/Unity/Assets/Ermfish/Sounds/Cook/evil_miaow.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/evil_miaow.mp3 rename to Unity/Assets/Ermfish/Sounds/Cook/evil_miaow.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/evil_miaow.mp3.meta b/Unity/Assets/Ermfish/Sounds/Cook/evil_miaow.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/evil_miaow.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Cook/evil_miaow.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/evil_voice_mail.mp3 b/Unity/Assets/Ermfish/Sounds/Cook/evil_voice_mail.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/evil_voice_mail.mp3 rename to Unity/Assets/Ermfish/Sounds/Cook/evil_voice_mail.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/evil_voice_mail.mp3.meta b/Unity/Assets/Ermfish/Sounds/Cook/evil_voice_mail.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/evil_voice_mail.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Cook/evil_voice_mail.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/evil_well_thats_stupid.mp3 b/Unity/Assets/Ermfish/Sounds/Cook/evil_well_thats_stupid.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/evil_well_thats_stupid.mp3 rename to Unity/Assets/Ermfish/Sounds/Cook/evil_well_thats_stupid.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/evil_well_thats_stupid.mp3.meta b/Unity/Assets/Ermfish/Sounds/Cook/evil_well_thats_stupid.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/evil_well_thats_stupid.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Cook/evil_well_thats_stupid.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/evil_what.mp3 b/Unity/Assets/Ermfish/Sounds/Cook/evil_what.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/evil_what.mp3 rename to Unity/Assets/Ermfish/Sounds/Cook/evil_what.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/evil_what.mp3.meta b/Unity/Assets/Ermfish/Sounds/Cook/evil_what.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/evil_what.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Cook/evil_what.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/evil_whats_going_on_here.mp3 b/Unity/Assets/Ermfish/Sounds/Cook/evil_whats_going_on_here.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/evil_whats_going_on_here.mp3 rename to Unity/Assets/Ermfish/Sounds/Cook/evil_whats_going_on_here.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/evil_whats_going_on_here.mp3.meta b/Unity/Assets/Ermfish/Sounds/Cook/evil_whats_going_on_here.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/evil_whats_going_on_here.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Cook/evil_whats_going_on_here.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/evil_whats_that.mp3 b/Unity/Assets/Ermfish/Sounds/Cook/evil_whats_that.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/evil_whats_that.mp3 rename to Unity/Assets/Ermfish/Sounds/Cook/evil_whats_that.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/evil_whats_that.mp3.meta b/Unity/Assets/Ermfish/Sounds/Cook/evil_whats_that.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/evil_whats_that.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Cook/evil_whats_that.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/im a cat.mp3 b/Unity/Assets/Ermfish/Sounds/Cook/im a cat.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/im a cat.mp3 rename to Unity/Assets/Ermfish/Sounds/Cook/im a cat.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/im a cat.mp3.meta b/Unity/Assets/Ermfish/Sounds/Cook/im a cat.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/im a cat.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Cook/im a cat.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/no.mp3 b/Unity/Assets/Ermfish/Sounds/Cook/no.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/no.mp3 rename to Unity/Assets/Ermfish/Sounds/Cook/no.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/no.mp3.meta b/Unity/Assets/Ermfish/Sounds/Cook/no.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/no.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Cook/no.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/sigh.mp3 b/Unity/Assets/Ermfish/Sounds/Cook/sigh.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/sigh.mp3 rename to Unity/Assets/Ermfish/Sounds/Cook/sigh.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/sigh.mp3.meta b/Unity/Assets/Ermfish/Sounds/Cook/sigh.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/sigh.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Cook/sigh.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/what are you doing.mp3 b/Unity/Assets/Ermfish/Sounds/Cook/what are you doing.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/what are you doing.mp3 rename to Unity/Assets/Ermfish/Sounds/Cook/what are you doing.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Cook/what are you doing.mp3.meta b/Unity/Assets/Ermfish/Sounds/Cook/what are you doing.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Cook/what are you doing.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Cook/what are you doing.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Draw.meta b/Unity/Assets/Ermfish/Sounds/Draw.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Draw.meta rename to Unity/Assets/Ermfish/Sounds/Draw.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Draw/Draw.asset b/Unity/Assets/Ermfish/Sounds/Draw/Draw.asset similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Draw/Draw.asset rename to Unity/Assets/Ermfish/Sounds/Draw/Draw.asset diff --git a/Unity/Assets/_old/Erm/Sounds/Draw/Draw.asset.meta b/Unity/Assets/Ermfish/Sounds/Draw/Draw.asset.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Draw/Draw.asset.meta rename to Unity/Assets/Ermfish/Sounds/Draw/Draw.asset.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Draw/evil_hello_01.mp3 b/Unity/Assets/Ermfish/Sounds/Draw/evil_hello_01.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Draw/evil_hello_01.mp3 rename to Unity/Assets/Ermfish/Sounds/Draw/evil_hello_01.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Draw/evil_hello_01.mp3.meta b/Unity/Assets/Ermfish/Sounds/Draw/evil_hello_01.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Draw/evil_hello_01.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Draw/evil_hello_01.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Draw/evil_hello_02.mp3 b/Unity/Assets/Ermfish/Sounds/Draw/evil_hello_02.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Draw/evil_hello_02.mp3 rename to Unity/Assets/Ermfish/Sounds/Draw/evil_hello_02.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Draw/evil_hello_02.mp3.meta b/Unity/Assets/Ermfish/Sounds/Draw/evil_hello_02.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Draw/evil_hello_02.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Draw/evil_hello_02.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Draw/evil_hello_03.mp3 b/Unity/Assets/Ermfish/Sounds/Draw/evil_hello_03.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Draw/evil_hello_03.mp3 rename to Unity/Assets/Ermfish/Sounds/Draw/evil_hello_03.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Draw/evil_hello_03.mp3.meta b/Unity/Assets/Ermfish/Sounds/Draw/evil_hello_03.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Draw/evil_hello_03.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Draw/evil_hello_03.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Draw/evil_hey_chat.mp3 b/Unity/Assets/Ermfish/Sounds/Draw/evil_hey_chat.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Draw/evil_hey_chat.mp3 rename to Unity/Assets/Ermfish/Sounds/Draw/evil_hey_chat.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Draw/evil_hey_chat.mp3.meta b/Unity/Assets/Ermfish/Sounds/Draw/evil_hey_chat.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Draw/evil_hey_chat.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Draw/evil_hey_chat.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Draw/evil_hi.mp3 b/Unity/Assets/Ermfish/Sounds/Draw/evil_hi.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Draw/evil_hi.mp3 rename to Unity/Assets/Ermfish/Sounds/Draw/evil_hi.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Draw/evil_hi.mp3.meta b/Unity/Assets/Ermfish/Sounds/Draw/evil_hi.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Draw/evil_hi.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Draw/evil_hi.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Draw/hello.mp3 b/Unity/Assets/Ermfish/Sounds/Draw/hello.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Draw/hello.mp3 rename to Unity/Assets/Ermfish/Sounds/Draw/hello.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Draw/hello.mp3.meta b/Unity/Assets/Ermfish/Sounds/Draw/hello.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Draw/hello.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Draw/hello.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Drop.meta b/Unity/Assets/Ermfish/Sounds/Drop.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop.meta rename to Unity/Assets/Ermfish/Sounds/Drop.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/Drop.asset b/Unity/Assets/Ermfish/Sounds/Drop/Drop.asset similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/Drop.asset rename to Unity/Assets/Ermfish/Sounds/Drop/Drop.asset diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/Drop.asset.meta b/Unity/Assets/Ermfish/Sounds/Drop/Drop.asset.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/Drop.asset.meta rename to Unity/Assets/Ermfish/Sounds/Drop/Drop.asset.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/LUL.mp3 b/Unity/Assets/Ermfish/Sounds/Drop/LUL.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/LUL.mp3 rename to Unity/Assets/Ermfish/Sounds/Drop/LUL.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/LUL.mp3.meta b/Unity/Assets/Ermfish/Sounds/Drop/LUL.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/LUL.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Drop/LUL.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/evil_arigato_01.mp3 b/Unity/Assets/Ermfish/Sounds/Drop/evil_arigato_01.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/evil_arigato_01.mp3 rename to Unity/Assets/Ermfish/Sounds/Drop/evil_arigato_01.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/evil_arigato_01.mp3.meta b/Unity/Assets/Ermfish/Sounds/Drop/evil_arigato_01.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/evil_arigato_01.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Drop/evil_arigato_01.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/evil_arigato_02.mp3 b/Unity/Assets/Ermfish/Sounds/Drop/evil_arigato_02.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/evil_arigato_02.mp3 rename to Unity/Assets/Ermfish/Sounds/Drop/evil_arigato_02.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/evil_arigato_02.mp3.meta b/Unity/Assets/Ermfish/Sounds/Drop/evil_arigato_02.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/evil_arigato_02.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Drop/evil_arigato_02.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/evil_bye_peepo.mp3 b/Unity/Assets/Ermfish/Sounds/Drop/evil_bye_peepo.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/evil_bye_peepo.mp3 rename to Unity/Assets/Ermfish/Sounds/Drop/evil_bye_peepo.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/evil_bye_peepo.mp3.meta b/Unity/Assets/Ermfish/Sounds/Drop/evil_bye_peepo.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/evil_bye_peepo.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Drop/evil_bye_peepo.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/evil_high_pitch_yarr_clean.mp3 b/Unity/Assets/Ermfish/Sounds/Drop/evil_high_pitch_yarr_clean.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/evil_high_pitch_yarr_clean.mp3 rename to Unity/Assets/Ermfish/Sounds/Drop/evil_high_pitch_yarr_clean.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/evil_high_pitch_yarr_clean.mp3.meta b/Unity/Assets/Ermfish/Sounds/Drop/evil_high_pitch_yarr_clean.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/evil_high_pitch_yarr_clean.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Drop/evil_high_pitch_yarr_clean.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/evil_leave_me_alone.mp3 b/Unity/Assets/Ermfish/Sounds/Drop/evil_leave_me_alone.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/evil_leave_me_alone.mp3 rename to Unity/Assets/Ermfish/Sounds/Drop/evil_leave_me_alone.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/evil_leave_me_alone.mp3.meta b/Unity/Assets/Ermfish/Sounds/Drop/evil_leave_me_alone.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/evil_leave_me_alone.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Drop/evil_leave_me_alone.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/evil_oh_cool_donowall.mp3 b/Unity/Assets/Ermfish/Sounds/Drop/evil_oh_cool_donowall.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/evil_oh_cool_donowall.mp3 rename to Unity/Assets/Ermfish/Sounds/Drop/evil_oh_cool_donowall.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/evil_oh_cool_donowall.mp3.meta b/Unity/Assets/Ermfish/Sounds/Drop/evil_oh_cool_donowall.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/evil_oh_cool_donowall.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Drop/evil_oh_cool_donowall.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/evil_thank_you_01.mp3 b/Unity/Assets/Ermfish/Sounds/Drop/evil_thank_you_01.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/evil_thank_you_01.mp3 rename to Unity/Assets/Ermfish/Sounds/Drop/evil_thank_you_01.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/evil_thank_you_01.mp3.meta b/Unity/Assets/Ermfish/Sounds/Drop/evil_thank_you_01.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/evil_thank_you_01.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Drop/evil_thank_you_01.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/evil_you_fool.mp3 b/Unity/Assets/Ermfish/Sounds/Drop/evil_you_fool.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/evil_you_fool.mp3 rename to Unity/Assets/Ermfish/Sounds/Drop/evil_you_fool.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/evil_you_fool.mp3.meta b/Unity/Assets/Ermfish/Sounds/Drop/evil_you_fool.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/evil_you_fool.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Drop/evil_you_fool.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/evildangerous.mp3 b/Unity/Assets/Ermfish/Sounds/Drop/evildangerous.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/evildangerous.mp3 rename to Unity/Assets/Ermfish/Sounds/Drop/evildangerous.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/evildangerous.mp3.meta b/Unity/Assets/Ermfish/Sounds/Drop/evildangerous.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/evildangerous.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Drop/evildangerous.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/oh.mp3 b/Unity/Assets/Ermfish/Sounds/Drop/oh.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/oh.mp3 rename to Unity/Assets/Ermfish/Sounds/Drop/oh.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/oh.mp3.meta b/Unity/Assets/Ermfish/Sounds/Drop/oh.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/oh.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Drop/oh.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/oh_okay.mp3 b/Unity/Assets/Ermfish/Sounds/Drop/oh_okay.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/oh_okay.mp3 rename to Unity/Assets/Ermfish/Sounds/Drop/oh_okay.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/oh_okay.mp3.meta b/Unity/Assets/Ermfish/Sounds/Drop/oh_okay.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/oh_okay.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Drop/oh_okay.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/really.mp3 b/Unity/Assets/Ermfish/Sounds/Drop/really.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/really.mp3 rename to Unity/Assets/Ermfish/Sounds/Drop/really.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/really.mp3.meta b/Unity/Assets/Ermfish/Sounds/Drop/really.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/really.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Drop/really.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/thank you 2.mp3 b/Unity/Assets/Ermfish/Sounds/Drop/thank you 2.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/thank you 2.mp3 rename to Unity/Assets/Ermfish/Sounds/Drop/thank you 2.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/thank you 2.mp3.meta b/Unity/Assets/Ermfish/Sounds/Drop/thank you 2.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/thank you 2.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Drop/thank you 2.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/thank you.mp3 b/Unity/Assets/Ermfish/Sounds/Drop/thank you.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/thank you.mp3 rename to Unity/Assets/Ermfish/Sounds/Drop/thank you.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/thank you.mp3.meta b/Unity/Assets/Ermfish/Sounds/Drop/thank you.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/thank you.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Drop/thank you.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/thanks.mp3 b/Unity/Assets/Ermfish/Sounds/Drop/thanks.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/thanks.mp3 rename to Unity/Assets/Ermfish/Sounds/Drop/thanks.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/thanks.mp3.meta b/Unity/Assets/Ermfish/Sounds/Drop/thanks.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/thanks.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Drop/thanks.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/thats a flex.mp3 b/Unity/Assets/Ermfish/Sounds/Drop/thats a flex.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/thats a flex.mp3 rename to Unity/Assets/Ermfish/Sounds/Drop/thats a flex.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/thats a flex.mp3.meta b/Unity/Assets/Ermfish/Sounds/Drop/thats a flex.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/thats a flex.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Drop/thats a flex.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/thats right.mp3 b/Unity/Assets/Ermfish/Sounds/Drop/thats right.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/thats right.mp3 rename to Unity/Assets/Ermfish/Sounds/Drop/thats right.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/thats right.mp3.meta b/Unity/Assets/Ermfish/Sounds/Drop/thats right.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/thats right.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Drop/thats right.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/yay.mp3 b/Unity/Assets/Ermfish/Sounds/Drop/yay.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/yay.mp3 rename to Unity/Assets/Ermfish/Sounds/Drop/yay.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Drop/yay.mp3.meta b/Unity/Assets/Ermfish/Sounds/Drop/yay.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Drop/yay.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Drop/yay.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Eat.meta b/Unity/Assets/Ermfish/Sounds/Eat.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Eat.meta rename to Unity/Assets/Ermfish/Sounds/Eat.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Eat/AAAAAAAAAAAHHHHH.mp3 b/Unity/Assets/Ermfish/Sounds/Eat/AAAAAAAAAAAHHHHH.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Eat/AAAAAAAAAAAHHHHH.mp3 rename to Unity/Assets/Ermfish/Sounds/Eat/AAAAAAAAAAAHHHHH.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Eat/AAAAAAAAAAAHHHHH.mp3.meta b/Unity/Assets/Ermfish/Sounds/Eat/AAAAAAAAAAAHHHHH.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Eat/AAAAAAAAAAAHHHHH.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Eat/AAAAAAAAAAAHHHHH.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Eat/Eat.asset b/Unity/Assets/Ermfish/Sounds/Eat/Eat.asset similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Eat/Eat.asset rename to Unity/Assets/Ermfish/Sounds/Eat/Eat.asset diff --git a/Unity/Assets/_old/Erm/Sounds/Eat/Eat.asset.meta b/Unity/Assets/Ermfish/Sounds/Eat/Eat.asset.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Eat/Eat.asset.meta rename to Unity/Assets/Ermfish/Sounds/Eat/Eat.asset.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Eat/NeuroScream.mp3 b/Unity/Assets/Ermfish/Sounds/Eat/NeuroScream.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Eat/NeuroScream.mp3 rename to Unity/Assets/Ermfish/Sounds/Eat/NeuroScream.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Eat/NeuroScream.mp3.meta b/Unity/Assets/Ermfish/Sounds/Eat/NeuroScream.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Eat/NeuroScream.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Eat/NeuroScream.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Eat/aaah_goodbye.mp3 b/Unity/Assets/Ermfish/Sounds/Eat/aaah_goodbye.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Eat/aaah_goodbye.mp3 rename to Unity/Assets/Ermfish/Sounds/Eat/aaah_goodbye.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Eat/aaah_goodbye.mp3.meta b/Unity/Assets/Ermfish/Sounds/Eat/aaah_goodbye.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Eat/aaah_goodbye.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Eat/aaah_goodbye.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Eat/evil pirate AAHHHH [clean].mp3 b/Unity/Assets/Ermfish/Sounds/Eat/evil pirate AAHHHH [clean].mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Eat/evil pirate AAHHHH [clean].mp3 rename to Unity/Assets/Ermfish/Sounds/Eat/evil pirate AAHHHH [clean].mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Eat/evil pirate AAHHHH [clean].mp3.meta b/Unity/Assets/Ermfish/Sounds/Eat/evil pirate AAHHHH [clean].mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Eat/evil pirate AAHHHH [clean].mp3.meta rename to Unity/Assets/Ermfish/Sounds/Eat/evil pirate AAHHHH [clean].mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Eat/evil pirate noise [clean].mp3 b/Unity/Assets/Ermfish/Sounds/Eat/evil pirate noise [clean].mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Eat/evil pirate noise [clean].mp3 rename to Unity/Assets/Ermfish/Sounds/Eat/evil pirate noise [clean].mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Eat/evil pirate noise [clean].mp3.meta b/Unity/Assets/Ermfish/Sounds/Eat/evil pirate noise [clean].mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Eat/evil pirate noise [clean].mp3.meta rename to Unity/Assets/Ermfish/Sounds/Eat/evil pirate noise [clean].mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Eat/evil pirate weeeee [clean].mp3 b/Unity/Assets/Ermfish/Sounds/Eat/evil pirate weeeee [clean].mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Eat/evil pirate weeeee [clean].mp3 rename to Unity/Assets/Ermfish/Sounds/Eat/evil pirate weeeee [clean].mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Eat/evil pirate weeeee [clean].mp3.meta b/Unity/Assets/Ermfish/Sounds/Eat/evil pirate weeeee [clean].mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Eat/evil pirate weeeee [clean].mp3.meta rename to Unity/Assets/Ermfish/Sounds/Eat/evil pirate weeeee [clean].mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Eat/evil_scream.mp3 b/Unity/Assets/Ermfish/Sounds/Eat/evil_scream.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Eat/evil_scream.mp3 rename to Unity/Assets/Ermfish/Sounds/Eat/evil_scream.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Eat/evil_scream.mp3.meta b/Unity/Assets/Ermfish/Sounds/Eat/evil_scream.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Eat/evil_scream.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Eat/evil_scream.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Eat/evil_scream_01.mp3 b/Unity/Assets/Ermfish/Sounds/Eat/evil_scream_01.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Eat/evil_scream_01.mp3 rename to Unity/Assets/Ermfish/Sounds/Eat/evil_scream_01.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Eat/evil_scream_01.mp3.meta b/Unity/Assets/Ermfish/Sounds/Eat/evil_scream_01.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Eat/evil_scream_01.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Eat/evil_scream_01.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Eat/evil_scream_02.mp3 b/Unity/Assets/Ermfish/Sounds/Eat/evil_scream_02.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Eat/evil_scream_02.mp3 rename to Unity/Assets/Ermfish/Sounds/Eat/evil_scream_02.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Eat/evil_scream_02.mp3.meta b/Unity/Assets/Ermfish/Sounds/Eat/evil_scream_02.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Eat/evil_scream_02.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Eat/evil_scream_02.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Ermfish sounds.asset b/Unity/Assets/Ermfish/Sounds/Ermfish Sounds.asset similarity index 62% rename from Unity/Assets/_old/Erm/Sounds/Ermfish sounds.asset rename to Unity/Assets/Ermfish/Sounds/Ermfish Sounds.asset index e5d43668..f0f735fc 100644 --- a/Unity/Assets/_old/Erm/Sounds/Ermfish sounds.asset +++ b/Unity/Assets/Ermfish/Sounds/Ermfish Sounds.asset @@ -9,17 +9,12 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c0985a00ee6f8fe428ff0d0e09eba1b9, type: 3} - m_Name: Ermfish sounds + m_Script: {fileID: 11500000, guid: efd98f6d65dc4615a0a85770a69d8cef, type: 3} + m_Name: Ermfish Sounds m_EditorClassIdentifier: - ambientItemSounds: {fileID: 11400000, guid: 3de2ffb6cd5e6404fb0bcdccfc44fa46, type: 2} - ambientWorldSounds: {fileID: 11400000, guid: 3de2ffb6cd5e6404fb0bcdccfc44fa46, type: 2} pickupSounds: {fileID: 11400000, guid: f247414bf2966cf47aaafd9366ae6ca4, type: 2} dropSounds: {fileID: 11400000, guid: 6eded4b83ed55cc4aac8329f5aaef703, type: 2} drawSounds: {fileID: 11400000, guid: 80a13049ce8e7d04cabc4fd9c887c1d7, type: 2} holsterSounds: {fileID: 11400000, guid: d105741eaefb1404bad1edcd3eb49376, type: 2} cookSounds: {fileID: 11400000, guid: 5f9bffa48791b084487973927c5a3901, type: 2} eatSounds: {fileID: 11400000, guid: 411f4ebbddbe2ea48b4129b7e8c80fab, type: 2} - hurtSounds: {fileID: 11400000, guid: 4f47d8b7127a0234ea057da7472d7808, type: 2} - attackSounds: {fileID: 0} - scanSounds: {fileID: 11400000, guid: 1138c2d796e81ac43a4f257daf9651b7, type: 2} diff --git a/Unity/Assets/_old/Erm/Sounds/Ermfish sounds.asset.meta b/Unity/Assets/Ermfish/Sounds/Ermfish Sounds.asset.meta similarity index 79% rename from Unity/Assets/_old/Erm/Sounds/Ermfish sounds.asset.meta rename to Unity/Assets/Ermfish/Sounds/Ermfish Sounds.asset.meta index 89164052..63c6dbad 100644 --- a/Unity/Assets/_old/Erm/Sounds/Ermfish sounds.asset.meta +++ b/Unity/Assets/Ermfish/Sounds/Ermfish Sounds.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d6e4db4e2b3b10b4dbc42e29b1bfbfe6 +guid: bfb77f100ed7e6e4fb42c9b05bcb00af NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Unity/Assets/_old/Erm/Sounds/Holster.meta b/Unity/Assets/Ermfish/Sounds/Holster.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Holster.meta rename to Unity/Assets/Ermfish/Sounds/Holster.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Holster/Holster.asset b/Unity/Assets/Ermfish/Sounds/Holster/Holster.asset similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Holster/Holster.asset rename to Unity/Assets/Ermfish/Sounds/Holster/Holster.asset diff --git a/Unity/Assets/_old/Erm/Sounds/Holster/Holster.asset.meta b/Unity/Assets/Ermfish/Sounds/Holster/Holster.asset.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Holster/Holster.asset.meta rename to Unity/Assets/Ermfish/Sounds/Holster/Holster.asset.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Holster/bye.mp3 b/Unity/Assets/Ermfish/Sounds/Holster/bye.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Holster/bye.mp3 rename to Unity/Assets/Ermfish/Sounds/Holster/bye.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Holster/bye.mp3.meta b/Unity/Assets/Ermfish/Sounds/Holster/bye.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Holster/bye.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Holster/bye.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Holster/evil_bye.mp3 b/Unity/Assets/Ermfish/Sounds/Holster/evil_bye.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Holster/evil_bye.mp3 rename to Unity/Assets/Ermfish/Sounds/Holster/evil_bye.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Holster/evil_bye.mp3.meta b/Unity/Assets/Ermfish/Sounds/Holster/evil_bye.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Holster/evil_bye.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Holster/evil_bye.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup.meta b/Unity/Assets/Ermfish/Sounds/Pickup.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup.meta rename to Unity/Assets/Ermfish/Sounds/Pickup.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/Evil_Jumpscare.mp3 b/Unity/Assets/Ermfish/Sounds/Pickup/Evil_Jumpscare.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/Evil_Jumpscare.mp3 rename to Unity/Assets/Ermfish/Sounds/Pickup/Evil_Jumpscare.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/Evil_Jumpscare.mp3.meta b/Unity/Assets/Ermfish/Sounds/Pickup/Evil_Jumpscare.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/Evil_Jumpscare.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Pickup/Evil_Jumpscare.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/MODS.mp3 b/Unity/Assets/Ermfish/Sounds/Pickup/MODS.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/MODS.mp3 rename to Unity/Assets/Ermfish/Sounds/Pickup/MODS.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/MODS.mp3.meta b/Unity/Assets/Ermfish/Sounds/Pickup/MODS.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/MODS.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Pickup/MODS.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/Pickup.asset b/Unity/Assets/Ermfish/Sounds/Pickup/Pickup.asset similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/Pickup.asset rename to Unity/Assets/Ermfish/Sounds/Pickup/Pickup.asset diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/Pickup.asset.meta b/Unity/Assets/Ermfish/Sounds/Pickup/Pickup.asset.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/Pickup.asset.meta rename to Unity/Assets/Ermfish/Sounds/Pickup/Pickup.asset.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/are you serious.mp3 b/Unity/Assets/Ermfish/Sounds/Pickup/are you serious.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/are you serious.mp3 rename to Unity/Assets/Ermfish/Sounds/Pickup/are you serious.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/are you serious.mp3.meta b/Unity/Assets/Ermfish/Sounds/Pickup/are you serious.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/are you serious.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Pickup/are you serious.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/evil_Oh_nyoooooo~.mp3 b/Unity/Assets/Ermfish/Sounds/Pickup/evil_Oh_nyoooooo~.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/evil_Oh_nyoooooo~.mp3 rename to Unity/Assets/Ermfish/Sounds/Pickup/evil_Oh_nyoooooo~.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/evil_Oh_nyoooooo~.mp3.meta b/Unity/Assets/Ermfish/Sounds/Pickup/evil_Oh_nyoooooo~.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/evil_Oh_nyoooooo~.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Pickup/evil_Oh_nyoooooo~.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/evil_doki_doki.mp3 b/Unity/Assets/Ermfish/Sounds/Pickup/evil_doki_doki.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/evil_doki_doki.mp3 rename to Unity/Assets/Ermfish/Sounds/Pickup/evil_doki_doki.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/evil_doki_doki.mp3.meta b/Unity/Assets/Ermfish/Sounds/Pickup/evil_doki_doki.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/evil_doki_doki.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Pickup/evil_doki_doki.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/evil_leave_me_alone.mp3 b/Unity/Assets/Ermfish/Sounds/Pickup/evil_leave_me_alone.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/evil_leave_me_alone.mp3 rename to Unity/Assets/Ermfish/Sounds/Pickup/evil_leave_me_alone.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/evil_leave_me_alone.mp3.meta b/Unity/Assets/Ermfish/Sounds/Pickup/evil_leave_me_alone.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/evil_leave_me_alone.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Pickup/evil_leave_me_alone.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/evil_my_love_for_you_is_unreal.mp3 b/Unity/Assets/Ermfish/Sounds/Pickup/evil_my_love_for_you_is_unreal.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/evil_my_love_for_you_is_unreal.mp3 rename to Unity/Assets/Ermfish/Sounds/Pickup/evil_my_love_for_you_is_unreal.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/evil_my_love_for_you_is_unreal.mp3.meta b/Unity/Assets/Ermfish/Sounds/Pickup/evil_my_love_for_you_is_unreal.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/evil_my_love_for_you_is_unreal.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Pickup/evil_my_love_for_you_is_unreal.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/evil_what.mp3 b/Unity/Assets/Ermfish/Sounds/Pickup/evil_what.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/evil_what.mp3 rename to Unity/Assets/Ermfish/Sounds/Pickup/evil_what.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/evil_what.mp3.meta b/Unity/Assets/Ermfish/Sounds/Pickup/evil_what.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/evil_what.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Pickup/evil_what.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/evil_whoah_there_cowboy.mp3 b/Unity/Assets/Ermfish/Sounds/Pickup/evil_whoah_there_cowboy.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/evil_whoah_there_cowboy.mp3 rename to Unity/Assets/Ermfish/Sounds/Pickup/evil_whoah_there_cowboy.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/evil_whoah_there_cowboy.mp3.meta b/Unity/Assets/Ermfish/Sounds/Pickup/evil_whoah_there_cowboy.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/evil_whoah_there_cowboy.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Pickup/evil_whoah_there_cowboy.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/evil_youre_filth.mp3 b/Unity/Assets/Ermfish/Sounds/Pickup/evil_youre_filth.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/evil_youre_filth.mp3 rename to Unity/Assets/Ermfish/Sounds/Pickup/evil_youre_filth.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/evil_youre_filth.mp3.meta b/Unity/Assets/Ermfish/Sounds/Pickup/evil_youre_filth.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/evil_youre_filth.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Pickup/evil_youre_filth.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/evilfrick_vocals.mp3 b/Unity/Assets/Ermfish/Sounds/Pickup/evilfrick_vocals.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/evilfrick_vocals.mp3 rename to Unity/Assets/Ermfish/Sounds/Pickup/evilfrick_vocals.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/evilfrick_vocals.mp3.meta b/Unity/Assets/Ermfish/Sounds/Pickup/evilfrick_vocals.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/evilfrick_vocals.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Pickup/evilfrick_vocals.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/evilfrickyou_vocals.mp3 b/Unity/Assets/Ermfish/Sounds/Pickup/evilfrickyou_vocals.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/evilfrickyou_vocals.mp3 rename to Unity/Assets/Ermfish/Sounds/Pickup/evilfrickyou_vocals.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/evilfrickyou_vocals.mp3.meta b/Unity/Assets/Ermfish/Sounds/Pickup/evilfrickyou_vocals.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/evilfrickyou_vocals.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Pickup/evilfrickyou_vocals.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/filtered_1.mp3 b/Unity/Assets/Ermfish/Sounds/Pickup/filtered_1.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/filtered_1.mp3 rename to Unity/Assets/Ermfish/Sounds/Pickup/filtered_1.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/filtered_1.mp3.meta b/Unity/Assets/Ermfish/Sounds/Pickup/filtered_1.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/filtered_1.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Pickup/filtered_1.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/hello.mp3 b/Unity/Assets/Ermfish/Sounds/Pickup/hello.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/hello.mp3 rename to Unity/Assets/Ermfish/Sounds/Pickup/hello.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/hello.mp3.meta b/Unity/Assets/Ermfish/Sounds/Pickup/hello.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/hello.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Pickup/hello.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/im the cutest.mp3 b/Unity/Assets/Ermfish/Sounds/Pickup/im the cutest.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/im the cutest.mp3 rename to Unity/Assets/Ermfish/Sounds/Pickup/im the cutest.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/im the cutest.mp3.meta b/Unity/Assets/Ermfish/Sounds/Pickup/im the cutest.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/im the cutest.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Pickup/im the cutest.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/neuro_dundundun.mp3 b/Unity/Assets/Ermfish/Sounds/Pickup/neuro_dundundun.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/neuro_dundundun.mp3 rename to Unity/Assets/Ermfish/Sounds/Pickup/neuro_dundundun.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/neuro_dundundun.mp3.meta b/Unity/Assets/Ermfish/Sounds/Pickup/neuro_dundundun.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/neuro_dundundun.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Pickup/neuro_dundundun.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/neuro_quackquackquack.mp3 b/Unity/Assets/Ermfish/Sounds/Pickup/neuro_quackquackquack.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/neuro_quackquackquack.mp3 rename to Unity/Assets/Ermfish/Sounds/Pickup/neuro_quackquackquack.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/neuro_quackquackquack.mp3.meta b/Unity/Assets/Ermfish/Sounds/Pickup/neuro_quackquackquack.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/neuro_quackquackquack.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Pickup/neuro_quackquackquack.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/oh.mp3 b/Unity/Assets/Ermfish/Sounds/Pickup/oh.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/oh.mp3 rename to Unity/Assets/Ermfish/Sounds/Pickup/oh.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/oh.mp3.meta b/Unity/Assets/Ermfish/Sounds/Pickup/oh.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/oh.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Pickup/oh.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/ow.mp3 b/Unity/Assets/Ermfish/Sounds/Pickup/ow.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/ow.mp3 rename to Unity/Assets/Ermfish/Sounds/Pickup/ow.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/ow.mp3.meta b/Unity/Assets/Ermfish/Sounds/Pickup/ow.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/ow.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Pickup/ow.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/right.mp3 b/Unity/Assets/Ermfish/Sounds/Pickup/right.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/right.mp3 rename to Unity/Assets/Ermfish/Sounds/Pickup/right.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/right.mp3.meta b/Unity/Assets/Ermfish/Sounds/Pickup/right.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/right.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Pickup/right.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/what are you doing.mp3 b/Unity/Assets/Ermfish/Sounds/Pickup/what are you doing.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/what are you doing.mp3 rename to Unity/Assets/Ermfish/Sounds/Pickup/what are you doing.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/what are you doing.mp3.meta b/Unity/Assets/Ermfish/Sounds/Pickup/what are you doing.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/what are you doing.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Pickup/what are you doing.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/what.mp3 b/Unity/Assets/Ermfish/Sounds/Pickup/what.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/what.mp3 rename to Unity/Assets/Ermfish/Sounds/Pickup/what.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/what.mp3.meta b/Unity/Assets/Ermfish/Sounds/Pickup/what.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/what.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Pickup/what.mp3.meta diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/why.mp3 b/Unity/Assets/Ermfish/Sounds/Pickup/why.mp3 similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/why.mp3 rename to Unity/Assets/Ermfish/Sounds/Pickup/why.mp3 diff --git a/Unity/Assets/_old/Erm/Sounds/Pickup/why.mp3.meta b/Unity/Assets/Ermfish/Sounds/Pickup/why.mp3.meta similarity index 100% rename from Unity/Assets/_old/Erm/Sounds/Pickup/why.mp3.meta rename to Unity/Assets/Ermfish/Sounds/Pickup/why.mp3.meta diff --git a/Unity/Assets/Scripts/SCHIZO/Creatures/Ermshark/Ermshark.cs b/Unity/Assets/Scripts/SCHIZO/Creatures/Ermshark/Ermshark.cs index 5e4ebe32..81d358df 100644 --- a/Unity/Assets/Scripts/SCHIZO/Creatures/Ermshark/Ermshark.cs +++ b/Unity/Assets/Scripts/SCHIZO/Creatures/Ermshark/Ermshark.cs @@ -1,10 +1,9 @@ using JetBrains.Annotations; using NaughtyAttributes; -using SCHIZO.Creatures.Components; using SCHIZO.Interop.Subnautica; using SCHIZO.Attributes.Typing; +using SCHIZO.Sounds.Players; using UnityEngine; -using WorldAmbientSoundPlayer = SCHIZO.Sounds.Players.WorldAmbientSoundPlayer; namespace SCHIZO.Creatures.Ermshark { diff --git a/Unity/Assets/Scripts/SCHIZO/Items/Data/ItemData.cs b/Unity/Assets/Scripts/SCHIZO/Items/Data/ItemData.cs index b10942b1..51949215 100644 --- a/Unity/Assets/Scripts/SCHIZO/Items/Data/ItemData.cs +++ b/Unity/Assets/Scripts/SCHIZO/Items/Data/ItemData.cs @@ -6,6 +6,7 @@ using SCHIZO.Items.Data.Crafting; using SCHIZO.Registering; using SCHIZO.Attributes.Visual; +using SCHIZO.Sounds; using UnityEngine; using UnityEngine.Serialization; using static NaughtyAttributes.EConditionOperator; @@ -26,21 +27,24 @@ public partial class ItemData : ModRegistryItem [BoxGroup("TechType"), ResizableTextArea, ShowIf(nameof(ShowPickupableProps))] public string tooltip; - [BoxGroup("Common Properties"), ShowIf(nameof(ShowPickupableProps)), Required] + [CommonData, ShowIf(nameof(ShowPickupableProps)), Required] public Sprite icon; - [BoxGroup("Common Properties"), HideIf(Or, nameof(HidePickupableProps), nameof(isBuildable))] + [CommonData, HideIf(Or, nameof(HidePickupableProps), nameof(isBuildable))] public Vector2Int itemSize = new Vector2Int(1, 1); - [BoxGroup("Common Properties"), HideIf(Or, nameof(HidePickupableProps), nameof(isBuildable))] + [CommonData, HideIf(Or, nameof(HidePickupableProps), nameof(isBuildable))] public bool isCraftable; - [BoxGroup("Common Properties"), HideIf(Or, nameof(HidePickupableProps), nameof(isCraftable))] + [CommonData, HideIf(Or, nameof(HidePickupableProps), nameof(isCraftable))] public bool isBuildable; - [BoxGroup("Common Properties"), ShowIf(nameof(IsActuallyCraftable))] + [CommonData, ShowIf(nameof(IsActuallyCraftable))] public float craftingTime = 2.5f; + [CommonData, ShowIf(nameof(itemSounds_ShowIf))] + public ItemSounds itemSounds; + #region Subnautica Data [SNData, Label("Register"), SerializeField] @@ -126,6 +130,8 @@ public partial class ItemData : ModRegistryItem private bool requiredForUnlockSN_ShowIf() => !unlockAtStartSN && IsBuildableOrCraftable(); private bool requiredForUnlockBZ_ShowIf() => !unlockAtStartBZ && IsBuildableOrCraftable(); + private bool itemSounds_ShowIf() => ShowPickupableProps() && !isBuildable; + protected virtual bool ShowPickupableProps() => true; private bool HidePickupableProps() => !ShowPickupableProps(); diff --git a/Unity/Assets/Scripts/SCHIZO/Sounds/ItemSounds.cs b/Unity/Assets/Scripts/SCHIZO/Sounds/ItemSounds.cs new file mode 100644 index 00000000..14f741e8 --- /dev/null +++ b/Unity/Assets/Scripts/SCHIZO/Sounds/ItemSounds.cs @@ -0,0 +1,19 @@ +using SCHIZO.Interop.NaughtyAttributes; +using SCHIZO.Sounds.Collections; +using UnityEngine; + +namespace SCHIZO.Sounds +{ + [CreateAssetMenu(menuName = "SCHIZO/Sounds/Item Sounds")] + public sealed partial class ItemSounds : NaughtyScriptableObject + { + public SoundCollection pickupSounds; + public SoundCollection dropSounds; + + public SoundCollection drawSounds; + public SoundCollection holsterSounds; + + public SoundCollection cookSounds; + public SoundCollection eatSounds; + } +} diff --git a/Unity/Assets/Scripts/SCHIZO/Sounds/ItemSounds.cs.meta b/Unity/Assets/Scripts/SCHIZO/Sounds/ItemSounds.cs.meta new file mode 100644 index 00000000..eea944ca --- /dev/null +++ b/Unity/Assets/Scripts/SCHIZO/Sounds/ItemSounds.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: efd98f6d65dc4615a0a85770a69d8cef +timeCreated: 1698798094 \ No newline at end of file diff --git a/Unity/Assets/Scripts/SCHIZO/Creatures/Components/HurtSoundPlayer.cs b/Unity/Assets/Scripts/SCHIZO/Sounds/Players/HurtSoundPlayer.cs similarity index 68% rename from Unity/Assets/Scripts/SCHIZO/Creatures/Components/HurtSoundPlayer.cs rename to Unity/Assets/Scripts/SCHIZO/Sounds/Players/HurtSoundPlayer.cs index cedd6b08..f5b93d21 100644 --- a/Unity/Assets/Scripts/SCHIZO/Creatures/Components/HurtSoundPlayer.cs +++ b/Unity/Assets/Scripts/SCHIZO/Sounds/Players/HurtSoundPlayer.cs @@ -1,6 +1,4 @@ -using SoundPlayer = SCHIZO.Sounds.Players.SoundPlayer; - -namespace SCHIZO.Creatures.Components +namespace SCHIZO.Sounds.Players { public sealed partial class HurtSoundPlayer : SoundPlayer { diff --git a/Unity/Assets/Scripts/SCHIZO/Creatures/Components/HurtSoundPlayer.cs.meta b/Unity/Assets/Scripts/SCHIZO/Sounds/Players/HurtSoundPlayer.cs.meta similarity index 100% rename from Unity/Assets/Scripts/SCHIZO/Creatures/Components/HurtSoundPlayer.cs.meta rename to Unity/Assets/Scripts/SCHIZO/Sounds/Players/HurtSoundPlayer.cs.meta