rip bozo

Alexejhero · Jun 11, 2024 · 135a6e5 · 135a6e5
1 parent c549b98
commit 135a6e5
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 18 deletions.
diff --git a/FMOD Project/Metadata/Event/{3215328c-b376-4534-829e-341cfa9384ce}.xml b/FMOD Project/Metadata/Event/{3215328c-b376-4534-829e-341cfa9384ce}.xml
@@ -5,7 +5,7 @@
 			<value>player_death</value>
 		</property>
 		<property name="outputFormat">
-			<value>1</value>
+			<value>2</value>
 		</property>
 		<relationship name="folder">
 			<destination>{18ed83b5-f268-4ef4-aa2f-e4917c0f1443}</destination>
@@ -67,9 +67,6 @@
 		</relationship>
 	</object>
 	<object class="EventAutomatableProperties" id="{45a2db69-fb1e-4127-b12b-23a31e094a28}">
-		<property name="maxVoices">
-			<value>1</value>
-		</property>
 		<property name="priority">
 			<value>3</value>
 		</property>
@@ -140,6 +137,7 @@
 	<object class="MixerBusEffectChain" id="{a18af778-d04a-4d1b-955c-194bc33f8a95}">
 		<relationship name="effects">
 			<destination>{b18569bf-9d3b-4f8f-bf74-94ae089116a7}</destination>
+			<destination>{3871e5d2-2162-480e-af1f-8a09872bdfa2}</destination>
 		</relationship>
 	</object>
 	<object class="MixerBusPanner" id="{d711e5f0-8e02-4f2f-bc8c-af938247a0b5}" />
@@ -165,6 +163,7 @@
 	</object>
 	<object class="MixerBusPanner" id="{2bbfc07d-903d-421d-a109-858143aadd87}" />
 	<object class="MixerBusFader" id="{b18569bf-9d3b-4f8f-bf74-94ae089116a7}" />
+	<object class="SpatialiserEffect" id="{3871e5d2-2162-480e-af1f-8a09872bdfa2}" />
 	<object class="Automator" id="{e7c9ed0d-5c1a-44bf-b760-38d5386725cf}">
 		<property name="nameOfPropertyBeingAutomated">
 			<value>duration</value>

diff --git a/SCHIZO/Resources/AssetBundles/Assets.cs b/SCHIZO/Resources/AssetBundles/Assets.cs
@@ -12,7 +12,7 @@ namespace SCHIZO.Resources;
 
 public static class Assets
 {
-    private const int _rnd = -2110179037;
+    private const int _rnd = -353940074;
 
     private static readonly UnityEngine.AssetBundle _a = ResourceManager.GetAssetBundle("assets");
 

diff --git a/SCHIZO/Resources/AssetBundles/assets b/SCHIZO/Resources/AssetBundles/assets
diff --git a/SCHIZO/Resources/FMODBanks/SCHIZO.bank b/SCHIZO/Resources/FMODBanks/SCHIZO.bank
diff --git a/SCHIZO/Sounds/Patches/PlayerDeathSoundsPatches.cs b/SCHIZO/Sounds/Patches/PlayerDeathSoundsPatches.cs
@@ -1,8 +1,6 @@
-using System.Collections.Generic;
-using System.Linq;
 using HarmonyLib;
-using SCHIZO.Helpers;
 using SCHIZO.Sounds.Players;
+using UnityEngine;
 
 namespace SCHIZO.Sounds.Patches;
 
@@ -13,13 +11,9 @@ internal static class PlayerDeathSoundsPatches
     [HarmonyPostfix]
     public static void PlayDeathSound()
     {
-        List<PlayerDeathSoundPlayer> deathSoundPlayers = Inventory.main.container.Select(item => item.item.gameObject)
-            .SelectComponent<PlayerDeathSoundPlayer>()
-            .ToList();
-        if (deathSoundPlayers.Count == 0) return;
-        PlayerDeathSoundPlayer player = deathSoundPlayers.Count == 1
-            ? deathSoundPlayers[0]
-            : deathSoundPlayers.GetRandom();
-        player.PlayOneShot();
+        foreach (PlayerDeathSoundPlayer sndPlayer in UnityEngine.Resources.FindObjectsOfTypeAll<PlayerDeathSoundPlayer>())
+        {
+            sndPlayer.Play(Random.Range(0, 0.5f));
+        }
     }
 }
diff --git a/Unity/Assets/Mod/Ermfish/Ermfish.prefab b/Unity/Assets/Mod/Ermfish/Ermfish.prefab
@@ -454,7 +454,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   soundEvent: event:/SCHIZO/creatures/ermfish/player_death
-  emitter: {fileID: 0}
+  emitter: {fileID: 5648931341203019549}
 --- !u!114 &5574741202301287243
 MonoBehaviour:
   m_ObjectHideFlags: 0

diff --git a/Unity/Assets/Scripts/SCHIZO/Sounds/Players/PlayerDeathSoundPlayer.cs b/Unity/Assets/Scripts/SCHIZO/Sounds/Players/PlayerDeathSoundPlayer.cs
@@ -2,6 +2,6 @@ namespace SCHIZO.Sounds.Players
 {
     public sealed partial class PlayerDeathSoundPlayer : SoundPlayer
     {
-        protected override bool Is3D => false;
+        protected override bool Is3D => true;
     }
 }