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 6a8813b7..ffaca843 100644 --- a/Assets/_PROJECT/Components/Bolt/Intercation Logic/Car Driving Routine.cs +++ b/Assets/_PROJECT/Components/Bolt/Intercation Logic/Car Driving Routine.cs @@ -2,6 +2,8 @@ using System.Collections; using System.Collections.Generic; using Unity.XR.CoreUtils; using UnityEngine; +using FMOD.Studio; + using static MouseLook; public class CarDrivingRoutine : MonoBehaviour @@ -23,10 +25,21 @@ public class CarDrivingRoutine : MonoBehaviour public List FrontTires; public List BackTires; + + private EventInstance CarMovement; + + private void Awake() + { + 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 + } private void Start() { targetSpeed = StraightSpeed; targetRotationSpeed = rotationSpeed; + + CarMovement.start(); //starting the car sound here } // Update is called once per frame @@ -73,6 +86,8 @@ public class CarDrivingRoutine : MonoBehaviour // Proceed to the next waypoint _waypoint = _waypoint.Next; } + + CarMovement.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(gameObject)); //updating the attributes } private void rollTires() @@ -106,6 +121,9 @@ public class CarDrivingRoutine : MonoBehaviour StartCoroutine(SmoothAdjustSpeed(0, 0, haltspeed)); // Smoothly halt in 1 second _tireSound.Stop(); _stopSound.Play(); + + CarMovement.setParameterByName("EasyBoltLogic", 1); + } private void OnTriggerExit(Collider other) @@ -114,6 +132,9 @@ public class CarDrivingRoutine : MonoBehaviour StartCoroutine(SmoothAdjustSpeed(targetSpeed, targetRotationSpeed, haltspeed)); // Smoothly resume speed in 1 second _stopSound.Stop(); _tireSound.Play(); + + CarMovement.setParameterByName("EasyBoltLogic", 0); + CarMovement.start(); } private IEnumerator SmoothAdjustSpeed(float targetStraightSpeed, float targetRotationSpeed, float duration) diff --git a/Assets/_PROJECT/Components/Bolt/Intercation Logic/Passanger Seat.cs b/Assets/_PROJECT/Components/Bolt/Intercation Logic/Passanger Seat.cs index 71ceb4bd..7f1b8bd1 100644 --- a/Assets/_PROJECT/Components/Bolt/Intercation Logic/Passanger Seat.cs +++ b/Assets/_PROJECT/Components/Bolt/Intercation Logic/Passanger Seat.cs @@ -37,6 +37,8 @@ public class PassangerSeat : LocomotionProvider Vector3 cameraShift = cameraTransform.localPosition; + AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.DoorOpen, gameObject); + currentPassanger = player; player.transform.SetParent(this.transform); player.transform.localPosition = -cameraShift; @@ -75,7 +77,9 @@ public class PassangerSeat : LocomotionProvider Transform cameraTransform = cameraChild.transform.parent.transform; - // Set the player’s parent to null (making it part of the scene hierarchy) + AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.DoorClose, gameObject); + + // Set the player�s parent to null (making it part of the scene hierarchy) currentPassanger.transform.SetParent(null); // Put the player outside; diff --git a/Assets/_PROJECT/Components/Elevator/Scripts/Elevator box.cs b/Assets/_PROJECT/Components/Elevator/Scripts/Elevator box.cs index 9ea4b591..0f3ab836 100644 --- a/Assets/_PROJECT/Components/Elevator/Scripts/Elevator box.cs +++ b/Assets/_PROJECT/Components/Elevator/Scripts/Elevator box.cs @@ -303,6 +303,8 @@ public class ElevatorBox : MonoBehaviour SetState(ElevatorState.ClosingDoors); playRandomAudioClipFrom(closeDoorsClips); + AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.ElevatorDoorClosing, gameObject); //fmod attached 3d oneshot event + ElevatorOuter currentCaller = findCurrentCaller(); if (currentCaller != null) currentCaller.CloseDoors(); @@ -318,6 +320,9 @@ public class ElevatorBox : MonoBehaviour //Debug.Log("Opening doors"); SetState(ElevatorState.OpeningDoors); playRandomAudioClipFrom(openDoorsClips); + + AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.ElevatorDoorOpening, gameObject); //fmod attached 3d oneshot event + ElevatorOuter targetCaller = findTargetCaller(); //Debug.Log("Target caller is: " + targetCaller); if (targetCaller != null) @@ -367,6 +372,8 @@ public class ElevatorBox : MonoBehaviour SetState(ElevatorState.Moving); playRandomAudioClipFrom(moveElevatorClips); + AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.ElevatorMovement, gameObject); //fmod attached 3d oneshot event + while (t < 1f) { t += Time.deltaTime / floorMoveTime; diff --git a/Assets/_PROJECT/Components/Portals2/Portal.prefab b/Assets/_PROJECT/Components/Portals2/Portal.prefab index 2554c858..ac5b5c42 100644 --- a/Assets/_PROJECT/Components/Portals2/Portal.prefab +++ b/Assets/_PROJECT/Components/Portals2/Portal.prefab @@ -124,6 +124,7 @@ GameObject: m_Component: - component: {fileID: 6021721823031538141} - component: {fileID: 4707456952479937532} + - component: {fileID: 5921542733598710255} m_Layer: 0 m_Name: Portal m_TagString: Untagged @@ -148,7 +149,7 @@ Transform: - {fileID: 1266057804064659733} - {fileID: 5614923999591170275} m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &4707456952479937532 AudioSource: @@ -291,6 +292,37 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!114 &5921542733598710255 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4777591596180506993} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9a6610d2e704f1648819acc8d7460285, type: 3} + m_Name: + m_EditorClassIdentifier: + CollisionTag: + EventReference: + Guid: + Data1: 214152321 + Data2: 1136432684 + Data3: -1979358295 + Data4: 727957873 + Path: event:/Ambiences/PortalSpacial + Event: + EventPlayTrigger: 1 + EventStopTrigger: 0 + AllowFadeout: 1 + TriggerOnce: 0 + Preload: 0 + NonRigidbodyVelocity: 0 + Params: [] + OverrideAttenuation: 0 + OverrideMinDistance: 1 + OverrideMaxDistance: 20 --- !u!1 &6014189720456933605 GameObject: m_ObjectHideFlags: 0 @@ -527,3 +559,4 @@ MonoBehaviour: portalScene: {fileID: 7751003758844882782} occlusionPortal: {fileID: 0} _shouldTeleport: 1 + teleportationProvider: {fileID: 0} diff --git a/Assets/_PROJECT/Components/Portals2/Space enter Collider.cs b/Assets/_PROJECT/Components/Portals2/Space enter Collider.cs index 1e698e85..14e117e2 100644 --- a/Assets/_PROJECT/Components/Portals2/Space enter Collider.cs +++ b/Assets/_PROJECT/Components/Portals2/Space enter Collider.cs @@ -31,7 +31,6 @@ public class SpaceEnterCollider : MonoBehaviour playerGravity.isInSpace = true; } Debug.Log(other + " entered space."); - AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.PortalEnter, gameObject); } private void OnTriggerExit(Collider other) @@ -53,6 +52,5 @@ public class SpaceEnterCollider : MonoBehaviour yield return new WaitForSeconds(1f); // Wait for 1 second playerGravity.isInSpace = false; Debug.Log("Default gravity restored after 1 second."); - AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.PortalEnter, gameObject); } } \ No newline at end of file diff --git a/Assets/_PROJECT/Components/Portals2/StencilPortal.cs b/Assets/_PROJECT/Components/Portals2/StencilPortal.cs index eb80a7bc..097b962e 100644 --- a/Assets/_PROJECT/Components/Portals2/StencilPortal.cs +++ b/Assets/_PROJECT/Components/Portals2/StencilPortal.cs @@ -65,7 +65,10 @@ public class StencilPortal : MonoBehaviour matchOrientation = MatchOrientation.TargetUpAndForward }; + AudioManager.Instance.PlayOneShot3D(FMODEvents.Instance.PortalEnter, targetPosition); + teleportationProvider.QueueTeleportRequest(request); + other.transform.rotation = TransformRotationBetweenPortals(this, targetPortal, other.transform.rotation); } else @@ -79,6 +82,7 @@ public class StencilPortal : MonoBehaviour { Destroy(gameObject, 0.5f); } + } private void OnTriggerExit(Collider other) @@ -86,6 +90,9 @@ public class StencilPortal : MonoBehaviour AllowTeleport(); if (!_shouldTeleport || IsInvoking(nameof(AllowTeleport))) return; if (!other.CompareTag("Player")) return; + + AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.PortalEnter, gameObject); + Debug.Log(transform.name + " player exited"); Invoke(nameof(AllowTeleport), 1f); } diff --git a/Assets/_PROJECT/Components/Server room/Alarm Trigger.cs b/Assets/_PROJECT/Components/Server room/Alarm Trigger.cs index b1a9306f..229f4caf 100644 --- a/Assets/_PROJECT/Components/Server room/Alarm Trigger.cs +++ b/Assets/_PROJECT/Components/Server room/Alarm Trigger.cs @@ -4,37 +4,61 @@ using System.Runtime.Remoting.Messaging; using UnityEngine; using UnityEngine.PlayerLoop; using UnityEngine.XR.Content.Interaction; +using FMOD.Studio; public class AlarmTrigger : MonoBehaviour { public XRPushButton PushButton; public AudioSource AlarmSequence; public AudioSource VentilationSequence; + + private EventInstance RoomHum; + private EventInstance AlarmSound; private bool hasAlarm = false; + private void Awake() + { + RoomHum = AudioManager.Instance.CreateInstance(FMODEvents.Instance.ServerRoomHumming); + RoomHum.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(gameObject)); + + AlarmSound = AudioManager.Instance.CreateInstance(FMODEvents.Instance.ServerRoomAlarm); + AlarmSound.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(gameObject)); + + + } void Start() { if (PushButton != null) { PushButton.onPress.AddListener(OnButtonPressed); + AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.ServerRoomButton, gameObject); + } } void OnButtonPressed() { Debug.Log("Alarm button Pressed!"); - - if (!AlarmSequence.isPlaying) { //if alarm isn't already triggered. + + if (!AudioManager.IsPlaying(AlarmSound)){ //if alarm isn't already triggered. VentilationSequence.Stop(); AlarmSequence.Play(); + + AlarmSound.start(); + AudioManager.Instance.StopInstance(RoomHum, STOP_MODE.ALLOWFADEOUT); + + hasAlarm = true; } } void Update() { - if(hasAlarm && !AlarmSequence.isPlaying) // If alarm state has ended. + if(hasAlarm && !AudioManager.IsPlaying(AlarmSound)) // If alarm state has ended. { VentilationSequence.Play(); // Return to normal. + + RoomHum.start(); + hasAlarm = false; } } diff --git a/Assets/_PROJECT/Components/Server room/Server rack.prefab b/Assets/_PROJECT/Components/Server room/Server rack.prefab index 182a5cc8..aeebf574 100644 --- a/Assets/_PROJECT/Components/Server room/Server rack.prefab +++ b/Assets/_PROJECT/Components/Server room/Server rack.prefab @@ -100,6 +100,10 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 2488785156293713400} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: ac65e655dd40bcd48b72b3f8ddcf45bd, + type: 3} + insertIndex: -1 + addedObject: {fileID: 3366414401841504121} m_SourcePrefab: {fileID: 100100000, guid: ac65e655dd40bcd48b72b3f8ddcf45bd, type: 3} --- !u!1 &7023167506039495560 stripped GameObject: @@ -252,3 +256,34 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!114 &3366414401841504121 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7023167506039495560} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9a6610d2e704f1648819acc8d7460285, type: 3} + m_Name: + m_EditorClassIdentifier: + CollisionTag: + EventReference: + Guid: + Data1: 2088767158 + Data2: 1236037630 + Data3: 1977926589 + Data4: -1933500246 + Path: event:/Ambiences/Server/OnlyHum + Event: + EventPlayTrigger: 1 + EventStopTrigger: 0 + AllowFadeout: 1 + TriggerOnce: 0 + Preload: 0 + NonRigidbodyVelocity: 0 + Params: [] + OverrideAttenuation: 0 + OverrideMinDistance: 1 + OverrideMaxDistance: 6.8 diff --git a/Assets/_PROJECT/Components/TwoHandedBow/TwoHandedBow.cs b/Assets/_PROJECT/Components/TwoHandedBow/TwoHandedBow.cs index 72cc8055..2ad1c141 100644 --- a/Assets/_PROJECT/Components/TwoHandedBow/TwoHandedBow.cs +++ b/Assets/_PROJECT/Components/TwoHandedBow/TwoHandedBow.cs @@ -58,11 +58,13 @@ namespace _PROJECT.Multiplayer.NewBow if (PullAmount == 0 & newPull > 0) { pullSounds.Play(); + AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.BowPullback, gameObject); } if (PullAmount < 0.98f & newPull >= 0.98f) { maxPullSounds.Play(); + AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.BowPullbackMax, gameObject); } PullAmount = newPull; diff --git a/Assets/_PROJECT/Components/TwoHandedBow/TwoHandedBowNetworkManager.cs b/Assets/_PROJECT/Components/TwoHandedBow/TwoHandedBowNetworkManager.cs index 117b2a44..2aba689f 100644 --- a/Assets/_PROJECT/Components/TwoHandedBow/TwoHandedBowNetworkManager.cs +++ b/Assets/_PROJECT/Components/TwoHandedBow/TwoHandedBowNetworkManager.cs @@ -63,6 +63,7 @@ namespace _PROJECT.Multiplayer.NewBow OwnerDeselectRpc(Owner, arrow); _interactionManager.SelectExit(_notch, _notch.firstInteractableSelected); PlayReleaseSoundRPC(); + AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.BowArrowRelease, gameObject); } _arrowNetworkObject = null; @@ -81,6 +82,7 @@ namespace _PROJECT.Multiplayer.NewBow _interactionManager.SelectEnter(_notch as IXRSelectInteractor, arrow); OwnerSelectRpc(Owner, arrowObject.GetComponent()); PlayNockSoundRPC(); + AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.BowArrowNock, gameObject); } public override void OnOwnershipClient(NetworkConnection prevOwner) diff --git a/Assets/_PROJECT/Prefabs/XR/Bow/TargetUFO.prefab b/Assets/_PROJECT/Prefabs/XR/Bow/TargetUFO.prefab index 79824a27..8cd5871c 100644 --- a/Assets/_PROJECT/Prefabs/XR/Bow/TargetUFO.prefab +++ b/Assets/_PROJECT/Prefabs/XR/Bow/TargetUFO.prefab @@ -36,7 +36,7 @@ Transform: m_Children: - {fileID: 7933779445518253981} m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3572526038880022669 MonoBehaviour: @@ -57,8 +57,6 @@ MonoBehaviour: type: 3} endPosition: {x: 0, y: 0, z: 0} forwardSpeed: 2 - minRandomOffset: {x: 0, y: 0, z: 0} - maxRandomOffset: {x: 0, y: 0, z: 0} --- !u!54 &3766976745949113692 Rigidbody: m_ObjectHideFlags: 0 diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index 0a509558..af8a1700 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:5ac84a47f80875029139a05c10e53736e2e16116ecca7a4eca39a721fb6e4449 -size 63223441 +oid sha256:fee18e1b2d26eba868dfa9911fe200d98b25a29c5d3f87c24b8a03b0ce347cd5 +size 63291289 diff --git a/Assets/_PROJECT/Scripts/Audio/FMODEvents.cs b/Assets/_PROJECT/Scripts/Audio/FMODEvents.cs index d127f5d1..649a54e7 100644 --- a/Assets/_PROJECT/Scripts/Audio/FMODEvents.cs +++ b/Assets/_PROJECT/Scripts/Audio/FMODEvents.cs @@ -20,6 +20,32 @@ public class FMODEvents : MonoBehaviour [field: SerializeField] public EventReference MapOpen { get; private set; } [field: SerializeField] public EventReference Hover { get; private set; } + [field: Header("Initial events")] + [field: SerializeField] public EventReference PortalSpacial { get; private set; } + [field: SerializeField] public EventReference UfoPassing { get; private set; } + + [field: SerializeField] public EventReference BowArrowHit { get; private set; } + [field: SerializeField] public EventReference BowArrowNock { get; private set; } + [field: SerializeField] public EventReference BowArrowRelease { get; private set; } + [field: SerializeField] public EventReference BowPullback { get; private set; } + [field: SerializeField] public EventReference BowPullbackMax { get; private set; } + + [field: SerializeField] public EventReference ElevatorDoorClosing { get; private set; } + [field: SerializeField] public EventReference ElevatorDoorOpening { get; private set; } + [field: SerializeField] public EventReference ElevatorArrival { get; private set; } + [field: SerializeField] public EventReference ElevatorMovement { get; private set; } + + [field: SerializeField] public EventReference BoltCarStopSound { get; private set; } + [field: SerializeField] public EventReference BoltCarSimpleDriving { get; private set; } + [field: SerializeField] public EventReference BoltCarHorn { get; private set; } + + [field: SerializeField] public EventReference ServerRoomAlarm { get; private set; } + [field: SerializeField] public EventReference ServerRoomButton { get; private set; } + [field: SerializeField] public EventReference ServerRoomHumming { get; private set; } + [field: SerializeField] public EventReference ServerRoomRackHum { get; private set; } + + + public static FMODEvents Instance { get; private set; } private void Awake() diff --git a/DeltaVRFMOD/.cache/buildrecords/Desktop/Ambience.br b/DeltaVRFMOD/.cache/buildrecords/Desktop/Ambience.br index 6baad1a4..2e6da9ff 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 0de9c299..8037c095 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/SFX.br b/DeltaVRFMOD/.cache/buildrecords/Desktop/SFX.br index 38adfdca..881b794d 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 d3a9e972..6dcdc624 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/B0AD5C08.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/B0AD5C08.fobj new file mode 100644 index 00000000..38a6a836 Binary files /dev/null and b/DeltaVRFMOD/.cache/fsbcache/Desktop/B0AD5C08.fobj differ diff --git a/DeltaVRFMOD/.cache/{13204e1d-21cc-4490-82e9-24d84211f1d7}.pdc b/DeltaVRFMOD/.cache/{13204e1d-21cc-4490-82e9-24d84211f1d7}.pdc new file mode 100644 index 00000000..a3815710 Binary files /dev/null and b/DeltaVRFMOD/.cache/{13204e1d-21cc-4490-82e9-24d84211f1d7}.pdc differ diff --git a/DeltaVRFMOD/.cache/{68ea2f26-b7f9-404f-80bd-02f96e1b80a9}.pdc b/DeltaVRFMOD/.cache/{68ea2f26-b7f9-404f-80bd-02f96e1b80a9}.pdc new file mode 100644 index 00000000..597aaa1f Binary files /dev/null and b/DeltaVRFMOD/.cache/{68ea2f26-b7f9-404f-80bd-02f96e1b80a9}.pdc differ diff --git a/DeltaVRFMOD/.cache/{df13839f-49ad-4d32-bf08-e5d2476a63bc}.pdc b/DeltaVRFMOD/.cache/{df13839f-49ad-4d32-bf08-e5d2476a63bc}.pdc new file mode 100644 index 00000000..60fa288d Binary files /dev/null and b/DeltaVRFMOD/.cache/{df13839f-49ad-4d32-bf08-e5d2476a63bc}.pdc differ diff --git a/DeltaVRFMOD/Build/Desktop/Desktop/Ambience.bank b/DeltaVRFMOD/Build/Desktop/Desktop/Ambience.bank index 55dde906..74685a37 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.strings.bank b/DeltaVRFMOD/Build/Desktop/Desktop/Master.strings.bank index 637aeff0..ab6c8746 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/SFX.bank b/DeltaVRFMOD/Build/Desktop/Desktop/SFX.bank index 190aa663..150f12b1 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 1f734bfc..75bb61b1 100644 Binary files a/DeltaVRFMOD/Build/Desktop/Desktop/UI.bank and b/DeltaVRFMOD/Build/Desktop/Desktop/UI.bank differ diff --git a/DeltaVRFMOD/Metadata/Event/{0318642c-4b78-4d3a-83b4-c9f48a27cd74}.xml b/DeltaVRFMOD/Metadata/Event/{0318642c-4b78-4d3a-83b4-c9f48a27cd74}.xml index a505294b..bdbf7fa4 100644 --- a/DeltaVRFMOD/Metadata/Event/{0318642c-4b78-4d3a-83b4-c9f48a27cd74}.xml +++ b/DeltaVRFMOD/Metadata/Event/{0318642c-4b78-4d3a-83b4-c9f48a27cd74}.xml @@ -53,7 +53,7 @@ {e4c14d23-8480-46d6-bf40-e1fbb66525f8} - {c751273e-6b77-46b1-8c19-a99f6f08e61e} + {ce68ea24-56d6-4af5-a850-87bda0652ecc} diff --git a/DeltaVRFMOD/Metadata/Event/{0cc3b481-962c-43bc-a963-058a71c1632b}.xml b/DeltaVRFMOD/Metadata/Event/{0cc3b481-962c-43bc-a963-058a71c1632b}.xml index a50c4ad8..ec614115 100644 --- a/DeltaVRFMOD/Metadata/Event/{0cc3b481-962c-43bc-a963-058a71c1632b}.xml +++ b/DeltaVRFMOD/Metadata/Event/{0cc3b481-962c-43bc-a963-058a71c1632b}.xml @@ -57,10 +57,14 @@ {4c312478-5cc1-4b8d-b975-dbab67a5ed47} - {c751273e-6b77-46b1-8c19-a99f6f08e61e} + {ce68ea24-56d6-4af5-a850-87bda0652ecc} - + + + 30 + + diff --git a/DeltaVRFMOD/Metadata/Event/{18954117-2365-48c6-b968-d8f2f7b6b04d}.xml b/DeltaVRFMOD/Metadata/Event/{18954117-2365-48c6-b968-d8f2f7b6b04d}.xml index 1344e3a5..34bb4f2e 100644 --- a/DeltaVRFMOD/Metadata/Event/{18954117-2365-48c6-b968-d8f2f7b6b04d}.xml +++ b/DeltaVRFMOD/Metadata/Event/{18954117-2365-48c6-b968-d8f2f7b6b04d}.xml @@ -94,7 +94,7 @@ - 3.1500000000000004 + 2.96 {6e63384d-6338-46de-8590-f5a0bbb0477f} diff --git a/DeltaVRFMOD/Metadata/Event/{3775966a-99f2-44af-92c6-1acbd0ff49ab}.xml b/DeltaVRFMOD/Metadata/Event/{3775966a-99f2-44af-92c6-1acbd0ff49ab}.xml index a224cffa..340c3a24 100644 --- a/DeltaVRFMOD/Metadata/Event/{3775966a-99f2-44af-92c6-1acbd0ff49ab}.xml +++ b/DeltaVRFMOD/Metadata/Event/{3775966a-99f2-44af-92c6-1acbd0ff49ab}.xml @@ -59,10 +59,14 @@ {24174714-86a5-40f1-8b02-9281c92d49d5} - {c751273e-6b77-46b1-8c19-a99f6f08e61e} + {ce68ea24-56d6-4af5-a850-87bda0652ecc} - + + + 9 + + @@ -198,7 +202,7 @@ - 0.5 + 1.5 Audio 2 diff --git a/DeltaVRFMOD/Metadata/Event/{39a2d8ec-9c25-457e-8222-8aa42e2ccf70}.xml b/DeltaVRFMOD/Metadata/Event/{39a2d8ec-9c25-457e-8222-8aa42e2ccf70}.xml index 91c9f70c..f76e226a 100644 --- a/DeltaVRFMOD/Metadata/Event/{39a2d8ec-9c25-457e-8222-8aa42e2ccf70}.xml +++ b/DeltaVRFMOD/Metadata/Event/{39a2d8ec-9c25-457e-8222-8aa42e2ccf70}.xml @@ -53,12 +53,12 @@ {81c25a42-8a5e-4295-8e79-12095db53616} - {c751273e-6b77-46b1-8c19-a99f6f08e61e} + {ce68ea24-56d6-4af5-a850-87bda0652ecc} - 7.5999999 + 9 @@ -107,6 +107,9 @@ + + 4 + Audio 1 diff --git a/DeltaVRFMOD/Metadata/Event/{3a1c56b0-8a44-4003-93af-3a2c15b2a8a2}.xml b/DeltaVRFMOD/Metadata/Event/{3a1c56b0-8a44-4003-93af-3a2c15b2a8a2}.xml index 02cc0481..b73fb345 100644 --- a/DeltaVRFMOD/Metadata/Event/{3a1c56b0-8a44-4003-93af-3a2c15b2a8a2}.xml +++ b/DeltaVRFMOD/Metadata/Event/{3a1c56b0-8a44-4003-93af-3a2c15b2a8a2}.xml @@ -72,6 +72,9 @@ + + 10 + {5f3e822b-bfc7-44f4-9a4f-421b142d08a3} @@ -90,7 +93,13 @@ - 1.1500000000000001 + 1.05 + + + 5 + + + 0.900000036 {7141a651-ee10-4129-ad5b-d5d159219d42} @@ -170,7 +179,7 @@ - 0.15000000000000013 + 0.15000000000000036 1 @@ -181,7 +190,7 @@ - 1.1500000000000001 + 1.05 0 diff --git a/DeltaVRFMOD/Metadata/Event/{3e2f2f36-9988-4981-81d5-b83afdd853a2}.xml b/DeltaVRFMOD/Metadata/Event/{3e2f2f36-9988-4981-81d5-b83afdd853a2}.xml index 02bae081..9079c17c 100644 --- a/DeltaVRFMOD/Metadata/Event/{3e2f2f36-9988-4981-81d5-b83afdd853a2}.xml +++ b/DeltaVRFMOD/Metadata/Event/{3e2f2f36-9988-4981-81d5-b83afdd853a2}.xml @@ -53,7 +53,7 @@ {08586293-44c3-4f17-b643-75f1352e19f1} - {c751273e-6b77-46b1-8c19-a99f6f08e61e} + {ce68ea24-56d6-4af5-a850-87bda0652ecc} diff --git a/DeltaVRFMOD/Metadata/Event/{4d5ea694-f330-46d1-a569-9b03007fb85f}.xml b/DeltaVRFMOD/Metadata/Event/{4d5ea694-f330-46d1-a569-9b03007fb85f}.xml index b367f88a..06301746 100644 --- a/DeltaVRFMOD/Metadata/Event/{4d5ea694-f330-46d1-a569-9b03007fb85f}.xml +++ b/DeltaVRFMOD/Metadata/Event/{4d5ea694-f330-46d1-a569-9b03007fb85f}.xml @@ -53,7 +53,7 @@ {3e854fc1-ef39-4841-82a1-28333142fdfa} - {c751273e-6b77-46b1-8c19-a99f6f08e61e} + {ce68ea24-56d6-4af5-a850-87bda0652ecc} diff --git a/DeltaVRFMOD/Metadata/Event/{5a8c3505-6852-4a2e-9f39-f1e44ccc2f71}.xml b/DeltaVRFMOD/Metadata/Event/{5a8c3505-6852-4a2e-9f39-f1e44ccc2f71}.xml index 104545b8..36ea7dd0 100644 --- a/DeltaVRFMOD/Metadata/Event/{5a8c3505-6852-4a2e-9f39-f1e44ccc2f71}.xml +++ b/DeltaVRFMOD/Metadata/Event/{5a8c3505-6852-4a2e-9f39-f1e44ccc2f71}.xml @@ -101,6 +101,9 @@ + + 6.5 + Audio 1 diff --git a/DeltaVRFMOD/Metadata/Event/{5dde6524-3f0f-46a1-869b-6997da43c578}.xml b/DeltaVRFMOD/Metadata/Event/{5dde6524-3f0f-46a1-869b-6997da43c578}.xml index 83812952..c5da9927 100644 --- a/DeltaVRFMOD/Metadata/Event/{5dde6524-3f0f-46a1-869b-6997da43c578}.xml +++ b/DeltaVRFMOD/Metadata/Event/{5dde6524-3f0f-46a1-869b-6997da43c578}.xml @@ -53,7 +53,7 @@ {a3566de7-edf1-49b3-873b-2c846c9be0e9} - {c751273e-6b77-46b1-8c19-a99f6f08e61e} + {ce68ea24-56d6-4af5-a850-87bda0652ecc} diff --git a/DeltaVRFMOD/Metadata/Event/{6360411a-8ba1-4d05-895f-3731610e36bf}.xml b/DeltaVRFMOD/Metadata/Event/{6360411a-8ba1-4d05-895f-3731610e36bf}.xml index 4bdbec49..b780535f 100644 --- a/DeltaVRFMOD/Metadata/Event/{6360411a-8ba1-4d05-895f-3731610e36bf}.xml +++ b/DeltaVRFMOD/Metadata/Event/{6360411a-8ba1-4d05-895f-3731610e36bf}.xml @@ -53,12 +53,12 @@ {c2cc40c9-eaa3-4660-a3b1-c3e295123233} - {c751273e-6b77-46b1-8c19-a99f6f08e61e} + {ce68ea24-56d6-4af5-a850-87bda0652ecc} - 65 + 25 @@ -101,6 +101,9 @@ + + 5.5 + Audio 1 diff --git a/DeltaVRFMOD/Metadata/Event/{7c800eb6-6ffe-49ac-bdc3-e475aa20c18c}.xml b/DeltaVRFMOD/Metadata/Event/{7c800eb6-6ffe-49ac-bdc3-e475aa20c18c}.xml new file mode 100644 index 00000000..4dfd16b7 --- /dev/null +++ b/DeltaVRFMOD/Metadata/Event/{7c800eb6-6ffe-49ac-bdc3-e475aa20c18c}.xml @@ -0,0 +1,263 @@ + + + + + OnlyHum + + + 2 + + + {5d87e2fb-50d7-435d-bcfa-207929c464ce} + + + {94eb8669-498d-4ab9-a9ad-ac26c390427a} + + + {708593bc-bb70-47a9-955f-907560d114bc} + + + {384ee97b-737f-48e5-b505-a9401c2ffeb9} + + + {1fb9b144-3aba-4f27-adac-3209e96a12a3} + + + {ebe51d68-94ca-4c6c-8e0a-5c76a6adec53} + + + {08383708-a4ec-4ed4-b239-3bc763c83cd0} + + + {a9418c0a-c15c-4523-8a31-2acc9d4bee1f} + + + {f141f2d4-6fa9-465a-a607-941cef3e083a} + + + + + {d081d164-9b22-49da-9d30-6446d5c1a60a} + + + + + {df15dac3-9896-4ee3-b440-080bd2774b16} + {84519fd3-aa92-408a-819f-c7e32f421300} + + + {d081d164-9b22-49da-9d30-6446d5c1a60a} + + + + + {66d0c94f-935d-4207-8632-309629bf6c65} + + + {754a1107-5283-4e76-8000-9e2a43fe795e} + + + {c751273e-6b77-46b1-8c19-a99f6f08e61e} + + + + + 6.80000019 + + + + + + {a5c17d57-867e-4c1c-9b99-2c1e3bc2f2b7} + {15f8a430-46d0-42b6-b5ba-b09760398b61} + {35c155d3-11a5-48b4-ba27-ebdb8b07dbd0} + + + {e0103a04-d0f3-4dc8-8554-5ea6923f3d4b} + + + + + {35c155d3-11a5-48b4-ba27-ebdb8b07dbd0} + + + {f0bec365-f358-476d-8289-fab527cda203} + + + + + {929b1c3e-951f-4cba-b573-a6725a0b69df} + + + {0c8d85ac-9823-45e9-8a9c-cffb9f9ef6b6} + + + {94eb8669-498d-4ab9-a9ad-ac26c390427a} + + + + + 0 + + + + + 0.40000000000000002 + + + 0 + + + + + {8334671c-21ec-4b08-a65f-03e78fa4f8f7} + + + + + + 0.40000000000000002 + + + {efa8bb86-2024-43c1-be7c-ee8c1e321e45} + + + + + 0.40000000000000002 + + + {e26f891b-8c70-4ab3-b685-56c4549bee2e} + + + + + 58.328526077097507 + + + {68049f79-4a3e-48c1-88c9-b19082a26534} + + + + + -4 + + + Audio 1 + + + {aff0a84f-2382-4445-ab2d-ff9fa115a0be} + + + {ffea0a28-2773-40c5-870b-a8ca2347662b} + + + {d081d164-9b22-49da-9d30-6446d5c1a60a} + + + + + 3 + + + 23.400000000000002 + + + {a9418c0a-c15c-4523-8a31-2acc9d4bee1f} + + + {ebe51d68-94ca-4c6c-8e0a-5c76a6adec53} + + + {f6061a3c-0c28-403e-a689-a7066ac726d9} + + + + + {e48ad53d-e9a1-4e8d-b153-43beab1a906c} + {37b2067f-7fb5-4b09-b7b6-4a444510790f} + + + + + + + {b04614d7-84ba-4e05-afb6-41c293a14819} + + + {3c732f5d-21f5-4498-8cb5-a13df8fd6c3c} + + + {15f8a430-46d0-42b6-b5ba-b09760398b61} + + + + + {cce4694f-95a9-4e69-84ec-2929ecffbb40} + + + {dbeca324-67c4-4acd-8a8a-0db364648b35} + + + {a5c17d57-867e-4c1c-9b99-2c1e3bc2f2b7} + + + + + {acbfc70b-5c7d-4114-9118-e03998f3e944} + + + + + + 0.40000000000000002 + + + {a5c17d57-867e-4c1c-9b99-2c1e3bc2f2b7} + {15f8a430-46d0-42b6-b5ba-b09760398b61} + {df15dac3-9896-4ee3-b440-080bd2774b16} + {84519fd3-aa92-408a-819f-c7e32f421300} + + + + + + + 0 + + + 1 + + + 0.25471893 + + + + + 0.40000000000000002 + + + 0 + + + + + 0 + + + 0 + + + -0.2547189 + + + + + 0.40000000000000002 + + + 1 + + + + diff --git a/DeltaVRFMOD/Metadata/Event/{7cf821cf-9b5c-43c9-b1b5-70e80fd1d3b7}.xml b/DeltaVRFMOD/Metadata/Event/{7cf821cf-9b5c-43c9-b1b5-70e80fd1d3b7}.xml index 0315f2bb..6e9312fc 100644 --- a/DeltaVRFMOD/Metadata/Event/{7cf821cf-9b5c-43c9-b1b5-70e80fd1d3b7}.xml +++ b/DeltaVRFMOD/Metadata/Event/{7cf821cf-9b5c-43c9-b1b5-70e80fd1d3b7}.xml @@ -56,7 +56,11 @@ {69ee688f-dc4e-4df2-a125-df79ed93217e} - + + + 25 + + @@ -72,6 +76,9 @@ + + 5.5 + {355d847d-6fcc-46c1-b9c7-f822f1709e57} diff --git a/DeltaVRFMOD/Metadata/Event/{7e1312c6-f538-463c-89f7-af96ce4f6057}.xml b/DeltaVRFMOD/Metadata/Event/{7e1312c6-f538-463c-89f7-af96ce4f6057}.xml new file mode 100644 index 00000000..bd49c2f1 --- /dev/null +++ b/DeltaVRFMOD/Metadata/Event/{7e1312c6-f538-463c-89f7-af96ce4f6057}.xml @@ -0,0 +1,133 @@ + + + + + BowPullbackMax + + + 2 + + + {0cba8840-8cbd-4de3-8edd-d6fa902d17ae} + + + {580b2471-2ad7-4de2-a446-343d84294f58} + + + {0b839698-65a9-4c48-9ce5-5733e3007478} + + + {1811ea64-6b8d-4dff-bf7b-e43940527d16} + + + {7ef619b4-88f1-48d5-947f-4ffb94acf260} + + + {1f80a385-7d41-434d-b93c-4535f60b3bca} + + + {f318c5d7-cc73-4c5b-bb58-ed983facb46f} + + + {ad63c3bf-9cae-46a5-bac6-fc0735d2d2e2} + + + {9d1145b0-e099-4ee4-ab1d-23cc274af901} + + + + + {53fe1a4d-3d20-465b-8604-8516be28d18b} + + + + + {53fe1a4d-3d20-465b-8604-8516be28d18b} + + + + + {0e663487-cc8a-4927-913a-28981039e797} + + + {638de9b6-7a13-408f-b3f7-5f827a0ed1c1} + + + {69ee688f-dc4e-4df2-a125-df79ed93217e} + + + + + + + {900ab59b-2ad6-41af-a57e-b9d17bd4bc1f} + + + {4a102695-cdbc-4c91-9213-479e37d9c09f} + + + + + {900ab59b-2ad6-41af-a57e-b9d17bd4bc1f} + + + + + {11157870-d323-4e43-90d5-66ac5587644c} + + + {af1e0bc6-86a7-442e-8a7f-fceba5e15012} + + + {580b2471-2ad7-4de2-a446-343d84294f58} + + + + + {11f71be5-8607-41a9-a416-06f25c44c5ef} + + + + + + 1.2925396825396793 + + + -3.5 + + + {049afdf8-fd83-4c95-be65-f0a0e4cd7d1d} + + + + + Audio 1 + + + {dc496132-bfed-4eda-9d16-af982db316cf} + + + {7f54b39a-ae9b-4c48-bac8-fb8380b42398} + + + {53fe1a4d-3d20-465b-8604-8516be28d18b} + + + + + {220e2ce0-f7e9-4619-aff3-befc50906f12} + {61dbeb6f-ecba-4974-8776-78293806718e} + + + + + + + {0253dc73-e8c5-44d1-bf5f-fcf8ca2bcaf3} + + + + + + + diff --git a/DeltaVRFMOD/Metadata/Event/{95df996b-940a-44ce-b51c-409fea8d9ddd}.xml b/DeltaVRFMOD/Metadata/Event/{95df996b-940a-44ce-b51c-409fea8d9ddd}.xml index 685b3156..6eaece6d 100644 --- a/DeltaVRFMOD/Metadata/Event/{95df996b-940a-44ce-b51c-409fea8d9ddd}.xml +++ b/DeltaVRFMOD/Metadata/Event/{95df996b-940a-44ce-b51c-409fea8d9ddd}.xml @@ -53,7 +53,7 @@ {9d17d214-c9f0-4694-8e50-2d018d3a3f11} - {c751273e-6b77-46b1-8c19-a99f6f08e61e} + {ce68ea24-56d6-4af5-a850-87bda0652ecc} diff --git a/DeltaVRFMOD/Metadata/Event/{af15be7d-d2b1-4b03-9e5a-a609f5948419}.xml b/DeltaVRFMOD/Metadata/Event/{af15be7d-d2b1-4b03-9e5a-a609f5948419}.xml index 794b0511..976face0 100644 --- a/DeltaVRFMOD/Metadata/Event/{af15be7d-d2b1-4b03-9e5a-a609f5948419}.xml +++ b/DeltaVRFMOD/Metadata/Event/{af15be7d-d2b1-4b03-9e5a-a609f5948419}.xml @@ -110,6 +110,9 @@ + + -6.5 + Audio 1 diff --git a/DeltaVRFMOD/Metadata/Event/{afa580e5-c55e-47b8-995f-2a9871e06469}.xml b/DeltaVRFMOD/Metadata/Event/{afa580e5-c55e-47b8-995f-2a9871e06469}.xml index 7f8658c4..62f8c8d7 100644 --- a/DeltaVRFMOD/Metadata/Event/{afa580e5-c55e-47b8-995f-2a9871e06469}.xml +++ b/DeltaVRFMOD/Metadata/Event/{afa580e5-c55e-47b8-995f-2a9871e06469}.xml @@ -53,7 +53,7 @@ {e5060f5c-c9f8-4a33-beb2-26531b539432} - {c751273e-6b77-46b1-8c19-a99f6f08e61e} + {ce68ea24-56d6-4af5-a850-87bda0652ecc} @@ -90,16 +90,19 @@ - 0.40600000000000003 + 0.38600000000000001 - 0.050000000000000003 + 0.070000000000000007 {4e9f4162-c020-48d3-90aa-c93f7a4d8b73} + + -4 + Audio 1 diff --git a/DeltaVRFMOD/Metadata/Event/{b8580522-9727-4d0b-a90f-0506536859fc}.xml b/DeltaVRFMOD/Metadata/Event/{b8580522-9727-4d0b-a90f-0506536859fc}.xml index 6d3dd9e2..e5f6d1e3 100644 --- a/DeltaVRFMOD/Metadata/Event/{b8580522-9727-4d0b-a90f-0506536859fc}.xml +++ b/DeltaVRFMOD/Metadata/Event/{b8580522-9727-4d0b-a90f-0506536859fc}.xml @@ -53,7 +53,7 @@ {3e919760-3b6c-4fc0-a0f1-f08423835bd5} - {c751273e-6b77-46b1-8c19-a99f6f08e61e} + {ce68ea24-56d6-4af5-a850-87bda0652ecc} diff --git a/DeltaVRFMOD/Metadata/Event/{ce89abc5-417e-4800-9b30-18883a321145}.xml b/DeltaVRFMOD/Metadata/Event/{ce89abc5-417e-4800-9b30-18883a321145}.xml index 8bb781bc..c89085e4 100644 --- a/DeltaVRFMOD/Metadata/Event/{ce89abc5-417e-4800-9b30-18883a321145}.xml +++ b/DeltaVRFMOD/Metadata/Event/{ce89abc5-417e-4800-9b30-18883a321145}.xml @@ -23,14 +23,19 @@ {c49501f3-10eb-4bdd-b904-e7e6710c1d15} + {a26ae91a-1441-4797-a642-069d624e022f} {1982504c-3a07-46e2-b039-b9b7a1a1dad6} {29660e79-a063-4b2e-a0ea-62bc161cc280} + {a28a491a-b70a-4928-84f0-4a8d20da8436} {2b587add-4f78-4187-a37f-dae4b4d360b5} + + {052e1f9c-5b6f-476b-946d-b2bdcdc8f8eb} + {9d1145b0-e099-4ee4-ab1d-23cc274af901} @@ -44,6 +49,8 @@ {05ec5f01-3eb6-4f68-b75b-e99b7c476eee} {8b5b1e6f-8c65-4fcd-9f8d-3751436c5e74} + {a9466738-1b8d-4e70-9b7d-688dea1edd90} + {fcddeaf0-4e73-470a-8cd1-ac1dae9e0af9} {783c2004-c047-4bf0-a1b5-05f363b1ec24} @@ -57,27 +64,54 @@ {4aed72c3-b0aa-465c-a3f2-fac44b603e66} - {c751273e-6b77-46b1-8c19-a99f6f08e61e} + {ce68ea24-56d6-4af5-a850-87bda0652ecc} - + + + 45 + + + {4b72ff3d-2834-4234-8b60-b186b82e17fa} {7aa9cf68-a829-4b12-b35b-808f1598df22} {d80a6cb7-4e01-408b-aeeb-bdf3f026f8a1} + {b4499ba3-0682-4445-a0c3-a2ff4458ca0a} + {1fff41c7-043e-4c21-acc7-b8f2f8994b3f} {091c9450-a21c-4ebf-b2a1-80de796c850d} + + + {bce4c5c5-20ca-4ba7-94e0-d28611cfd8db} + {85073601-b8e4-4ae1-be57-2a8a10d997af} + {05178856-04a2-4728-b715-9217fc5bb18f} + {c350f37d-5272-4d6a-9054-928c1e67be6a} + {9964499a-db8f-493b-bee8-bfa02b4f9b3a} + + + {78ccdff9-5ac7-4f70-898c-306b3284fa82} + + {4b72ff3d-2834-4234-8b60-b186b82e17fa} + {05178856-04a2-4728-b715-9217fc5bb18f} {5c94ebb3-1287-45c8-bfab-533e1639192b} + {b54a18e7-fa7c-4f63-9e3b-8c7484a9e9b3} + {250eac10-e01b-467a-8969-fb44d83f9d35} + + + + + {c6ed1c8a-6317-4b6e-9c2f-a9de5d998f05} @@ -104,6 +138,19 @@ 0 + + + 0 + + + + + 1 + + + 0 + + {4af3e614-3781-4cf2-b219-24fb669ddca6} @@ -128,6 +175,15 @@ {7afa3e98-540d-43a2-9418-22c433971b2d} + + + + 1 + + + 0 + + Audio 1 @@ -142,6 +198,54 @@ {783c2004-c047-4bf0-a1b5-05f363b1ec24} + + + 0 + + + + + 1 + + + 0 + + + + + 29.400000000000002 + + + 3.6240000000000001 + + + {e5c8c7bf-afb1-4055-a1b0-a2c3f583f42c} + + + + + {24ed03ae-9194-4150-8905-7dd80063ac12} + + + + + {3ab8c1a9-878c-461c-892d-3bdbc9cdb0a5} + + + + + Audio 2 + + + {d0bce8c1-ceec-494a-bafc-02b3caaede9d} + + + {3dec12a9-a9c7-48fc-9fb7-27ec50f1dd80} + + + {783c2004-c047-4bf0-a1b5-05f363b1ec24} + + 0.5 @@ -159,6 +263,43 @@ {dae054e7-60c6-4d77-96cc-35d0be657136} + + + 29.400000000000002 + + + Stop + + + {2b587add-4f78-4187-a37f-dae4b4d360b5} + + + {1982504c-3a07-46e2-b039-b9b7a1a1dad6} + + + + + 0.5 + + + 25.5 + + + {2b587add-4f78-4187-a37f-dae4b4d360b5} + + + {a26ae91a-1441-4797-a642-069d624e022f} + + + {8a1e2fda-33b5-4056-87f4-3b05a1a5a38b} + + + {b54a18e7-fa7c-4f63-9e3b-8c7484a9e9b3} + + + {7007bc9b-631e-461e-b46e-f1cb71b0a9e3} + + {17b6686c-b69a-4290-9a34-f1615792f5c3} @@ -195,12 +336,63 @@ + + + {ce3ec112-9719-4c10-9608-13fec8d173d0} + + + {8b8b7b9c-2587-4e7b-a8e3-5bcfe0137f93} + + + {9964499a-db8f-493b-bee8-bfa02b4f9b3a} + + + + + {116d2077-87b0-4b0f-8f6c-dbc340168bea} + + + {c1b4e272-87d2-4cbd-b441-b953a9f55ad9} + + + {c350f37d-5272-4d6a-9054-928c1e67be6a} + + + + + {b99da5db-4add-462e-999e-35bad8a56417} + + + {7aa9cf68-a829-4b12-b35b-808f1598df22} {d80a6cb7-4e01-408b-aeeb-bdf3f026f8a1} {05ec5f01-3eb6-4f68-b75b-e99b7c476eee} {8b5b1e6f-8c65-4fcd-9f8d-3751436c5e74} + {bce4c5c5-20ca-4ba7-94e0-d28611cfd8db} + {85073601-b8e4-4ae1-be57-2a8a10d997af} + + + + + {b4499ba3-0682-4445-a0c3-a2ff4458ca0a} + {1fff41c7-043e-4c21-acc7-b8f2f8994b3f} + {c350f37d-5272-4d6a-9054-928c1e67be6a} + {9964499a-db8f-493b-bee8-bfa02b4f9b3a} + {a9466738-1b8d-4e70-9b7d-688dea1edd90} + {fcddeaf0-4e73-470a-8cd1-ac1dae9e0af9} + + + + + 1 + + + 1 + + + {c6ed1c8a-6317-4b6e-9c2f-a9de5d998f05} @@ -244,4 +436,43 @@ + + + 0 + + + 1 + + + 0.25471893 + + + + + 1 + + + 0 + + + + + 0 + + + 0 + + + -0.0476088375 + + + + + 1 + + + 1 + + + diff --git a/DeltaVRFMOD/Metadata/Event/{d8cab979-82dd-41e0-ae17-4d3654bf58b8}.xml b/DeltaVRFMOD/Metadata/Event/{d8cab979-82dd-41e0-ae17-4d3654bf58b8}.xml index 1acc13c5..c643618a 100644 --- a/DeltaVRFMOD/Metadata/Event/{d8cab979-82dd-41e0-ae17-4d3654bf58b8}.xml +++ b/DeltaVRFMOD/Metadata/Event/{d8cab979-82dd-41e0-ae17-4d3654bf58b8}.xml @@ -53,7 +53,7 @@ {2f60d028-dc8f-45db-ac5b-6e5b1a716e0a} - {c751273e-6b77-46b1-8c19-a99f6f08e61e} + {ce68ea24-56d6-4af5-a850-87bda0652ecc} diff --git a/DeltaVRFMOD/Metadata/Event/{dbd4958a-6ef2-4241-9e49-b786845fdcef}.xml b/DeltaVRFMOD/Metadata/Event/{dbd4958a-6ef2-4241-9e49-b786845fdcef}.xml index 0cc830e5..a33e4118 100644 --- a/DeltaVRFMOD/Metadata/Event/{dbd4958a-6ef2-4241-9e49-b786845fdcef}.xml +++ b/DeltaVRFMOD/Metadata/Event/{dbd4958a-6ef2-4241-9e49-b786845fdcef}.xml @@ -53,7 +53,7 @@ {2f42552a-c959-4d41-88be-aa199ef8549a} - {c751273e-6b77-46b1-8c19-a99f6f08e61e} + {ce68ea24-56d6-4af5-a850-87bda0652ecc} diff --git a/DeltaVRFMOD/Metadata/Event/{ead4a758-711a-46af-9be3-3d28f5a3f5db}.xml b/DeltaVRFMOD/Metadata/Event/{ead4a758-711a-46af-9be3-3d28f5a3f5db}.xml index 65725006..e5edc805 100644 --- a/DeltaVRFMOD/Metadata/Event/{ead4a758-711a-46af-9be3-3d28f5a3f5db}.xml +++ b/DeltaVRFMOD/Metadata/Event/{ead4a758-711a-46af-9be3-3d28f5a3f5db}.xml @@ -90,7 +90,7 @@ - 2.6500000000000012 + 2.3799999999999999 0.35000000000000003 @@ -100,6 +100,9 @@ {bb457d7b-62da-41e5-9a38-dc64cf533e9d} {cdd76c1d-9f72-4a72-8074-d2f4b6fc2cb1} + + {c0c01a5c-5f2d-4669-8b5c-4ee696936174} + {5328c5d6-44ab-4638-a72d-20743f838f89} @@ -153,6 +156,14 @@ 0.5 + + + {b2fb1f1d-5401-41f3-bdc0-af2bd70cc79d} + + + {10dfe4c4-3693-4219-8f60-39968d906099} + + {3581fb60-fe20-471b-86ec-5d23a822ea7c} @@ -161,5 +172,24 @@ + + + 1.8 + + + 1 + + + 0.25471893 + + + + + 2.3799999999999999 + + + 0 + + diff --git a/DeltaVRFMOD/Metadata/Event/{edb8b086-c8c2-4f9b-a6c9-c324aa020ad3}.xml b/DeltaVRFMOD/Metadata/Event/{edb8b086-c8c2-4f9b-a6c9-c324aa020ad3}.xml index 265333d5..8249f84d 100644 --- a/DeltaVRFMOD/Metadata/Event/{edb8b086-c8c2-4f9b-a6c9-c324aa020ad3}.xml +++ b/DeltaVRFMOD/Metadata/Event/{edb8b086-c8c2-4f9b-a6c9-c324aa020ad3}.xml @@ -58,7 +58,7 @@ - 2000 + 90 diff --git a/DeltaVRFMOD/Metadata/Event/{f4113020-2cbf-4b8d-8b35-4d57b3da94fb}.xml b/DeltaVRFMOD/Metadata/Event/{f4113020-2cbf-4b8d-8b35-4d57b3da94fb}.xml index 94b064b1..31066712 100644 --- a/DeltaVRFMOD/Metadata/Event/{f4113020-2cbf-4b8d-8b35-4d57b3da94fb}.xml +++ b/DeltaVRFMOD/Metadata/Event/{f4113020-2cbf-4b8d-8b35-4d57b3da94fb}.xml @@ -53,7 +53,7 @@ {903e03c7-f297-4004-9b93-556a9754c8af} - {c751273e-6b77-46b1-8c19-a99f6f08e61e} + {ce68ea24-56d6-4af5-a850-87bda0652ecc} diff --git a/DeltaVRFMOD/Metadata/ParameterPreset/{09b7a108-c526-4e56-a535-055b90acdc95}.xml b/DeltaVRFMOD/Metadata/ParameterPreset/{09b7a108-c526-4e56-a535-055b90acdc95}.xml new file mode 100644 index 00000000..f7759a93 --- /dev/null +++ b/DeltaVRFMOD/Metadata/ParameterPreset/{09b7a108-c526-4e56-a535-055b90acdc95}.xml @@ -0,0 +1,29 @@ + + + + + EasyBoltLogic + + + {72821a40-1f9b-449e-9f29-45c4d8800c81} + + + {c6ed1c8a-6317-4b6e-9c2f-a9de5d998f05} + + + + + 2 + + + 2 + + + Driving + Stopping + + + 0 + + + diff --git a/ProjectSettings/AudioManager.asset b/ProjectSettings/AudioManager.asset index bc6abbd7..ad7daa56 100644 --- a/ProjectSettings/AudioManager.asset +++ b/ProjectSettings/AudioManager.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7105b1e15f990334af69cbdcfaa594a4a4987ca2525675bc70e807344831d95d +oid sha256:15a687c1c7be0e1cc0af97c61ed3a13192e666f1d61fc57280fde6421a8d196e size 446 diff --git a/highscores.json b/highscores.json index fbdf3d31..21381bd8 100644 --- a/highscores.json +++ b/highscores.json @@ -24,6 +24,10 @@ "name": "destro", "score": 332.0 }, + { + "name": "er", + "score": 164.0 + }, { "name": "fdgdggdd", "score": 148.0