Skip to content

Commit

Permalink
move jukebox track(s) to fmod
Browse files Browse the repository at this point in the history
should fix the track info thing
  • Loading branch information
Govorunb committed Dec 12, 2023
1 parent b1a5e9d commit 8dcdbee
Show file tree
Hide file tree
Showing 51 changed files with 267 additions and 107 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.01.00">
<object class="EncodableAsset" id="{19d1452c-b977-4ac6-95e5-eb91a3d88fee}">
<property name="assetPath">
<value>jukebox/</value>
</property>
<relationship name="masterAssetFolder">
<destination>{ed559c48-6dff-4cc2-8829-33aeecf805d3}</destination>
</relationship>
</object>
</objects>
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.01.00">
<object class="EncodableAsset" id="{3d15c50c-53bc-4436-9fcf-4974e03be120}">
<property name="assetPath">
<value>neuro logs/love vedal/</value>
</property>
<relationship name="masterAssetFolder">
<destination>{ed559c48-6dff-4cc2-8829-33aeecf805d3}</destination>
</relationship>
</object>
</objects>
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.01.00">
<object class="EncodableAsset" id="{7d02f929-84d8-409e-9ddd-0922fa17f344}">
<property name="assetPath">
<value>neuro logs/</value>
</property>
<relationship name="masterAssetFolder">
<destination>{ed559c48-6dff-4cc2-8829-33aeecf805d3}</destination>
</relationship>
</object>
</objects>
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.01.00">
<object class="EncodableAsset" id="{82a41305-c31b-4be9-bd31-79772ffbea59}">
<property name="assetPath">
<value>neuro logs/hate vedal/</value>
</property>
<relationship name="masterAssetFolder">
<destination>{ed559c48-6dff-4cc2-8829-33aeecf805d3}</destination>
</relationship>
</object>
</objects>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<objects serializationModel="Studio.02.01.00">
<object class="AudioFile" id="{21bfa9d0-a16a-4e7c-a28c-112b0f4fac90}">
<property name="assetPath">
<value>lovevedal-02.ogg</value>
<value>neuro logs/love vedal/lovevedal-02.ogg</value>
</property>
<property name="isStreaming">
<value>true</value>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.01.00">
<object class="AudioFile" id="{2be3055a-d3ef-409e-8c43-5cb6b59355e3}">
<property name="assetPath">
<value>jukebox/Seishun Complex - Neuro-sama Cover Animation ft. anny [nGmwH2ZYlP4].mp3</value>
</property>
<property name="isStreaming">
<value>true</value>
</property>
<property name="frequencyInKHz">
<value>48</value>
</property>
<property name="channelCount">
<value>2</value>
</property>
<property name="length">
<value>206.328</value>
</property>
<relationship name="masterAssetFolder">
<destination>{ed559c48-6dff-4cc2-8829-33aeecf805d3}</destination>
</relationship>
</object>
</objects>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<objects serializationModel="Studio.02.01.00">
<object class="AudioFile" id="{4f72d2fc-acda-4837-9930-04937b931d3e}">
<property name="assetPath">
<value>hatevedal-07.ogg</value>
<value>neuro logs/hate vedal/hatevedal-07.ogg</value>
</property>
<property name="frequencyInKHz">
<value>24</value>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<objects serializationModel="Studio.02.01.00">
<object class="AudioFile" id="{55214acb-12a4-461d-b691-779411fb3fe4}">
<property name="assetPath">
<value>lovevedal-04.ogg</value>
<value>neuro logs/love vedal/lovevedal-04.ogg</value>
</property>
<property name="isStreaming">
<value>true</value>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<objects serializationModel="Studio.02.01.00">
<object class="AudioFile" id="{5b3c7561-0894-4652-9fe3-dfe0e3f53863}">
<property name="assetPath">
<value>lovevedal-01.ogg</value>
<value>neuro logs/love vedal/lovevedal-01.ogg</value>
</property>
<property name="isStreaming">
<value>true</value>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<objects serializationModel="Studio.02.01.00">
<object class="AudioFile" id="{7332095b-7f97-4afa-8a6e-f53c429e3938}">
<property name="assetPath">
<value>hatevedal-01.ogg</value>
<value>neuro logs/hate vedal/hatevedal-01.ogg</value>
</property>
<property name="isStreaming">
<value>true</value>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<objects serializationModel="Studio.02.01.00">
<object class="AudioFile" id="{7374f9bf-bbc5-488b-9e53-23191092a74a}">
<property name="assetPath">
<value>hatevedal-05.ogg</value>
<value>neuro logs/hate vedal/hatevedal-05.ogg</value>
</property>
<property name="isStreaming">
<value>true</value>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<objects serializationModel="Studio.02.01.00">
<object class="AudioFile" id="{aaf68db3-8bd8-4ebf-9c1b-97b12191dd5b}">
<property name="assetPath">
<value>hatevedal-02.ogg</value>
<value>neuro logs/hate vedal/hatevedal-02.ogg</value>
</property>
<property name="isStreaming">
<value>true</value>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<objects serializationModel="Studio.02.01.00">
<object class="AudioFile" id="{b9676ab5-adf3-4f89-9cc8-5363ed7726e5}">
<property name="assetPath">
<value>hatevedal-06.ogg</value>
<value>neuro logs/hate vedal/hatevedal-06.ogg</value>
</property>
<property name="isStreaming">
<value>true</value>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<objects serializationModel="Studio.02.01.00">
<object class="AudioFile" id="{c0703bc1-c02c-4dda-bb98-f72bed727e7b}">
<property name="assetPath">
<value>hatevedal-03.ogg</value>
<value>neuro logs/hate vedal/hatevedal-03.ogg</value>
</property>
<property name="isStreaming">
<value>true</value>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<objects serializationModel="Studio.02.01.00">
<object class="AudioFile" id="{c153b7eb-f7db-4828-b163-69b4269c5c65}">
<property name="assetPath">
<value>lovevedal-05.ogg</value>
<value>neuro logs/love vedal/lovevedal-05.ogg</value>
</property>
<property name="isStreaming">
<value>true</value>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<objects serializationModel="Studio.02.01.00">
<object class="AudioFile" id="{c1a024a7-a93c-44b3-92a8-d313b6bb993e}">
<property name="assetPath">
<value>lovevedal-03.ogg</value>
<value>neuro logs/love vedal/lovevedal-03.ogg</value>
</property>
<property name="isStreaming">
<value>true</value>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<objects serializationModel="Studio.02.01.00">
<object class="AudioFile" id="{c789a2e7-f20f-491a-9350-a970ea52be6b}">
<property name="assetPath">
<value>lovevedal-06.ogg</value>
<value>neuro logs/love vedal/lovevedal-06.ogg</value>
</property>
<property name="isStreaming">
<value>true</value>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<objects serializationModel="Studio.02.01.00">
<object class="AudioFile" id="{c9f6b52b-b1a4-406d-87ca-7334e153f66f}">
<property name="assetPath">
<value>lovevedal-07.ogg</value>
<value>neuro logs/love vedal/lovevedal-07.ogg</value>
</property>
<property name="frequencyInKHz">
<value>24</value>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<objects serializationModel="Studio.02.01.00">
<object class="AudioFile" id="{e316810c-0b86-4079-afe3-ab6efc48d10d}">
<property name="assetPath">
<value>hatevedal-04.ogg</value>
<value>neuro logs/hate vedal/hatevedal-04.ogg</value>
</property>
<property name="isStreaming">
<value>true</value>
Expand Down
130 changes: 130 additions & 0 deletions FMOD Project/Metadata/Event/{d401bd90-2cc7-4357-94fd-85ac0b808c72}.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.01.00">
<object class="Event" id="{d401bd90-2cc7-4357-94fd-85ac0b808c72}">
<property name="name">
<value>SeishunComplex</value>
</property>
<property name="outputFormat">
<value>2</value>
</property>
<relationship name="folder">
<destination>{9e27e85a-2e27-443b-8e16-675f4b2735b9}</destination>
</relationship>
<relationship name="mixer">
<destination>{90d710b9-1291-4406-b856-75e3d9d4523f}</destination>
</relationship>
<relationship name="masterTrack">
<destination>{2c269955-7d4f-452f-bd5b-c56d79d3bfb3}</destination>
</relationship>
<relationship name="mixerInput">
<destination>{58c82f29-8969-4b1e-9458-1b5721054403}</destination>
</relationship>
<relationship name="automatableProperties">
<destination>{ec8cd690-cbf3-464a-91e6-42be7c83831a}</destination>
</relationship>
<relationship name="markerTracks">
<destination>{a94b3134-5706-4e71-8cbe-0f7d2444c23b}</destination>
</relationship>
<relationship name="groupTracks">
<destination>{d1db81e5-fa53-4d74-80d6-d31b6a9aec7b}</destination>
</relationship>
<relationship name="timeline">
<destination>{0ef0c190-6741-4dca-9cc3-b3165a706f43}</destination>
</relationship>
<relationship name="banks">
<destination>{6f6c823e-9073-439e-9503-3b2b490ddbfb}</destination>
</relationship>
</object>
<object class="EventMixer" id="{90d710b9-1291-4406-b856-75e3d9d4523f}">
<relationship name="masterBus">
<destination>{0a92808f-7fb3-438b-a7ef-c01a02372d39}</destination>
</relationship>
</object>
<object class="MasterTrack" id="{2c269955-7d4f-452f-bd5b-c56d79d3bfb3}">
<relationship name="mixerGroup">
<destination>{0a92808f-7fb3-438b-a7ef-c01a02372d39}</destination>
</relationship>
</object>
<object class="MixerInput" id="{58c82f29-8969-4b1e-9458-1b5721054403}">
<relationship name="effectChain">
<destination>{1f34ed1d-16da-4b0c-8ed7-ea4ace041885}</destination>
</relationship>
<relationship name="panner">
<destination>{35283c3c-7604-4d20-a8d6-c05c88867099}</destination>
</relationship>
<relationship name="output">
<destination>{f5cd1372-6a56-4fef-bd4b-b33143d09538}</destination>
</relationship>
</object>
<object class="EventAutomatableProperties" id="{ec8cd690-cbf3-464a-91e6-42be7c83831a}" />
<object class="MarkerTrack" id="{a94b3134-5706-4e71-8cbe-0f7d2444c23b}" />
<object class="GroupTrack" id="{d1db81e5-fa53-4d74-80d6-d31b6a9aec7b}">
<relationship name="modules">
<destination>{ab103dec-3701-4c02-b5d9-44e2ea0b2365}</destination>
</relationship>
<relationship name="mixerGroup">
<destination>{bf4d2aad-6f69-4a2c-acef-4a13e8b38ca7}</destination>
</relationship>
</object>
<object class="Timeline" id="{0ef0c190-6741-4dca-9cc3-b3165a706f43}">
<relationship name="modules">
<destination>{ab103dec-3701-4c02-b5d9-44e2ea0b2365}</destination>
</relationship>
</object>
<object class="EventMixerMaster" id="{0a92808f-7fb3-438b-a7ef-c01a02372d39}">
<relationship name="effectChain">
<destination>{6fcadf66-e663-499d-8f45-b7554d29b74b}</destination>
</relationship>
<relationship name="panner">
<destination>{8b846630-8bcf-433a-88bf-263e2c979c62}</destination>
</relationship>
<relationship name="mixer">
<destination>{90d710b9-1291-4406-b856-75e3d9d4523f}</destination>
</relationship>
</object>
<object class="MixerBusEffectChain" id="{1f34ed1d-16da-4b0c-8ed7-ea4ace041885}">
<relationship name="effects">
<destination>{ba47c9b7-22f0-41e0-8808-5e236e3ee462}</destination>
</relationship>
</object>
<object class="MixerBusPanner" id="{35283c3c-7604-4d20-a8d6-c05c88867099}" />
<object class="SingleSound" id="{ab103dec-3701-4c02-b5d9-44e2ea0b2365}">
<property name="length">
<value>206.328</value>
</property>
<relationship name="audioFile">
<destination>{2be3055a-d3ef-409e-8c43-5cb6b59355e3}</destination>
</relationship>
</object>
<object class="EventMixerGroup" id="{bf4d2aad-6f69-4a2c-acef-4a13e8b38ca7}">
<property name="name">
<value>Audio 1</value>
</property>
<relationship name="effectChain">
<destination>{7ced503d-736f-464b-a955-f2824a6e2fae}</destination>
</relationship>
<relationship name="panner">
<destination>{395a1567-6846-4be3-a7e8-cd304f7132a0}</destination>
</relationship>
<relationship name="output">
<destination>{0a92808f-7fb3-438b-a7ef-c01a02372d39}</destination>
</relationship>
</object>
<object class="MixerBusEffectChain" id="{6fcadf66-e663-499d-8f45-b7554d29b74b}">
<relationship name="effects">
<destination>{b2436bf4-3272-4cf4-a3f1-9058ff841a18}</destination>
<destination>{fe0c2bdb-4385-407c-9b54-a7c82367c429}</destination>
</relationship>
</object>
<object class="MixerBusPanner" id="{8b846630-8bcf-433a-88bf-263e2c979c62}" />
<object class="MixerBusFader" id="{ba47c9b7-22f0-41e0-8808-5e236e3ee462}" />
<object class="MixerBusEffectChain" id="{7ced503d-736f-464b-a955-f2824a6e2fae}">
<relationship name="effects">
<destination>{98327059-691e-4d04-8f7a-e15cfc9f8aa5}</destination>
</relationship>
</object>
<object class="MixerBusPanner" id="{395a1567-6846-4be3-a7e8-cd304f7132a0}" />
<object class="MixerBusFader" id="{b2436bf4-3272-4cf4-a3f1-9058ff841a18}" />
<object class="SpatialiserEffect" id="{fe0c2bdb-4385-407c-9b54-a7c82367c429}" />
<object class="MixerBusFader" id="{98327059-691e-4d04-8f7a-e15cfc9f8aa5}" />
</objects>
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.01.00">
<object class="EventFolder" id="{9e27e85a-2e27-443b-8e16-675f4b2735b9}">
<property name="name">
<value>jukebox</value>
</property>
<relationship name="folder">
<destination>{b1cc6170-82f0-4087-b202-f3bffb8cbc9b}</destination>
</relationship>
</object>
</objects>
3 changes: 1 addition & 2 deletions SCHIZO/Items/PDAJournal.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using Nautilus.Assets;
using Nautilus.Assets.Gadgets;
using Nautilus.Assets.PrefabTemplates;
using Nautilus.Handlers;
using SCHIZO.Helpers;

namespace SCHIZO.Items;
Expand Down Expand Up @@ -56,7 +55,7 @@ public static void Register(PDAJournal journal)
{
if (Prefabs.ContainsKey(journal.key))
{
LOGGER.LogWarning($"Dupe PDAJournalPrefab {journal.key}");
LOGGER.LogWarning($"Duplicate PDAJournal key {journal.key}");
return;
}
Prefabs[journal.key] = new PDAJournalPrefab(journal);
Expand Down
4 changes: 1 addition & 3 deletions SCHIZO/Jukebox/CustomJukeboxDisk.BelowZero.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ public sealed class CustomJukeboxDisk : JukeboxDisk
{
if (track == default) LOGGER.LogWarning($"Jukebox disk {name} at {transform.position} was not assigned a track");

// the lore is that when you pick up a disk, AL-AN plays a snippet of it in your head
// if (unlockSound && Story.StoryGoalManager.main!?.GetAlanActor() == Actor.AlAn)
if (unlockSound) // temp for development/testing // Alex's PR comment: uuh
if (unlockSound)
{
int soundLenHash = unlockSound.samples.GetHashCode();
int soundNameHash = unlockSound.name.GetHashCode();
Expand Down
Loading

0 comments on commit 8dcdbee

Please sign in to comment.