diff --git a/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu b/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu index 826a224fe..a502f3c79 100644 --- a/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu +++ b/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu @@ -218,7 +218,62 @@ + + + + + + + + + + + + + + + + + + + + 0 + 0 + 5 + Log3 + + + 1000 + -200 + 37 + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2483,7 +2538,9 @@ + + -7.4 @@ -2506,7 +2563,7 @@ 5 - 1 + 10 0 37 @@ -2541,6 +2598,53 @@ + + + + + + + + + + + + + 0 + 0 + 5 + + + 100 + -200 + 37 + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2553,7 +2657,7 @@ - + @@ -2763,7 +2867,7 @@ - + diff --git a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.validationcache b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.validationcache index 7f572c8a2..aee7726df 100644 --- a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.validationcache +++ b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.validationcache @@ -31,7 +31,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -55,7 +55,7 @@ - - + + diff --git a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.wsettings b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.wsettings index 8832db972..9a5e5685b 100644 --- a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.wsettings +++ b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.wsettings @@ -5,6 +5,9 @@ + + + @@ -15,8 +18,11 @@ + + + @@ -37,9 +43,9 @@ - + - + @@ -74,16 +80,16 @@ - + - + - - + + diff --git a/Aetheria-Economy_WwiseProject/Events/Ship Audio.wwu b/Aetheria-Economy_WwiseProject/Events/Ship Audio.wwu index e6c582bf5..4e308582b 100644 --- a/Aetheria-Economy_WwiseProject/Events/Ship Audio.wwu +++ b/Aetheria-Economy_WwiseProject/Events/Ship Audio.wwu @@ -79,6 +79,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Aetheria-Economy_WwiseProject/Game Parameters/item_properties.wwu b/Aetheria-Economy_WwiseProject/Game Parameters/item_properties.wwu index 1db36c125..a4d85ee06 100644 --- a/Aetheria-Economy_WwiseProject/Game Parameters/item_properties.wwu +++ b/Aetheria-Economy_WwiseProject/Game Parameters/item_properties.wwu @@ -20,22 +20,25 @@ - + - + - + - + + + + diff --git a/Aetheria-Economy_WwiseProject/SoundBanks/Default Work Unit.wwu b/Aetheria-Economy_WwiseProject/SoundBanks/Default Work Unit.wwu index a7382c7e6..98ff9f7c1 100644 --- a/Aetheria-Economy_WwiseProject/SoundBanks/Default Work Unit.wwu +++ b/Aetheria-Economy_WwiseProject/SoundBanks/Default Work Unit.wwu @@ -18,68 +18,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/Assets/Materials/UI/Shield.mat b/Assets/Materials/UI/Shield.mat index 5981cb7dd..2d0ec54ad 100644 --- a/Assets/Materials/UI/Shield.mat +++ b/Assets/Materials/UI/Shield.mat @@ -88,7 +88,7 @@ Material: - _OcclusionStrength: 1 - _OffsetSize: 0.5 - _Parallax: 0.02 - - _Radius: 3.6 + - _Radius: 0.38 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Resources/Prefabs/Ships/Djinni.prefab b/Assets/Resources/Prefabs/Ships/Djinni.prefab index c07ce3058..46f9534a6 100644 --- a/Assets/Resources/Prefabs/Ships/Djinni.prefab +++ b/Assets/Resources/Prefabs/Ships/Djinni.prefab @@ -1732,6 +1732,7 @@ Transform: - {fileID: 253280912000941906} - {fileID: 7393376835743981754} - {fileID: 4372481120480406282} + - {fileID: 2469466822132512704} m_Father: {fileID: 9106854767781449910} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3254,6 +3255,36 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &4207676493251148750 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2469466822132512704} + m_Layer: 0 + m_Name: Reactor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2469466822132512704 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4207676493251148750} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 45, z: 427} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5496325214845933821} + m_RootOrder: 14 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4252398138544919482 GameObject: m_ObjectHideFlags: 0 @@ -6901,6 +6932,8 @@ MonoBehaviour: Shield: {fileID: 1053924711515204557} HullColliders: - {fileID: 7082458133318971407} + EquipmentHardpoints: + - {fileID: 2469466822132512704} RadiatorHardpoints: [] ThrusterHardpoints: - {fileID: 3048427942634017260} @@ -7231,12 +7264,12 @@ PrefabInstance: - target: {fileID: 9112456537762432107, guid: 897fa55d98f1f7f40b889f93ce9146f4, type: 3} propertyPath: m_LocalScale.y - value: 103625.586 + value: 42400 objectReference: {fileID: 0} - target: {fileID: 9112456537762432107, guid: 897fa55d98f1f7f40b889f93ce9146f4, type: 3} propertyPath: m_LocalScale.z - value: 42394.773 + value: 103625.6 objectReference: {fileID: 0} - target: {fileID: 9112456537762432107, guid: 897fa55d98f1f7f40b889f93ce9146f4, type: 3} @@ -7256,12 +7289,12 @@ PrefabInstance: - target: {fileID: 9112456537762432107, guid: 897fa55d98f1f7f40b889f93ce9146f4, type: 3} propertyPath: m_LocalRotation.w - value: 0.7660445 + value: 0.9961947 objectReference: {fileID: 0} - target: {fileID: 9112456537762432107, guid: 897fa55d98f1f7f40b889f93ce9146f4, type: 3} propertyPath: m_LocalRotation.x - value: -0.6427876 + value: 0.08715578 objectReference: {fileID: 0} - target: {fileID: 9112456537762432107, guid: 897fa55d98f1f7f40b889f93ce9146f4, type: 3} @@ -7276,7 +7309,7 @@ PrefabInstance: - target: {fileID: 9112456537762432107, guid: 897fa55d98f1f7f40b889f93ce9146f4, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -80 + value: 10 objectReference: {fileID: 0} - target: {fileID: 9112456537762432107, guid: 897fa55d98f1f7f40b889f93ce9146f4, type: 3} diff --git a/Assets/Resources/Prefabs/Ships/Longinus.prefab b/Assets/Resources/Prefabs/Ships/Longinus.prefab index 3ba781759..515a074db 100644 --- a/Assets/Resources/Prefabs/Ships/Longinus.prefab +++ b/Assets/Resources/Prefabs/Ships/Longinus.prefab @@ -61,6 +61,8 @@ MonoBehaviour: Shield: {fileID: 1396696402015347448} HullColliders: - {fileID: 622200413621136597} + EquipmentHardpoints: + - {fileID: 5919860033273162118} RadiatorHardpoints: - {fileID: 3129773903157032569} - {fileID: 3644514805656464792} @@ -278,6 +280,36 @@ Transform: m_Father: {fileID: 3808243476348176084} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1803454581226085886 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5919860033273162118} + m_Layer: 0 + m_Name: Reactor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5919860033273162118 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1803454581226085886} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0, y: 0.83, z: -2.82} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3808243475646715368} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2196299114121468031 GameObject: m_ObjectHideFlags: 0 @@ -492,6 +524,7 @@ Transform: - {fileID: 3808243475227829746} - {fileID: 2790942369306015874} - {fileID: 8786608379366237548} + - {fileID: 5919860033273162118} m_Father: {fileID: 737798575382408336} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/ARPG.unity b/Assets/Scenes/ARPG.unity index 43adf0183..07b00c4ce 100644 --- a/Assets/Scenes/ARPG.unity +++ b/Assets/Scenes/ARPG.unity @@ -1631,8 +1631,7 @@ MonoBehaviour: data: idInternal: 0 valueGuidInternal: - WwiseObjectReference: {fileID: 11400000, guid: afe2baef276b4b34f98f465e29ce4bfe, - type: 2} + WwiseObjectReference: {fileID: 0} useCallbacks: 0 Callbacks: [] playingId: 0 @@ -7511,6 +7510,64 @@ MonoBehaviour: CopyRotation: 0 PixelSnapCamera: {fileID: 0} PixelSnapIncrement: 1 +--- !u!1 &491219182 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 491219184} + - component: {fileID: 491219183} + m_Layer: 0 + m_Name: WwiseGlobal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &491219183 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 491219182} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a4eab75687879a445a2a2397d86a2172, type: 3} + m_Name: + m_EditorClassIdentifier: + InitializationSettings: {fileID: 11400000, guid: ca1886ece3dfc5e49902e78defccd355, + type: 2} + basePath: + language: + defaultPoolSize: 0 + lowerPoolSize: 0 + streamingPoolSize: 0 + memoryCutoffThreshold: 0 + monitorPoolSize: 0 + monitorQueuePoolSize: 0 + callbackManagerBufferSize: 0 + spatialAudioPoolSize: 0 + maxSoundPropagationDepth: 0 + diffractionFlags: 11 + engineLogging: 0 +--- !u!4 &491219184 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 491219182} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &496438310 GameObject: m_ObjectHideFlags: 0 @@ -15693,62 +15750,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1012981707} m_CullTransparentMesh: 0 ---- !u!1 &1019449640 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1019449642} - - component: {fileID: 1019449643} - m_Layer: 0 - m_Name: WwiseGlobal - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1019449642 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1019449640} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 8 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1019449643 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1019449640} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d1f1a89fa3598c644a67edc70006ab8b, type: 3} - m_Name: - m_EditorClassIdentifier: - triggerList: f7e1664c - useOtherObject: 0 - data: - idInternal: 0 - valueGuidInternal: - WwiseObjectReference: {fileID: 11400000, guid: 1f7596d26fd55df42a4027d547caa78a, - type: 2} - decodeBank: 0 - loadAsynchronous: 0 - saveDecodedBank: 0 - unloadTriggerList: 958ca0ea - bankNameInternal: - valueGuidInternal: --- !u!1 &1029396710 GameObject: m_ObjectHideFlags: 0 @@ -23957,64 +23958,6 @@ MonoBehaviour: TabButtons: {fileID: 1783772015} ActiveTabColor: {r: 1, g: 0.44583336, b: 0.050000012, a: 1} InactiveTabColor: {r: 0.6981132, g: 0.6981132, b: 0.6981132, a: 1} ---- !u!1 &1732078363 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1732078365} - - component: {fileID: 1732078364} - m_Layer: 0 - m_Name: WwiseGlobal - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1732078364 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1732078363} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a4eab75687879a445a2a2397d86a2172, type: 3} - m_Name: - m_EditorClassIdentifier: - InitializationSettings: {fileID: 11400000, guid: ca1886ece3dfc5e49902e78defccd355, - type: 2} - basePath: - language: - defaultPoolSize: 0 - lowerPoolSize: 0 - streamingPoolSize: 0 - memoryCutoffThreshold: 0 - monitorPoolSize: 0 - monitorQueuePoolSize: 0 - callbackManagerBufferSize: 0 - spatialAudioPoolSize: 0 - maxSoundPropagationDepth: 0 - diffractionFlags: 11 - engineLogging: 0 ---- !u!4 &1732078365 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1732078363} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 10 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1733988258 GameObject: m_ObjectHideFlags: 0 @@ -28344,7 +28287,7 @@ Transform: - {fileID: 936330465} - {fileID: 415301831} m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2139956859 GameObject: diff --git a/Assets/Scenes/Main Menu.unity b/Assets/Scenes/Main Menu.unity index 56751dd82..84152c002 100644 --- a/Assets/Scenes/Main Menu.unity +++ b/Assets/Scenes/Main Menu.unity @@ -1302,8 +1302,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 741153267} - m_LocalRotation: {x: 0.015506901, y: 0.9502416, z: -0.30741307, w: 0.047933236} - m_LocalPosition: {x: -117.51998, y: -77.08744, z: 149.09026} + m_LocalRotation: {x: 0.015506897, y: 0.9502416, z: -0.30741316, w: 0.047933206} + m_LocalPosition: {x: -117.52, y: -77.08742, z: 149.09026} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 412917866} @@ -1773,8 +1773,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 965376321} - m_LocalRotation: {x: 0.015506901, y: 0.9502416, z: -0.30741307, w: 0.047933236} - m_LocalPosition: {x: -117.51998, y: -77.08744, z: 149.09026} + m_LocalRotation: {x: 0.015506897, y: 0.9502416, z: -0.30741316, w: 0.047933206} + m_LocalPosition: {x: -117.52, y: -77.08742, z: 149.09026} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -3050,6 +3050,8 @@ GameObject: - component: {fileID: 1854054864} - component: {fileID: 1854054863} - component: {fileID: 1854054865} + - component: {fileID: 1854054867} + - component: {fileID: 1854054866} m_Layer: 0 m_Name: WwiseGlobal m_TagString: Untagged @@ -3110,6 +3112,56 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c3cd207057515c4438a31a6a7b548fe7, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1854054866 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1854054862} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d1f1a89fa3598c644a67edc70006ab8b, type: 3} + m_Name: + m_EditorClassIdentifier: + triggerList: f7e1664c + useOtherObject: 0 + data: + idInternal: 0 + valueGuidInternal: + WwiseObjectReference: {fileID: 11400000, guid: be557f5797521904d8f254bfbd064b49, + type: 2} + decodeBank: 0 + loadAsynchronous: 0 + saveDecodedBank: 0 + unloadTriggerList: + bankNameInternal: + valueGuidInternal: +--- !u!114 &1854054867 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1854054862} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d1f1a89fa3598c644a67edc70006ab8b, type: 3} + m_Name: + m_EditorClassIdentifier: + triggerList: f7e1664c + useOtherObject: 0 + data: + idInternal: 0 + valueGuidInternal: + WwiseObjectReference: {fileID: 11400000, guid: 1f7596d26fd55df42a4027d547caa78a, + type: 2} + decodeBank: 0 + loadAsynchronous: 0 + saveDecodedBank: 0 + unloadTriggerList: + bankNameInternal: + valueGuidInternal: --- !u!1 &1872107548 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs index 840d955d1..c1a1e53e8 100644 --- a/Assets/Scripts/Gameplay/ActionGameManager.cs +++ b/Assets/Scripts/Gameplay/ActionGameManager.cs @@ -257,11 +257,12 @@ public class ActionGameManager : MonoBehaviour { if (length(wormhole.Position - CurrentEntity.Position.xz) < Settings.GameplaySettings.WormholeExitRadius) { + var oldZone = Zone; ship.EnterWormhole(wormhole.Position); ship.OnEnteredWormhole += () => { GenerateLevel(wormhole.Target); - ship.ExitWormhole(ZoneRenderer.WormholeInstances.Keys.First().Position, + ship.ExitWormhole(ZoneRenderer.WormholeInstances.Keys.First(w=>w.Target==Zone.SectorZone).Position, Settings.GameplaySettings.WormholeExitVelocity * ItemManager.Random.NextFloat2Direction()); CurrentEntity.Zone = Zone; }; @@ -477,10 +478,7 @@ public class ActionGameManager : MonoBehaviour if (CurrentEntity != null) { CurrentEntity.Deactivate(); - if (CurrentEntity.Zone != null) - { - CurrentEntity.Zone.Entities.Remove(CurrentEntity); - } + CurrentEntity.Zone?.Entities.Remove(CurrentEntity); CurrentEntity.Zone = Zone; Zone.Entities.Add(CurrentEntity); CurrentEntity.Activate(); diff --git a/Assets/Scripts/Gameplay/EntityInstance.cs b/Assets/Scripts/Gameplay/EntityInstance.cs index 29ffc5157..387f8f831 100644 --- a/Assets/Scripts/Gameplay/EntityInstance.cs +++ b/Assets/Scripts/Gameplay/EntityInstance.cs @@ -15,6 +15,7 @@ public class EntityInstance : MonoBehaviour public ShieldManager Shield; public HullCollider[] HullColliders; + public Transform[] EquipmentHardpoints; public RadiatorHardpoint[] RadiatorHardpoints; public ThrusterHardpoint[] ThrusterHardpoints; public WeaponHardpoint[] WeaponHardpoints; @@ -36,6 +37,9 @@ public class EntityInstance : MonoBehaviour private bool _unfadedElementsVisible = false; private float _fadeTime; + private (Reactor reactor, GameObject sfxSource) _reactor; + private Dictionary _radiatorSfx = new Dictionary(); + private static Dictionary _instantWeaponManagers = new Dictionary(); private static Dictionary _constantWeaponManagers = new Dictionary(); @@ -195,6 +199,39 @@ public class EntityInstance : MonoBehaviour _constantWeaponManagers[data].StopFiring(item); } } + + var hp = Entity.Hardpoints[item.Position.x, item.Position.y]; + if (hp != null && !string.IsNullOrEmpty(item.Data.SoundEffectTrigger)) + { + if(hp.Type == HardpointType.Radiator) + { + var radiatorHardpoint = RadiatorHardpoints.FirstOrDefault(x => x.name == hp.Transform); + if (radiatorHardpoint) + { + var rad = item.GetBehavior(); + if(rad != null && !string.IsNullOrEmpty(item.Data.SoundEffectTrigger)) + { + AkSoundEngine.RegisterGameObj(radiatorHardpoint.gameObject); + AkSoundEngine.PostEvent(item.Data.SoundEffectTrigger, radiatorHardpoint.gameObject); + _radiatorSfx[rad] = radiatorHardpoint.gameObject; + } + } + } + if(hp.Type == HardpointType.Reactor) + { + var reactorHardpoint = EquipmentHardpoints.FirstOrDefault(x => x.name == hp.Transform); + if (reactorHardpoint) + { + var reactor = item.GetBehavior(); + if( reactor != null && !string.IsNullOrEmpty(item.Data.SoundEffectTrigger) ) + { + AkSoundEngine.RegisterGameObj(reactorHardpoint.gameObject); + AkSoundEngine.PostEvent(item.Data.SoundEffectTrigger, reactorHardpoint.gameObject); + _reactor = (reactor, reactorHardpoint.gameObject); + } + } + } + } } RadiatorMeshes = new Dictionary(); Barrels = new Dictionary(); @@ -423,6 +460,23 @@ public class EntityInstance : MonoBehaviour foreach(var material in _fadeMaterials) material.SetFloat("_Fade", _fade); } } + + foreach (var r in _radiatorSfx) + { + r.Value.SetActive(r.Key.Item.Online.Value); + AkSoundEngine.SetRTPCValue("performance_durability", r.Key.Item.DurabilityPerformance, r.Value); + AkSoundEngine.SetRTPCValue("performance_thermal", r.Key.Item.ThermalPerformance, r.Value); + AkSoundEngine.SetRTPCValue("performance_quality", r.Key.Item.ItemManager.CompoundQuality(r.Key.Item.EquippableItem), r.Value); + } + + if (_reactor.reactor != null) + { + _reactor.sfxSource.SetActive(_reactor.reactor.Item.Online.Value); + AkSoundEngine.SetRTPCValue("reactor_load", _reactor.reactor.CurrentLoadRatio, _reactor.sfxSource); + AkSoundEngine.SetRTPCValue("performance_durability", _reactor.reactor.Item.DurabilityPerformance, _reactor.sfxSource); + AkSoundEngine.SetRTPCValue("performance_thermal", _reactor.reactor.Item.ThermalPerformance, _reactor.sfxSource); + AkSoundEngine.SetRTPCValue("performance_quality", _reactor.reactor.Item.ItemManager.CompoundQuality(_reactor.reactor.Item.EquippableItem), _reactor.sfxSource); + } foreach (var x in RadiatorMeshes) { @@ -439,8 +493,19 @@ public class EntityInstance : MonoBehaviour transform.position = Entity.Position; } - private void OnDestroy() + public virtual void OnDestroy() { + foreach (var r in _radiatorSfx) + { + AkSoundEngine.PostEvent(r.Key.Item.Data.SoundEffectTrigger + "_stop", r.Value); + AkSoundEngine.UnregisterGameObj(r.Value); + } + + if (_reactor.reactor != null) + { + AkSoundEngine.PostEvent(_reactor.reactor.Item.Data.SoundEffectTrigger + "_stop", _reactor.sfxSource); + AkSoundEngine.UnregisterGameObj(_reactor.sfxSource); + } foreach(var x in _subscriptions) x.Dispose(); } diff --git a/Assets/Scripts/Gameplay/ShipInstance.cs b/Assets/Scripts/Gameplay/ShipInstance.cs index e74dfbabd..e071a059c 100644 --- a/Assets/Scripts/Gameplay/ShipInstance.cs +++ b/Assets/Scripts/Gameplay/ShipInstance.cs @@ -4,7 +4,16 @@ using UnityEngine; public class ShipInstance : EntityInstance { - public (Thruster effect, ParticleSystem system, float baseEmission)[] Particles; + private class ThrusterInstance + { + public Thruster Thruster; + public GameObject SfxSource; + public ParticleSystem System; + public float BaseEmission; + public int MaxParticleCount; + } + + private ThrusterInstance[] _thrusters; public Ship Ship { get; private set; } @@ -18,40 +27,52 @@ public class ShipInstance : EntityInstance return; } Ship = ship; - Particles = ship.GetBehaviors() - .Select(x => + _thrusters = ship.GetBehaviors().Select(thruster => { - var effectData = (ThrusterData) x.Data; + var effectData = (ThrusterData) thruster.Data; var particles = Instantiate(UnityHelpers.LoadAsset(effectData.ParticlesPrefab), transform, false); var particlesShape = particles.shape; - particlesShape.meshRenderer = ThrusterHardpoints - .FirstOrDefault(t => t.name == x.Entity.Hardpoints[x.Item.Position.x, x.Item.Position.y].Transform) - ?.Emitter; - return (x, particles, particles.emission.rateOverTimeMultiplier); + var thrusterHardpoint = ThrusterHardpoints + .FirstOrDefault(t => t.name == thruster.Entity.Hardpoints[thruster.Item.Position.x, thruster.Item.Position.y].Transform); + particlesShape.meshRenderer = thrusterHardpoint?.Emitter; + if (!string.IsNullOrEmpty(thruster.Item.Data.SoundEffectTrigger) && thrusterHardpoint != null) + { + AkSoundEngine.RegisterGameObj(thrusterHardpoint.gameObject); + AkSoundEngine.PostEvent(thruster.Item.Data.SoundEffectTrigger, thrusterHardpoint.gameObject); + } + + return new ThrusterInstance + { + Thruster = thruster, + SfxSource = thrusterHardpoint?.gameObject, + System = particles, + BaseEmission = particles.emission.rateOverTimeMultiplier, + MaxParticleCount = 0 + }; }) .ToArray(); - foreach (var particle in Particles) + foreach (var particle in _thrusters) { - particle.system.gameObject.SetActive(false); + particle.System.gameObject.SetActive(false); } } protected override void ShowUnfadedElements() { base.ShowUnfadedElements(); - foreach (var particle in Particles) + foreach (var particle in _thrusters) { - particle.system.gameObject.SetActive(true); + particle.System.gameObject.SetActive(true); } } protected override void HideUnfadedElements() { base.HideUnfadedElements(); - foreach (var particle in Particles) + foreach (var particle in _thrusters) { - particle.system.gameObject.SetActive(false); + particle.System.gameObject.SetActive(false); } } @@ -59,14 +80,38 @@ public class ShipInstance : EntityInstance { base.Update(); - foreach (var (effect, system, baseEmission) in Particles) + foreach (var thrusterInstance in _thrusters) { - var emissionModule = system.emission; - var item = effect.Item.EquippableItem; + var emissionModule = thrusterInstance.System.emission; + var item = thrusterInstance.Thruster.Item.EquippableItem; var data = Entity.ItemManager.GetData(item); - emissionModule.rateOverTimeMultiplier = baseEmission * effect.Axis * (item.Durability / data.Durability); + thrusterInstance.MaxParticleCount = thrusterInstance.System.particleCount; + emissionModule.rateOverTimeMultiplier = thrusterInstance.BaseEmission * thrusterInstance.Thruster.Axis * (item.Durability / data.Durability); + if (thrusterInstance.SfxSource) + { + var throttle = 0f; + if (thrusterInstance.System.particleCount > 0) + throttle = (float) thrusterInstance.System.particleCount / thrusterInstance.MaxParticleCount; + AkSoundEngine.SetRTPCValue("thruster_throttle", throttle, thrusterInstance.SfxSource); + AkSoundEngine.SetRTPCValue("performance_durability", thrusterInstance.Thruster.Item.DurabilityPerformance, thrusterInstance.SfxSource); + AkSoundEngine.SetRTPCValue("performance_thermal", thrusterInstance.Thruster.Item.ThermalPerformance, thrusterInstance.SfxSource); + AkSoundEngine.SetRTPCValue("performance_quality", + thrusterInstance.Thruster.Item.ItemManager.CompoundQuality(thrusterInstance.Thruster.Item.EquippableItem), thrusterInstance.SfxSource); + } } transform.rotation = Ship.Rotation; } + + public override void OnDestroy() + { + foreach (var thrusterInstance in _thrusters) + { + if (thrusterInstance.SfxSource) + { + AkSoundEngine.PostEvent(thrusterInstance.Thruster.Item.Data.SoundEffectTrigger + "_stop", thrusterInstance.SfxSource); + AkSoundEngine.UnregisterGameObj(thrusterInstance.SfxSource); + } + } + } } \ No newline at end of file diff --git a/Assets/Scripts/ServerShared/Behaviors/Reactor.cs b/Assets/Scripts/ServerShared/Behaviors/Reactor.cs index 9f2d3c3f7..0892b83ce 100644 --- a/Assets/Scripts/ServerShared/Behaviors/Reactor.cs +++ b/Assets/Scripts/ServerShared/Behaviors/Reactor.cs @@ -40,6 +40,8 @@ public class Reactor : IBehavior, IOrderedBehavior public ItemManager Context { get; } public float Draw { get; private set; } + + public float CurrentLoadRatio { get; private set; } public int Order => 100; @@ -64,7 +66,6 @@ public class Reactor : IBehavior, IOrderedBehavior var capacitor = onRemove.Value.GetBehavior(); if (capacitor != null) _capacitors.Remove(capacitor); }); - } public void ConsumeEnergy(float energy) @@ -78,7 +79,8 @@ public class Reactor : IBehavior, IOrderedBehavior var efficiency = Item.Evaluate(_data.Efficiency); // This behavior executes last, so any components drawing power have already done so - + + CurrentLoadRatio = Draw / max(charge, .01f); // Subtract the baseline charge from draw Draw -= charge; diff --git a/Assets/Scripts/ServerShared/Entity.cs b/Assets/Scripts/ServerShared/Entity.cs index a6b4f5b8c..eb4adffa3 100644 --- a/Assets/Scripts/ServerShared/Entity.cs +++ b/Assets/Scripts/ServerShared/Entity.cs @@ -907,7 +907,7 @@ public class EquippedItem public ReadOnlyReactiveProperty Online { get; } public ReactiveProperty Enabled { get; } = new ReactiveProperty(true); public ReadOnlyReactiveProperty Active { get; } - + public ItemManager ItemManager { get; } public float Temperature { @@ -919,20 +919,18 @@ public class EquippedItem } } - - protected readonly ItemManager _itemManager; //private bool _online; public EquippedItem(ItemManager itemManager, EquippableItem item, int2 position, Entity entity) { - _itemManager = itemManager; - Data = _itemManager.GetData(item); + ItemManager = itemManager; + Data = ItemManager.GetData(item); Entity = entity; EquippableItem = item; Position = position; Conductivity = Data.Conductivity; - ThermalExponent = _itemManager.Evaluate(Data.HeatExponent, EquippableItem); - DurabilityExponent = _itemManager.Evaluate(Data.DurabilityExponent, EquippableItem); + ThermalExponent = ItemManager.Evaluate(Data.HeatExponent, EquippableItem); + DurabilityExponent = ItemManager.Evaluate(Data.DurabilityExponent, EquippableItem); var hullData = itemManager.GetData(entity.Hull); InsetShape = hullData.Shape.Inset(Data.Shape, position, item.Rotation); @@ -971,7 +969,7 @@ public class EquippedItem var durability = 1f; if(stat.DurabilityDependent) durability = pow(DurabilityPerformance, DurabilityExponent); - var quality = pow(_itemManager.Quality(stat, EquippableItem), stat.QualityExponent); + var quality = pow(ItemManager.Quality(stat, EquippableItem), stat.QualityExponent); var scaleModifier = 1.0f; foreach (var value in stat.GetScaleModifiers(Entity).Values) scaleModifier = scaleModifier * value; @@ -1001,8 +999,8 @@ public class EquippedItem DurabilityPerformance = EquippableItem.Durability / Data.Durability; var performanceThreshold = Entity.Settings.ShutdownPerformance; Wear = (1 - pow(Data.Performance(temp), - (1 - pow(_itemManager.CompoundQuality(EquippableItem), _itemManager.GameplaySettings.QualityWearExponent)) * - _itemManager.GameplaySettings.ThermalWearExponent) + (1 - pow(ItemManager.CompoundQuality(EquippableItem), ItemManager.GameplaySettings.QualityWearExponent)) * + ItemManager.GameplaySettings.ThermalWearExponent) ) * Data.Durability / Data.ThermalResilience; ThermalOnline.Value = ThermalPerformance > performanceThreshold || Entity.OverrideShutdown && EquippableItem.OverrideShutdown; DurabilityOnline.Value = EquippableItem.Durability > .01f; @@ -1045,7 +1043,7 @@ public class EquippedCargoBay : EquippedItem public EquippedCargoBay(ItemManager itemManager, EquippableItem item, int2 position, Entity entity, string name) : base(itemManager, item, position, entity) { - Data = _itemManager.GetData(EquippableItem) as CargoBayData; + Data = ItemManager.GetData(EquippableItem) as CargoBayData; Name = name; Mass = Data.Mass; @@ -1057,7 +1055,7 @@ public class EquippedCargoBay : EquippedItem // Check whether the given item will fit when its origin is placed at the given coordinate public bool ItemFits(ItemInstance item, int2 cargoCoord) { - var itemData = _itemManager.GetData(item); + var itemData = ItemManager.GetData(item); // Check every cell of the item's shape foreach (var i in itemData.Shape.Coordinates) { @@ -1084,7 +1082,7 @@ public class EquippedCargoBay : EquippedItem public bool TryFindSpace(SimpleCommodity item, out List positions) { positions = new List(); - var itemData = _itemManager.GetData(item); + var itemData = ItemManager.GetData(item); var remainingQuantity = item.Quantity; // For simple commodities, search for existing item stacks to add to @@ -1170,7 +1168,7 @@ public class EquippedCargoBay : EquippedItem // Returns true only when ALL of the items are successfully stored public bool TryStore(SimpleCommodity item, int2 cargoCoord) { - var itemData = _itemManager.GetData(item); + var itemData = ItemManager.GetData(item); if (ItemFits(item, cargoCoord)) { foreach (var p in itemData.Shape.Coordinates) @@ -1203,8 +1201,8 @@ public class EquippedCargoBay : EquippedItem } else return false; - Mass += _itemManager.GetMass(item); - ThermalMass += _itemManager.GetThermalMass(item); + Mass += ItemManager.GetMass(item); + ThermalMass += ItemManager.GetThermalMass(item); return true; } @@ -1216,7 +1214,7 @@ public class EquippedCargoBay : EquippedItem { if (!ItemFits(item, cargoCoord)) return false; - var itemData = _itemManager.GetData(item); + var itemData = ItemManager.GetData(item); foreach (var p in itemData.Shape.Coordinates) { var pos = cargoCoord + itemData.Shape.Rotate(p, item.Rotation); @@ -1228,8 +1226,8 @@ public class EquippedCargoBay : EquippedItem ItemsOfType[item.Data] = new List(); ItemsOfType[item.Data].Add(item); - Mass += _itemManager.GetMass(item); - ThermalMass += _itemManager.GetThermalMass(item); + Mass += ItemManager.GetMass(item); + ThermalMass += ItemManager.GetThermalMass(item); return true; } @@ -1238,10 +1236,10 @@ public class EquippedCargoBay : EquippedItem { if (!Cargo.ContainsKey(item)) { - _itemManager.Log("Attempted to remove item from a cargo bay that it wasn't even in! Something went wrong here!"); + ItemManager.Log("Attempted to remove item from a cargo bay that it wasn't even in! Something went wrong here!"); return null; } - var itemData = _itemManager.GetData(item); + var itemData = ItemManager.GetData(item); if(quantity >= item.Quantity) { foreach(var v in Data.InteriorShape.Coordinates) @@ -1253,8 +1251,8 @@ public class EquippedCargoBay : EquippedItem if (!ItemsOfType[item.Data].Any()) ItemsOfType.Remove(item.Data); - Mass -= _itemManager.GetMass(item); - ThermalMass -= _itemManager.GetThermalMass(item); + Mass -= ItemManager.GetMass(item); + ThermalMass -= ItemManager.GetThermalMass(item); return item; } @@ -1269,10 +1267,10 @@ public class EquippedCargoBay : EquippedItem { if (!Cargo.ContainsKey(item)) { - _itemManager.Log("Attempted to remove item from a cargo bay that it wasn't even in! Something went wrong here!"); + ItemManager.Log("Attempted to remove item from a cargo bay that it wasn't even in! Something went wrong here!"); return; } - var itemData = _itemManager.GetData(item); + var itemData = ItemManager.GetData(item); foreach(var v in Data.InteriorShape.Coordinates) if (Occupancy[v.x, v.y] == item) Occupancy[v.x, v.y] = null; @@ -1282,8 +1280,8 @@ public class EquippedCargoBay : EquippedItem if (!ItemsOfType[item.Data].Any()) ItemsOfType.Remove(item.Data); - Mass -= _itemManager.GetMass(item); - ThermalMass -= _itemManager.GetThermalMass(item); + Mass -= ItemManager.GetMass(item); + ThermalMass -= ItemManager.GetThermalMass(item); } public void Remove(ItemInstance item) @@ -1298,7 +1296,7 @@ public class EquippedCargoBay : EquippedItem { if (!Cargo.ContainsKey(item)) { - _itemManager.Log("Attempted to remove item from a cargo bay that it wasn't even in! Something went wrong here!"); + ItemManager.Log("Attempted to remove item from a cargo bay that it wasn't even in! Something went wrong here!"); return false; } @@ -1316,7 +1314,7 @@ public class EquippedCargoBay : EquippedItem { if (!Cargo.ContainsKey(item)) { - _itemManager.Log("Attempted to remove item from a cargo bay that it wasn't even in! Something went wrong here!"); + ItemManager.Log("Attempted to remove item from a cargo bay that it wasn't even in! Something went wrong here!"); return false; } @@ -1333,7 +1331,7 @@ public class EquippedDockingBay : EquippedCargoBay private DockingBayData _data; public EquippedDockingBay(ItemManager itemManager, EquippableItem item, int2 position, Entity entity, string name) : base(itemManager, item, position, entity, name) { - _data = _itemManager.GetData(EquippableItem) as DockingBayData; + _data = ItemManager.GetData(EquippableItem) as DockingBayData; } } diff --git a/Assets/Scripts/ServerShared/ItemData.cs b/Assets/Scripts/ServerShared/ItemData.cs index bfbf6bd9f..080cc5fe9 100644 --- a/Assets/Scripts/ServerShared/ItemData.cs +++ b/Assets/Scripts/ServerShared/ItemData.cs @@ -300,6 +300,9 @@ public abstract class EquippableItemData : CraftedItemData [InspectableField, JsonProperty("resilience"), Key(18)] public float ThermalResilience = 1; + [InspectableField, JsonProperty("sfx"), Key(19)] + public string SoundEffectTrigger; + [IgnoreMember] public abstract HardpointType HardpointType { get; } @@ -341,7 +344,7 @@ public abstract class EquippableItemData : CraftedItemData [RethinkTable("Items"), Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)] public class GearData : EquippableItemData { - [InspectableField, JsonProperty("hardpointType"), Key(19)] + [InspectableField, JsonProperty("hardpointType"), Key(20)] public HardpointType Hardpoint; [IgnoreMember] public override HardpointType HardpointType => Hardpoint; @@ -350,7 +353,7 @@ public class GearData : EquippableItemData [RethinkTable("Items"), Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)] public class CargoBayData : EquippableItemData { - [InspectableField, JsonProperty("interiorShape"), Key(19)] + [InspectableField, JsonProperty("interiorShape"), Key(20)] public Shape InteriorShape; [IgnoreMember] public override HardpointType HardpointType => HardpointType.Tool; } @@ -358,7 +361,7 @@ public class CargoBayData : EquippableItemData [RethinkTable("Items"), Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)] public class DockingBayData : CargoBayData { - [InspectableField, JsonProperty("maxSize"), Key(20)] + [InspectableField, JsonProperty("maxSize"), Key(21)] public int2 MaxSize; [IgnoreMember] public override HardpointType HardpointType => HardpointType.Tool; } @@ -366,19 +369,19 @@ public class DockingBayData : CargoBayData [RethinkTable("Items"), Inspectable, MessagePackObject, JsonObject(MemberSerialization.OptIn)] public class HullData : EquippableItemData { - [InspectableField, JsonProperty("hardpoints"), Key(19)] + [InspectableField, JsonProperty("hardpoints"), Key(20)] public List Hardpoints = new List(); - [InspectablePrefab, JsonProperty("prefab"), Key(20)] + [InspectablePrefab, JsonProperty("prefab"), Key(21)] public string Prefab; - [InspectableField, JsonProperty("hullType"), Key(21)] + [InspectableField, JsonProperty("hullType"), Key(22)] public HullType HullType; - [InspectableField, JsonProperty("gridOffset"), Key(22)] + [InspectableField, JsonProperty("gridOffset"), Key(23)] public float GridOffset; - [InspectableField, JsonProperty("armor"), Key(23)] + [InspectableField, JsonProperty("armor"), Key(24)] public float Armor; [IgnoreMember] diff --git a/Assets/Scripts/ServerShared/Ship.cs b/Assets/Scripts/ServerShared/Ship.cs index 61d4e5be1..fe754cc98 100644 --- a/Assets/Scripts/ServerShared/Ship.cs +++ b/Assets/Scripts/ServerShared/Ship.cs @@ -233,9 +233,9 @@ public class Ship : Entity public override void Update(float delta) { + foreach (var thruster in _allThrusters) thruster.Axis = 0; if (_active && !_exitingWormhole && !_enteringWormhole) { - foreach (var thruster in _allThrusters) thruster.Axis = 0; var rightThrusterTorqueCompensation = abs(RightStrafeTotalTorque) / RightStrafeTorqueThrusters.Length; foreach (var thruster in _rightThrusters) { diff --git a/Assets/StreamingAssets/Audio/GeneratedSoundBanks/Wwise_IDs.h b/Assets/StreamingAssets/Audio/GeneratedSoundBanks/Wwise_IDs.h index 15485846c..f693d8e4a 100644 --- a/Assets/StreamingAssets/Audio/GeneratedSoundBanks/Wwise_IDs.h +++ b/Assets/StreamingAssets/Audio/GeneratedSoundBanks/Wwise_IDs.h @@ -19,10 +19,14 @@ namespace AK static const AkUniqueID EQUIP = 2412608643U; static const AkUniqueID PICKUP = 3978245845U; static const AkUniqueID REACTOR_TYPE01 = 108700025U; + static const AkUniqueID REACTOR_TYPE01_STOP = 1226299660U; static const AkUniqueID TEST_SPASHIP_FULL_UNIT = 937212177U; static const AkUniqueID THRUSTER_LARGE = 2370087034U; + static const AkUniqueID THRUSTER_LARGE_STOP = 1006509321U; static const AkUniqueID THRUSTER_MEDIUM = 2528260676U; + static const AkUniqueID THRUSTER_MEDIUM_STOP = 2044992675U; static const AkUniqueID THRUSTER_SMALL = 1944968294U; + static const AkUniqueID THRUSTER_SMALL_STOP = 1154341749U; static const AkUniqueID UI_FAIL = 3050276906U; static const AkUniqueID UI_SUCCESS = 981465891U; static const AkUniqueID UNDOCK = 2826728501U; @@ -36,7 +40,7 @@ namespace AK { static const AkUniqueID PERFORMANCE_DURABILITY = 965148665U; static const AkUniqueID PERFORMANCE_QUALITY = 875134311U; - static const AkUniqueID PERFORMANCE_TEMPERATURE = 2129580506U; + static const AkUniqueID PERFORMANCE_THERMAL = 3835443961U; static const AkUniqueID REACTOR_LOAD = 3735272724U; static const AkUniqueID SHIP_VELOCITY = 3579545711U; static const AkUniqueID THRUSTER_THROTTLE = 4116566921U; @@ -45,12 +49,8 @@ namespace AK namespace BANKS { static const AkUniqueID INIT = 1355168291U; - static const AkUniqueID REACTOR_TYPE01 = 108700025U; - static const AkUniqueID THRUSTER_LARGE = 2370087034U; - static const AkUniqueID THRUSTER_MEDIUM = 2528260676U; - static const AkUniqueID THRUSTER_SMALL = 1944968294U; + static const AkUniqueID SHIP = 284967655U; static const AkUniqueID UI = 1551306167U; - static const AkUniqueID WORMHOLE = 1857378326U; } // namespace BANKS namespace BUSSES diff --git a/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset b/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset index 670df43a5..c09f13395 100644 --- a/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset +++ b/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f2aa52e203e7ee70723acc6de6331565f9f88981df9a8ce669a001ff820aa78 -size 15474 +oid sha256:67c95be1d91ffcc7ca6f923b3dae3a25da31f21e79cd3739f2509b216470b591 +size 11582 diff --git a/Assets/Wwise/ScriptableObjects/Soundbank/FA8840A4-46A9-455E-BF88-D7239E2E6D72.asset b/Assets/Wwise/ScriptableObjects/Soundbank/FA8840A4-46A9-455E-BF88-D7239E2E6D72.asset new file mode 100644 index 000000000..80344d6e2 --- /dev/null +++ b/Assets/Wwise/ScriptableObjects/Soundbank/FA8840A4-46A9-455E-BF88-D7239E2E6D72.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b618cb47fb1eadcc2477deb15cb474adaf81c9d2d7a4ee7ba2149aa4fa7a8a6 +size 505 diff --git a/Assets/Wwise/ScriptableObjects/Soundbank/FA8840A4-46A9-455E-BF88-D7239E2E6D72.asset.meta b/Assets/Wwise/ScriptableObjects/Soundbank/FA8840A4-46A9-455E-BF88-D7239E2E6D72.asset.meta new file mode 100644 index 000000000..76b86042f --- /dev/null +++ b/Assets/Wwise/ScriptableObjects/Soundbank/FA8840A4-46A9-455E-BF88-D7239E2E6D72.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: be557f5797521904d8f254bfbd064b49 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/GameData/AetherDB.msgpack b/GameData/AetherDB.msgpack index 43017a734..8bf85b4a3 100644 --- a/GameData/AetherDB.msgpack +++ b/GameData/AetherDB.msgpack @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0aa8d5d3d4894a1b95b03ea24379428ddbcd7861bb32538d68a8a72c5f81c2eb -size 65821 +oid sha256:26edb1f3eef434e3536ef34d876a1f3111351d75d4ad48606cd0e538ad4e2e80 +size 65945 diff --git a/GameData/PlayerSettings.msgpack b/GameData/PlayerSettings.msgpack index 66c99f543..bcde497f7 100644 --- a/GameData/PlayerSettings.msgpack +++ b/GameData/PlayerSettings.msgpack @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7dd401bd5adc4bf7ef630cb63e86541d997693ce7d1c3d81e1ddf065aa1335c5 -size 39265 +oid sha256:9ddaff12d5044010cede9de232964c53fe64ef814da977d989540f70b59efbd9 +size 54152