diff --git a/Assets/_PROJECT/Components/Bolt/Intercation Logic/Car Driving Routine.cs b/Assets/_PROJECT/Components/Bolt/Intercation Logic/Car Driving Routine.cs index 29d6fdd0..64d612a2 100644 --- a/Assets/_PROJECT/Components/Bolt/Intercation Logic/Car Driving Routine.cs +++ b/Assets/_PROJECT/Components/Bolt/Intercation Logic/Car Driving Routine.cs @@ -1,9 +1,9 @@ using FishNet.Object; -using FMOD.Studio; using System.Collections; using System.Collections.Generic; using Unity.XR.CoreUtils; using UnityEngine; +using FMOD.Studio; using static MouseLook; public class CarDrivingRoutine : NetworkBehaviour @@ -25,37 +25,12 @@ public class CarDrivingRoutine : NetworkBehaviour public List FrontTires; public List BackTires; - - private EventInstance CarMovement; - private FirstPersonOcclusion occlusion; - - private void Awake() - { - //Debug.LogError("AUDIO MANAGER:"); - //Debug.LogError(AudioManager.Instance); - //Debug.LogError("FMOD EVENTS INSTANCE:"); - //Debug.LogError(FMODEvents.Instance); - //Debug.LogError("Car Simple Driving:"); - //Debug.LogError(FMODEvents.Instance.BoltCarSimpleDriving); - CarMovement = AudioManager.Instance.CreateInstance(FMODEvents.Instance.BoltCarSimpleDriving); //initialising the variable - CarMovement.setParameterByName("EasyBoltLogic", 0); //"Driving - 0 in FMOD" - CarMovement.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(gameObject)); //setting 3d attributes - - occlusion = GetComponent(); - - if (occlusion != null) - { - occlusion.InitialiseWithInstance(CarMovement); - } - - } + public CarAudioController AudioController; private void Start() { targetSpeed = StraightSpeed; targetRotationSpeed = rotationSpeed; - CarMovement.start(); //starting the car sound here - AudioManager.Instance.SetGlobalParameter("CarPassengerLogic", 0.0f); //change the value of the global parameter in FMOD, initial value } // Update is called once per frame @@ -80,6 +55,7 @@ public class CarDrivingRoutine : NetworkBehaviour { if (!isTurning) { + AudioController.SetRPM(1300); //set externally in CarAudioController.cs setTireRotation(tireTurnAngle); } @@ -89,6 +65,7 @@ public class CarDrivingRoutine : NetworkBehaviour { if (isTurning) { + AudioController.SetRPM(1450); setTireRotation(-tireTurnAngle); } @@ -102,8 +79,6 @@ public class CarDrivingRoutine : NetworkBehaviour // Proceed to the next waypoint _waypoint = _waypoint.Next; } - - CarMovement.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(gameObject)); //updating the attributes } private void rollTires() @@ -138,7 +113,8 @@ public class CarDrivingRoutine : NetworkBehaviour _tireSound.Stop(); _stopSound.Play(); - CarMovement.setParameterByName("EasyBoltLogic", 1); + AudioController.SetRPM(475); + AudioController.PlayStopSound(); } @@ -149,8 +125,8 @@ public class CarDrivingRoutine : NetworkBehaviour _stopSound.Stop(); _tireSound.Play(); - CarMovement.setParameterByName("EasyBoltLogic", 0); - CarMovement.start(); + AudioController.SetRPM(1450); + } private IEnumerator SmoothAdjustSpeed(float targetStraightSpeed, float targetRotationSpeed, float duration) diff --git a/Assets/_PROJECT/Components/Bolt/Intercation Logic/CarAudioController.cs b/Assets/_PROJECT/Components/Bolt/Intercation Logic/CarAudioController.cs new file mode 100644 index 00000000..b4d1ee3e --- /dev/null +++ b/Assets/_PROJECT/Components/Bolt/Intercation Logic/CarAudioController.cs @@ -0,0 +1,54 @@ +using UnityEngine; +using FMOD.Studio; + +public class CarAudioController : MonoBehaviour +{ + private EventInstance carMovementInstance; + private FirstPersonOcclusion occlusion; + + private void Awake() + { + //Debug.LogError("AUDIO MANAGER:"); + //Debug.LogError(AudioManager.Instance); + //Debug.LogError("FMOD EVENTS INSTANCE:"); + //Debug.LogError(FMODEvents.Instance); + //Debug.LogError("Car Simple Driving:"); + //Debug.LogError(FMODEvents.Instance.BoltCarSimpleDriving); + carMovementInstance = AudioManager.Instance.CreateInstance(FMODEvents.Instance.CarModulatedDriving); + carMovementInstance.setParameterByName("RPM", 1450); + carMovementInstance.setParameterByName("Load", 0); + carMovementInstance.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(gameObject)); + + occlusion = GetComponent(); + if (occlusion != null) + occlusion.InitialiseWithInstance(carMovementInstance); + } + + private void Start() + { + carMovementInstance.start(); + AudioManager.Instance.SetGlobalParameter("CarPassengerLogic", 0.0f); //change the value of the global parameter in FMOD, initial value + } + + private void Update() + { + // Always update 3D position to follow the car model transform + carMovementInstance.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(gameObject)); + } + + // These methods are called externally by CarDrivingRoutine + public void SetRPM(float value) + { + carMovementInstance.setParameterByName("RPM", value); + } + + public void PlayStopSound() + { + carMovementInstance.getParameterByName("RPM", out float currentRPM); + + if (currentRPM == 475) + { + AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.BoltCarStopSound, gameObject); + } + } +} diff --git a/Assets/_PROJECT/Components/Bolt/Intercation Logic/CarAudioController.cs.meta b/Assets/_PROJECT/Components/Bolt/Intercation Logic/CarAudioController.cs.meta new file mode 100644 index 00000000..17d4781c --- /dev/null +++ b/Assets/_PROJECT/Components/Bolt/Intercation Logic/CarAudioController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: bfb4dce81082ebf46801139bdb2ce8ad +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index 28988c6d..9f18ede6 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71eccbf1623e0aa99333d36e8b1b9587d5052474671c7b61b897cea6d6b8d77c -size 63789504 +oid sha256:21887f4b83cc98169f93d6da72b4d7381115d55f1157a18024cc4547902adb18 +size 63788134 diff --git a/Assets/_PROJECT/Scripts/Audio/FMODEvents.cs b/Assets/_PROJECT/Scripts/Audio/FMODEvents.cs index 41a2d02f..3d5eb6fa 100644 --- a/Assets/_PROJECT/Scripts/Audio/FMODEvents.cs +++ b/Assets/_PROJECT/Scripts/Audio/FMODEvents.cs @@ -20,12 +20,14 @@ public class FMODEvents : MonoBehaviour [field: Header("CAR")] [field: SerializeField] public EventReference DoorOpen { get; private set; } [field: SerializeField] public EventReference DoorClose { get; private set; } + [field: SerializeField] public EventReference CarModulatedDriving { get; private set; } [field: Header("UI")] [field: SerializeField] public EventReference Click { get; private set; } [field: SerializeField] public EventReference MapOpen { get; private set; } [field: SerializeField] public EventReference Hover { get; private set; } [field: SerializeField] public EventReference LetterEnter { get; private set; } + [field: SerializeField] public EventReference LetterHover { get; private set; } [field: Header("Initial events")] [field: SerializeField] public EventReference PortalSpacial { get; private set; } diff --git a/DeltaVRFMOD/.cache/buildrecords/Desktop/Ambience.br b/DeltaVRFMOD/.cache/buildrecords/Desktop/Ambience.br index 54df15eb..b492b516 100644 Binary files a/DeltaVRFMOD/.cache/buildrecords/Desktop/Ambience.br and b/DeltaVRFMOD/.cache/buildrecords/Desktop/Ambience.br differ diff --git a/DeltaVRFMOD/.cache/buildrecords/Desktop/Master.br b/DeltaVRFMOD/.cache/buildrecords/Desktop/Master.br index aafb3135..a9393009 100644 Binary files a/DeltaVRFMOD/.cache/buildrecords/Desktop/Master.br and b/DeltaVRFMOD/.cache/buildrecords/Desktop/Master.br differ diff --git a/DeltaVRFMOD/.cache/buildrecords/Desktop/Music.br b/DeltaVRFMOD/.cache/buildrecords/Desktop/Music.br index 4f9cb772..ba8db091 100644 Binary files a/DeltaVRFMOD/.cache/buildrecords/Desktop/Music.br and b/DeltaVRFMOD/.cache/buildrecords/Desktop/Music.br differ diff --git a/DeltaVRFMOD/.cache/buildrecords/Desktop/SFX.br b/DeltaVRFMOD/.cache/buildrecords/Desktop/SFX.br index 91f9b781..d4e75815 100644 Binary files a/DeltaVRFMOD/.cache/buildrecords/Desktop/SFX.br and b/DeltaVRFMOD/.cache/buildrecords/Desktop/SFX.br differ diff --git a/DeltaVRFMOD/.cache/buildrecords/Desktop/UI.br b/DeltaVRFMOD/.cache/buildrecords/Desktop/UI.br index e5b03a7a..1b2592c3 100644 Binary files a/DeltaVRFMOD/.cache/buildrecords/Desktop/UI.br and b/DeltaVRFMOD/.cache/buildrecords/Desktop/UI.br differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/1CCFC295.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/1CCFC295.fobj new file mode 100644 index 00000000..fc5839f6 Binary files /dev/null and b/DeltaVRFMOD/.cache/fsbcache/Desktop/1CCFC295.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/3A2168FB.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/3A2168FB.fobj new file mode 100644 index 00000000..5d152fc5 Binary files /dev/null and b/DeltaVRFMOD/.cache/fsbcache/Desktop/3A2168FB.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/3B86A42D.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/3B86A42D.fobj new file mode 100644 index 00000000..519066c3 Binary files /dev/null and b/DeltaVRFMOD/.cache/fsbcache/Desktop/3B86A42D.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/4F58503D.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/4F58503D.fobj new file mode 100644 index 00000000..1846503c Binary files /dev/null and b/DeltaVRFMOD/.cache/fsbcache/Desktop/4F58503D.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/5D9EF9FE.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/5D9EF9FE.fobj new file mode 100644 index 00000000..9f968000 Binary files /dev/null and b/DeltaVRFMOD/.cache/fsbcache/Desktop/5D9EF9FE.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/63CC1F2F.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/63CC1F2F.fobj new file mode 100644 index 00000000..ed1510ef Binary files /dev/null and b/DeltaVRFMOD/.cache/fsbcache/Desktop/63CC1F2F.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/70DAD674.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/70DAD674.fobj new file mode 100644 index 00000000..eab12e67 Binary files /dev/null and b/DeltaVRFMOD/.cache/fsbcache/Desktop/70DAD674.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/71B772AB.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/71B772AB.fobj new file mode 100644 index 00000000..234be882 Binary files /dev/null and b/DeltaVRFMOD/.cache/fsbcache/Desktop/71B772AB.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/7351E2AB.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/7351E2AB.fobj new file mode 100644 index 00000000..6c054c89 Binary files /dev/null and b/DeltaVRFMOD/.cache/fsbcache/Desktop/7351E2AB.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/7E5CEA89.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/7E5CEA89.fobj new file mode 100644 index 00000000..52a76e3c Binary files /dev/null and b/DeltaVRFMOD/.cache/fsbcache/Desktop/7E5CEA89.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/8BE37828.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/8BE37828.fobj new file mode 100644 index 00000000..517ac128 Binary files /dev/null and b/DeltaVRFMOD/.cache/fsbcache/Desktop/8BE37828.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/8F1BE0FA.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/8F1BE0FA.fobj new file mode 100644 index 00000000..cda8286e Binary files /dev/null and b/DeltaVRFMOD/.cache/fsbcache/Desktop/8F1BE0FA.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/A96CF0E3.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/A96CF0E3.fobj new file mode 100644 index 00000000..d9859b3f Binary files /dev/null and b/DeltaVRFMOD/.cache/fsbcache/Desktop/A96CF0E3.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/D0A3D171.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/D0A3D171.fobj new file mode 100644 index 00000000..09e05853 Binary files /dev/null and b/DeltaVRFMOD/.cache/fsbcache/Desktop/D0A3D171.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/ECF897C4.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/ECF897C4.fobj new file mode 100644 index 00000000..987a2116 Binary files /dev/null and b/DeltaVRFMOD/.cache/fsbcache/Desktop/ECF897C4.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/EEB9C972.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/EEB9C972.fobj new file mode 100644 index 00000000..3d878be1 Binary files /dev/null and b/DeltaVRFMOD/.cache/fsbcache/Desktop/EEB9C972.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/F246625E.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/F246625E.fobj new file mode 100644 index 00000000..09ec3e14 Binary files /dev/null and b/DeltaVRFMOD/.cache/fsbcache/Desktop/F246625E.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/F8AEEC18.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/F8AEEC18.fobj new file mode 100644 index 00000000..81daed8e Binary files /dev/null and b/DeltaVRFMOD/.cache/fsbcache/Desktop/F8AEEC18.fobj differ diff --git a/DeltaVRFMOD/.cache/{14c77ecb-d1ce-4c7f-ac0b-5d35e5b8b8f0}.pdc b/DeltaVRFMOD/.cache/{14c77ecb-d1ce-4c7f-ac0b-5d35e5b8b8f0}.pdc new file mode 100644 index 00000000..6e2accbd Binary files /dev/null and b/DeltaVRFMOD/.cache/{14c77ecb-d1ce-4c7f-ac0b-5d35e5b8b8f0}.pdc differ diff --git a/DeltaVRFMOD/.cache/{5e873d64-3dcc-4eb3-b9d0-18012ded0446}.pdc b/DeltaVRFMOD/.cache/{5e873d64-3dcc-4eb3-b9d0-18012ded0446}.pdc new file mode 100644 index 00000000..ac4ca926 Binary files /dev/null and b/DeltaVRFMOD/.cache/{5e873d64-3dcc-4eb3-b9d0-18012ded0446}.pdc differ diff --git a/DeltaVRFMOD/.cache/{ec1f632f-a8bb-46c3-8d0f-0552160e3e2b}.pdc b/DeltaVRFMOD/.cache/{ec1f632f-a8bb-46c3-8d0f-0552160e3e2b}.pdc new file mode 100644 index 00000000..788f989c Binary files /dev/null and b/DeltaVRFMOD/.cache/{ec1f632f-a8bb-46c3-8d0f-0552160e3e2b}.pdc differ diff --git a/DeltaVRFMOD/.cache/{f08195f0-52fa-42ed-9119-6f6530f5a576}.pdc b/DeltaVRFMOD/.cache/{f08195f0-52fa-42ed-9119-6f6530f5a576}.pdc new file mode 100644 index 00000000..9d2011e8 Binary files /dev/null and b/DeltaVRFMOD/.cache/{f08195f0-52fa-42ed-9119-6f6530f5a576}.pdc differ diff --git a/DeltaVRFMOD/.cache/{f6c41cb5-7cc4-4f59-b2ff-cdaa7490f248}.pdc b/DeltaVRFMOD/.cache/{f6c41cb5-7cc4-4f59-b2ff-cdaa7490f248}.pdc new file mode 100644 index 00000000..29fc5637 Binary files /dev/null and b/DeltaVRFMOD/.cache/{f6c41cb5-7cc4-4f59-b2ff-cdaa7490f248}.pdc differ diff --git a/DeltaVRFMOD/Assets/Vehicles, Electric, Car, Tesla, Model 3, Idle, Engine Compartment 03 SND66189 7.wav b/DeltaVRFMOD/Assets/Vehicles, Electric, Car, Tesla, Model 3, Idle, Engine Compartment 03 SND66189 7.wav new file mode 100644 index 00000000..24bd83b4 --- /dev/null +++ b/DeltaVRFMOD/Assets/Vehicles, Electric, Car, Tesla, Model 3, Idle, Engine Compartment 03 SND66189 7.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e024cbfa26c0f448fadf07ba70536978f994e031afa97cc5c39795bf7c05080 +size 7617440 diff --git a/DeltaVRFMOD/Assets/Vehicles, Electric, Car, Tesla, Model 3, Idle, Engine Compartment 03 SND66189.wav b/DeltaVRFMOD/Assets/Vehicles, Electric, Car, Tesla, Model 3, Idle, Engine Compartment 03 SND66189.wav deleted file mode 100644 index 360cafbb..00000000 --- a/DeltaVRFMOD/Assets/Vehicles, Electric, Car, Tesla, Model 3, Idle, Engine Compartment 03 SND66189.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dbd85c3ce770e006e536f97269ce3fa7e1253106ba6f99185eef573853db8acb -size 9594212 diff --git a/DeltaVRFMOD/Build/Desktop/Desktop/Ambience.bank b/DeltaVRFMOD/Build/Desktop/Desktop/Ambience.bank index c3359d96..52f99fb0 100644 Binary files a/DeltaVRFMOD/Build/Desktop/Desktop/Ambience.bank and b/DeltaVRFMOD/Build/Desktop/Desktop/Ambience.bank differ diff --git a/DeltaVRFMOD/Build/Desktop/Desktop/Master.bank b/DeltaVRFMOD/Build/Desktop/Desktop/Master.bank index be627fcd..c34d6379 100644 Binary files a/DeltaVRFMOD/Build/Desktop/Desktop/Master.bank and b/DeltaVRFMOD/Build/Desktop/Desktop/Master.bank differ diff --git a/DeltaVRFMOD/Build/Desktop/Desktop/Master.strings.bank b/DeltaVRFMOD/Build/Desktop/Desktop/Master.strings.bank index f5e8c4c1..a40cae39 100644 Binary files a/DeltaVRFMOD/Build/Desktop/Desktop/Master.strings.bank and b/DeltaVRFMOD/Build/Desktop/Desktop/Master.strings.bank differ diff --git a/DeltaVRFMOD/Build/Desktop/Desktop/Music.bank b/DeltaVRFMOD/Build/Desktop/Desktop/Music.bank index 56d43fa4..eaf8afa4 100644 Binary files a/DeltaVRFMOD/Build/Desktop/Desktop/Music.bank and b/DeltaVRFMOD/Build/Desktop/Desktop/Music.bank differ diff --git a/DeltaVRFMOD/Build/Desktop/Desktop/SFX.bank b/DeltaVRFMOD/Build/Desktop/Desktop/SFX.bank index 17fa65a4..3e782701 100644 Binary files a/DeltaVRFMOD/Build/Desktop/Desktop/SFX.bank and b/DeltaVRFMOD/Build/Desktop/Desktop/SFX.bank differ diff --git a/DeltaVRFMOD/Build/Desktop/Desktop/UI.bank b/DeltaVRFMOD/Build/Desktop/Desktop/UI.bank index 0d780d40..1f0cd4d9 100644 Binary files a/DeltaVRFMOD/Build/Desktop/Desktop/UI.bank and b/DeltaVRFMOD/Build/Desktop/Desktop/UI.bank differ diff --git a/DeltaVRFMOD/Metadata/AudioFile/{9eaeebc1-c010-44b0-9fa7-19a155286115}.xml b/DeltaVRFMOD/Metadata/AudioFile/{f08195f0-52fa-42ed-9119-6f6530f5a576}.xml similarity index 80% rename from DeltaVRFMOD/Metadata/AudioFile/{9eaeebc1-c010-44b0-9fa7-19a155286115}.xml rename to DeltaVRFMOD/Metadata/AudioFile/{f08195f0-52fa-42ed-9119-6f6530f5a576}.xml index c96ac335..a2297f32 100644 --- a/DeltaVRFMOD/Metadata/AudioFile/{9eaeebc1-c010-44b0-9fa7-19a155286115}.xml +++ b/DeltaVRFMOD/Metadata/AudioFile/{f08195f0-52fa-42ed-9119-6f6530f5a576}.xml @@ -1,8 +1,8 @@ - + - Vehicles, Electric, Car, Tesla, Model 3, Idle, Engine Compartment 03 SND66189.wav + Vehicles, Electric, Car, Tesla, Model 3, Idle, Engine Compartment 03 SND66189 7.wav true @@ -14,7 +14,7 @@ 2 - 16.656541666666666 + 13.224645833333334 {0fbc34f9-6022-42da-8b3b-f18344a8ea0f} diff --git a/DeltaVRFMOD/Metadata/Event/{0cc3b481-962c-43bc-a963-058a71c1632b}.xml b/DeltaVRFMOD/Metadata/Event/{0cc3b481-962c-43bc-a963-058a71c1632b}.xml index 14d63c11..3657cdc7 100644 --- a/DeltaVRFMOD/Metadata/Event/{0cc3b481-962c-43bc-a963-058a71c1632b}.xml +++ b/DeltaVRFMOD/Metadata/Event/{0cc3b481-962c-43bc-a963-058a71c1632b}.xml @@ -97,6 +97,9 @@ + + 1 + {577898e3-8d39-419b-8a71-df165b29fdb3} @@ -165,7 +168,7 @@ - -7.5 + 1 Audio 1 @@ -426,7 +429,7 @@ ApplyDA - 2 + 1 0 @@ -454,7 +457,7 @@ ApplyDir - 2 + 1 0 @@ -814,10 +817,10 @@ - 1 + 0.81000000000000005 - 65 + 20 diff --git a/DeltaVRFMOD/Metadata/Event/{11bf17f9-9c7d-44f2-b105-627916d832e6}.xml b/DeltaVRFMOD/Metadata/Event/{11bf17f9-9c7d-44f2-b105-627916d832e6}.xml index 0a6ef915..f57f1506 100644 --- a/DeltaVRFMOD/Metadata/Event/{11bf17f9-9c7d-44f2-b105-627916d832e6}.xml +++ b/DeltaVRFMOD/Metadata/Event/{11bf17f9-9c7d-44f2-b105-627916d832e6}.xml @@ -415,7 +415,7 @@ ApplyDA - 2 + 1 0 diff --git a/DeltaVRFMOD/Metadata/Event/{4d5ea694-f330-46d1-a569-9b03007fb85f}.xml b/DeltaVRFMOD/Metadata/Event/{4d5ea694-f330-46d1-a569-9b03007fb85f}.xml index 3c92c7f0..9df3e3f2 100644 --- a/DeltaVRFMOD/Metadata/Event/{4d5ea694-f330-46d1-a569-9b03007fb85f}.xml +++ b/DeltaVRFMOD/Metadata/Event/{4d5ea694-f330-46d1-a569-9b03007fb85f}.xml @@ -89,14 +89,26 @@ - - 3.6240000000000001 + + 1.4000000000000001 + + 1.3899999999999999 + + + 1.4600000000000002 + + + {111a1b6f-a8ed-41dc-b6a8-69d90e344aff} + {e5c8c7bf-afb1-4055-a1b0-a2c3f583f42c} + + -12.5 + Audio 1 @@ -118,6 +130,14 @@ + + + {87542ae9-e834-42d6-b53e-cf380095bc2c} + + + {d80a7e09-dd1f-41d9-90aa-23da2eca0c0e} + + {553d7eb6-4fc1-4128-b274-2710e4417f56} @@ -126,5 +146,24 @@ + + + 1.4000000000000001 + + + 0 + + + -0.220267966 + + + + + 1.4600000000000002 + + + 1 + + diff --git a/DeltaVRFMOD/Metadata/Event/{ca59a34a-ee6f-46dc-8c48-68580f166894}.xml b/DeltaVRFMOD/Metadata/Event/{ca59a34a-ee6f-46dc-8c48-68580f166894}.xml index 109d7266..ad7c7706 100644 --- a/DeltaVRFMOD/Metadata/Event/{ca59a34a-ee6f-46dc-8c48-68580f166894}.xml +++ b/DeltaVRFMOD/Metadata/Event/{ca59a34a-ee6f-46dc-8c48-68580f166894}.xml @@ -37,7 +37,6 @@ {94ac9330-6c0b-421a-b3ab-8fe75d998e5d} {117ce9aa-a267-47a1-b0ef-0042e96b99a8} - {2713ce2d-100c-41d4-985a-d3867f5d58e0} {9d1145b0-e099-4ee4-ab1d-23cc274af901} @@ -70,7 +69,11 @@ {7ec75b45-6865-4d1b-bfab-f8e3ca952cf8} - + + + 30 + + @@ -90,7 +93,7 @@ - {b1566735-f30a-4149-b6df-61e3a48e06be} + {824fb99e-7e5f-4ef4-8601-72fea554b368} {da10e6fc-66e6-44ac-b520-558594949a15} @@ -113,8 +116,8 @@ {36301cbf-6264-435e-9b58-1a68610df7e6} {c7b9e72f-b880-4a15-81d4-5a2dcae36f8f} - {b1566735-f30a-4149-b6df-61e3a48e06be} {193251eb-f70e-4eb8-9d6e-7fa209353b5f} + {824fb99e-7e5f-4ef4-8601-72fea554b368} {a9a726c5-2680-484a-916a-fa6ab1499915} @@ -125,12 +128,10 @@ {7f93562b-4c20-4f1d-9c68-6a145d8afb6d} - - - {c6ed1c8a-6317-4b6e-9c2f-a9de5d998f05} - - + + 4 + {26251485-8b8f-4259-bc84-5fbf400ec338} @@ -175,7 +176,7 @@ 1000 - -2 + 1.20000005 true @@ -192,7 +193,7 @@ - -6.5 + -10 Engine1 @@ -235,7 +236,7 @@ - -6.5 + -6 Engine2 @@ -250,39 +251,32 @@ {11d0567a-a4de-4fe0-9531-f883ee95423b} - + true - 900 + 866.52313232421875 1300 - - 5 - - - - -0.5 - true - {0635810e-9df9-4892-bf4e-e262cf200b79} + {ca2aa301-412b-4ba7-a293-4505fc14421d} - {c4be0190-cfaa-4725-b21f-fb62e08011dc} + {ea9a2afc-2e36-4147-a29b-11acec5e67a2} - {75f44b88-35d2-4043-8391-c10116f2c707} + {f08195f0-52fa-42ed-9119-6f6530f5a576} - -13 + -11 Tires @@ -302,12 +296,11 @@ true - 900 + 866.52313232421875 1300 - {c56c0d73-e43c-4a99-93a7-274e2134fe4a} @@ -320,7 +313,7 @@ - -16 + -19.5 Tires @@ -389,20 +382,23 @@ - + pitch - 3650 + 5000 + + + 0.104999997 - + - {25fd1d63-74f7-49ec-a025-968572352e6f} + {285b0f69-7d07-463d-8fd7-c011d6c84260} - {ccda9bd9-8fb3-49d7-ba2d-5a8d01c1367d} + {6ea1b1be-1b88-41d4-aef4-73f0f83ada89} @@ -417,7 +413,7 @@ pitch - 2100 + 1750 0.745000005 @@ -465,7 +461,7 @@ - 850 + 866.52313232421875 1 @@ -485,13 +481,13 @@ - 900 + 866.52313232421875 1 - 0.25471893 + 0.203604177 @@ -503,18 +499,18 @@ - + - 900 + 866.52313232421875 0 - -0.2547189 + -0.203604087 - + 1000 @@ -536,18 +532,18 @@ - 900 + 866.52313232421875 0 - -0.2547189 + -0.203604087 - 1200 + 1000 1 diff --git a/DeltaVRFMOD/Metadata/Event/{edb8b086-c8c2-4f9b-a6c9-c324aa020ad3}.xml b/DeltaVRFMOD/Metadata/Event/{edb8b086-c8c2-4f9b-a6c9-c324aa020ad3}.xml index 6b082b3a..a59e8cd4 100644 --- a/DeltaVRFMOD/Metadata/Event/{edb8b086-c8c2-4f9b-a6c9-c324aa020ad3}.xml +++ b/DeltaVRFMOD/Metadata/Event/{edb8b086-c8c2-4f9b-a6c9-c324aa020ad3}.xml @@ -328,7 +328,7 @@ ApplyDA - 2 + 1 0 @@ -356,7 +356,7 @@ ApplyDir - 0 + 1 0 diff --git a/DeltaVRFMOD/Metadata/ParameterPreset/{363cf08f-b9ae-4a7c-9b0b-21744049bdd5}.xml b/DeltaVRFMOD/Metadata/ParameterPreset/{363cf08f-b9ae-4a7c-9b0b-21744049bdd5}.xml index d3c388af..060634e4 100644 --- a/DeltaVRFMOD/Metadata/ParameterPreset/{363cf08f-b9ae-4a7c-9b0b-21744049bdd5}.xml +++ b/DeltaVRFMOD/Metadata/ParameterPreset/{363cf08f-b9ae-4a7c-9b0b-21744049bdd5}.xml @@ -27,7 +27,13 @@ cursorPosition - 0.17999999225139618 + 0.079999998211860657 + + + 0.059999998658895493 + + + true diff --git a/DeltaVRFMOD/Metadata/ParameterPreset/{c4b79f2b-c503-4e8a-bc42-6c104c7bac33}.xml b/DeltaVRFMOD/Metadata/ParameterPreset/{c4b79f2b-c503-4e8a-bc42-6c104c7bac33}.xml index 357b5eb3..7275c561 100644 --- a/DeltaVRFMOD/Metadata/ParameterPreset/{c4b79f2b-c503-4e8a-bc42-6c104c7bac33}.xml +++ b/DeltaVRFMOD/Metadata/ParameterPreset/{c4b79f2b-c503-4e8a-bc42-6c104c7bac33}.xml @@ -13,7 +13,7 @@ - 1 + 0 {a1523d7a-fecc-424f-8e27-bd2c5cb9a80f} diff --git a/DeltaVRFMOD/Metadata/ParameterPreset/{d5332d70-c7b1-41b6-952b-56db050cc7a3}.xml b/DeltaVRFMOD/Metadata/ParameterPreset/{d5332d70-c7b1-41b6-952b-56db050cc7a3}.xml index c7b9a9d0..10b57744 100644 --- a/DeltaVRFMOD/Metadata/ParameterPreset/{d5332d70-c7b1-41b6-952b-56db050cc7a3}.xml +++ b/DeltaVRFMOD/Metadata/ParameterPreset/{d5332d70-c7b1-41b6-952b-56db050cc7a3}.xml @@ -16,7 +16,7 @@ -1 - -1 + -0.5