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 a502f3c79..e49771045 100644
--- a/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu
+++ b/Aetheria-Economy_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu
@@ -205,10 +205,14 @@
+
+
+
+
@@ -224,15 +228,15 @@
-
-
+
+
-
+
-
+
@@ -244,7 +248,7 @@
Log3
- 1000
+ 2000
-200
37
@@ -284,6 +288,7 @@
+
2.8
@@ -2535,15 +2540,17 @@
+
+
+
-
- -7.4
+ 0.6
@@ -2559,9 +2566,14 @@
0
- -200
+ -12.14909
5
+
+ 1
+ -5
+ 0
+
10
0
@@ -2601,10 +2613,13 @@
+
+
+
-
+
@@ -2615,7 +2630,7 @@
5
- 100
+ 1000
-200
37
@@ -2852,6 +2867,9 @@
SFX
+
+
+
diff --git a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.validationcache b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.validationcache
index aee7726df..f920187cd 100644
--- a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.validationcache
+++ b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.validationcache
@@ -31,7 +31,7 @@
-
+
@@ -41,11 +41,11 @@
-
+
-
-
+
+
@@ -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 9a5e5685b..b5b96f927 100644
--- a/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.wsettings
+++ b/Aetheria-Economy_WwiseProject/Aetheria-Economy_WwiseProject.rwvens.wsettings
@@ -36,6 +36,14 @@
GeneratedSoundBanks\Windows\
+
+
+
+
+
+
+
+
@@ -43,7 +51,7 @@
-
+
diff --git a/Aetheria-Economy_WwiseProject/Attenuations/Default Work Unit.wwu b/Aetheria-Economy_WwiseProject/Attenuations/Default Work Unit.wwu
index 8e8de78b8..eb07fdfe7 100644
--- a/Aetheria-Economy_WwiseProject/Attenuations/Default Work Unit.wwu
+++ b/Aetheria-Economy_WwiseProject/Attenuations/Default Work Unit.wwu
@@ -1,6 +1,56 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ 0
+ 5
+ Log3
+
+
+ 2000
+ -200
+ 37
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Assets/Materials/UI/Map Gravity Lines.mat b/Assets/Materials/UI/Map Gravity Lines.mat
index 58ee0a10b..90090842b 100644
--- a/Assets/Materials/UI/Map Gravity Lines.mat
+++ b/Assets/Materials/UI/Map Gravity Lines.mat
@@ -86,7 +86,7 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- - _Scale: 5.978973
+ - _Scale: 6.029707
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
diff --git a/Assets/Scenes/ARPG.unity b/Assets/Scenes/ARPG.unity
index 07b00c4ce..8685cffa9 100644
--- a/Assets/Scenes/ARPG.unity
+++ b/Assets/Scenes/ARPG.unity
@@ -15030,8 +15030,6 @@ GameObject:
m_Component:
- component: {fileID: 1005979865}
- component: {fileID: 1005979868}
- - component: {fileID: 1005979867}
- - component: {fileID: 1005979866}
m_Layer: 0
m_Name: Influence Camera
m_TagString: MainCamera
@@ -15053,42 +15051,6 @@ Transform:
m_Father: {fileID: 1665127616}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1005979866
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1005979864}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 4ae335524e949404bb57f1612ec4b9b5, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- isDefaultListener: 1
- listenerId: 0
---- !u!114 &1005979867
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1005979864}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: f27db6b94e477054e96392f94dc50c9d, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_listeners:
- initialListenerList: []
- useDefaultListeners: 1
- isEnvironmentAware: 0
- isStaticObject: 0
- m_positionOffsetData:
- KeepMe: 0
- positionOffset: {x: 0, y: 0, z: 0}
- m_posOffsetData: {fileID: 0}
- listenerMask: 1
--- !u!20 &1005979868
Camera:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Gameplay/EntityInstance.cs b/Assets/Scripts/Gameplay/EntityInstance.cs
index 387f8f831..e64e082ac 100644
--- a/Assets/Scripts/Gameplay/EntityInstance.cs
+++ b/Assets/Scripts/Gameplay/EntityInstance.cs
@@ -464,6 +464,7 @@ public class EntityInstance : MonoBehaviour
foreach (var r in _radiatorSfx)
{
r.Value.SetActive(r.Key.Item.Online.Value);
+ AkSoundEngine.SetObjectPosition(r.Value, r.Value.transform);
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);
@@ -472,6 +473,7 @@ public class EntityInstance : MonoBehaviour
if (_reactor.reactor != null)
{
_reactor.sfxSource.SetActive(_reactor.reactor.Item.Online.Value);
+ AkSoundEngine.SetObjectPosition(_reactor.sfxSource, _reactor.sfxSource.transform);
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);
diff --git a/Assets/Scripts/Gameplay/ShipInstance.cs b/Assets/Scripts/Gameplay/ShipInstance.cs
index e071a059c..2c498a878 100644
--- a/Assets/Scripts/Gameplay/ShipInstance.cs
+++ b/Assets/Scripts/Gameplay/ShipInstance.cs
@@ -92,6 +92,7 @@ public class ShipInstance : EntityInstance
var throttle = 0f;
if (thrusterInstance.System.particleCount > 0)
throttle = (float) thrusterInstance.System.particleCount / thrusterInstance.MaxParticleCount;
+ AkSoundEngine.SetObjectPosition(thrusterInstance.SfxSource, thrusterInstance.SfxSource.transform);
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);
diff --git a/Assets/Scripts/ServerShared/Behaviors/Reactor.cs b/Assets/Scripts/ServerShared/Behaviors/Reactor.cs
index 0892b83ce..81fbc69d0 100644
--- a/Assets/Scripts/ServerShared/Behaviors/Reactor.cs
+++ b/Assets/Scripts/ServerShared/Behaviors/Reactor.cs
@@ -80,7 +80,6 @@ public class Reactor : IBehavior, IOrderedBehavior
// 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;
@@ -90,6 +89,7 @@ public class Reactor : IBehavior, IOrderedBehavior
// We have an energy deficit, have to overload the reactor
if (Draw > .01f)
{
+ CurrentLoadRatio = (Draw + charge) / max(charge, .01f);
var overloadEfficiency = Item.Evaluate(_data.OverloadEfficiency);
// Generate heat using overload efficiency, usually much less efficient!
@@ -122,9 +122,14 @@ public class Reactor : IBehavior, IOrderedBehavior
// We still have an energy surplus, try to throttle the reactor to reduce heat generation
if (Draw < -.01f)
{
+ CurrentLoadRatio = (Draw + charge) / max(charge, .01f);
heat -= Draw / efficiency * (1 - 1 / Item.Evaluate(_data.ThrottlingFactor));
Draw = 0;
}
+ else
+ {
+ CurrentLoadRatio = 1;
+ }
Item.AddHeat(heat);
return true;
diff --git a/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset b/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset
index c09f13395..9fed3e2c2 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:67c95be1d91ffcc7ca6f923b3dae3a25da31f21e79cd3739f2509b216470b591
-size 11582
+oid sha256:046c09c95561993e756c90bbf1979b530523e0f0ac4d4e55e4cdf2dad815e833
+size 13259
diff --git a/GameData/PlayerSettings.msgpack b/GameData/PlayerSettings.msgpack
index bcde497f7..906687b1e 100644
--- a/GameData/PlayerSettings.msgpack
+++ b/GameData/PlayerSettings.msgpack
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:9ddaff12d5044010cede9de232964c53fe64ef814da977d989540f70b59efbd9
+oid sha256:11f7d6b0debd0e6e44a1f6d7d804e56986cee0eca5d0370f87f782658befcb82
size 54152