Bläddra i källkod

Stabilization/2305 (as of 4/4/2023) -> development (#305)

Olex Lozitskiy 2 år sedan
förälder
incheckning
4cee1b11a0
93 ändrade filer med 7773 tillägg och 2068 borttagningar
  1. 2 0
      Gem/Code/CMakeLists.txt
  2. 0 1
      Gem/Code/Include/PlayerMatchLifecycleBus.h
  3. 3 1
      Gem/Code/Source/AutoGen/EnergyCannonComponent.AutoComponent.xml
  4. 16 0
      Gem/Code/Source/AutoGen/GemSpawnerComponent.AutoComponent.xml
  5. 5 1
      Gem/Code/Source/AutoGen/NetworkMatchComponent.AutoComponent.xml
  6. 1 1
      Gem/Code/Source/AutoGen/NetworkPlayerMovementComponent.AutoComponent.xml
  7. 9 3
      Gem/Code/Source/Components/Multiplayer/EnergyCannonComponent.cpp
  8. 7 1
      Gem/Code/Source/Components/Multiplayer/EnergyCannonComponent.h
  9. 42 12
      Gem/Code/Source/Components/Multiplayer/GemSpawnerComponent.cpp
  10. 11 3
      Gem/Code/Source/Components/Multiplayer/GemSpawnerComponent.h
  11. 1 0
      Gem/Code/Source/Components/Multiplayer/PlayerIdentityComponent.cpp
  12. 1 1
      Gem/Code/Source/Components/NetworkAnimationComponent.cpp
  13. 105 24
      Gem/Code/Source/Components/NetworkMatchComponent.cpp
  14. 11 0
      Gem/Code/Source/Components/NetworkMatchComponent.h
  15. 11 17
      Gem/Code/Source/Components/NetworkPlayerMovementComponent.cpp
  16. 3 3
      Gem/Code/Source/Components/NetworkTeleportCompatibleComponent.cpp
  17. 36 6
      Gem/Code/Source/Components/UI/HUDComponent.cpp
  18. 17 3
      Gem/Code/Source/Components/UI/HUDComponent.h
  19. 14 5
      Gem/Code/Source/Components/UI/UiGameOverComponent.cpp
  20. 2 11
      Gem/Code/Source/Components/UI/UiGameOverComponent.h
  21. 1 1
      Gem/Code/Source/Effects/GameEffect.cpp
  22. 10 16
      Gem/Code/Source/GameState/GameStateMatchEnded.cpp
  23. 2 5
      Gem/Code/Source/GameState/GameStateMatchEnded.h
  24. 19 1
      Gem/Code/Source/GameState/GameStateWaitingForPlayers.cpp
  25. 8 0
      Gem/Code/Source/GameState/GameStateWaitingForPlayers.h
  26. 0 9
      Gem/Code/multiplayersample_files.cmake
  27. 17 0
      Gem/Code/multiplayersample_server_files.cmake
  28. 1673 3
      Levels/GameplayTest/GameplayTest.prefab
  29. 21 9
      Levels/NewStarbase/NewStarbase.prefab
  30. 248 59
      Levels/Prefab-Test/Prefab-Test.prefab
  31. 2 2
      PopcornFX/Particles/EnergyBallTrap/FX_EnergyBallTrap_BuildUp.pkfx
  32. 70 15
      Prefabs/Energy_Cannon_with_Energy_Ball.prefab
  33. 2 2
      Prefabs/Ground_Teleport_Volume.prefab
  34. 379 0
      Prefabs/Player_Drop_Gem.prefab
  35. 26 13
      Registry/multiplayersample.setreg
  36. 2 2
      Sounds/wwise/Init.bnk
  37. 2 2
      Sounds/wwise/MultiplayerSample_SoundBank.bnk
  38. 143 0
      Sounds/wwise/Wwise_IDs.h
  39. 281 23
      Sounds/wwise_project/Actor-Mixer Hierarchy/AMPS/INT.wwu
  40. 246 1
      Sounds/wwise_project/Actor-Mixer Hierarchy/AMPS/LVL.wwu
  41. 982 426
      Sounds/wwise_project/Actor-Mixer Hierarchy/AMPS/Player.wwu
  42. 42 1
      Sounds/wwise_project/Actor-Mixer Hierarchy/AMPS/SX.wwu
  43. 1 0
      Sounds/wwise_project/Actor-Mixer Hierarchy/AMPS/UI.wwu
  44. 102 109
      Sounds/wwise_project/Actor-Mixer Hierarchy/AMPS/WPN.wwu
  45. 1167 12
      Sounds/wwise_project/Attenuations/AMPS.wwu
  46. 13 569
      Sounds/wwise_project/Attenuations/ATN_Defaults.wwu
  47. 57 1
      Sounds/wwise_project/Events/AMPS/AMB.wwu
  48. 54 0
      Sounds/wwise_project/Events/AMPS/ENV.wwu
  49. 120 0
      Sounds/wwise_project/Events/AMPS/INT.wwu
  50. 6 6
      Sounds/wwise_project/Events/AMPS/PLAYER.wwu
  51. 10 0
      Sounds/wwise_project/Game Parameters/AMPS/Gameplay.wwu
  52. 15 0
      Sounds/wwise_project/Game Parameters/AMPS/Physics.wwu
  53. 6 3
      Sounds/wwise_project/Game Parameters/AMPS/VolumeControls.wwu
  54. 3 0
      Sounds/wwise_project/GeneratedSoundBanks/Windows/Init.bnk
  55. 3 0
      Sounds/wwise_project/GeneratedSoundBanks/Windows/MultiplayerSample_SoundBank.bnk
  56. 1 1
      Sounds/wwise_project/Master-Mixer Hierarchy/AMPS/AMPS.wwu
  57. 30 2
      Sounds/wwise_project/Master-Mixer Hierarchy/AMPS/Mixer_Main.wwu
  58. 3 0
      Sounds/wwise_project/Originals/SFX/Hexany/LVL/sx_amb_ext_generalWindLoop_01.wav
  59. 3 0
      Sounds/wwise_project/Originals/SFX/Hexany/LVL/sx_env_lamp_loop_01.wav
  60. 3 0
      Sounds/wwise_project/Originals/SFX/Hexany/LVL/sx_env_lamp_loop_02.wav
  61. 3 0
      Sounds/wwise_project/Originals/SFX/Hexany/LVL/sx_env_lamp_loop_03.wav
  62. 3 0
      Sounds/wwise_project/Originals/SFX/Hexany/LVL/sx_env_lamp_loop_04.wav
  63. 3 0
      Sounds/wwise_project/Originals/SFX/Hexany/LVL/sx_env_lamp_loop_05.wav
  64. 2 2
      Sounds/wwise_project/Originals/SFX/Hexany/laserPistol/sx_wpn_laserPistol_fire_01.wav
  65. 2 2
      Sounds/wwise_project/Originals/SFX/Hexany/laserPistol/sx_wpn_laserPistol_fire_02.wav
  66. 2 2
      Sounds/wwise_project/Originals/SFX/Hexany/laserPistol/sx_wpn_laserPistol_fire_03.wav
  67. 2 2
      Sounds/wwise_project/Originals/SFX/Hexany/laserPistol/sx_wpn_laserPistol_fire_04.wav
  68. 2 2
      Sounds/wwise_project/Originals/SFX/Hexany/laserPistol/sx_wpn_laserPistol_fire_05.wav
  69. 2 2
      Sounds/wwise_project/Originals/SFX/Hexany/laserPistol/sx_wpn_laserPistol_fire_06.wav
  70. 3 0
      Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_foley_knockdown_01.wav
  71. 3 0
      Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_shieldBreak_01.wav
  72. 3 0
      Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_shieldBreak_02.wav
  73. 3 0
      Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_shieldBreak_03.wav
  74. 3 0
      Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_vocal_exert_01.wav
  75. 3 0
      Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_vocal_exert_02.wav
  76. 3 0
      Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_vocal_exert_03.wav
  77. 3 0
      Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_vocal_exert_04.wav
  78. 3 0
      Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_vocal_exert_05.wav
  79. 3 0
      Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_vocal_exert_06.wav
  80. 3 0
      Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_vocal_pain_01.wav
  81. 3 0
      Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_vocal_pain_02.wav
  82. 3 0
      Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_vocal_pain_03.wav
  83. 3 0
      Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_vocal_pain_04.wav
  84. 3 0
      Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_vocal_pain_05.wav
  85. 3 0
      Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_vocal_pain_06.wav
  86. 3 0
      Sounds/wwise_project/Originals/SFX/Hexany/teleporter/sx_int_teleporter_activate_01.wav
  87. 3 0
      Sounds/wwise_project/Originals/SFX/Hexany/teleporter/sx_int_teleporter_loop_01.wav
  88. 110 1
      Sounds/wwise_project/Soundcaster Sessions/Default Work Unit.wwu
  89. 1450 142
      UICanvases/BasicHUD.uicanvas
  90. 0 485
      UICanvases/HUD.uicanvas
  91. 2 2
      UICanvases/UiFx/PlayerHitFlash.png
  92. 9 10
      libs/gameaudio/wwise/Wwise_IDs.h
  93. 57 30
      libs/gameaudio/wwise/multiplayersample_controls.xml

+ 2 - 0
Gem/Code/CMakeLists.txt

@@ -52,6 +52,7 @@ ly_add_target(
     FILES_CMAKE
         multiplayersample_autogen_files.cmake
         multiplayersample_files.cmake
+        multiplayersample_server_files.cmake
         ${pal_dir}/multiplayersample_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
     INCLUDE_DIRECTORIES
         PRIVATE
@@ -84,6 +85,7 @@ ly_add_target(
         multiplayersample_autogen_files.cmake
         multiplayersample_files.cmake
         multiplayersample_client_files.cmake
+        multiplayersample_server_files.cmake
         ${pal_dir}/multiplayersample_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
     INCLUDE_DIRECTORIES
         PRIVATE

+ 0 - 1
Gem/Code/Include/PlayerMatchLifecycleBus.h

@@ -17,7 +17,6 @@ namespace MultiplayerSample
     {
     public:
         virtual ~PlayerMatchLifecycleNotifications() = default;
-
         virtual void OnGameTimerChange([[maybe_unused]] float currentTimeSec, [[maybe_unused]] float totalTimeSec) {}
         virtual void OnPlayerArmorZero([[maybe_unused]] Multiplayer::NetEntityId playerEntity) {}
     };

+ 3 - 1
Gem/Code/Source/AutoGen/EnergyCannonComponent.AutoComponent.xml

@@ -16,8 +16,10 @@
                        Description="Specifies the rate in milliseconds at which to fire projectiles, each cannon can only fire a single projectile at once so this also controls the projectile lifetime." />
     <ArchetypeProperty Type="AZ::TimeMs" Name="BallLifetimeMs" Init="" Container="Object" ExposeToEditor="true"
                        Description="Specifies the duration in milliseconds that the energy ball should live for. Must be less than the RateOfFireMs setting." />
+    <ArchetypeProperty Type="AZ::TimeMs" Name="BuildUpTimeMs" Init="" Container="Object" ExposeToEditor="true"
+                       Description="Specifies the number of milliseconds to start the build-up effect before shooting the next energy ball." />
     <ArchetypeProperty Type="GameEffect" Name="FiringEffect" Init="" Container="Object" ExposeToEditor="true" Description="Specifies the effect to play upon firing" />
     <ArchetypeProperty Type="AZ::EntityId" Name="EnergyBallEntity" ExposeToEditor="true" Description="The entity representing an energy ball." />
 
-    <RemoteProcedure Name="RPC_BallLaunched" InvokeFrom="Authority" HandleOn="Client" IsPublic="true" IsReliable="true" GenerateEventBindings="true" Description="Triggered on clients whenever a firing event occurs." />
+    <RemoteProcedure Name="RPC_TriggerBuildup" InvokeFrom="Authority" HandleOn="Client" IsPublic="true" IsReliable="true" GenerateEventBindings="true" Description="Triggered on clients to start the buildup event." />
 </Component>

+ 16 - 0
Gem/Code/Source/AutoGen/GemSpawnerComponent.AutoComponent.xml

@@ -24,4 +24,20 @@
 
     <ArchetypeProperty Type="AZStd::string" Name="GemSpawnTag"
                        ExposeToEditor="true" Description="A tag value for entities the describe the location of gems spawn points." />
+
+    <RemoteProcedure Name="RPC_SpawnGem" InvokeFrom="Server" HandleOn="Authority" 
+                     IsPublic="true" IsReliable="true" GenerateEventBindings="true" Description="Spawn a gem at a specific location">
+      <Param Type="Multiplayer::NetEntityId" Name="PlayerEntity"/>
+      <Param Type="AZ::Vector3" Name="SpawnLocation"/>
+      <Param Type="AZStd::string" Name="GemTag"/>
+    </RemoteProcedure>
+
+  <RemoteProcedure Name="RPC_SpawnGemWithValue" InvokeFrom="Server" HandleOn="Authority"
+                   IsPublic="true" IsReliable="true" GenerateEventBindings="true" Description="Spawn a gem at a specific location with the given value">
+    <Param Type="Multiplayer::NetEntityId" Name="PlayerEntity"/>
+    <Param Type="AZ::Vector3" Name="SpawnLocation"/>
+    <Param Type="AZStd::string" Name="GemTag"/>
+    <Param Type="uint16_t" Name="GemValue"/>
+  </RemoteProcedure>
+
 </Component>

+ 5 - 1
Gem/Code/Source/AutoGen/NetworkMatchComponent.AutoComponent.xml

@@ -23,11 +23,15 @@
                      ExposeToEditor="false" ExposeToScript="false" GenerateEventBindings="true"
                      Description="The current states of players in-game resources"/>
     <NetworkProperty Type="uint16_t" Name="PlayerCount" Init="0" ReplicateFrom="Authority" ReplicateTo="Client" Container="Object" IsPublic="true" IsRewindable="true" IsPredictable="false" ExposeToEditor="false" ExposeToScript="false" GenerateEventBindings="true" Description="The remaining time in the round in seconds" />
+    <NetworkProperty Type="AZ::TimeMs" Name="MatchStartHostTime" Init="AZ::Time::ZeroTimeMs" ReplicateFrom="Authority" ReplicateTo="Client" Container="Object" IsPublic="true" IsRewindable="true" IsPredictable="false" ExposeToEditor="false" ExposeToScript="false" GenerateEventBindings="true" Description="The host time when the first match will begin. The initial value is set via sv_MpsFirstMatchDelaySeconds. Note: Clients can use IMultiplayer::GetHostTimeMs to see the current host time." />
+
 
     <ArchetypeProperty Type="float"  Name="RoundDuration"  Init="120.f" ExposeToEditor="true" Description="Total time of a round in seconds" />
     <ArchetypeProperty Type="uint16_t"  Name="TotalRounds"  Init="3" ExposeToEditor="true" Description="Total number of rounds" />
     <ArchetypeProperty Type="uint16_t"  Name="RespawnPenaltyPercent" Init="50" ExposeToEditor="true" Description="Percent of score to deduct on armor depletion"/>
-    <ArchetypeProperty Type="float"  Name="RestDurationBetweenRounds"  Init="10.0f" ExposeToEditor="true" Description="The time between rounds to rest and look at the score." />
+    <ArchetypeProperty Type="AZStd::string"  Name="RespawnGemTag" ExposeToEditor="true" Description="The type of gem to spawn on armor depletion" />
+    <ArchetypeProperty Type="float"  Name="RestDurationBetweenRounds"  Init="15.0f" ExposeToEditor="true" Description="The time between rounds to rest and look at the score." />
+    <ArchetypeProperty Type="float"  Name="RestDurationBetweenMatches"  Init="20.0f" ExposeToEditor="true" Description="The time between matches to rest and look at the score." />
 
     <RemoteProcedure Name="RPC_EndMatch" InvokeFrom="Authority" HandleOn="Client" IsPublic="false" IsReliable="true"
                     GenerateEventBindings="" Description="Send match over event and results">

+ 1 - 1
Gem/Code/Source/AutoGen/NetworkPlayerMovementComponent.AutoComponent.xml

@@ -20,7 +20,7 @@
     <NetworkProperty Type="AZ::Vector3" Name="SelfGeneratedVelocity" Init="AZ::Vector3::CreateZero()" ReplicateFrom="Authority" ReplicateTo="Client" IsRewindable="true" IsPredictable="true" IsPublic="true" Container="Object" ExposeToEditor="false" ExposeToScript="true" GenerateEventBindings="true" Description="Velocity generated by this player"/>
     <NetworkProperty Type="float" Name="SecondsSinceOnGround" Init="0.0f" ReplicateFrom="Authority" ReplicateTo="Client" IsRewindable="true" IsPredictable="true" IsPublic="true" Container="Object" ExposeToEditor="false" ExposeToScript="true" GenerateEventBindings="true" Description="Number of seconds since the player was last on the ground"/>
     <NetworkProperty Type="float" Name="SecondsSinceJumpRequest" Init="1000.0f" ReplicateFrom="Authority" ReplicateTo="Client" IsRewindable="true" IsPredictable="true" IsPublic="true" Container="Object" ExposeToEditor="false" ExposeToScript="true" GenerateEventBindings="true" Description="Number of seconds elapsed without a jump button press"/>
-    <NetworkProperty Type="bool" Name="OnGround" Init="true" ReplicateFrom="Authority" ReplicateTo="Autonomous" IsRewindable="true" IsPredictable="true" IsPublic="true" Container="Object" ExposeToEditor="false" ExposeToScript="true" GenerateEventBindings="true" Description="Tracks whether or not the player is currently on the ground"/>
+    <NetworkProperty Type="bool" Name="OnGround" Init="true" ReplicateFrom="Authority" ReplicateTo="Client" IsRewindable="true" IsPredictable="true" IsPublic="true" Container="Object" ExposeToEditor="false" ExposeToScript="true" GenerateEventBindings="true" Description="Tracks whether or not the player is currently on the ground"/>
     <NetworkProperty Type="bool" Name="WasOnGround" Init="true" ReplicateFrom="Authority" ReplicateTo="Autonomous" IsRewindable="true" IsPredictable="true" IsPublic="true" Container="Object" ExposeToEditor="false" ExposeToScript="true" GenerateEventBindings="true" Description="Tracks whether or not the player was previously on the ground in the last tick"/>
     <NetworkProperty Type="bool" Name="IsJumping" Init="false" ReplicateFrom="Authority" ReplicateTo="Autonomous" IsRewindable="true" IsPredictable="true" IsPublic="true" Container="Object" ExposeToEditor="false" ExposeToScript="true" GenerateEventBindings="true" Description="Tracks whether or not the player is still executing a jump"/>
 

+ 9 - 3
Gem/Code/Source/Components/Multiplayer/EnergyCannonComponent.cpp

@@ -37,7 +37,7 @@ namespace MultiplayerSample
     }
 
 #if AZ_TRAIT_CLIENT
-    void EnergyCannonComponent::HandleRPC_BallLaunched([[maybe_unused]] AzNetworking::IConnection* invokingConnection)
+    void EnergyCannonComponent::HandleRPC_TriggerBuildup([[maybe_unused]] AzNetworking::IConnection* invokingConnection)
     {
         m_effect.TriggerEffect(GetEntity()->GetTransform()->GetWorldTM());
     }
@@ -67,6 +67,12 @@ namespace MultiplayerSample
     }
 
 #if AZ_TRAIT_SERVER
+    void EnergyCannonComponentController::OnTriggerBuildup()
+    {
+        // This RPC starts the buildup effect on the client, we want it to start before the actual ball launch event occurs to make everyhing line up nicely
+        RPC_TriggerBuildup();
+    }
+
     void EnergyCannonComponentController::OnFireEnergyBall()
     {
         // Re-using the same ball entity.
@@ -79,11 +85,11 @@ namespace MultiplayerSample
                 const AZ::Transform& cannonTm = GetEntity()->GetTransform()->GetWorldTM();
                 const AZ::Vector3 forward = cannonTm.TransformVector(AZ::Vector3::CreateAxisY(-1.f));
                 const AZ::Vector3 effectOffset = GetFiringEffect().GetEffectOffset();
-                ballComponent->RPC_LaunchBall(cannonTm.GetTranslation() + effectOffset, forward, GetNetEntityId());
-                RPC_BallLaunched();
+                ballComponent->RPC_LaunchBall(cannonTm.GetTranslation() + cannonTm.TransformVector(effectOffset), forward, GetNetEntityId());
 
                 // Enqueue our ball kill event
                 m_killEvent.Enqueue(GetBallLifetimeMs(), false);
+                m_triggerBuildupEvent.Enqueue(GetRateOfFireMs() - GetBuildUpTimeMs(), false);
             }
         }
     }

+ 7 - 1
Gem/Code/Source/Components/Multiplayer/EnergyCannonComponent.h

@@ -23,7 +23,7 @@ namespace MultiplayerSample
         void OnDeactivate(Multiplayer::EntityIsMigrating entityIsMigrating) override;
 
 #if AZ_TRAIT_CLIENT
-        void HandleRPC_BallLaunched(AzNetworking::IConnection* invokingConnection) override;
+        void HandleRPC_TriggerBuildup(AzNetworking::IConnection* invokingConnection) override;
 #endif
 
     private:
@@ -41,6 +41,12 @@ namespace MultiplayerSample
 
 #if AZ_TRAIT_SERVER
     private:
+        void OnTriggerBuildup();
+        AZ::ScheduledEvent m_triggerBuildupEvent{ [this]()
+        {
+            OnTriggerBuildup();
+        }, AZ::Name("BuildupEnergyCannon") };
+
         void OnFireEnergyBall();
         AZ::ScheduledEvent m_firingEvent{[this]()
         {

+ 42 - 12
Gem/Code/Source/Components/Multiplayer/GemSpawnerComponent.cpp

@@ -162,28 +162,58 @@ namespace MultiplayerSample
         }
     }
 
-    void GemSpawnerComponentController::SpawnGem(const AZ::Vector3& location, const AZ::Crc32& type)
+    void GemSpawnerComponentController::HandleRPC_SpawnGem(
+        [[maybe_unused]] AzNetworking::IConnection* invokingConnection, 
+        [[maybe_unused]] const Multiplayer::NetEntityId& playerEntity, const AZ::Vector3& spawnLocation, const AZStd::string& gemTag)
     {
-        if (GetParent().GetGemSpawnables().empty())
-        {
-            return;
+        SpawnGem(spawnLocation, AZ::Crc32(gemTag));
+    }
+
+    void GemSpawnerComponentController::HandleRPC_SpawnGemWithValue(
+        [[maybe_unused]] AzNetworking::IConnection* invokingConnection,
+        [[maybe_unused]] const Multiplayer::NetEntityId& playerEntity, 
+        const AZ::Vector3& spawnLocation, const AZStd::string& gemTag, const uint16_t& gemValue)
+    {
+        
+        if (auto gemEntry = GetGemSpawnable(AZ::Crc32(gemTag)); gemEntry)
+        { 
+            // Spawn the gem with the max value between what's requested and what's in the gem table.
+            uint16_t value = AZStd::max(gemEntry->m_scoreValue, gemValue);
+            SpawnGem(spawnLocation, gemEntry->m_gemAsset, value);
         }
+    }
 
-        const GemSpawnable* spawnable = nullptr;
-        for (const GemSpawnable& gemType : GetParent().GetGemSpawnables())
+    AZStd::optional<const GemSpawnable> GemSpawnerComponentController::GetGemSpawnable(AZ::Crc32 gemTag) const
+    {
+        for (const GemSpawnable gemType : GetParent().GetGemSpawnables())
         {
-            if (type == AZ::Crc32(gemType.m_tag.c_str()))
+            if (gemTag == AZ::Crc32(gemType.m_tag.c_str()))
             {
-                spawnable = &gemType;
+                return gemType;
             }
         }
-        if (!spawnable)
+
+        return {};
+    }
+
+    void GemSpawnerComponentController::SpawnGem(const AZ::Vector3& location, const AZ::Crc32& type)
+    {
+        if (auto gemEntry = GetGemSpawnable(type); gemEntry)
+        {
+            SpawnGem(location, gemEntry->m_gemAsset, gemEntry->m_scoreValue);
+        }
+    }
+
+    void GemSpawnerComponentController::SpawnGem(const AZ::Vector3& location, const AzFramework::SpawnableAsset& gemAsset, uint16_t gemValue)
+    {
+        // Don't spawn gems with 0 value.
+        if (gemValue == 0)
         {
             return;
         }
 
         PrefabCallbacks callbacks;
-        callbacks.m_onActivateCallback = [this, spawnable](AZStd::shared_ptr<AzFramework::EntitySpawnTicket> ticket,
+        callbacks.m_onActivateCallback = [this, gemValue](AZStd::shared_ptr<AzFramework::EntitySpawnTicket> ticket,
             AzFramework::SpawnableConstEntityContainerView view)
         {
             if (view.empty())
@@ -200,7 +230,7 @@ namespace MultiplayerSample
                     if (GemComponentController* gemController = static_cast<GemComponentController*>(gem->GetController()))
                     {
                         gemController->SetRandomPeriodOffset(GetNetworkRandomComponentController()->GetRandomInt() % 1000);
-                        gemController->SetGemScoreValue(spawnable->m_scoreValue);
+                        gemController->SetGemScoreValue(gemValue);
                         gemController->SetGemSpawnerController(this);
                     }
                 }
@@ -213,7 +243,7 @@ namespace MultiplayerSample
 
         GetParent().GetNetworkPrefabSpawnerComponent()->SpawnPrefabAsset(
             AZ::Transform::CreateFromQuaternionAndTranslation(AZ::Quaternion::CreateIdentity(), location),
-            spawnable->m_gemAsset, AZStd::move(callbacks));
+            gemAsset, AZStd::move(callbacks));
     }
 
     void GemSpawnerComponentController::RemoveGems()

+ 11 - 3
Gem/Code/Source/Components/Multiplayer/GemSpawnerComponent.h

@@ -38,15 +38,23 @@ namespace MultiplayerSample
 
 #if AZ_TRAIT_SERVER
         void SpawnGems();
+        void SpawnGem(const AZ::Vector3& location, const AZ::Crc32& type);
         void RemoveGem(AzFramework::EntitySpawnTicket::Id gemTicketId);
+        void RemoveGems();
+
+        void HandleRPC_SpawnGem(
+            AzNetworking::IConnection* invokingConnection, const Multiplayer::NetEntityId& playerEntity, 
+            const AZ::Vector3& spawnLocation, const AZStd::string& gemTag) override;
+        void HandleRPC_SpawnGemWithValue(
+            AzNetworking::IConnection* invokingConnection, const Multiplayer::NetEntityId& playerEntity, 
+            const AZ::Vector3& spawnLocation, const AZStd::string& gemTag, const uint16_t& gemValue) override;
 #endif
 
     private:
 #if AZ_TRAIT_SERVER
-        void SpawnGem(const AZ::Vector3& location, const AZ::Crc32& type);
-        void RemoveGems();
+        AZStd::optional<const GemSpawnable> GetGemSpawnable(AZ::Crc32 gemTag) const;
+        void SpawnGem(const AZ::Vector3& location, const AzFramework::SpawnableAsset& gemAsset, uint16_t gemValue);
 #endif
-        
         AZStd::unordered_map<AzFramework::EntitySpawnTicket::Id, AZStd::shared_ptr<AzFramework::EntitySpawnTicket>> m_spawnedGems;
 
         struct GemSpawnEntry

+ 1 - 0
Gem/Code/Source/Components/Multiplayer/PlayerIdentityComponent.cpp

@@ -64,6 +64,7 @@ namespace MultiplayerSample
     void PlayerIdentityComponent::OnDeactivate([[maybe_unused]] Multiplayer::EntityIsMigrating entityIsMigrating)
     {
         #if AZ_TRAIT_CLIENT
+            AZ::TickBus::Handler::BusDisconnect();
         #endif
     }
 

+ 1 - 1
Gem/Code/Source/Components/NetworkAnimationComponent.cpp

@@ -136,7 +136,7 @@ namespace MultiplayerSample
             if (m_velocityParamId != InvalidParamIndex)
             {
                 const bool aiming = GetActiveAnimStates().GetBit(aznumeric_cast<uint32_t>(CharacterAnimState::Aiming));
-                if(GetTurningEnabled() && !aiming)
+                if (GetTurningEnabled() && !aiming)
                 { 
                     const float turnAmount = velocity2d.GetX();
                     m_animationGraph->SetParameterVector2(m_velocityParamId, AZ::Vector2(turnAmount, speed));

+ 105 - 24
Gem/Code/Source/Components/NetworkMatchComponent.cpp

@@ -5,23 +5,20 @@
  *
  */
 
+#include <AzCore/Component/TransformBus.h>
 #include <AzCore/Preprocessor/EnumReflectUtils.h>
 
 #include <GameplayEffectsNotificationBus.h>
 #include <MultiplayerSampleTypes.h>
 #include <UiGameOverBus.h>
 
-#include <GameState/GameStateMatchEnded.h>
-#include <GameState/GameStateMatchInProgress.h>
-#include <GameState/GameStatePreparingMatch.h>
+#include <Source/Components/Multiplayer/GemSpawnerComponent.h>
 #include <Source/Components/Multiplayer/MatchPlayerCoinsComponent.h>
 #include <Source/Components/Multiplayer/PlayerIdentityComponent.h>
 #include <Source/Components/NetworkTeleportCompatibleComponent.h>
 #include <Source/Components/NetworkHealthComponent.h>
 #include <Source/Components/NetworkMatchComponent.h>
 #include <Source/Components/NetworkRandomComponent.h>
-#include <GameState/GameStateRequestBus.h>
-#include <GameState/GameStateWaitingForPlayers.h>
 
 #include "NetworkRandomComponent.h"
 #include "Multiplayer/GemSpawnerComponent.h"
@@ -34,6 +31,14 @@
 #   include <LyShine/Bus/UiCursorBus.h>
 #endif
 
+#if AZ_TRAIT_SERVER
+#   include <GameState/GameStateRequestBus.h>
+#   include <GameState/GameStateWaitingForPlayers.h>
+#   include <GameState/GameStatePreparingMatch.h>
+#   include <GameState/GameStateMatchInProgress.h>
+#   include <GameState/GameStateMatchEnded.h>
+#endif
+
 namespace MultiplayerSample
 {
     AZ_ENUM_DEFINE_REFLECT_UTILITIES(AllowedPlayerActions);
@@ -117,6 +122,12 @@ namespace MultiplayerSample
             return AllowedPlayerActions::RotationOnly;
         }
 
+        // Disable player actions if the match hasn't started and we're still waiting for more players to join
+        if ( AZ::Interface<Multiplayer::IMultiplayer>::Get()->GetCurrentHostTimeMs() < GetMatchStartHostTime())
+        {
+            return AllowedPlayerActions::RotationOnly;
+        }
+
         return AllowedPlayerActions::All;
     }
 
@@ -145,6 +156,11 @@ namespace MultiplayerSample
         return aznumeric_cast<int32_t>(GetPlayerCount());
     }
 
+    AZ::TimeMs NetworkMatchComponent::GetMatchStartHostTime() const
+    {
+        return NetworkMatchComponentBase::GetMatchStartHostTime();
+    }
+
     void NetworkMatchComponent::AddRoundNumberEventHandler(AZ::Event<uint16_t>::Handler& handler)
     {
         RoundNumberAddEvent(handler);
@@ -160,6 +176,11 @@ namespace MultiplayerSample
         RoundRestTimeRemainingAddEvent(handler);
     }
 
+    void NetworkMatchComponent::AddFirstMatchStartHostTime(AZ::Event<AZ::TimeMs>::Handler& handler)
+    {
+        this->MatchStartHostTimeAddEvent(handler);
+    }
+
 #if AZ_TRAIT_SERVER
     void NetworkMatchComponent::OnPlayerActivated(Multiplayer::NetEntityId playerEntity)
     {
@@ -214,26 +235,28 @@ namespace MultiplayerSample
             AZ::SimpleLcgRandom randomNumberGenerator(aznumeric_cast<int64_t>(AZ::GetElapsedTimeMs()));
             m_playerNameRandomStartingIndexPrefix = randomNumberGenerator.GetRandom() % AutoAssignedPlayerNamePrefix.size();
             m_playerNameRandomStartingIndexPostfix = randomNumberGenerator.GetRandom() % AutoAssignedPlayerNamePostfix.size();
-        #endif
+        
 
-        GameState::GameStateRequests::AddGameStateFactoryOverrideForType<GameStateWaitingForPlayers>([this]()
-            {
-                return AZStd::make_shared<GameStateWaitingForPlayers>(this);
-            });
-        GameState::GameStateRequests::AddGameStateFactoryOverrideForType<GameStatePreparingMatch>([this]()
-            {
-                return AZStd::make_shared<GameStatePreparingMatch>(this);
-            });
-        GameState::GameStateRequests::AddGameStateFactoryOverrideForType<GameStateMatchInProgress>([this]()
-            {
-                return AZStd::make_shared<GameStateMatchInProgress>(this);
-            });
-        GameState::GameStateRequests::AddGameStateFactoryOverrideForType<GameStateMatchEnded>([this]()
-            {
-                return AZStd::make_shared<GameStateMatchEnded>(this);
-            });
+            GameState::GameStateRequests::AddGameStateFactoryOverrideForType<GameStateWaitingForPlayers>([this]()
+                {
+                    return AZStd::make_shared<GameStateWaitingForPlayers>(this);
+                });
+            GameState::GameStateRequests::AddGameStateFactoryOverrideForType<GameStatePreparingMatch>([this]()
+                {
+                    return AZStd::make_shared<GameStatePreparingMatch>(this);
+                });
+            GameState::GameStateRequests::AddGameStateFactoryOverrideForType<GameStateMatchInProgress>([this]()
+                {
+                    return AZStd::make_shared<GameStateMatchInProgress>(this);
+                });
+
+            GameState::GameStateRequests::AddGameStateFactoryOverrideForType<GameStateMatchEnded>([this]()
+                {
+                    return AZStd::make_shared<GameStateMatchEnded>(this);
+                });
 
-        GameState::GameStateRequests::CreateAndPushNewOverridableGameStateOfType<GameStateWaitingForPlayers>();
+            GameState::GameStateRequests::CreateAndPushNewOverridableGameStateOfType<GameStateWaitingForPlayers>();
+        #endif
 
         PlayerMatchLifecycleBus::Handler::BusConnect();
     }
@@ -242,13 +265,14 @@ namespace MultiplayerSample
     {
         PlayerMatchLifecycleBus::Handler::BusDisconnect();
 
+#if AZ_TRAIT_SERVER
         GameState::GameStateRequestBus::Broadcast(&GameState::GameStateRequestBus::Events::PopAllGameStates);
 
         GameState::GameStateRequests::RemoveGameStateFactoryOverrideForType<GameStateWaitingForPlayers>();
         GameState::GameStateRequests::RemoveGameStateFactoryOverrideForType<GameStatePreparingMatch>();
         GameState::GameStateRequests::RemoveGameStateFactoryOverrideForType<GameStateMatchInProgress>();
         GameState::GameStateRequests::RemoveGameStateFactoryOverrideForType<GameStateMatchEnded>();
-#if AZ_TRAIT_SERVER
+
         m_roundTickEvent.RemoveFromQueue();
         m_restTickEvent.RemoveFromQueue();
 #endif
@@ -327,6 +351,27 @@ namespace MultiplayerSample
             results.m_playerStates.push_back(state);
         }
 
+        // Print the player results to server.log for tracking tournament winners.
+        // Sort the players by score (highest score is 1st)
+        // If scores are matching, then sort by remaining armor.
+        AZStd::sort(results.m_playerStates.begin(), results.m_playerStates.end(), [](const PlayerState& a, const PlayerState& b)
+            {
+                if (a.m_score == b.m_score)
+                {
+                    return a.m_remainingArmor > b.m_remainingArmor;
+                }
+                return a.m_score > b.m_score;
+            });
+
+        AZStd::string prettyPrintMatchResults = "";
+        prettyPrintMatchResults += AZStd::string::format("Match Results (%u players)\n", results.m_playerStates.size());
+        for (const PlayerState& playerState : results.m_playerStates)
+        {
+            prettyPrintMatchResults += AZStd::string::format("\tPlayer %s score %u, armor %u.\n", playerState.m_playerName.c_str(), playerState.m_score, playerState.m_remainingArmor);
+        }
+        AZ_Info("NetworkMatchComponentController", prettyPrintMatchResults.c_str());
+
+
         FindWinner(results, potentialWinners);
 
         RPC_EndMatch(results);
@@ -400,6 +445,9 @@ namespace MultiplayerSample
 
     void NetworkMatchComponentController::EndRound()
     {
+        // As soon as a round ends, remove all the gems until the next round begins.
+        GetGemSpawnerComponentController()->RemoveGems();
+
         // Check if we're in-between rounds, or if this is the end of the match...
         if (GetRoundNumber() < GetTotalRounds()) // In-between
         {
@@ -467,7 +515,40 @@ namespace MultiplayerSample
         {
             if (Multiplayer::ConstNetworkEntityHandle playerHandle = Multiplayer::GetNetworkEntityManager()->GetEntity(playerEntity))
             {
+                AZ::Vector3 playerTranslation = playerHandle.Exists() 
+                    ? playerHandle.GetEntity()->GetTransform()->GetWorldTranslation() 
+                    : AZ::Vector3::CreateZero();
                 RespawnPlayer(playerEntity, PlayerResetOptions{ true, GetRespawnPenaltyPercent() });
+                if (playerHandle.Exists())
+                {
+                    MultiplayerSample::GemSpawnerComponent* gemSpawnerComponent = GetParent().GetGemSpawnerComponent();
+
+                    if (gemSpawnerComponent)
+                    {
+                        const AZStd::vector<PlayerCoinState>& coinStates = GetMatchPlayerCoinsComponentController()->GetParent().
+                            GetPlayerCoinCounts();
+
+                        const auto coinStateIterator = AZStd::find_if(
+                            coinStates.begin(), coinStates.end(), [playerEntity](const PlayerCoinState& state)
+                            {
+                                return state.m_playerId == playerEntity;
+                            });
+
+                        if (coinStateIterator != coinStates.end())
+                        {
+                            float coinsDropped = coinStateIterator->m_coins * (GetRespawnPenaltyPercent() * 0.01f);
+
+                            gemSpawnerComponent->RPC_SpawnGemWithValue(
+                                playerEntity, playerTranslation, GetRespawnGemTag(), static_cast<uint16_t>(coinsDropped));
+                        }
+                        else
+                        {
+                            gemSpawnerComponent->RPC_SpawnGem(
+                                playerEntity, playerTranslation, GetRespawnGemTag());
+                        }
+                            
+                    }
+                }
             }
         }
         else

+ 11 - 0
Gem/Code/Source/Components/NetworkMatchComponent.h

@@ -54,6 +54,11 @@ namespace MultiplayerSample
         //! @result the current count of active players
         virtual int32_t GetTotalPlayerCount() const = 0;
 
+        //! Returns the time the first match begins
+        //! Host Time is the time in milliseconds since the host server application has started.
+        //! @result the time the first match begins
+        virtual AZ::TimeMs GetMatchStartHostTime() const = 0;
+
         //! Adds an event handler to the round number AZ::Event
         //! @param handler the handler to add the the requested component event
         virtual void AddRoundNumberEventHandler(AZ::Event<uint16_t>::Handler& handler) = 0;
@@ -65,6 +70,10 @@ namespace MultiplayerSample
         //! Adds an event handler to the round number rest remaining AZ::Event
         //! @param handler the handler to add the the requested component event
         virtual void AddRoundRestTimeRemainingEventHandler(AZ::Event<RoundTimeSec>::Handler& handler) = 0;
+
+        //! Adds an event handler to capture the time the first match is set to begin.
+        //! @param handler the handler to add the the requested component event
+        virtual void AddFirstMatchStartHostTime(AZ::Event<AZ::TimeMs>::Handler& handler) = 0;
     };
 
 
@@ -99,9 +108,11 @@ namespace MultiplayerSample
         int32_t GetCurrentRoundNumber() const override;
         int32_t GetTotalRoundCount() const override;
         int32_t GetTotalPlayerCount() const override;
+        AZ::TimeMs GetMatchStartHostTime() const override;
         void AddRoundNumberEventHandler(AZ::Event<uint16_t>::Handler& handler) override;
         void AddRoundTimeRemainingEventHandler(AZ::Event<RoundTimeSec>::Handler& handler) override;
         void AddRoundRestTimeRemainingEventHandler(AZ::Event<RoundTimeSec>::Handler& handler) override;
+        void AddFirstMatchStartHostTime(AZ::Event<AZ::TimeMs>::Handler& handler) override;
         //! @}
 
 #if AZ_TRAIT_SERVER

+ 11 - 17
Gem/Code/Source/Components/NetworkPlayerMovementComponent.cpp

@@ -22,6 +22,7 @@
 #include <AzFramework/Physics/Components/SimulatedBodyComponentBus.h>
 #include <PhysX/CharacterGameplayBus.h>
 #include <PhysX/CharacterControllerBus.h>
+#include <GameplayEffectsNotificationBus.h>
 
 namespace MultiplayerSample
 {
@@ -233,8 +234,7 @@ namespace MultiplayerSample
         AZ::Vector3 aimAngles = GetNetworkSimplePlayerCameraComponentController()->GetAimAngles();
         aimAngles.SetZ(NormalizeHeading(aimAngles.GetZ() - playerInput->m_viewYaw * cl_AimStickScaleZ * cl_MaxMouseDelta));
         aimAngles.SetX(NormalizeHeading(aimAngles.GetX() - playerInput->m_viewPitch * cl_AimStickScaleX * cl_MaxMouseDelta));
-        aimAngles.SetX(
-            NormalizeHeading(AZ::GetClamp(aimAngles.GetX(), -AZ::Constants::QuarterPi * 1.5f, AZ::Constants::QuarterPi * 1.5f)));
+        aimAngles.SetX(NormalizeHeading(AZ::GetClamp(aimAngles.GetX(), -AZ::Constants::QuarterPi * 1.5f, AZ::Constants::QuarterPi * 1.5f)));
         GetNetworkSimplePlayerCameraComponentController()->SetAimAngles(aimAngles);
 
         const AZ::Quaternion newOrientation = AZ::Quaternion::CreateRotationZ(aimAngles.GetZ());
@@ -248,9 +248,6 @@ namespace MultiplayerSample
         // absolute velocity is based on velocity generated by the player and other sources
         const AZ::Vector3 absoluteVelocity = GetVelocityFromExternalSources() + GetSelfGeneratedVelocity();
 
-        // if we're not intentionally moving downward on a platform and have a negative velocity we're falling
-        const bool isFalling = !movingDownward && absoluteVelocity.GetZ() < 0.0f;
-
         GetNetworkCharacterComponentController()->TryMoveWithVelocity(absoluteVelocity, deltaTime);
 
         // If a jump was triggered, reset our jump request time to our "slop threshold" so that we don't double-count the jump request
@@ -262,24 +259,18 @@ namespace MultiplayerSample
 
         // Tell the camera whether or not we're sprinting
         GetNetworkSimplePlayerCameraComponentController()->SetSprintMode(playerInput->m_sprint);
-        GetNetworkAnimationComponentController()->ModifyActiveAnimStates().SetBit(
-            aznumeric_cast<uint32_t>(CharacterAnimState::Sprinting), playerInput->m_sprint);
-
-        GetNetworkAnimationComponentController()->ModifyActiveAnimStates().SetBit(
-            aznumeric_cast<uint32_t>(CharacterAnimState::Crouching), playerInput->m_crouch);
+        GetNetworkAnimationComponentController()->ModifyActiveAnimStates().SetBit(aznumeric_cast<uint32_t>(CharacterAnimState::Sprinting), playerInput->m_sprint);
+        GetNetworkAnimationComponentController()->ModifyActiveAnimStates().SetBit(aznumeric_cast<uint32_t>(CharacterAnimState::Crouching), playerInput->m_crouch);
 
-        // the Landing anim state will automatically turn off after it's triggered
-        GetNetworkAnimationComponentController()->ModifyActiveAnimStates().SetBit(
-            aznumeric_cast<uint32_t>(CharacterAnimState::Landing), onGround && !wasOnGround && !jumpTriggered);
+        // The Landing anim state will automatically turn off after it's triggered
+        GetNetworkAnimationComponentController()->ModifyActiveAnimStates().SetBit(aznumeric_cast<uint32_t>(CharacterAnimState::Landing), onGround && !wasOnGround && !jumpTriggered);
 
         // Always set/clear the jump state every tick or you might get ghost jump animations.
         // We only set it on the tick where the jump is first triggered, not for the entire jump.
-        GetNetworkAnimationComponentController()->ModifyActiveAnimStates().SetBit(
-            aznumeric_cast<uint32_t>(CharacterAnimState::Jumping), jumpTriggered);
+        GetNetworkAnimationComponentController()->ModifyActiveAnimStates().SetBit(aznumeric_cast<uint32_t>(CharacterAnimState::Jumping), jumpTriggered);
 
         // Set whether or not we're currently falling.
-        GetNetworkAnimationComponentController()->ModifyActiveAnimStates().SetBit(
-            aznumeric_cast<uint32_t>(CharacterAnimState::Falling), isFalling);
+        GetNetworkAnimationComponentController()->ModifyActiveAnimStates().SetBit(aznumeric_cast<uint32_t>(CharacterAnimState::Falling), !onGround);
 
         // If we're still on the ground, then zero out our velocity from external forces
         // This prevents us from sliding along the ground after we land
@@ -381,6 +372,9 @@ namespace MultiplayerSample
                         selfGeneratedVelocity.SetZ(initialJumpVelocity);
                         jumpTriggered = true;
                         SetIsJumping(true);
+
+                        GameplayEffectsNotificationBus::Broadcast(&GameplayEffectsNotificationBus::Events::OnPositionalEffect,
+                            SoundEffect::PlayerExertion, GetEntity()->GetTransform()->GetWorldTranslation());
                     }
                 }
             }

+ 3 - 3
Gem/Code/Source/Components/NetworkTeleportCompatibleComponent.cpp

@@ -10,7 +10,7 @@
 #include <Multiplayer/Components/NetworkTransformComponent.h>
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/Serialization/SerializeContext.h>
-#include <AzFramework/Physics/RigidBodyBus.h>
+#include <AzFramework/Physics/Components/SimulatedBodyComponentBus.h>
 
 namespace MultiplayerSample
 {
@@ -63,7 +63,7 @@ namespace MultiplayerSample
         
         // disable physics (needed to move rigid bodies)
         // see: https://github.com/o3de/o3de/issues/2541
-        Physics::RigidBodyRequestBus::Event(selfId, &Physics::RigidBodyRequestBus::Events::DisablePhysics);
+        AzPhysics::SimulatedBodyComponentRequestsBus::Event(selfId, &AzPhysics::SimulatedBodyComponentRequestsBus::Events::DisablePhysics);
 
         // move self and increment resetCount to prevent transform interpolation
         AZ::TransformBus::Event(selfId,
@@ -73,7 +73,7 @@ namespace MultiplayerSample
         netTransform->SetResetCount(netTransform->GetResetCount() + 1);
 
         // re-enable physics
-        Physics::RigidBodyRequestBus::Event(selfId, &Physics::RigidBodyRequestBus::Events::EnablePhysics);
+        AzPhysics::SimulatedBodyComponentRequestsBus::Event(selfId, &AzPhysics::SimulatedBodyComponentRequestsBus::Events::EnablePhysics);
 
         NotifyTeleport(teleportedLocation);
     }

+ 36 - 6
Gem/Code/Source/Components/UI/HUDComponent.cpp

@@ -37,10 +37,10 @@ namespace MultiplayerSample
                 ->Version(1)
                 ->Field("RoundNumberText", &HUDComponent::m_roundNumberText)
                 ->Field("RoundNumberId", &HUDComponent::m_roundNumberUi)
-                ->Field("RoundTimerText", &HUDComponent::m_roundTimerText)
                 ->Field("RoundTimerId", &HUDComponent::m_roundTimerUi)
                 ->Field("RoundSecondsRemaining", &HUDComponent::m_roundSecondsRemainingUiParent)
-                ;
+                ->Field("FirstMatchParent", &HUDComponent::m_firstMatchStartingUiParent)
+                ->Field("FirstMatchTimer", &HUDComponent::m_firstMatchStartingTimerUi);
 
             if (AZ::EditContext* editContext = serializeContext->GetEditContext())
             {
@@ -53,6 +53,8 @@ namespace MultiplayerSample
                     ->DataElement(AZ::Edit::UIHandlers::Default, &HUDComponent::m_roundNumberUi, "Round Number Textbox", "The ui textbox for displaying the current round number.")
                     ->DataElement(AZ::Edit::UIHandlers::Default, &HUDComponent::m_roundTimerUi, "Round Time Textbox", "The ui textbox for displaying the time remaining in the round.")
                     ->DataElement(AZ::Edit::UIHandlers::Default, &HUDComponent::m_roundSecondsRemainingUiParent, "Round Seconds Remaining UI Elements", "The parent ui element containing all the ui images to display the seconds remaining.")
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &HUDComponent::m_firstMatchStartingUiParent, "First Match Parent", "UI to display for players while they wait for other players to join before the first match begins.")
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &HUDComponent::m_firstMatchStartingTimerUi, "First Match Timer", "The ui text to display the time remaining before the first match starts.")
                     ;
             }
         }
@@ -77,9 +79,8 @@ namespace MultiplayerSample
         auto minutes = AZStd::chrono::duration_cast<AZStd::chrono::minutes>(duration);
         auto seconds = AZStd::chrono::duration_cast<AZStd::chrono::seconds>(duration - minutes);
 
-        m_roundTimerText = AZStd::string::format("%02i:%02i", static_cast<int>(minutes.count()), static_cast<int>(seconds.count()));
-
-        UiTextBus::Event(m_roundTimerUi, &UiTextBus::Events::SetText, m_roundTimerText);
+        AZStd::string roundTimerText = AZStd::string::format("%02i:%02i", static_cast<int>(minutes.count()), static_cast<int>(seconds.count()));
+        UiTextBus::Event(m_roundTimerUi, &UiTextBus::Events::SetText, roundTimerText);
 
         // Display a countdown of custom UI when the round is close to finishing
         if (duration.count() > 0 && duration.count() <= 10)
@@ -98,4 +99,33 @@ namespace MultiplayerSample
             UiElementBus::Event(m_roundSecondsRemainingUiParent, &UiElementBus::Events::SetIsEnabled, false);
         }
     }
-} // namespace MultiplayerSample
+
+    void HUDComponent::UpdateFirstMatchTimerUi()
+    {
+        const AZ::TimeMs timeRemainingUntilMatchStartMs = AZ::Interface<INetworkMatch>::Get()->GetMatchStartHostTime() - AZ::Interface<Multiplayer::IMultiplayer>::Get()->GetCurrentHostTimeMs();
+
+        // Update the UI to display the time remaining until the first match begins
+        if (timeRemainingUntilMatchStartMs > AZ::Time::ZeroTimeMs)
+        {
+            UiElementBus::Event(m_firstMatchStartingUiParent, &UiElementBus::Events::SetIsEnabled, true);
+
+            const AZStd::chrono::milliseconds duration(static_cast<long long>(timeRemainingUntilMatchStartMs));
+            const auto minutes = AZStd::chrono::duration_cast<AZStd::chrono::minutes>(duration);
+            const auto seconds = AZStd::chrono::duration_cast<AZStd::chrono::seconds>(duration - minutes);
+
+            AZStd::string matchTimeText = AZStd::string::format("%02i:%02i", static_cast<int>(minutes.count()), static_cast<int>(seconds.count()));
+            UiTextBus::Event(m_firstMatchStartingTimerUi, &UiTextBus::Events::SetText, matchTimeText);
+
+            // Requeue to refresh the UI after a second if there's still time left on the clock
+            if (!m_updateFirstMatchTimer.IsScheduled())
+            {
+                m_updateFirstMatchTimer.Enqueue(AZ::SecondsToTimeMs(1.0), true);
+            }
+        }
+        else
+        {
+            UiElementBus::Event(m_firstMatchStartingUiParent, &UiElementBus::Events::SetIsEnabled, false);
+            m_updateFirstMatchTimer.RemoveFromQueue();
+        }
+    }
+} // namespace MultiplayerSample

+ 17 - 3
Gem/Code/Source/Components/UI/HUDComponent.h

@@ -37,26 +37,40 @@ namespace MultiplayerSample
             {
                 if (const auto networkMatchComponent = AZ::Interface<INetworkMatch>::Get())
                 {
+                    m_waitForActiveNetworkMatchComponent.RemoveFromQueue();
+
                     SetRoundNumberText(aznumeric_cast<uint16_t>(networkMatchComponent->GetCurrentRoundNumber()));
                     m_roundNumberHandler = AZ::EventHandler<uint16_t>([this](uint16_t value) { SetRoundNumberText(value); });
                     networkMatchComponent->AddRoundNumberEventHandler(m_roundNumberHandler);
 
                     m_roundTimerHandler = AZ::EventHandler<RoundTimeSec>([this](RoundTimeSec value) { SetRoundTimerText(value); });
                     networkMatchComponent->AddRoundTimeRemainingEventHandler(m_roundTimerHandler);
-                    m_waitForActiveNetworkMatchComponent.RemoveFromQueue();
+
+                    // Listen for an event if the host changes the match start time
+                    // This can happen if an admin changes the start time during a tournament to wait for more players.
+                    UpdateFirstMatchTimerUi();
+                    m_firstMatchStartHostTimeHandler = AZ::EventHandler<AZ::TimeMs>([this]([[maybe_unused]]AZ::TimeMs value) {UpdateFirstMatchTimerUi(); });
+                    networkMatchComponent->AddFirstMatchStartHostTime(m_firstMatchStartHostTimeHandler);
                 }
             }, AZ::Name("HUDComponent Wait For Active NetworkMatchComponent"));
 
         void SetRoundNumberText(uint16_t round);
         void SetRoundTimerText(RoundTimeSec time);
-    
+        void UpdateFirstMatchTimerUi();
+
         AZ::EventHandler<uint16_t> m_roundNumberHandler; 
         AZ::EventHandler<RoundTimeSec> m_roundTimerHandler;
+        AZ::EventHandler<AZ::TimeMs> m_firstMatchStartHostTimeHandler;
+        AZ::ScheduledEvent m_updateFirstMatchTimer = AZ::ScheduledEvent([this]
+            {
+                UpdateFirstMatchTimerUi();
+            }, AZ::Name("HUDComponent Update First Match Timer"));
 
         AZ::EntityId m_roundNumberUi;
         AZ::EntityId m_roundTimerUi;
         AZStd::string m_roundNumberText;
-        AZStd::string m_roundTimerText;
         AZ::EntityId m_roundSecondsRemainingUiParent;
+        AZ::EntityId m_firstMatchStartingUiParent;
+        AZ::EntityId m_firstMatchStartingTimerUi;
     };
 } // namespace MultiplayerSample

+ 14 - 5
Gem/Code/Source/Components/UI/UiGameOverComponent.cpp

@@ -59,23 +59,33 @@ namespace MultiplayerSample
         m_onRoundNumberChangedHandler.Disconnect();
     }
 
-    void UiGameOverComponent::DisplaySecondsRemainingUI(uint16_t secondsRemaining)
+    void UiGameOverComponent::DisplaySecondsRemainingUI()
     {
+        const AZ::TimeMs currentHostTime = AZ::Interface<Multiplayer::IMultiplayer>::Get()->GetCurrentHostTimeMs();
+        const AZ::TimeMs matchStartTime = AZ::Interface<INetworkMatch>::Get()->GetMatchStartHostTime();
+
+        const uint16_t secondsRemaining = aznumeric_cast<uint16_t>(AZStd::floor(AZ::TimeMsToSeconds(matchStartTime - currentHostTime)));
         LyShine::EntityArray rankNumberUIElements;
         UiElementBus::EventResult(rankNumberUIElements, m_timeRemainingUntilNewMatchUIContainer, &UiElementBus::Events::GetChildElements);
 
-        for(uint16_t uiNumbersIdx = 0; uiNumbersIdx < rankNumberUIElements.size(); ++uiNumbersIdx)
+        const uint16_t rankNumberUiCount = aznumeric_cast<uint16_t>(rankNumberUIElements.size());
+        for(uint16_t uiNumbersIdx = 0; uiNumbersIdx < rankNumberUiCount; ++uiNumbersIdx)
         {
             UiElementBus::Event(rankNumberUIElements[uiNumbersIdx]->GetId(), &UiElementBus::Events::SetIsEnabled, secondsRemaining == uiNumbersIdx);
         }
+
+        // Remove this event to update the timer ui once the time reaches 0
+        if (secondsRemaining == 0)
+        {
+            m_onSecondsRemainingChanged.RemoveFromQueue();
+        }
     }
 
     void UiGameOverComponent::SetGameOverScreenEnabled(bool enabled)
     {
         if (enabled)
         {
-            m_secondsRemainingUntilNewMatch = RestSecondsBetweenMatches;
-            DisplaySecondsRemainingUI(m_secondsRemainingUntilNewMatch);
+            DisplaySecondsRemainingUI();
             m_onSecondsRemainingChanged.Enqueue(AZ::TimeMs{ 1000 }, true);
         }
         else
@@ -151,6 +161,5 @@ namespace MultiplayerSample
                 UiElementBus::Event(rankNumbers[i]->GetId(), &UiElementBus::Events::SetIsEnabled, i == clientPlayerRank);
             }
         }
-
     }
 }

+ 2 - 11
Gem/Code/Source/Components/UI/UiGameOverComponent.h

@@ -20,8 +20,6 @@ namespace MultiplayerSample
         , public UiGameOverBus::Handler
     {
     public:
-        static constexpr uint16_t RestSecondsBetweenMatches = 5;
-
         AZ_COMPONENT(UiGameOverComponent, "{37a2de13-a8fa-4ee1-8652-e17253137f62}");
 
         static void Reflect(AZ::ReflectContext* context);
@@ -40,17 +38,11 @@ namespace MultiplayerSample
         // There aren't any network events around match restart time;
         // Real time is controlled on the server within the match state machine, but not shared across network.
         // See GameStatePreparingMatch.cpp and GameStateMatchEnded.cpp.
-        void DisplaySecondsRemainingUI(uint16_t secondsRemaining);
+        void DisplaySecondsRemainingUI();
         AZ::ScheduledEvent m_onSecondsRemainingChanged = AZ::ScheduledEvent( [this]()
         {
-            m_secondsRemainingUntilNewMatch -= 1;
-            DisplaySecondsRemainingUI(m_secondsRemainingUntilNewMatch);
+            DisplaySecondsRemainingUI();
 
-            // Remove this scheduled event once the time reaches 0
-            if (m_secondsRemainingUntilNewMatch == 0)
-            {
-                m_onSecondsRemainingChanged.RemoveFromQueue();
-            }
         }, AZ::Name("GameOverUI Seconds Remaining"));
 
         // Listen for the NetworkMatch Round Number to Change
@@ -79,6 +71,5 @@ namespace MultiplayerSample
         AZ::EntityId m_rankNumbersUIContainer;
         AZStd::vector<AZ::EntityId> m_topRankPlayersUIElements;
         AZ::EntityId m_timeRemainingUntilNewMatchUIContainer;
-        uint16_t m_secondsRemainingUntilNewMatch;
     };
 }

+ 1 - 1
Gem/Code/Source/Effects/GameEffect.cpp

@@ -149,7 +149,7 @@ namespace MultiplayerSample
     void GameEffect::TriggerEffect([[maybe_unused]] const AZ::Transform& transform) const
     {
 #if AZ_TRAIT_CLIENT
-        const AZ::Vector3 offsetPosition = transform.GetTranslation() + m_effectOffset;
+        const AZ::Vector3 offsetPosition = transform.GetTranslation() + transform.TransformVector(m_effectOffset);
         AZ::Transform transformOffset = transform;
         transformOffset.SetTranslation(offsetPosition);
         if (m_emitter != nullptr)

+ 10 - 16
Gem/Code/Source/GameState/GameStateMatchEnded.cpp

@@ -9,23 +9,23 @@
 #include <GameState/GameStateRequestBus.h>
 #include <Source/GameState/GameStateMatchEnded.h>
 #include <Source/GameState/GameStatePreparingMatch.h>
+#include <AzCore/Time/ITime.h>
 
 namespace MultiplayerSample
 {    
     GameStateMatchEnded::GameStateMatchEnded([[maybe_unused]] NetworkMatchComponentController* controller)
+        : m_controller(controller)
     {
-#if AZ_TRAIT_SERVER
-        m_controller = controller;	    
-#endif	    
     }
 
     void GameStateMatchEnded::OnEnter()
     {
-#if AZ_TRAIT_SERVER
         m_controller->EndMatch();
-#endif
-        m_finishingTime = AZ::TimeMs{ 3000 };
-        m_finishingEvent.Enqueue(AZ::Time::ZeroTimeMs, true);
+
+        const AZ::TimeMs restBeforeNewMatch = AZ::SecondsToTimeMs(m_controller->GetRestDurationBetweenMatches());
+        const AZ::TimeMs nextMatchStartTime = AZ::Interface<Multiplayer::IMultiplayer>::Get()->GetCurrentHostTimeMs() + restBeforeNewMatch;
+        m_controller->SetMatchStartHostTime(nextMatchStartTime);
+        m_finishingEvent.Enqueue(restBeforeNewMatch);
 
         GameplayEffectsNotificationBus::Broadcast(&GameplayEffectsNotificationBus::Events::OnEffect, SoundEffect::GameEnd);
     }
@@ -35,15 +35,9 @@ namespace MultiplayerSample
         m_finishingEvent.RemoveFromQueue();
     }
 
-    void GameStateMatchEnded::OnFinishedMatchTick()
+    void GameStateMatchEnded::OnFinishedMatch()
     {
-        m_finishingTime -= m_finishingEvent.TimeInQueueMs();
-        if (m_finishingTime <= AZ::Time::ZeroTimeMs)
-        {
-            m_finishingEvent.RemoveFromQueue();
-
-            const auto state = GameState::GameStateRequests::CreateNewOverridableGameStateOfType<GameStatePreparingMatch>();
-            GameState::GameStateRequestBus::Broadcast(&GameState::GameStateRequestBus::Events::ReplaceActiveGameState, state);
-        }
+        const auto state = GameState::GameStateRequests::CreateNewOverridableGameStateOfType<GameStatePreparingMatch>();
+        GameState::GameStateRequestBus::Broadcast(&GameState::GameStateRequestBus::Events::ReplaceActiveGameState, state);
     }
 }

+ 2 - 5
Gem/Code/Source/GameState/GameStateMatchEnded.h

@@ -29,15 +29,12 @@ namespace MultiplayerSample
         //! }@
 
     private:
-#if AZ_TRAIT_SERVER
         NetworkMatchComponentController* m_controller = nullptr;
-#endif
-        AZ::TimeMs m_finishingTime = AZ::Time::ZeroTimeMs;
 
-        void OnFinishedMatchTick();
+        void OnFinishedMatch();
         AZ::ScheduledEvent m_finishingEvent{ [this]()
         {
-            OnFinishedMatchTick();
+            OnFinishedMatch();
         }, AZ::Name("GameStateMatchEnded") };
     };
 }

+ 19 - 1
Gem/Code/Source/GameState/GameStateWaitingForPlayers.cpp

@@ -8,10 +8,18 @@
 #include <GameState/GameStateRequestBus.h>
 #include <Source/GameState/GameStatePreparingMatch.h>
 #include <Source/GameState/GameStateWaitingForPlayers.h>
+#include <PlayerMatchLifecycleBus.h>
 
 namespace MultiplayerSample
 {
+    AZ_CVAR(uint32_t, sv_MpsFirstMatchDelaySeconds, 0, nullptr, AZ::ConsoleFunctorFlags::DontReplicate,
+        "Controls how many seconds the server waits to start the first match after the first player has connected. "
+        "This is a cvar instead of network archetype because it's important for server admins to be able to set this as a launch parameter instead of having to update a level prefab. This setting could be removed if using holding lobby and matchmaking."
+        "For example, during a tournament, if all the players are ready a server admin can start server with a 60 second match delay.");
+
+
     GameStateWaitingForPlayers::GameStateWaitingForPlayers([[maybe_unused]] NetworkMatchComponentController* controller)
+        : m_controller(controller)
     {
         PlayerIdentityNotificationBus::Handler::BusConnect();
     }
@@ -19,7 +27,17 @@ namespace MultiplayerSample
     void GameStateWaitingForPlayers::OnPlayerActivated([[maybe_unused]] Multiplayer::NetEntityId playerEntity)
     {
         PlayerIdentityNotificationBus::Handler::BusDisconnect();
-        
+
+        // The first player has joined, start the timer before starting the first match
+        const AZ::TimeMs firstMatchDelayMs = AZ::SecondsToTimeMs(sv_MpsFirstMatchDelaySeconds);
+        const AZ::TimeMs firstMatchHostTime = AZ::Interface<Multiplayer::IMultiplayer>::Get()->GetCurrentHostTimeMs() + firstMatchDelayMs;
+
+        m_controller->SetMatchStartHostTime(firstMatchHostTime);
+        m_beginMatchEvent.Enqueue(firstMatchDelayMs);
+    }
+
+    void GameStateWaitingForPlayers::BeginMatch()
+    {
         const auto state = GameState::GameStateRequests::CreateNewOverridableGameStateOfType<GameStatePreparingMatch>();
         GameState::GameStateRequestBus::Broadcast(&GameState::GameStateRequestBus::Events::ReplaceActiveGameState, state);
     }

+ 8 - 0
Gem/Code/Source/GameState/GameStateWaitingForPlayers.h

@@ -29,5 +29,13 @@ namespace MultiplayerSample
         //! }@
 
     private:
+        NetworkMatchComponentController* m_controller = nullptr;
+
+        void BeginMatch();
+        AZ::ScheduledEvent m_beginMatchEvent{ [this]() 
+            {
+                BeginMatch(); 
+            }, 
+            AZ::Name("GameStateWaitingForPlayersBeginMatch") };
     };
 }

+ 0 - 9
Gem/Code/multiplayersample_files.cmake

@@ -76,15 +76,6 @@ set(FILES
     Source/Components/RpcTesterComponent.cpp
     Source/Components/RpcTesterComponent.h
 
-    Source/GameState/GameStateMatchEnded.h
-    Source/GameState/GameStateMatchEnded.cpp
-    Source/GameState/GameStateMatchInProgress.h
-    Source/GameState/GameStateMatchInProgress.cpp
-    Source/GameState/GameStatePreparingMatch.h
-    Source/GameState/GameStatePreparingMatch.cpp
-    Source/GameState/GameStateWaitingForPlayers.h
-    Source/GameState/GameStateWaitingForPlayers.cpp
-
     Source/Weapons/BaseWeapon.cpp
     Source/Weapons/BaseWeapon.h
     Source/Weapons/IWeapon.h

+ 17 - 0
Gem/Code/multiplayersample_server_files.cmake

@@ -0,0 +1,17 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+
+set(FILES
+    Source/GameState/GameStateMatchInProgress.h
+    Source/GameState/GameStateMatchInProgress.cpp
+    Source/GameState/GameStatePreparingMatch.h
+    Source/GameState/GameStatePreparingMatch.cpp
+    Source/GameState/GameStateWaitingForPlayers.h
+    Source/GameState/GameStateWaitingForPlayers.cpp
+    Source/GameState/GameStateMatchEnded.cpp
+    Source/GameState/GameStateMatchEnded.h
+)

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1673 - 3
Levels/GameplayTest/GameplayTest.prefab


+ 21 - 9
Levels/NewStarbase/NewStarbase.prefab

@@ -4812,9 +4812,9 @@
                         "$type": "NetworkTeleportComponent",
                         "TeleportEffect": {
                             "ParticleAsset": {
-                                "guid": "{D49CE200-BF8B-5DBF-98BD-14CF7C480D45}"
+                                "guid": "{FAEA4FC5-78DF-5608-8DA2-88C6CFB1D281}"
                             },
-                            "AudioTrigger": "play_sx_int_jumppad_launch",
+                            "AudioTrigger": "play_sx_int_teleporter_activate",
                             "EffectOffset": [
                                 0.0,
                                 0.0,
@@ -5538,7 +5538,8 @@
                     "Id": 110022581788315572,
                     "m_template": {
                         "$type": "MultiplayerSample::NetworkMatchComponent",
-                        "RespawnPenaltyPercent": 20
+                        "RespawnPenaltyPercent": 20,
+                        "RespawnGemTag": "Respawn Gem"
                     }
                 },
                 "Component_[11474776527615145837]": {
@@ -5690,6 +5691,17 @@
                                     "assetHint": "prefabs/diamond_gem.spawnable"
                                 },
                                 "Score": 20
+                            },
+                            {
+                                "Tag": "Respawn Gem",
+                                "Asset": {
+                                    "assetId": {
+                                        "guid": "{0A633BA0-57EE-51B7-8722-1EBC551740F2}",
+                                        "subId": 3148544445
+                                    },
+                                    "assetHint": "prefabs/player_drop_gem.spawnable"
+                                },
+                                "Score": 0
                             }
                         ],
                         "SpawnTablesPerRound": [
@@ -7255,9 +7267,9 @@
                         "$type": "NetworkTeleportComponent",
                         "TeleportEffect": {
                             "ParticleAsset": {
-                                "guid": "{D49CE200-BF8B-5DBF-98BD-14CF7C480D45}"
+                                "guid": "{FAEA4FC5-78DF-5608-8DA2-88C6CFB1D281}"
                             },
-                            "AudioTrigger": "play_sx_int_jumppad_launch",
+                            "AudioTrigger": "play_sx_int_teleporter_activate",
                             "EffectOffset": [
                                 0.0,
                                 0.0,
@@ -7543,9 +7555,9 @@
                         "$type": "NetworkTeleportComponent",
                         "TeleportEffect": {
                             "ParticleAsset": {
-                                "guid": "{D49CE200-BF8B-5DBF-98BD-14CF7C480D45}"
+                                "guid": "{FAEA4FC5-78DF-5608-8DA2-88C6CFB1D281}"
                             },
-                            "AudioTrigger": "play_sx_int_jumppad_launch",
+                            "AudioTrigger": "play_sx_int_teleporter_activate",
                             "EffectOffset": [
                                 0.0,
                                 0.0,
@@ -7839,9 +7851,9 @@
                         "$type": "NetworkTeleportComponent",
                         "TeleportEffect": {
                             "ParticleAsset": {
-                                "guid": "{D49CE200-BF8B-5DBF-98BD-14CF7C480D45}"
+                                "guid": "{FAEA4FC5-78DF-5608-8DA2-88C6CFB1D281}"
                             },
-                            "AudioTrigger": "play_sx_int_jumppad_launch",
+                            "AudioTrigger": "play_sx_int_teleporter_activate",
                             "EffectOffset": [
                                 0.0,
                                 0.0,

+ 248 - 59
Levels/Prefab-Test/Prefab-Test.prefab

@@ -25,14 +25,8 @@
                 "Child Entity Order": [
                     "Entity_[3930003406247]",
                     "Entity_[1176639161715]",
-                    "Instance_[20226982305437]/ContainerEntity",
-                    "Instance_[37741858938525]/ContainerEntity",
-                    "Instance_[55239555702429]/ContainerEntity",
-                    "Instance_[72999245471389]/ContainerEntity",
-                    "Instance_[91098237656733]/ContainerEntity",
-                    "Instance_[128747359507152]/ContainerEntity",
-                    "Instance_[4405444703377]/ContainerEntity",
-                    "Instance_[43837539447953]/ContainerEntity"
+                    "Entity_[4004838096029]",
+                    "Entity_[44149897411741]"
                 ]
             },
             "Component_[15230859088967841193]": {
@@ -409,7 +403,8 @@
                 },
                 "Component_[16247165675903986673]": {
                     "$type": "EditorVisibilityComponent",
-                    "Id": 16247165675903986673
+                    "Id": 16247165675903986673,
+                    "VisibilityFlag": false
                 },
                 "Component_[18082433625958885247]": {
                     "$type": "EditorDisabledCompositionComponent",
@@ -953,7 +948,10 @@
                     "$type": "EditorEntitySortComponent",
                     "Id": 4644775951685885016,
                     "Child Entity Order": [
-                        "Instance_[40654643291332]/Entity_[1419387525450]",
+                        "Instance_[128747359507152]/ContainerEntity",
+                        "Instance_[4405444703377]/ContainerEntity",
+                        "Instance_[43837539447953]/ContainerEntity",
+                        "Instance_[40654643291332]/ContainerEntity",
                         "Instance_[41578061259972]/ContainerEntity",
                         "Instance_[41655370671300]/ContainerEntity",
                         "Instance_[41724090148036]/ContainerEntity",
@@ -975,11 +973,6 @@
                         "Instance_[23618958615187]/ContainerEntity",
                         "Instance_[117150461420179]/ContainerEntity",
                         "Instance_[1266414567741743]/ContainerEntity",
-                        "Instance_[86752528665640]/ContainerEntity",
-                        "Instance_[86859902848040]/ContainerEntity",
-                        "Instance_[86967277030440]/ContainerEntity",
-                        "Instance_[87074651212840]/ContainerEntity",
-                        "Instance_[87182025395240]/ContainerEntity",
                         "Instance_[87289399577640]/ContainerEntity",
                         "Instance_[87396773760040]/ContainerEntity"
                     ]
@@ -1002,6 +995,56 @@
                 }
             }
         },
+        "Entity_[3953298488477]": {
+            "Id": "Entity_[3953298488477]",
+            "Name": "gem_one",
+            "Components": {
+                "Component_[1140639001735473989]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 1140639001735473989
+                },
+                "Component_[13726996269258797851]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 13726996269258797851
+                },
+                "Component_[13965404938101719378]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 13965404938101719378
+                },
+                "Component_[14634580807146244331]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 14634580807146244331,
+                    "Parent Entity": "Entity_[3930003406247]",
+                    "Transform Data": {
+                        "Translate": [
+                            145.20147705078125,
+                            59.44342803955078,
+                            4.703718185424805
+                        ]
+                    }
+                },
+                "Component_[15785212467023455306]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 15785212467023455306
+                },
+                "Component_[4107758271538328763]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 4107758271538328763
+                },
+                "Component_[587015781584182570]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 587015781584182570
+                },
+                "Component_[691358497764424953]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 691358497764424953
+                },
+                "Component_[9619094306615181653]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 9619094306615181653
+                }
+            }
+        },
         "Entity_[39642656472487]": {
             "Id": "Entity_[39642656472487]",
             "Name": "Skylight",
@@ -1089,6 +1132,108 @@
                     }
                 }
             }
+        },
+        "Entity_[4004838096029]": {
+            "Id": "Entity_[4004838096029]",
+            "Name": "Gem_Art",
+            "Components": {
+                "Component_[10328369953420271117]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 10328369953420271117
+                },
+                "Component_[12838310471572575925]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 12838310471572575925
+                },
+                "Component_[13330103089671716049]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 13330103089671716049
+                },
+                "Component_[15079293175512794312]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 15079293175512794312,
+                    "Parent Entity": "Entity_[1146574390643]"
+                },
+                "Component_[2432696987887717282]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 2432696987887717282
+                },
+                "Component_[3268996885436349442]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 3268996885436349442,
+                    "Child Entity Order": [
+                        "Instance_[86752528665640]/ContainerEntity",
+                        "Instance_[86859902848040]/ContainerEntity",
+                        "Instance_[86967277030440]/ContainerEntity",
+                        "Instance_[87074651212840]/ContainerEntity",
+                        "Instance_[87182025395240]/ContainerEntity",
+                        "Instance_[44029638327453]/ContainerEntity"
+                    ]
+                },
+                "Component_[359932234016867482]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 359932234016867482
+                },
+                "Component_[5791594382843386489]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 5791594382843386489
+                },
+                "Component_[9560842267558930211]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 9560842267558930211
+                }
+            }
+        },
+        "Entity_[44149897411741]": {
+            "Id": "Entity_[44149897411741]",
+            "Name": "Gem_PickUp_Prefabs",
+            "Components": {
+                "Component_[10625726441925320184]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 10625726441925320184
+                },
+                "Component_[1136967946820337400]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 1136967946820337400
+                },
+                "Component_[154298334514094993]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 154298334514094993
+                },
+                "Component_[16187781701273769486]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 16187781701273769486,
+                    "Child Entity Order": [
+                        "Instance_[20226982305437]/ContainerEntity",
+                        "Instance_[37741858938525]/ContainerEntity",
+                        "Instance_[55239555702429]/ContainerEntity",
+                        "Instance_[72999245471389]/ContainerEntity",
+                        "Instance_[91098237656733]/ContainerEntity",
+                        "Instance_[84509705092253]/ContainerEntity"
+                    ]
+                },
+                "Component_[17961227236916110011]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 17961227236916110011,
+                    "Parent Entity": "Entity_[1146574390643]"
+                },
+                "Component_[1853077174055284533]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 1853077174055284533
+                },
+                "Component_[3437190941441067620]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 3437190941441067620
+                },
+                "Component_[4466383879842976142]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 4466383879842976142
+                },
+                "Component_[6201710303216603545]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 6201710303216603545
+                }
+            }
         }
     },
     "Instances": {
@@ -1183,17 +1328,17 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[2000417864965542772]/Parent Entity",
-                    "value": "../Entity_[1146574390643]"
+                    "value": "../Entity_[3930003406247]"
                 },
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[2000417864965542772]/Transform Data/Translate/0",
-                    "value": 22.01111602783203
+                    "value": 63.15948486328125
                 },
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[2000417864965542772]/Transform Data/Translate/1",
-                    "value": 14.647554397583008
+                    "value": 18.676774978637695
                 }
             ]
         },
@@ -1253,7 +1398,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[14420415435941492777]/Parent Entity",
-                    "value": "../Entity_[1146574390643]"
+                    "value": "../Entity_[44149897411741]"
                 },
                 {
                     "op": "replace",
@@ -1298,12 +1443,12 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[8875781117888677262]/Parent Entity",
-                    "value": "../Entity_[1146574390643]"
+                    "value": "../Entity_[44149897411741]"
                 },
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[8875781117888677262]/Transform Data/Translate/0",
-                    "value": 98.84895324707033
+                    "value": 98.84895324707031
                 },
                 {
                     "op": "replace",
@@ -1322,28 +1467,22 @@
             "Patches": [
                 {
                     "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[3452999764137394831]/Parent Entity",
+                    "path": "/ContainerEntity/Components/Component_[10254217550286296355]/Parent Entity",
                     "value": "../Entity_[3930003406247]"
                 },
                 {
                     "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[3452999764137394831]/Transform Data/Translate/0",
-                    "value": -1.541001319885254
-                },
-                {
-                    "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[3452999764137394831]/Transform Data/Translate/1",
-                    "value": -0.19441795349121097
+                    "path": "/ContainerEntity/Components/Component_[10254217550286296355]/Transform Data/Translate/0",
+                    "value": 41.14836883544922
                 },
                 {
                     "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[3452999764137394831]/Transform Data/Rotate/2",
-                    "value": 180.0
+                    "path": "/ContainerEntity/Components/Component_[10254217550286296355]/Transform Data/Translate/1",
+                    "value": 4.0292205810546875
                 },
                 {
-                    "op": "add",
-                    "path": "/ContainerEntity/Components/Component_[9544742750209915924]/Child Entity Order/0",
-                    "value": "Entity_[1423682492746]"
+                    "op": "remove",
+                    "path": "/Entities/Entity_[79122787930156]/Components/Component_[3433022179537173310]/configuration/propertyOverrides/overridesUnused/0"
                 }
             ]
         },
@@ -1518,17 +1657,17 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[16004579542647427624]/Parent Entity",
-                    "value": "../Entity_[1146574390643]"
+                    "value": "../Entity_[3930003406247]"
                 },
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[16004579542647427624]/Transform Data/Translate/0",
-                    "value": 108.78033447265625
+                    "value": 149.9287109375
                 },
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[16004579542647427624]/Transform Data/Translate/1",
-                    "value": 51.45598602294922
+                    "value": 55.485206604003906
                 },
                 {
                     "op": "replace",
@@ -1537,23 +1676,48 @@
                 }
             ]
         },
+        "Instance_[44029638327453]": {
+            "Source": "Pick_Ups/Gems/gem_combo.prefab",
+            "Patches": [
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[4811221071627586596]/Parent Entity",
+                    "value": "../Entity_[4004838096029]"
+                },
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[4811221071627586596]/Transform Data/Translate/0",
+                    "value": 104.05310821533203
+                },
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[4811221071627586596]/Transform Data/Translate/1",
+                    "value": 55.414207458496094
+                },
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[4811221071627586596]/Transform Data/Translate/2",
+                    "value": 4.748165607452393
+                }
+            ]
+        },
         "Instance_[4405444703377]": {
             "Source": "KB3D_HighTechStreets/Objects/HTS_Road_Chunk/HTS_Road_Chunk.prefab",
             "Patches": [
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[15827628951370538256]/Parent Entity",
-                    "value": "../Entity_[1146574390643]"
+                    "value": "../Entity_[3930003406247]"
                 },
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[15827628951370538256]/Transform Data/Translate/0",
-                    "value": 95.83011627197266
+                    "value": 136.97848510742188
                 },
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[15827628951370538256]/Transform Data/Translate/1",
-                    "value": 48.20128631591797
+                    "value": 52.230506896972656
                 },
                 {
                     "op": "replace",
@@ -1613,7 +1777,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[10518291555049438123]/Parent Entity",
-                    "value": "../Entity_[1146574390643]"
+                    "value": "../Entity_[44149897411741]"
                 },
                 {
                     "op": "replace",
@@ -1663,7 +1827,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[13733325515080958445]/Parent Entity",
-                    "value": "../Entity_[1146574390643]"
+                    "value": "../Entity_[44149897411741]"
                 },
                 {
                     "op": "replace",
@@ -1682,6 +1846,31 @@
                 }
             ]
         },
+        "Instance_[84509705092253]": {
+            "Source": "Prefabs/Player_Drop_Gem.prefab",
+            "Patches": [
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[17803071605478226933]/Parent Entity",
+                    "value": "../Entity_[44149897411741]"
+                },
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[17803071605478226933]/Transform Data/Translate/0",
+                    "value": 95.84037017822266
+                },
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[17803071605478226933]/Transform Data/Translate/1",
+                    "value": 53.83031463623047
+                },
+                {
+                    "op": "replace",
+                    "path": "/ContainerEntity/Components/Component_[17803071605478226933]/Transform Data/Translate/2",
+                    "value": 4.559815406799316
+                }
+            ]
+        },
         "Instance_[862689945530783]": {
             "Source": "KB3D_HighTechStreets/Prefabs/HTS_BldgLG_D.prefab",
             "Patches": [
@@ -1751,17 +1940,17 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[14634580807146244331]/Parent Entity",
-                    "value": "../Entity_[3930003406247]"
+                    "value": "../Entity_[4004838096029]"
                 },
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[14634580807146244331]/Transform Data/Translate/0",
-                    "value": 141.66995239257813
+                    "value": 100.5215835571289
                 },
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[14634580807146244331]/Transform Data/Translate/1",
-                    "value": 58.91188049316406
+                    "value": 54.882659912109375
                 },
                 {
                     "op": "replace",
@@ -1776,17 +1965,17 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[4108868488500559633]/Parent Entity",
-                    "value": "../Entity_[3930003406247]"
+                    "value": "../Entity_[4004838096029]"
                 },
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[4108868488500559633]/Transform Data/Translate/0",
-                    "value": 142.34725952148438
+                    "value": 101.19889068603516
                 },
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[4108868488500559633]/Transform Data/Translate/1",
-                    "value": 59.05173110961914
+                    "value": 55.02251052856445
                 },
                 {
                     "op": "replace",
@@ -1841,17 +2030,17 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[18332677191708595514]/Parent Entity",
-                    "value": "../Entity_[3930003406247]"
+                    "value": "../Entity_[4004838096029]"
                 },
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[18332677191708595514]/Transform Data/Translate/0",
-                    "value": 142.92379760742188
+                    "value": 101.77542877197266
                 },
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[18332677191708595514]/Transform Data/Translate/1",
-                    "value": 59.17203903198242
+                    "value": 55.142818450927734
                 },
                 {
                     "op": "replace",
@@ -1866,17 +2055,17 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[4886439398006661207]/Parent Entity",
-                    "value": "../Entity_[3930003406247]"
+                    "value": "../Entity_[4004838096029]"
                 },
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[4886439398006661207]/Transform Data/Translate/0",
-                    "value": 143.5849609375
+                    "value": 102.43659210205078
                 },
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[4886439398006661207]/Transform Data/Translate/1",
-                    "value": 59.33064270019531
+                    "value": 55.301422119140625
                 },
                 {
                     "op": "replace",
@@ -1891,17 +2080,17 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[403139584444037813]/Parent Entity",
-                    "value": "../Entity_[3930003406247]"
+                    "value": "../Entity_[4004838096029]"
                 },
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[403139584444037813]/Transform Data/Translate/0",
-                    "value": 144.1368408203125
+                    "value": 102.98847198486328
                 },
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[403139584444037813]/Transform Data/Translate/1",
-                    "value": 59.45323944091797
+                    "value": 55.42401885986328
                 },
                 {
                     "op": "replace",
@@ -2036,12 +2225,12 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[3688874831980273851]/Parent Entity",
-                    "value": "../Entity_[1146574390643]"
+                    "value": "../Entity_[44149897411741]"
                 },
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[3688874831980273851]/Transform Data/Translate/0",
-                    "value": 96.55432891845705
+                    "value": 96.55432891845703
                 },
                 {
                     "op": "replace",

+ 2 - 2
PopcornFX/Particles/EnergyBallTrap/FX_EnergyBallTrap_BuildUp.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1eeb75d87ea94fa51e5dbbd2195a606b9ccdf1d765019edc411eccec77e61457
-size 268229
+oid sha256:993fee956f1794290c4a5a5e0f2ee5639cc2769da35547bf6cf4a716a9d3b21e
+size 270200

+ 70 - 15
Prefabs/Energy_Cannon_with_Energy_Ball.prefab

@@ -91,7 +91,7 @@
                                 "Type": 31
                             }
                         ],
-                        "AttributesRawData": "AACAPwAAAAAAAAAAAAAAAAAAQD8AAAAAAAAAAAAAAAA="
+                        "AttributesRawData": "AACAPwAAAAAAAAAAAAAAAM3MTD8AAAAAAAAAAAAAAAA="
                     },
                     "EditorAttributeList": {
                         "AttributeCategories": [
@@ -101,7 +101,7 @@
                                         "ValueFX": 1.0
                                     },
                                     {
-                                        "ValueFX": 0.75
+                                        "ValueFX": 0.800000011920929
                                     }
                                 ]
                             }
@@ -125,9 +125,9 @@
                     "Parent Entity": "Entity_[660556807508]",
                     "Transform Data": {
                         "Translate": [
-                            -4.76837158203125e-7,
-                            0.014715194702148438,
-                            1.3146799802780151
+                            -9.5367431640625e-7,
+                            -0.30000001192092896,
+                            0.6000000238418579
                         ],
                         "UniformScale": 0.5
                     }
@@ -157,7 +157,7 @@
                         "GatherParams": {
                             "GatherShape": 2,
                             "CastDistance": 0.0,
-                            "TravelSpeed": 12.0,
+                            "TravelSpeed": 8.0,
                             "BulletDrop": false
                         },
                         "HitEffect": {
@@ -240,10 +240,10 @@
                         "Configuration": {
                             "ModelAsset": {
                                 "assetId": {
-                                    "guid": "{98F0A4B8-3708-5D15-BFB4-FA4AA377F084}",
-                                    "subId": 269172407
+                                    "guid": "{251F7A49-FA34-57EC-919D-399EAF8F9770}",
+                                    "subId": 269561695
                                 },
-                                "assetHint": "defenceturret/defenceturret.azmodel"
+                                "assetHint": "spacecannon/spacecannon.azmodel"
                             }
                         }
                     }
@@ -287,6 +287,7 @@
                         "$type": "MultiplayerSample::EnergyCannonComponent",
                         "RateOfFireMs": 4000,
                         "BallLifetimeMs": 3800,
+                        "BuildUpTimeMs": 3300,
                         "FiringEffect": {
                             "ParticleAsset": {
                                 "guid": "{F16C718B-7B3D-5F6B-877C-0CA15AAE7544}"
@@ -294,8 +295,8 @@
                             "AudioTrigger": "play_sx_int_energyballtrap_buildup",
                             "EffectOffset": [
                                 0.0,
-                                0.0,
-                                1.2999999523162842
+                                -0.30000001192092896,
+                                0.6000000238418579
                             ]
                         },
                         "EnergyBallEntity": "Entity_[656261840212]"
@@ -316,7 +317,10 @@
                 "Component_[3533828349650165605]": {
                     "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
                     "Id": 3533828349650165605,
-                    "Parent Entity": "ContainerEntity"
+                    "Parent Entity": "ContainerEntity",
+                    "Transform Data": {
+                        "UniformScale": 2.0
+                    }
                 },
                 "Component_[398718130345139058]": {
                     "$type": "EditorEntitySortComponent",
@@ -338,10 +342,9 @@
                                 "{}": {
                                     "MaterialAsset": {
                                         "assetId": {
-                                            "guid": "{98F0A4B8-3708-5D15-BFB4-FA4AA377F084}",
-                                            "subId": 1927518764
+                                            "guid": "{7F678F45-39F0-573F-A178-34E76532397E}"
                                         },
-                                        "assetHint": "defenceturret/defenceturret_opaque_mat_14061460897371757100.azmaterial"
+                                        "assetHint": "spacecannon/spacecannon_base_mat.azmaterial"
                                     }
                                 }
                             }
@@ -352,12 +355,64 @@
                     "$type": "EditorEntityIconComponent",
                     "Id": 8731904734389776651
                 },
+                "Component_[9112722425705082704]": {
+                    "$type": "EditorMeshColliderComponent",
+                    "Id": 9112722425705082704,
+                    "ColliderConfiguration": {
+                        "Rotation": [
+                            0.0,
+                            -0.0,
+                            1.0,
+                            -0.0
+                        ],
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "base_MAT"
+                                }
+                            ]
+                        }
+                    },
+                    "ShapeConfiguration": {
+                        "PhysicsAsset": {
+                            "Asset": {
+                                "assetId": {
+                                    "guid": "{251F7A49-FA34-57EC-919D-399EAF8F9770}",
+                                    "subId": 1397975047
+                                },
+                                "assetHint": "spacecannon/spacecannon.pxmesh"
+                            },
+                            "Configuration": {
+                                "Scale": [
+                                    2.0,
+                                    2.0,
+                                    2.0
+                                ],
+                                "PhysicsAsset": {
+                                    "assetId": {
+                                        "guid": "{251F7A49-FA34-57EC-919D-399EAF8F9770}",
+                                        "subId": 1397975047
+                                    },
+                                    "loadBehavior": "QueueLoad",
+                                    "assetHint": "spacecannon/spacecannon.pxmesh"
+                                }
+                            }
+                        }
+                    },
+                    "DebugDrawSettings": {
+                        "LocallyEnabled": false
+                    }
+                },
                 "Component_[9219518570565453785]": {
                     "$type": "GenericComponentWrapper",
                     "Id": 9219518570565453785,
                     "m_template": {
                         "$type": "Multiplayer::NetworkTransformComponent"
                     }
+                },
+                "Component_[9579942683680693676]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 9579942683680693676
                 }
             }
         }

+ 2 - 2
Prefabs/Ground_Teleport_Volume.prefab

@@ -261,9 +261,9 @@
                         "$type": "NetworkTeleportComponent",
                         "TeleportEffect": {
                             "ParticleAsset": {
-                                "guid": "{D49CE200-BF8B-5DBF-98BD-14CF7C480D45}"
+                                "guid": "{FAEA4FC5-78DF-5608-8DA2-88C6CFB1D281}"
                             },
-                            "AudioTrigger": "play_sx_int_jumppad_launch",
+                            "AudioTrigger": "play_sx_int_teleporter_activate",
                             "EffectOffset": [
                                 0.0,
                                 0.0,

+ 379 - 0
Prefabs/Player_Drop_Gem.prefab

@@ -0,0 +1,379 @@
+{
+    "ContainerEntity": {
+        "Id": "ContainerEntity",
+        "Name": "Player_Drop_Gem",
+        "Components": {
+            "Component_[10290833748294756724]": {
+                "$type": "EditorOnlyEntityComponent",
+                "Id": 10290833748294756724
+            },
+            "Component_[11890153593728525156]": {
+                "$type": "EditorInspectorComponent",
+                "Id": 11890153593728525156
+            },
+            "Component_[16027644798071772795]": {
+                "$type": "EditorDisabledCompositionComponent",
+                "Id": 16027644798071772795
+            },
+            "Component_[17803071605478226933]": {
+                "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                "Id": 17803071605478226933,
+                "Parent Entity": ""
+            },
+            "Component_[3209515166493233442]": {
+                "$type": "EditorLockComponent",
+                "Id": 3209515166493233442
+            },
+            "Component_[3699644582002602364]": {
+                "$type": "EditorVisibilityComponent",
+                "Id": 3699644582002602364
+            },
+            "Component_[4413809066330629844]": {
+                "$type": "EditorEntityIconComponent",
+                "Id": 4413809066330629844
+            },
+            "Component_[6288761158084607325]": {
+                "$type": "EditorPendingCompositionComponent",
+                "Id": 6288761158084607325
+            },
+            "Component_[7395235309804273739]": {
+                "$type": "EditorPrefabComponent",
+                "Id": 7395235309804273739
+            },
+            "Component_[7985104381369676474]": {
+                "$type": "EditorEntitySortComponent",
+                "Id": 7985104381369676474,
+                "Child Entity Order": [
+                    "Entity_[84518295026845]"
+                ]
+            }
+        }
+    },
+    "Entities": {
+        "Entity_[84518295026845]": {
+            "Id": "Entity_[84518295026845]",
+            "Name": "Combo_Gem",
+            "Components": {
+                "Component_[10163317628562516844]": {
+                    "$type": "EditorMaterialComponent",
+                    "Id": 10163317628562516844,
+                    "Controller": {
+                        "Configuration": {
+                            "materials": [
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 749070437
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{3D3B1B5A-919F-5272-B349-B386F240A4F5}"
+                                            },
+                                            "assetHint": "pick_ups/gems/skins/gem_interior_red.azmaterial"
+                                        }
+                                    }
+                                },
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 1773378494
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{F55EDFEA-D784-546E-9489-9FE7265B8283}"
+                                            },
+                                            "assetHint": "pick_ups/gems/skins/gem_interior_green.azmaterial"
+                                        }
+                                    }
+                                },
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 2007229905
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{AD75328E-5545-55E6-97C8-C2E3D627B3E6}"
+                                            },
+                                            "assetHint": "pick_ups/gems/skins/gem_interior_yellow.azmaterial"
+                                        }
+                                    }
+                                },
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 2137042421
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{4EE7CFA7-04F3-5D52-872C-46192C145AAF}"
+                                            },
+                                            "assetHint": "pick_ups/gems/skins/gem_exterior_red.azmaterial"
+                                        }
+                                    }
+                                },
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 2745205751
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{E42EA630-B22B-5DD2-83DD-9FBD7FAC8FC1}"
+                                            },
+                                            "assetHint": "pick_ups/gems/skins/gem_exterior_yellow.azmaterial"
+                                        }
+                                    }
+                                },
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 3458859696
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{B539B85B-5B81-52E3-95D5-33A0E3C36E29}"
+                                            },
+                                            "assetHint": "pick_ups/gems/skins/gem_exterior_green.azmaterial"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                },
+                "Component_[11153673147495975095]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 11153673147495975095
+                },
+                "Component_[11667213342982191799]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 11667213342982191799
+                },
+                "Component_[12404836632210058281]": {
+                    "$type": "AZ::Render::EditorMeshComponent",
+                    "Id": 12404836632210058281,
+                    "Controller": {
+                        "Configuration": {
+                            "ModelAsset": {
+                                "assetId": {
+                                    "guid": "{1C0444A0-943C-5802-8F4F-74AB4A427599}",
+                                    "subId": 279381580
+                                },
+                                "assetHint": "pick_ups/gems/gem_combo.azmodel"
+                            }
+                        }
+                    }
+                },
+                "Component_[13644541024230291784]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 13644541024230291784
+                },
+                "Component_[14439860670826727286]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14439860670826727286,
+                    "Child Entity Order": [
+                        "Entity_[84522589994141]"
+                    ]
+                },
+                "Component_[17696701252402760237]": {
+                    "$type": "EditorStaticRigidBodyComponent",
+                    "Id": 17696701252402760237
+                },
+                "Component_[3117152326793893835]": {
+                    "$type": "GenericComponentWrapper",
+                    "Id": 3117152326793893835,
+                    "m_template": {
+                        "$type": "NetBindComponent"
+                    }
+                },
+                "Component_[4684877471957022317]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 4684877471957022317,
+                    "ComponentOrderEntryArray": [
+                        {
+                            "ComponentId": 6627174300642616873
+                        },
+                        {
+                            "ComponentId": 17696701252402760237,
+                            "SortIndex": 1
+                        },
+                        {
+                            "ComponentId": 3117152326793893835,
+                            "SortIndex": 2
+                        },
+                        {
+                            "ComponentId": 8324971338110981697,
+                            "SortIndex": 3
+                        },
+                        {
+                            "ComponentId": 10163317628562516844,
+                            "SortIndex": 4
+                        },
+                        {
+                            "ComponentId": 6047658345822598543,
+                            "SortIndex": 5
+                        },
+                        {
+                            "ComponentId": 12404836632210058281,
+                            "SortIndex": 6
+                        },
+                        {
+                            "ComponentId": 4709323619022222983,
+                            "SortIndex": 7
+                        }
+                    ]
+                },
+                "Component_[4709323619022222983]": {
+                    "$type": "EditorColliderComponent",
+                    "Id": 4709323619022222983,
+                    "ColliderConfiguration": {
+                        "Trigger": true,
+                        "InSceneQueries": false,
+                        "Position": [
+                            0.0,
+                            0.0,
+                            0.6499999761581421
+                        ],
+                        "MaterialSlots": {
+                            "Slots": [
+                                {
+                                    "Name": "Entire object",
+                                    "MaterialAsset": {
+                                        "assetId": {
+                                            "guid": "{EF76347C-319F-584E-9DDE-A06D328F4304}",
+                                            "subId": 1
+                                        },
+                                        "assetHint": "physx/glass.physicsmaterial"
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "ShapeConfiguration": {
+                        "ShapeType": 0,
+                        "Sphere": {
+                            "Radius": 1.0
+                        }
+                    },
+                    "DebugDrawSettings": {
+                        "LocallyEnabled": false
+                    }
+                },
+                "Component_[6047658345822598543]": {
+                    "$type": "GenericComponentWrapper",
+                    "Id": 6047658345822598543,
+                    "m_template": {
+                        "$type": "MultiplayerSample::GemComponent",
+                        "VerticalAmplitude": 0.5
+                    }
+                },
+                "Component_[6627174300642616873]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 6627174300642616873,
+                    "Parent Entity": "ContainerEntity"
+                },
+                "Component_[7858479129415370824]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 7858479129415370824
+                },
+                "Component_[8324971338110981697]": {
+                    "$type": "GenericComponentWrapper",
+                    "Id": 8324971338110981697,
+                    "m_template": {
+                        "$type": "Multiplayer::NetworkTransformComponent"
+                    }
+                },
+                "Component_[9503189652770780952]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 9503189652770780952
+                },
+                "Component_[957135423684634937]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 957135423684634937
+                }
+            }
+        },
+        "Entity_[84522589994141]": {
+            "Id": "Entity_[84522589994141]",
+            "Name": "Light",
+            "Components": {
+                "Component_[10067174683346795274]": {
+                    "$type": "GenericComponentWrapper",
+                    "Id": 10067174683346795274,
+                    "m_template": {
+                        "$type": "NetBindComponent"
+                    }
+                },
+                "Component_[11389931810497139456]": {
+                    "$type": "AZ::Render::EditorAreaLightComponent",
+                    "Id": 11389931810497139456,
+                    "Controller": {
+                        "Configuration": {
+                            "LightType": 6,
+                            "Color": [
+                                0.9647058844566345,
+                                0.6941176652908325,
+                                0.1764705926179886
+                            ],
+                            "Intensity": 20.0,
+                            "AttenuationRadiusMode": 0,
+                            "AttenuationRadius": 2.0
+                        }
+                    }
+                },
+                "Component_[11397583193951446659]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 11397583193951446659
+                },
+                "Component_[12515557652890195284]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 12515557652890195284
+                },
+                "Component_[13963058857013492150]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 13963058857013492150
+                },
+                "Component_[6673632923646444973]": {
+                    "$type": "GenericComponentWrapper",
+                    "Id": 6673632923646444973,
+                    "m_template": {
+                        "$type": "Multiplayer::NetworkTransformComponent"
+                    }
+                },
+                "Component_[6689047679337604189]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 6689047679337604189
+                },
+                "Component_[8073892722386754434]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 8073892722386754434
+                },
+                "Component_[866618880442094446]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 866618880442094446
+                },
+                "Component_[8838068600041134746]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 8838068600041134746
+                },
+                "Component_[9631743660200799251]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 9631743660200799251,
+                    "Parent Entity": "Entity_[84518295026845]",
+                    "Transform Data": {
+                        "Translate": [
+                            0.0,
+                            0.0,
+                            0.7173895835876465
+                        ]
+                    }
+                },
+                "Component_[9846482979970475305]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 9846482979970475305
+                }
+            }
+        }
+    }
+}

+ 26 - 13
Registry/multiplayersample.setreg

@@ -1,15 +1,28 @@
 {
-    "MultiplayerSample": {
-        "Settings": {
-            "WinningCoinCount": 333,
-            "EnergyBall": {
-                "KnockbackDistanceMeters": 2.0,
-                "Speed": 15.0,
-                "ArmorDamage": 10
-            },
-            "EnergyCannon": {
-                "FiringPeriodMilliseconds": 2000
-            }
-        }
-    }
+	"MultiplayerSample": {
+		"Settings": {
+			"WinningCoinCount": 333,
+			"EnergyBall": {
+				"KnockbackDistanceMeters": 2.0,
+				"Speed": 15.0,
+				"ArmorDamage": 10
+			},
+			"EnergyCannon": {
+				"FiringPeriodMilliseconds": 2000
+			}
+		}
+	},
+	"O3DE": {
+		"Atom": {
+			"RPI": {
+				"Initialization": {
+					"ImageSystemDescriptor": {
+						"SystemStreamingImagePoolSize": 750000000,
+						"SystemAttachmentImagePoolSize": 0,
+                        "SystemStreamingImagePoolMipBias": 1
+					}
+				}
+			}
+		}
+	}
 }

+ 2 - 2
Sounds/wwise/Init.bnk

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bed64b65dcbd00d724bff540a7201b65a775d0e3df8b766150b09eee3e36463e
-size 2036
+oid sha256:cd174d7ca3c76e2fc92ae87d7ba1aa5dbd4154cbe95d3cffc48c5c4ccc13cbd3
+size 2311

+ 2 - 2
Sounds/wwise/MultiplayerSample_SoundBank.bnk

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:35d3c0371a34ed39fd957204b84b00bcfe9fa5916e9adf017b7e076d4cb7388e
-size 33758356
+oid sha256:ed6e7dcf3c3a5c808be13a26caa9f13f9e402e3798fffc361e1b854acc0a8844
+size 50096838

+ 143 - 0
Sounds/wwise/Wwise_IDs.h

@@ -0,0 +1,143 @@
+/////////////////////////////////////////////////////////////////////////////////////////////////////
+//
+// Audiokinetic Wwise generated include file. Do not edit.
+//
+/////////////////////////////////////////////////////////////////////////////////////////////////////
+
+#ifndef __WWISE_IDS_H__
+#define __WWISE_IDS_H__
+
+#include <AK/SoundEngine/Common/AkTypes.h>
+
+namespace AK
+{
+    namespace EVENTS
+    {
+        static const AkUniqueID DO_NOTHING = 3888641552U;
+        static const AkUniqueID GET_FOCUS = 4280413250U;
+        static const AkUniqueID LOSE_FOCUS = 3350149075U;
+        static const AkUniqueID MUTE_ALL = 1739713018U;
+        static const AkUniqueID PLAY_SX_AMB_EXT_GENERAL = 1593597659U;
+        static const AkUniqueID PLAY_SX_ENV_LAMP_LOOP = 1589077493U;
+        static const AkUniqueID PLAY_SX_INT_ENERGYBALLTRAP_BUILDUP = 1394544692U;
+        static const AkUniqueID PLAY_SX_INT_ENERGYBALLTRAP_IMPACT = 3130133043U;
+        static const AkUniqueID PLAY_SX_INT_ENERGYBALLTRAP_ONCOOLDOWN = 2009335613U;
+        static const AkUniqueID PLAY_SX_INT_ENERGYBALLTRAP_PROJECTILE = 3442601232U;
+        static const AkUniqueID PLAY_SX_INT_ENERGYBALLTRAP_RISING = 149130571U;
+        static const AkUniqueID PLAY_SX_INT_ENERGYCOLLECTOR_EXPLOSION = 599142529U;
+        static const AkUniqueID PLAY_SX_INT_GEM_PICKUP = 3972513212U;
+        static const AkUniqueID PLAY_SX_INT_JUMPPAD_LAUNCH = 544525055U;
+        static const AkUniqueID PLAY_SX_INT_MALFUNCTIONINGSHIELDGENERATOR_BUILDUP = 4040956934U;
+        static const AkUniqueID PLAY_SX_INT_MALFUNCTIONINGSHIELDGENERATOR_EXPLO = 3532523743U;
+        static const AkUniqueID PLAY_SX_INT_MALFUNCTIONINGSHIELDGENERATOR_IDLE = 3971492149U;
+        static const AkUniqueID PLAY_SX_INT_TELEPORTER_ACTIVATE = 2479494560U;
+        static const AkUniqueID PLAY_SX_INT_TELEPORTER_IDLE = 2491323057U;
+        static const AkUniqueID PLAY_SX_PLAYER_ARMOR_BREAKING = 2969244755U;
+        static const AkUniqueID PLAY_SX_PLAYER_ARMOR_MEND = 4115785916U;
+        static const AkUniqueID PLAY_SX_PLAYER_EXERTION = 1387321888U;
+        static const AkUniqueID PLAY_SX_PLAYER_FOOTSTEP = 2558021178U;
+        static const AkUniqueID PLAY_SX_PLAYER_KNOCKDOWN = 76446992U;
+        static const AkUniqueID PLAY_SX_PLAYER_LADDER_CLIMB = 3686292530U;
+        static const AkUniqueID PLAY_SX_PLAYER_PAIN = 411195352U;
+        static const AkUniqueID PLAY_SX_UI_GAME_COUNTDOWN = 1622843585U;
+        static const AkUniqueID PLAY_SX_UI_GAME_END = 517894047U;
+        static const AkUniqueID PLAY_SX_UI_GAME_FANFARE_DEFEAT = 4001802235U;
+        static const AkUniqueID PLAY_SX_UI_GAME_FANFARE_VICTORY = 1060136708U;
+        static const AkUniqueID PLAY_SX_UI_GAME_ROUND_END = 3115542230U;
+        static const AkUniqueID PLAY_SX_UI_GAME_ROUND_START = 2382033085U;
+        static const AkUniqueID PLAY_SX_UI_GAME_SHUTDOWN = 2153376150U;
+        static const AkUniqueID PLAY_SX_WPN_BUBBLEGUN_BUILDUP = 1913852464U;
+        static const AkUniqueID PLAY_SX_WPN_BUBBLEGUN_COOLDOWN = 3452843118U;
+        static const AkUniqueID PLAY_SX_WPN_BUBBLEGUN_EXPLOSION = 546806306U;
+        static const AkUniqueID PLAY_SX_WPN_BUBBLEGUN_FIRE = 2192863753U;
+        static const AkUniqueID PLAY_SX_WPN_BUBBLEGUN_IMPACT = 2679540967U;
+        static const AkUniqueID PLAY_SX_WPN_BUBBLEGUN_PROJECTILE = 3867312284U;
+        static const AkUniqueID PLAY_SX_WPN_BUBBLEGUN_READY = 2608530362U;
+        static const AkUniqueID PLAY_SX_WPN_LASERPISTOL_FIRE = 2665115109U;
+        static const AkUniqueID PLAY_SX_WPN_LASERPISTOL_IMPACT = 172245811U;
+        static const AkUniqueID STOP_SX_AMB_EXT_GENERAL = 802626345U;
+        static const AkUniqueID STOP_SX_ENV_LAMP_LOOP = 860941867U;
+        static const AkUniqueID STOP_SX_INT_ENERGYBALLTRAP_PROJECTILE = 2825372966U;
+        static const AkUniqueID STOP_SX_INT_MALFUNCTIONINGSHIELDGENERATOR_IDLE = 1399787879U;
+        static const AkUniqueID STOP_SX_INT_TELEPORTER_IDLE = 1815794527U;
+        static const AkUniqueID STOP_SX_WPN_BUBBLEGUN_PROJECTILE = 3507985354U;
+        static const AkUniqueID UNMUTE_ALL = 4003578643U;
+    } // namespace EVENTS
+
+    namespace SWITCHES
+    {
+        namespace SURFACE
+        {
+            static const AkUniqueID GROUP = 1834394558U;
+
+            namespace SWITCH
+            {
+                static const AkUniqueID CONCRETE = 841620460U;
+                static const AkUniqueID DIRT = 2195636714U;
+                static const AkUniqueID GLASS = 2449969375U;
+                static const AkUniqueID METAL = 2473969246U;
+                static const AkUniqueID TILE = 2637588553U;
+            } // namespace SWITCH
+        } // namespace SURFACE
+
+    } // namespace SWITCHES
+
+    namespace GAME_PARAMETERS
+    {
+        static const AkUniqueID AZIMUTH = 1437246667U;
+        static const AkUniqueID DIFFRACTION = 499096576U;
+        static const AkUniqueID DISTANCE_100 = 1181406900U;
+        static const AkUniqueID DISTANCE_1000 = 2385509740U;
+        static const AkUniqueID DISTANCE_10000 = 1099690292U;
+        static const AkUniqueID ELEVATION = 2141048674U;
+        static const AkUniqueID HEALTH = 3677180323U;
+        static const AkUniqueID OBSTRUCTION = 4251783213U;
+        static const AkUniqueID OCCLUSION = 183903552U;
+        static const AkUniqueID TRANSMISSIONLOSS = 2536503308U;
+        static const AkUniqueID VELOCITY = 3519441192U;
+        static const AkUniqueID VOLUME_MASTER = 3695994288U;
+        static const AkUniqueID VOLUME_MUSIC = 3891337659U;
+        static const AkUniqueID VOLUME_SFX = 3673881719U;
+    } // namespace GAME_PARAMETERS
+
+    namespace BANKS
+    {
+        static const AkUniqueID INIT = 1355168291U;
+        static const AkUniqueID MULTIPLAYERSAMPLE_SOUNDBANK = 3140736671U;
+    } // namespace BANKS
+
+    namespace BUSSES
+    {
+        static const AkUniqueID _REVERBS = 514132455U;
+        static const AkUniqueID AMB = 1117531639U;
+        static const AkUniqueID ENV = 529726550U;
+        static const AkUniqueID GAMEPLAY = 89505537U;
+        static const AkUniqueID INT = 529034928U;
+        static const AkUniqueID LVL = 964811649U;
+        static const AkUniqueID MASTER_AUDIO_BUS = 3803692087U;
+        static const AkUniqueID MIXER_MAIN = 3273726892U;
+        static const AkUniqueID MIXER_SECONDARY = 1367444071U;
+        static const AkUniqueID MX = 1685527054U;
+        static const AkUniqueID PLAYER = 1069431850U;
+        static const AkUniqueID SX = 1584861564U;
+        static const AkUniqueID UI = 1551306167U;
+        static const AkUniqueID WPN = 828766390U;
+    } // namespace BUSSES
+
+    namespace AUX_BUSSES
+    {
+        static const AkUniqueID RVB_EXT_MAIN = 3960723471U;
+        static const AkUniqueID RVB_INT_ROOM_LARGE = 2072552507U;
+        static const AkUniqueID RVB_INT_ROOM_MEDIUM = 3499485599U;
+        static const AkUniqueID RVB_INT_ROOM_SMALL = 3054965799U;
+    } // namespace AUX_BUSSES
+
+    namespace AUDIO_DEVICES
+    {
+        static const AkUniqueID NO_OUTPUT = 2317455096U;
+        static const AkUniqueID SYSTEM = 3859886410U;
+    } // namespace AUDIO_DEVICES
+
+}// namespace AK
+
+#endif // __WWISE_IDS_H__

+ 281 - 23
Sounds/wwise_project/Actor-Mixer Hierarchy/AMPS/INT.wwu

@@ -11,12 +11,14 @@
 					<PropertyList>
 						<Property Name="3DSpatialization" Type="int16" Value="2"/>
 						<Property Name="Color" Type="int16" Value="20"/>
+						<Property Name="EnableDiffraction" Type="bool" Value="True"/>
 						<Property Name="OverrideColor" Type="bool" Value="True"/>
 						<Property Name="OverrideOutput" Type="bool" Value="True"/>
+						<Property Name="OverridePositioning" Type="bool" Value="True"/>
 					</PropertyList>
 					<ReferenceList>
 						<Reference Name="Attenuation">
-							<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+							<ObjectRef Name="ATN_INT_Default" ID="{F4475714-3770-46C9-92A5-6067FD1C17BB}" WorkUnitID="{0FF05D3F-153E-4D02-A6CC-FC77CC0CAD81}"/>
 						</Reference>
 						<Reference Name="Conversion">
 							<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -28,9 +30,15 @@
 					<ChildrenList>
 						<ActorMixer Name="EnergyBallTrap" ID="{B3FCC548-EA26-4E59-B7DD-EE409F33CE8E}" ShortID="897879539">
 							<PropertyList>
+								<Property Name="3DSpatialization" Type="int16" Value="2"/>
 								<Property Name="BelowThresholdBehavior" Type="int16" Value="3"/>
+								<Property Name="EnableDiffraction" Type="bool" Value="True"/>
+								<Property Name="OverridePositioning" Type="bool" Value="True"/>
 							</PropertyList>
 							<ReferenceList>
+								<Reference Name="Attenuation">
+									<ObjectRef Name="ATN_INT_Trap" ID="{AFE142B5-7438-4098-9291-18BCDCD34D7B}" WorkUnitID="{0FF05D3F-153E-4D02-A6CC-FC77CC0CAD81}"/>
+								</Reference>
 								<Reference Name="Conversion">
 									<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
 								</Reference>
@@ -41,9 +49,11 @@
 							<ChildrenList>
 								<RandomSequenceContainer Name="sx_int_energyBallTrap_buildup" ID="{13873A13-8973-4020-9FFB-501BD5BA5865}" ShortID="182794333">
 									<PropertyList>
+										<Property Name="BelowThresholdBehavior" Type="int16" Value="2"/>
+										<Property Name="OverrideVirtualVoice" Type="bool" Value="True"/>
 										<Property Name="Volume" Type="Real64">
 											<ValueList>
-												<Value>-8</Value>
+												<Value>-16</Value>
 											</ValueList>
 										</Property>
 									</PropertyList>
@@ -63,7 +73,7 @@
 											</PropertyList>
 											<ReferenceList>
 												<Reference Name="Attenuation">
-													<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 												</Reference>
 												<Reference Name="Conversion">
 													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -91,13 +101,21 @@
 								</RandomSequenceContainer>
 								<RandomSequenceContainer Name="sx_int_energyBallTrap_impact" ID="{92014ACE-04FD-4CE2-8FEC-0513182D6858}" ShortID="342465274">
 									<PropertyList>
+										<Property Name="3DSpatialization" Type="int16" Value="2"/>
+										<Property Name="BelowThresholdBehavior" Type="int16" Value="2"/>
+										<Property Name="EnableDiffraction" Type="bool" Value="True"/>
+										<Property Name="OverridePositioning" Type="bool" Value="True"/>
+										<Property Name="OverrideVirtualVoice" Type="bool" Value="True"/>
 										<Property Name="Volume" Type="Real64">
 											<ValueList>
-												<Value>-7</Value>
+												<Value>-12</Value>
 											</ValueList>
 										</Property>
 									</PropertyList>
 									<ReferenceList>
+										<Reference Name="Attenuation">
+											<ObjectRef Name="ATN_WPN_Impact_Default" ID="{02FD8E94-C99D-4362-9DCD-BAF59B93A518}" WorkUnitID="{0FF05D3F-153E-4D02-A6CC-FC77CC0CAD81}"/>
+										</Reference>
 										<Reference Name="Conversion">
 											<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
 										</Reference>
@@ -113,7 +131,7 @@
 											</PropertyList>
 											<ReferenceList>
 												<Reference Name="Attenuation">
-													<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 												</Reference>
 												<Reference Name="Conversion">
 													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -143,7 +161,7 @@
 											</PropertyList>
 											<ReferenceList>
 												<Reference Name="Attenuation">
-													<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 												</Reference>
 												<Reference Name="Conversion">
 													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -173,7 +191,7 @@
 											</PropertyList>
 											<ReferenceList>
 												<Reference Name="Attenuation">
-													<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 												</Reference>
 												<Reference Name="Conversion">
 													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -223,7 +241,7 @@
 											</PropertyList>
 											<ReferenceList>
 												<Reference Name="Attenuation">
-													<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 												</Reference>
 												<Reference Name="Conversion">
 													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -251,13 +269,19 @@
 								</RandomSequenceContainer>
 								<RandomSequenceContainer Name="sx_int_energyBallTrap_projectile" ID="{6532E75E-4F40-4806-8BC9-24CE451B2221}" ShortID="459005780">
 									<PropertyList>
+										<Property Name="3DSpatialization" Type="int16" Value="2"/>
+										<Property Name="EnableDiffraction" Type="bool" Value="True"/>
+										<Property Name="OverridePositioning" Type="bool" Value="True"/>
 										<Property Name="Volume" Type="Real64">
 											<ValueList>
-												<Value>-18</Value>
+												<Value>-20</Value>
 											</ValueList>
 										</Property>
 									</PropertyList>
 									<ReferenceList>
+										<Reference Name="Attenuation">
+											<ObjectRef Name="ATN_WPN_Projectile_Default" ID="{875233F6-6B3F-48E9-9ECD-11FB1B195CCC}" WorkUnitID="{0FF05D3F-153E-4D02-A6CC-FC77CC0CAD81}"/>
+										</Reference>
 										<Reference Name="Conversion">
 											<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
 										</Reference>
@@ -274,7 +298,7 @@
 											</PropertyList>
 											<ReferenceList>
 												<Reference Name="Attenuation">
-													<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 												</Reference>
 												<Reference Name="Conversion">
 													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -324,7 +348,7 @@
 											</PropertyList>
 											<ReferenceList>
 												<Reference Name="Attenuation">
-													<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 												</Reference>
 												<Reference Name="Conversion">
 													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -355,9 +379,15 @@
 						</ActorMixer>
 						<ActorMixer Name="Gem" ID="{8682B672-CBD3-4F7A-BE0F-2203F82DC2E9}" ShortID="387902803">
 							<PropertyList>
+								<Property Name="3DSpatialization" Type="int16" Value="2"/>
 								<Property Name="BelowThresholdBehavior" Type="int16" Value="3"/>
+								<Property Name="EnableDiffraction" Type="bool" Value="True"/>
+								<Property Name="OverridePositioning" Type="bool" Value="True"/>
 							</PropertyList>
 							<ReferenceList>
+								<Reference Name="Attenuation">
+									<ObjectRef Name="ATN_Default_10" ID="{CADD0C94-A66F-475F-A061-620A6D76B155}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+								</Reference>
 								<Reference Name="Conversion">
 									<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
 								</Reference>
@@ -413,7 +443,7 @@
 											</PropertyList>
 											<ReferenceList>
 												<Reference Name="Attenuation">
-													<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 												</Reference>
 												<Reference Name="Conversion">
 													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -444,9 +474,15 @@
 						</ActorMixer>
 						<ActorMixer Name="JumpPad" ID="{383D17E4-D49E-4BA6-A5F0-2AC21C966FA4}" ShortID="869294703">
 							<PropertyList>
+								<Property Name="3DSpatialization" Type="int16" Value="2"/>
 								<Property Name="BelowThresholdBehavior" Type="int16" Value="3"/>
+								<Property Name="EnableDiffraction" Type="bool" Value="True"/>
+								<Property Name="OverridePositioning" Type="bool" Value="True"/>
 							</PropertyList>
 							<ReferenceList>
+								<Reference Name="Attenuation">
+									<ObjectRef Name="ATN_INT_JumpPad" ID="{B20BF362-B310-4C42-AC31-ED627834073C}" WorkUnitID="{0FF05D3F-153E-4D02-A6CC-FC77CC0CAD81}"/>
+								</Reference>
 								<Reference Name="Conversion">
 									<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
 								</Reference>
@@ -457,9 +493,22 @@
 							<ChildrenList>
 								<RandomSequenceContainer Name="sx_int_jumpPad_launch" ID="{715FC78B-4F25-4B37-B15F-8B41ED56110F}" ShortID="1028960929">
 									<PropertyList>
+										<Property Name="Pitch" Type="int32">
+											<ModifierList>
+												<ModifierInfo>
+													<Modifier Name="" ID="{BB489F52-6184-4067-8CFD-E977E9E97C61}">
+														<PropertyList>
+															<Property Name="Enabled" Type="bool" Value="True"/>
+															<Property Name="Max" Type="Real64" Value="60"/>
+															<Property Name="Min" Type="Real64" Value="-60"/>
+														</PropertyList>
+													</Modifier>
+												</ModifierInfo>
+											</ModifierList>
+										</Property>
 										<Property Name="Volume" Type="Real64">
 											<ValueList>
-												<Value>-4</Value>
+												<Value>-5</Value>
 											</ValueList>
 										</Property>
 									</PropertyList>
@@ -479,7 +528,7 @@
 											</PropertyList>
 											<ReferenceList>
 												<Reference Name="Attenuation">
-													<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 												</Reference>
 												<Reference Name="Conversion">
 													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -521,7 +570,23 @@
 								<RandomSequenceContainer Name="sx_int_energyCollector_explosion" ID="{F7B977C9-5A5B-4A1F-AB64-F730DAD37337}" ShortID="1063007841">
 									<PropertyList>
 										<Property Name="3DSpatialization" Type="int16" Value="2"/>
-										<Property Name="BelowThresholdBehavior" Type="int16" Value="3"/>
+										<Property Name="BelowThresholdBehavior" Type="int16" Value="2"/>
+										<Property Name="EnableDiffraction" Type="bool" Value="True"/>
+										<Property Name="OverridePositioning" Type="bool" Value="True"/>
+										<Property Name="OverrideVirtualVoice" Type="bool" Value="True"/>
+										<Property Name="Pitch" Type="int32">
+											<ModifierList>
+												<ModifierInfo>
+													<Modifier Name="" ID="{23960D84-076F-47DF-86A7-A4153786912E}">
+														<PropertyList>
+															<Property Name="Enabled" Type="bool" Value="True"/>
+															<Property Name="Max" Type="Real64" Value="60"/>
+															<Property Name="Min" Type="Real64" Value="-60"/>
+														</PropertyList>
+													</Modifier>
+												</ModifierInfo>
+											</ModifierList>
+										</Property>
 										<Property Name="Volume" Type="Real64">
 											<ValueList>
 												<Value>-1</Value>
@@ -530,7 +595,7 @@
 									</PropertyList>
 									<ReferenceList>
 										<Reference Name="Attenuation">
-											<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+											<ObjectRef Name="ATN_WPN_Explosion_Large" ID="{10812A45-46F3-492A-A38E-A2FF15AC8130}" WorkUnitID="{0FF05D3F-153E-4D02-A6CC-FC77CC0CAD81}"/>
 										</Reference>
 										<Reference Name="Conversion">
 											<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -616,6 +681,15 @@
 							<ObjectLists/>
 						</ActorMixer>
 						<ActorMixer Name="ShieldGenerator" ID="{CF255924-3D19-445B-9088-BBDA53301A5D}" ShortID="937703326">
+							<PropertyList>
+								<Property Name="Pitch" Type="int32">
+									<ModifierList>
+										<ModifierInfo>
+											<Modifier Name="" ID="{FC8EBEA5-AF1B-4510-9458-FA6EBFBEA237}"/>
+										</ModifierInfo>
+									</ModifierList>
+								</Property>
+							</PropertyList>
 							<ReferenceList>
 								<Reference Name="Conversion">
 									<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -628,7 +702,8 @@
 								<RandomSequenceContainer Name="sx_int_malfunctioningShieldGenerator_buildUp" ID="{62399925-3AE3-499B-AB20-D8FF1037A822}" ShortID="884853138">
 									<PropertyList>
 										<Property Name="3DSpatialization" Type="int16" Value="2"/>
-										<Property Name="BelowThresholdBehavior" Type="int16" Value="3"/>
+										<Property Name="BelowThresholdBehavior" Type="int16" Value="2"/>
+										<Property Name="OverrideVirtualVoice" Type="bool" Value="True"/>
 										<Property Name="Volume" Type="Real64">
 											<ValueList>
 												<Value>-3</Value>
@@ -637,7 +712,7 @@
 									</PropertyList>
 									<ReferenceList>
 										<Reference Name="Attenuation">
-											<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+											<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 										</Reference>
 										<Reference Name="Conversion">
 											<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -675,9 +750,22 @@
 								</RandomSequenceContainer>
 								<RandomSequenceContainer Name="sx_int_malfunctioningShieldGenerator_idle" ID="{9296EE8C-3BD6-4B3F-A169-EA06BE7E2C0C}" ShortID="527520955">
 									<PropertyList>
+										<Property Name="Pitch" Type="int32">
+											<ModifierList>
+												<ModifierInfo>
+													<Modifier Name="" ID="{2080D8CB-6FD3-4CB9-ADCB-EC648C850E0B}">
+														<PropertyList>
+															<Property Name="Enabled" Type="bool" Value="True"/>
+															<Property Name="Max" Type="Real64" Value="60"/>
+															<Property Name="Min" Type="Real64" Value="-60"/>
+														</PropertyList>
+													</Modifier>
+												</ModifierInfo>
+											</ModifierList>
+										</Property>
 										<Property Name="Volume" Type="Real64">
 											<ValueList>
-												<Value>-14</Value>
+												<Value>-16</Value>
 											</ValueList>
 										</Property>
 									</PropertyList>
@@ -698,7 +786,7 @@
 											</PropertyList>
 											<ReferenceList>
 												<Reference Name="Attenuation">
-													<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 												</Reference>
 												<Reference Name="Conversion">
 													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -726,6 +814,24 @@
 								</RandomSequenceContainer>
 								<RandomSequenceContainer Name="sx_int_malfunctioningShieldGenerator_explo" ID="{01E0DEFE-B2F5-4AF4-AFD5-4D242E317371}" ShortID="462254982">
 									<PropertyList>
+										<Property Name="3DSpatialization" Type="int16" Value="2"/>
+										<Property Name="BelowThresholdBehavior" Type="int16" Value="2"/>
+										<Property Name="EnableDiffraction" Type="bool" Value="True"/>
+										<Property Name="OverridePositioning" Type="bool" Value="True"/>
+										<Property Name="OverrideVirtualVoice" Type="bool" Value="True"/>
+										<Property Name="Pitch" Type="int32">
+											<ModifierList>
+												<ModifierInfo>
+													<Modifier Name="" ID="{545E12B5-8F04-46FD-B084-4B8CB9C368AD}">
+														<PropertyList>
+															<Property Name="Enabled" Type="bool" Value="True"/>
+															<Property Name="Max" Type="Real64" Value="60"/>
+															<Property Name="Min" Type="Real64" Value="-60"/>
+														</PropertyList>
+													</Modifier>
+												</ModifierInfo>
+											</ModifierList>
+										</Property>
 										<Property Name="Volume" Type="Real64">
 											<ValueList>
 												<Value>-6</Value>
@@ -733,6 +839,9 @@
 										</Property>
 									</PropertyList>
 									<ReferenceList>
+										<Reference Name="Attenuation">
+											<ObjectRef Name="ATN_WPN_Explosion_Large" ID="{10812A45-46F3-492A-A38E-A2FF15AC8130}" WorkUnitID="{0FF05D3F-153E-4D02-A6CC-FC77CC0CAD81}"/>
+										</Reference>
 										<Reference Name="Conversion">
 											<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
 										</Reference>
@@ -748,7 +857,7 @@
 											</PropertyList>
 											<ReferenceList>
 												<Reference Name="Attenuation">
-													<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 												</Reference>
 												<Reference Name="Conversion">
 													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -778,7 +887,7 @@
 											</PropertyList>
 											<ReferenceList>
 												<Reference Name="Attenuation">
-													<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 												</Reference>
 												<Reference Name="Conversion">
 													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -808,7 +917,7 @@
 											</PropertyList>
 											<ReferenceList>
 												<Reference Name="Attenuation">
-													<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 												</Reference>
 												<Reference Name="Conversion">
 													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -844,6 +953,155 @@
 							</ChildrenList>
 							<ObjectLists/>
 						</ActorMixer>
+						<ActorMixer Name="Teleporter" ID="{89222400-2CF3-4392-838B-0559932B3F2E}" ShortID="823777430">
+							<PropertyList>
+								<Property Name="Pitch" Type="int32">
+									<ModifierList>
+										<ModifierInfo>
+											<Modifier Name="" ID="{84AD078E-8FB5-4D14-91C2-AE5F557A9738}"/>
+										</ModifierInfo>
+									</ModifierList>
+								</Property>
+							</PropertyList>
+							<ReferenceList>
+								<Reference Name="Conversion">
+									<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
+								</Reference>
+								<Reference Name="OutputBus">
+									<ObjectRef Name="Master Audio Bus" ID="{1514A4D8-1DA6-412A-A17E-75CA0C2149F3}" WorkUnitID="{F62C277B-2C60-43BB-A8B2-F1E94C3F98EC}"/>
+								</Reference>
+							</ReferenceList>
+							<ChildrenList>
+								<RandomSequenceContainer Name="sx_int_teleporter_activate" ID="{1FDF3977-BF55-431F-BF82-01497FE2688C}" ShortID="790274834">
+									<PropertyList>
+										<Property Name="Pitch" Type="int32">
+											<ModifierList>
+												<ModifierInfo>
+													<Modifier Name="" ID="{014BE4A9-413E-47A8-A390-9C159BB00CD6}">
+														<PropertyList>
+															<Property Name="Enabled" Type="bool" Value="True"/>
+															<Property Name="Max" Type="Real64" Value="80"/>
+															<Property Name="Min" Type="Real64" Value="-80"/>
+														</PropertyList>
+													</Modifier>
+												</ModifierInfo>
+											</ModifierList>
+										</Property>
+										<Property Name="Volume" Type="Real64">
+											<ValueList>
+												<Value>-17</Value>
+											</ValueList>
+										</Property>
+									</PropertyList>
+									<ReferenceList>
+										<Reference Name="Conversion">
+											<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
+										</Reference>
+										<Reference Name="OutputBus">
+											<ObjectRef Name="Master Audio Bus" ID="{1514A4D8-1DA6-412A-A17E-75CA0C2149F3}" WorkUnitID="{F62C277B-2C60-43BB-A8B2-F1E94C3F98EC}"/>
+										</Reference>
+									</ReferenceList>
+									<ChildrenList>
+										<Sound Name="sx_int_teleporter_activate_01" ID="{7D22C746-F4EF-4111-BAA2-7613439B44EA}" ShortID="598262678">
+											<PropertyList>
+												<Property Name="3DSpatialization" Type="int16" Value="2"/>
+												<Property Name="BelowThresholdBehavior" Type="int16" Value="3"/>
+											</PropertyList>
+											<ReferenceList>
+												<Reference Name="Attenuation">
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+												</Reference>
+												<Reference Name="Conversion">
+													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
+												</Reference>
+												<Reference Name="OutputBus">
+													<ObjectRef Name="INT" ID="{F112B44E-7349-4F64-821F-E3CC2DAB05DC}" WorkUnitID="{8B26C89C-CDEC-42FD-AE82-2A0A21AD7AAE}"/>
+												</Reference>
+											</ReferenceList>
+											<ChildrenList>
+												<AudioFileSource Name="sx_int_teleporter_activate_01" ID="{3F8B8349-E921-4FC3-BF57-9D472042F9FF}">
+													<Language>SFX</Language>
+													<AudioFile>Hexany\teleporter\sx_int_teleporter_activate_01.wav</AudioFile>
+													<MediaIDList>
+														<MediaID ID="495133134"/>
+													</MediaIDList>
+												</AudioFileSource>
+											</ChildrenList>
+											<ObjectLists/>
+											<ActiveSourceList>
+												<ActiveSource Name="sx_int_teleporter_activate_01" ID="{3F8B8349-E921-4FC3-BF57-9D472042F9FF}" Platform="Linked"/>
+											</ActiveSourceList>
+										</Sound>
+									</ChildrenList>
+									<ObjectLists/>
+								</RandomSequenceContainer>
+								<RandomSequenceContainer Name="sx_int_teleporter_loop" ID="{D7945CD0-C24B-464C-AD49-BB6C722139B2}" ShortID="656771698">
+									<PropertyList>
+										<Property Name="Pitch" Type="int32">
+											<ModifierList>
+												<ModifierInfo>
+													<Modifier Name="" ID="{2BF17959-BEF9-4E65-84B2-E63C1706F6F0}">
+														<PropertyList>
+															<Property Name="Enabled" Type="bool" Value="True"/>
+															<Property Name="Max" Type="Real64" Value="60"/>
+															<Property Name="Min" Type="Real64" Value="-60"/>
+														</PropertyList>
+													</Modifier>
+												</ModifierInfo>
+											</ModifierList>
+										</Property>
+										<Property Name="Volume" Type="Real64">
+											<ValueList>
+												<Value>-16</Value>
+											</ValueList>
+										</Property>
+									</PropertyList>
+									<ReferenceList>
+										<Reference Name="Conversion">
+											<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
+										</Reference>
+										<Reference Name="OutputBus">
+											<ObjectRef Name="Master Audio Bus" ID="{1514A4D8-1DA6-412A-A17E-75CA0C2149F3}" WorkUnitID="{F62C277B-2C60-43BB-A8B2-F1E94C3F98EC}"/>
+										</Reference>
+									</ReferenceList>
+									<ChildrenList>
+										<Sound Name="sx_int_teleporter_loop_01" ID="{BD2935FF-8AA4-4859-AAC2-A652F5668509}" ShortID="377669000">
+											<PropertyList>
+												<Property Name="3DSpatialization" Type="int16" Value="2"/>
+												<Property Name="BelowThresholdBehavior" Type="int16" Value="3"/>
+												<Property Name="IsLoopingEnabled" Type="bool" Value="True"/>
+											</PropertyList>
+											<ReferenceList>
+												<Reference Name="Attenuation">
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+												</Reference>
+												<Reference Name="Conversion">
+													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
+												</Reference>
+												<Reference Name="OutputBus">
+													<ObjectRef Name="INT" ID="{F112B44E-7349-4F64-821F-E3CC2DAB05DC}" WorkUnitID="{8B26C89C-CDEC-42FD-AE82-2A0A21AD7AAE}"/>
+												</Reference>
+											</ReferenceList>
+											<ChildrenList>
+												<AudioFileSource Name="sx_int_teleporter_loop_01" ID="{93BC3602-8A99-4412-8DFE-3583833B5DF8}">
+													<Language>SFX</Language>
+													<AudioFile>Hexany\teleporter\sx_int_teleporter_loop_01.wav</AudioFile>
+													<MediaIDList>
+														<MediaID ID="381397623"/>
+													</MediaIDList>
+												</AudioFileSource>
+											</ChildrenList>
+											<ObjectLists/>
+											<ActiveSourceList>
+												<ActiveSource Name="sx_int_teleporter_loop_01" ID="{93BC3602-8A99-4412-8DFE-3583833B5DF8}" Platform="Linked"/>
+											</ActiveSourceList>
+										</Sound>
+									</ChildrenList>
+									<ObjectLists/>
+								</RandomSequenceContainer>
+							</ChildrenList>
+							<ObjectLists/>
+						</ActorMixer>
 					</ChildrenList>
 					<ObjectLists/>
 				</ActorMixer>

+ 246 - 1
Sounds/wwise_project/Actor-Mixer Hierarchy/AMPS/LVL.wwu

@@ -11,6 +11,7 @@
 					<PropertyList>
 						<Property Name="OverrideOutput" Type="bool" Value="True"/>
 						<Property Name="OverridePositioning" Type="bool" Value="True"/>
+						<Property Name="OverrideUserAuxSends" Type="bool" Value="True"/>
 					</PropertyList>
 					<ReferenceList>
 						<Reference Name="Conversion">
@@ -35,19 +36,79 @@
 									<ObjectRef Name="AMB" ID="{5333BB51-154D-41D1-8783-5A25AB9C1606}" WorkUnitID="{8B26C89C-CDEC-42FD-AE82-2A0A21AD7AAE}"/>
 								</Reference>
 							</ReferenceList>
+							<ChildrenList>
+								<BlendContainer Name="sx_amb_ext_generalWindLoop" ID="{F55CE3A4-96C3-4E54-8267-FBB6A47AAAE1}" ShortID="476924289">
+									<ReferenceList>
+										<Reference Name="Conversion">
+											<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
+										</Reference>
+										<Reference Name="OutputBus">
+											<ObjectRef Name="Master Audio Bus" ID="{1514A4D8-1DA6-412A-A17E-75CA0C2149F3}" WorkUnitID="{F62C277B-2C60-43BB-A8B2-F1E94C3F98EC}"/>
+										</Reference>
+									</ReferenceList>
+									<ChildrenList>
+										<Sound Name="sx_amb_ext_generalWindLoop_01" ID="{D5B887EE-2886-4A8E-BAC5-02801D416970}" ShortID="176801769">
+											<PropertyList>
+												<Property Name="BelowThresholdBehavior" Type="int16" Value="3"/>
+												<Property Name="IsLoopingEnabled" Type="bool" Value="True"/>
+												<Property Name="Volume" Type="Real64">
+													<ValueList>
+														<Value>-12</Value>
+													</ValueList>
+												</Property>
+											</PropertyList>
+											<ReferenceList>
+												<Reference Name="Conversion">
+													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
+												</Reference>
+												<Reference Name="OutputBus">
+													<ObjectRef Name="AMB" ID="{5333BB51-154D-41D1-8783-5A25AB9C1606}" WorkUnitID="{8B26C89C-CDEC-42FD-AE82-2A0A21AD7AAE}"/>
+												</Reference>
+											</ReferenceList>
+											<ChildrenList>
+												<AudioFileSource Name="sx_amb_ext_generalWindLoop_01" ID="{BBCBA6EF-62D2-45D7-94D5-9CF4D5E81C5C}">
+													<Language>SFX</Language>
+													<AudioFile>Hexany\LVL\sx_amb_ext_generalWindLoop_01.wav</AudioFile>
+													<MediaIDList>
+														<MediaID ID="1012790102"/>
+													</MediaIDList>
+												</AudioFileSource>
+											</ChildrenList>
+											<ObjectLists/>
+											<ActiveSourceList>
+												<ActiveSource Name="sx_amb_ext_generalWindLoop_01" ID="{BBCBA6EF-62D2-45D7-94D5-9CF4D5E81C5C}" Platform="Linked"/>
+											</ActiveSourceList>
+										</Sound>
+									</ChildrenList>
+									<ObjectLists/>
+								</BlendContainer>
+							</ChildrenList>
 							<ObjectLists/>
 						</ActorMixer>
 						<ActorMixer Name="ENV" ID="{ED4DCE4F-1B4B-4EEE-88FA-CB998A2AEED6}" ShortID="670007726">
 							<PropertyList>
 								<Property Name="3DSpatialization" Type="int16" Value="2"/>
 								<Property Name="Color" Type="int16" Value="17"/>
+								<Property Name="EnableDiffraction" Type="bool" Value="True"/>
+								<Property Name="IsGlobalLimit" Type="int16" Value="1"/>
+								<Property Name="MaxSoundPerInstance" Type="int16">
+									<ValueList>
+										<Value>4</Value>
+									</ValueList>
+								</Property>
+								<Property Name="OverLimitBehavior" Type="int16" Value="1"/>
 								<Property Name="OverrideColor" Type="bool" Value="True"/>
 								<Property Name="OverrideOutput" Type="bool" Value="True"/>
 								<Property Name="OverridePositioning" Type="bool" Value="True"/>
+								<Property Name="UseMaxSoundPerInstance" Type="bool">
+									<ValueList>
+										<Value>True</Value>
+									</ValueList>
+								</Property>
 							</PropertyList>
 							<ReferenceList>
 								<Reference Name="Attenuation">
-									<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+									<ObjectRef Name="ATN_Default_05" ID="{1100DBF0-42C6-494C-BD3A-2B9740ED2E02}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 								</Reference>
 								<Reference Name="Conversion">
 									<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -56,6 +117,190 @@
 									<ObjectRef Name="ENV" ID="{2E0DA529-08FD-419D-AEA6-99E8B272C191}" WorkUnitID="{8B26C89C-CDEC-42FD-AE82-2A0A21AD7AAE}"/>
 								</Reference>
 							</ReferenceList>
+							<ChildrenList>
+								<RandomSequenceContainer Name="sx_env_lamp_loop" ID="{3E4B8120-39EA-47E4-987D-27398375B187}" ShortID="662383037">
+									<PropertyList>
+										<Property Name="MaxSoundPerInstance" Type="int16">
+											<ValueList>
+												<Value>1</Value>
+											</ValueList>
+										</Property>
+										<Property Name="NormalOrShuffle" Type="int16" Value="0"/>
+										<Property Name="RandomAvoidRepeatingCount" Type="int32" Value="2"/>
+										<Property Name="UseMaxSoundPerInstance" Type="bool">
+											<ValueList>
+												<Value>True</Value>
+											</ValueList>
+										</Property>
+									</PropertyList>
+									<ReferenceList>
+										<Reference Name="Conversion">
+											<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
+										</Reference>
+										<Reference Name="OutputBus">
+											<ObjectRef Name="Master Audio Bus" ID="{1514A4D8-1DA6-412A-A17E-75CA0C2149F3}" WorkUnitID="{F62C277B-2C60-43BB-A8B2-F1E94C3F98EC}"/>
+										</Reference>
+									</ReferenceList>
+									<ChildrenList>
+										<Sound Name="sx_env_lamp_loop_01" ID="{F67FE7C3-C786-41F8-8BEC-E3A6B16FC141}" ShortID="665761646">
+											<PropertyList>
+												<Property Name="3DSpatialization" Type="int16" Value="2"/>
+												<Property Name="BelowThresholdBehavior" Type="int16" Value="3"/>
+												<Property Name="IsLoopingEnabled" Type="bool" Value="True"/>
+											</PropertyList>
+											<ReferenceList>
+												<Reference Name="Attenuation">
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+												</Reference>
+												<Reference Name="Conversion">
+													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
+												</Reference>
+												<Reference Name="OutputBus">
+													<ObjectRef Name="ENV" ID="{2E0DA529-08FD-419D-AEA6-99E8B272C191}" WorkUnitID="{8B26C89C-CDEC-42FD-AE82-2A0A21AD7AAE}"/>
+												</Reference>
+											</ReferenceList>
+											<ChildrenList>
+												<AudioFileSource Name="sx_env_lamp_loop_01" ID="{5D5C109C-606E-45AE-BAB2-5AD06EFCCE85}">
+													<Language>SFX</Language>
+													<AudioFile>Hexany\LVL\sx_env_lamp_loop_01.wav</AudioFile>
+													<MediaIDList>
+														<MediaID ID="490970791"/>
+													</MediaIDList>
+												</AudioFileSource>
+											</ChildrenList>
+											<ObjectLists/>
+											<ActiveSourceList>
+												<ActiveSource Name="sx_env_lamp_loop_01" ID="{5D5C109C-606E-45AE-BAB2-5AD06EFCCE85}" Platform="Linked"/>
+											</ActiveSourceList>
+										</Sound>
+										<Sound Name="sx_env_lamp_loop_02" ID="{66BA9D2C-E946-4753-ACDE-2BF809591D16}" ShortID="291023735">
+											<PropertyList>
+												<Property Name="3DSpatialization" Type="int16" Value="2"/>
+												<Property Name="BelowThresholdBehavior" Type="int16" Value="3"/>
+												<Property Name="IsLoopingEnabled" Type="bool" Value="True"/>
+											</PropertyList>
+											<ReferenceList>
+												<Reference Name="Attenuation">
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+												</Reference>
+												<Reference Name="Conversion">
+													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
+												</Reference>
+												<Reference Name="OutputBus">
+													<ObjectRef Name="ENV" ID="{2E0DA529-08FD-419D-AEA6-99E8B272C191}" WorkUnitID="{8B26C89C-CDEC-42FD-AE82-2A0A21AD7AAE}"/>
+												</Reference>
+											</ReferenceList>
+											<ChildrenList>
+												<AudioFileSource Name="sx_env_lamp_loop_02" ID="{1600161D-D3AD-4430-8915-A61B4DF4A1B3}">
+													<Language>SFX</Language>
+													<AudioFile>Hexany\LVL\sx_env_lamp_loop_02.wav</AudioFile>
+													<MediaIDList>
+														<MediaID ID="106114186"/>
+													</MediaIDList>
+												</AudioFileSource>
+											</ChildrenList>
+											<ObjectLists/>
+											<ActiveSourceList>
+												<ActiveSource Name="sx_env_lamp_loop_02" ID="{1600161D-D3AD-4430-8915-A61B4DF4A1B3}" Platform="Linked"/>
+											</ActiveSourceList>
+										</Sound>
+										<Sound Name="sx_env_lamp_loop_03" ID="{5E164566-253B-49CE-AACB-91C12DCD0585}" ShortID="280754703">
+											<PropertyList>
+												<Property Name="3DSpatialization" Type="int16" Value="2"/>
+												<Property Name="BelowThresholdBehavior" Type="int16" Value="3"/>
+												<Property Name="IsLoopingEnabled" Type="bool" Value="True"/>
+											</PropertyList>
+											<ReferenceList>
+												<Reference Name="Attenuation">
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+												</Reference>
+												<Reference Name="Conversion">
+													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
+												</Reference>
+												<Reference Name="OutputBus">
+													<ObjectRef Name="ENV" ID="{2E0DA529-08FD-419D-AEA6-99E8B272C191}" WorkUnitID="{8B26C89C-CDEC-42FD-AE82-2A0A21AD7AAE}"/>
+												</Reference>
+											</ReferenceList>
+											<ChildrenList>
+												<AudioFileSource Name="sx_env_lamp_loop_03" ID="{6650FA0F-1BC7-47A3-8120-1EEEDEC85C56}">
+													<Language>SFX</Language>
+													<AudioFile>Hexany\LVL\sx_env_lamp_loop_03.wav</AudioFile>
+													<MediaIDList>
+														<MediaID ID="641351060"/>
+													</MediaIDList>
+												</AudioFileSource>
+											</ChildrenList>
+											<ObjectLists/>
+											<ActiveSourceList>
+												<ActiveSource Name="sx_env_lamp_loop_03" ID="{6650FA0F-1BC7-47A3-8120-1EEEDEC85C56}" Platform="Linked"/>
+											</ActiveSourceList>
+										</Sound>
+										<Sound Name="sx_env_lamp_loop_04" ID="{804FBD41-9467-4C8F-8BCB-611A37A49B5E}" ShortID="864807782">
+											<PropertyList>
+												<Property Name="3DSpatialization" Type="int16" Value="2"/>
+												<Property Name="BelowThresholdBehavior" Type="int16" Value="3"/>
+												<Property Name="IsLoopingEnabled" Type="bool" Value="True"/>
+											</PropertyList>
+											<ReferenceList>
+												<Reference Name="Attenuation">
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+												</Reference>
+												<Reference Name="Conversion">
+													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
+												</Reference>
+												<Reference Name="OutputBus">
+													<ObjectRef Name="ENV" ID="{2E0DA529-08FD-419D-AEA6-99E8B272C191}" WorkUnitID="{8B26C89C-CDEC-42FD-AE82-2A0A21AD7AAE}"/>
+												</Reference>
+											</ReferenceList>
+											<ChildrenList>
+												<AudioFileSource Name="sx_env_lamp_loop_04" ID="{9D02AA9B-7086-48F5-AD98-12460884634F}">
+													<Language>SFX</Language>
+													<AudioFile>Hexany\LVL\sx_env_lamp_loop_04.wav</AudioFile>
+													<MediaIDList>
+														<MediaID ID="46050496"/>
+													</MediaIDList>
+												</AudioFileSource>
+											</ChildrenList>
+											<ObjectLists/>
+											<ActiveSourceList>
+												<ActiveSource Name="sx_env_lamp_loop_04" ID="{9D02AA9B-7086-48F5-AD98-12460884634F}" Platform="Linked"/>
+											</ActiveSourceList>
+										</Sound>
+										<Sound Name="sx_env_lamp_loop_05" ID="{28C2E380-8357-4C33-94BD-4219143836F8}" ShortID="999031489">
+											<PropertyList>
+												<Property Name="3DSpatialization" Type="int16" Value="2"/>
+												<Property Name="BelowThresholdBehavior" Type="int16" Value="3"/>
+												<Property Name="IsLoopingEnabled" Type="bool" Value="True"/>
+											</PropertyList>
+											<ReferenceList>
+												<Reference Name="Attenuation">
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+												</Reference>
+												<Reference Name="Conversion">
+													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
+												</Reference>
+												<Reference Name="OutputBus">
+													<ObjectRef Name="ENV" ID="{2E0DA529-08FD-419D-AEA6-99E8B272C191}" WorkUnitID="{8B26C89C-CDEC-42FD-AE82-2A0A21AD7AAE}"/>
+												</Reference>
+											</ReferenceList>
+											<ChildrenList>
+												<AudioFileSource Name="sx_env_lamp_loop_05" ID="{535D1BCE-5249-40B0-AB55-6A3BAB9F8AD5}">
+													<Language>SFX</Language>
+													<AudioFile>Hexany\LVL\sx_env_lamp_loop_05.wav</AudioFile>
+													<MediaIDList>
+														<MediaID ID="869795255"/>
+													</MediaIDList>
+												</AudioFileSource>
+											</ChildrenList>
+											<ObjectLists/>
+											<ActiveSourceList>
+												<ActiveSource Name="sx_env_lamp_loop_05" ID="{535D1BCE-5249-40B0-AB55-6A3BAB9F8AD5}" Platform="Linked"/>
+											</ActiveSourceList>
+										</Sound>
+									</ChildrenList>
+									<ObjectLists/>
+								</RandomSequenceContainer>
+							</ChildrenList>
 							<ObjectLists/>
 						</ActorMixer>
 					</ChildrenList>

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 982 - 426
Sounds/wwise_project/Actor-Mixer Hierarchy/AMPS/Player.wwu


+ 42 - 1
Sounds/wwise_project/Actor-Mixer Hierarchy/AMPS/SX.wwu

@@ -8,10 +8,48 @@
 						<Property Name="3DSpatialization" Type="int16" Value="2"/>
 						<Property Name="BelowThresholdBehavior" Type="int16" Value="3"/>
 						<Property Name="EnableDiffraction" Type="bool" Value="True"/>
+						<Property Name="PriorityDistanceFactor" Type="bool" Value="True"/>
+						<Property Name="UserAuxSendVolume0" Type="Real64">
+							<ValueList>
+								<Value>-3</Value>
+							</ValueList>
+							<RTPCList>
+								<RTPC Name="" ID="{561CDF06-0F5D-4207-B69C-524BD0C608C2}" ShortID="123837462">
+									<ReferenceList>
+										<Reference Name="ControlInput">
+											<ObjectRef Name="Distance_100" ID="{F3EEAFF4-46E7-4EAD-9336-DAE7EB3F7B50}" WorkUnitID="{027FA53E-BB70-43C3-849F-6A97AE8C9671}"/>
+										</Reference>
+									</ReferenceList>
+									<Curve Name="" ID="{3C9C3F68-6FD7-4792-BC66-37E913E36D87}">
+										<PropertyList>
+											<Property Name="Flags" Type="int32" Value="3"/>
+										</PropertyList>
+										<PointList>
+											<Point>
+												<XPos>0</XPos>
+												<YPos>-200</YPos>
+												<Flags>5</Flags>
+											</Point>
+											<Point>
+												<XPos>3</XPos>
+												<YPos>-200</YPos>
+												<Flags>0</Flags>
+												<SegmentShape>Exp1</SegmentShape>
+											</Point>
+											<Point>
+												<XPos>100</XPos>
+												<YPos>0</YPos>
+												<Flags>37</Flags>
+											</Point>
+										</PointList>
+									</Curve>
+								</RTPC>
+							</RTPCList>
+						</Property>
 					</PropertyList>
 					<ReferenceList>
 						<Reference Name="Attenuation">
-							<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+							<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 						</Reference>
 						<Reference Name="Conversion">
 							<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -19,6 +57,9 @@
 						<Reference Name="OutputBus">
 							<ObjectRef Name="SX" ID="{9BAD8B54-940E-473A-9DE7-E613A4F0BB4B}" WorkUnitID="{8B26C89C-CDEC-42FD-AE82-2A0A21AD7AAE}"/>
 						</Reference>
+						<Reference Name="UserAuxSend0">
+							<ObjectRef Name="RVB_EXT_Main" ID="{F8DF5907-D7A9-43AF-B130-2AB20EED85E3}" WorkUnitID="{8B26C89C-CDEC-42FD-AE82-2A0A21AD7AAE}"/>
+						</Reference>
 					</ReferenceList>
 					<ChildrenList>
 						<WorkUnit Name="INT" ID="{91FC1C7C-6270-4F53-848A-9AD118F4D59E}" PersistMode="Reference"/>

+ 1 - 0
Sounds/wwise_project/Actor-Mixer Hierarchy/AMPS/UI.wwu

@@ -13,6 +13,7 @@
 						<Property Name="OverrideColor" Type="bool" Value="True"/>
 						<Property Name="OverrideOutput" Type="bool" Value="True"/>
 						<Property Name="OverridePositioning" Type="bool" Value="True"/>
+						<Property Name="OverrideUserAuxSends" Type="bool" Value="True"/>
 					</PropertyList>
 					<ReferenceList>
 						<Reference Name="Conversion">

+ 102 - 109
Sounds/wwise_project/Actor-Mixer Hierarchy/AMPS/WPN.wwu

@@ -11,12 +11,47 @@
 					<PropertyList>
 						<Property Name="3DSpatialization" Type="int16" Value="2"/>
 						<Property Name="Color" Type="int16" Value="26"/>
+						<Property Name="EnableDiffraction" Type="bool" Value="True"/>
 						<Property Name="OverrideColor" Type="bool" Value="True"/>
 						<Property Name="OverrideOutput" Type="bool" Value="True"/>
+						<Property Name="OverridePositioning" Type="bool" Value="True"/>
+						<Property Name="OverrideUserAuxSends" Type="bool" Value="True"/>
+						<Property Name="UserAuxSendVolume0" Type="Real64">
+							<ValueList>
+								<Value>-6</Value>
+							</ValueList>
+							<RTPCList>
+								<RTPC Name="" ID="{C2840056-5ACF-425E-A220-E04087602386}" ShortID="246665797">
+									<ReferenceList>
+										<Reference Name="ControlInput">
+											<ObjectRef Name="Distance_100" ID="{F3EEAFF4-46E7-4EAD-9336-DAE7EB3F7B50}" WorkUnitID="{027FA53E-BB70-43C3-849F-6A97AE8C9671}"/>
+										</Reference>
+									</ReferenceList>
+									<Curve Name="" ID="{6D5941F4-63E2-459C-9D50-60012E9F4921}">
+										<PropertyList>
+											<Property Name="Flags" Type="int32" Value="3"/>
+										</PropertyList>
+										<PointList>
+											<Point>
+												<XPos>0</XPos>
+												<YPos>-24</YPos>
+												<Flags>5</Flags>
+												<SegmentShape>SCurve</SegmentShape>
+											</Point>
+											<Point>
+												<XPos>100</XPos>
+												<YPos>0</YPos>
+												<Flags>37</Flags>
+											</Point>
+										</PointList>
+									</Curve>
+								</RTPC>
+							</RTPCList>
+						</Property>
 					</PropertyList>
 					<ReferenceList>
 						<Reference Name="Attenuation">
-							<ObjectRef Name="ATN_Default_50u" ID="{26519701-82FD-4427-895C-D3B2B2506AA0}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+							<ObjectRef Name="ATN_WPN_Fire_Default" ID="{735A8852-2B4F-4658-879C-B45EA3EE9407}" WorkUnitID="{0FF05D3F-153E-4D02-A6CC-FC77CC0CAD81}"/>
 						</Reference>
 						<Reference Name="Conversion">
 							<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -24,6 +59,9 @@
 						<Reference Name="OutputBus">
 							<ObjectRef Name="WPN" ID="{98A42EC1-C2A2-4DED-A5D6-8B31BF89D863}" WorkUnitID="{8B26C89C-CDEC-42FD-AE82-2A0A21AD7AAE}"/>
 						</Reference>
+						<Reference Name="UserAuxSend0">
+							<ObjectRef Name="RVB_EXT_Main" ID="{F8DF5907-D7A9-43AF-B130-2AB20EED85E3}" WorkUnitID="{8B26C89C-CDEC-42FD-AE82-2A0A21AD7AAE}"/>
+						</Reference>
 					</ReferenceList>
 					<ChildrenList>
 						<ActorMixer Name="BubbleGun" ID="{AB19D110-54F4-4DF9-87F6-3DDE635795E8}" ShortID="47891662">
@@ -41,13 +79,19 @@
 							<ChildrenList>
 								<RandomSequenceContainer Name="sx_wpn_bubbleGun_projectile" ID="{D8503B8F-5FC1-4FDF-8A28-5EB2CFD8F27F}" ShortID="546168485">
 									<PropertyList>
+										<Property Name="3DSpatialization" Type="int16" Value="2"/>
+										<Property Name="EnableDiffraction" Type="bool" Value="True"/>
+										<Property Name="OverridePositioning" Type="bool" Value="True"/>
 										<Property Name="Volume" Type="Real64">
 											<ValueList>
-												<Value>-12</Value>
+												<Value>-15</Value>
 											</ValueList>
 										</Property>
 									</PropertyList>
 									<ReferenceList>
+										<Reference Name="Attenuation">
+											<ObjectRef Name="ATN_WPN_Projectile_Default" ID="{875233F6-6B3F-48E9-9ECD-11FB1B195CCC}" WorkUnitID="{0FF05D3F-153E-4D02-A6CC-FC77CC0CAD81}"/>
+										</Reference>
 										<Reference Name="Conversion">
 											<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
 										</Reference>
@@ -64,7 +108,7 @@
 											</PropertyList>
 											<ReferenceList>
 												<Reference Name="Attenuation">
-													<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 												</Reference>
 												<Reference Name="Conversion">
 													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -100,7 +144,7 @@
 											</PropertyList>
 											<ReferenceList>
 												<Reference Name="Attenuation">
-													<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 												</Reference>
 												<Reference Name="Conversion">
 													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -136,7 +180,7 @@
 											</PropertyList>
 											<ReferenceList>
 												<Reference Name="Attenuation">
-													<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 												</Reference>
 												<Reference Name="Conversion">
 													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -172,7 +216,7 @@
 											</PropertyList>
 											<ReferenceList>
 												<Reference Name="Attenuation">
-													<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 												</Reference>
 												<Reference Name="Conversion">
 													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -208,7 +252,7 @@
 											</PropertyList>
 											<ReferenceList>
 												<Reference Name="Attenuation">
-													<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 												</Reference>
 												<Reference Name="Conversion">
 													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -243,7 +287,7 @@
 									<PropertyList>
 										<Property Name="Volume" Type="Real64">
 											<ValueList>
-												<Value>-7</Value>
+												<Value>-13</Value>
 											</ValueList>
 										</Property>
 									</PropertyList>
@@ -263,7 +307,7 @@
 											</PropertyList>
 											<ReferenceList>
 												<Reference Name="Attenuation">
-													<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 												</Reference>
 												<Reference Name="Conversion">
 													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -274,6 +318,13 @@
 											</ReferenceList>
 											<ChildrenList>
 												<AudioFileSource Name="sx_wpn_bubbleGun_fire_02" ID="{07B15443-F600-45D1-B4B1-4EA8EAE6B466}">
+													<PropertyList>
+														<Property Name="VolumeOffset" Type="Real64">
+															<ValueList>
+																<Value>3</Value>
+															</ValueList>
+														</Property>
+													</PropertyList>
 													<Language>SFX</Language>
 													<AudioFile>Hexany\bubbleGun\sx_wpn_bubbleGun_fire_02.wav</AudioFile>
 													<MediaIDList>
@@ -293,7 +344,7 @@
 											</PropertyList>
 											<ReferenceList>
 												<Reference Name="Attenuation">
-													<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 												</Reference>
 												<Reference Name="Conversion">
 													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -323,7 +374,7 @@
 											</PropertyList>
 											<ReferenceList>
 												<Reference Name="Attenuation">
-													<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 												</Reference>
 												<Reference Name="Conversion">
 													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -353,7 +404,7 @@
 											</PropertyList>
 											<ReferenceList>
 												<Reference Name="Attenuation">
-													<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 												</Reference>
 												<Reference Name="Conversion">
 													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -404,13 +455,19 @@
 								</RandomSequenceContainer>
 								<RandomSequenceContainer Name="sx_wpn_bubbleGun_explosion" ID="{31AA59D2-2141-428D-A6A0-D4C187895783}" ShortID="956012988">
 									<PropertyList>
+										<Property Name="3DSpatialization" Type="int16" Value="2"/>
+										<Property Name="EnableDiffraction" Type="bool" Value="True"/>
+										<Property Name="OverridePositioning" Type="bool" Value="True"/>
 										<Property Name="Volume" Type="Real64">
 											<ValueList>
-												<Value>-8</Value>
+												<Value>-14</Value>
 											</ValueList>
 										</Property>
 									</PropertyList>
 									<ReferenceList>
+										<Reference Name="Attenuation">
+											<ObjectRef Name="ATN_WPN_Impact_Default" ID="{02FD8E94-C99D-4362-9DCD-BAF59B93A518}" WorkUnitID="{0FF05D3F-153E-4D02-A6CC-FC77CC0CAD81}"/>
+										</Reference>
 										<Reference Name="Conversion">
 											<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
 										</Reference>
@@ -426,7 +483,7 @@
 											</PropertyList>
 											<ReferenceList>
 												<Reference Name="Attenuation">
-													<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 												</Reference>
 												<Reference Name="Conversion">
 													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -456,7 +513,7 @@
 											</PropertyList>
 											<ReferenceList>
 												<Reference Name="Attenuation">
-													<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 												</Reference>
 												<Reference Name="Conversion">
 													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -486,7 +543,7 @@
 											</PropertyList>
 											<ReferenceList>
 												<Reference Name="Attenuation">
-													<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 												</Reference>
 												<Reference Name="Conversion">
 													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -516,7 +573,7 @@
 											</PropertyList>
 											<ReferenceList>
 												<Reference Name="Attenuation">
-													<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 												</Reference>
 												<Reference Name="Conversion">
 													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -546,7 +603,7 @@
 											</PropertyList>
 											<ReferenceList>
 												<Reference Name="Attenuation">
-													<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 												</Reference>
 												<Reference Name="Conversion">
 													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -574,9 +631,14 @@
 								</RandomSequenceContainer>
 								<RandomSequenceContainer Name="sx_wpn_bubbleGun_buildup" ID="{AECF22A5-1C08-4E49-8958-81DF4CEA4C06}" ShortID="826656276">
 									<PropertyList>
+										<Property Name="Inclusion" Type="bool">
+											<ValueList>
+												<Value>False</Value>
+											</ValueList>
+										</Property>
 										<Property Name="Volume" Type="Real64">
 											<ValueList>
-												<Value>-5</Value>
+												<Value>-16</Value>
 											</ValueList>
 										</Property>
 									</PropertyList>
@@ -596,7 +658,7 @@
 											</PropertyList>
 											<ReferenceList>
 												<Reference Name="Attenuation">
-													<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 												</Reference>
 												<Reference Name="Conversion">
 													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -624,13 +686,24 @@
 								</RandomSequenceContainer>
 								<RandomSequenceContainer Name="sx_wpn_bubbleGun_impact" ID="{0D9C3F92-5D5C-4DD5-9D6D-847F2A693AB9}" ShortID="565483201">
 									<PropertyList>
+										<Property Name="3DSpatialization" Type="int16" Value="2"/>
+										<Property Name="EnableDiffraction" Type="bool" Value="True"/>
+										<Property Name="Inclusion" Type="bool">
+											<ValueList>
+												<Value>False</Value>
+											</ValueList>
+										</Property>
+										<Property Name="OverridePositioning" Type="bool" Value="True"/>
 										<Property Name="Volume" Type="Real64">
 											<ValueList>
-												<Value>-8</Value>
+												<Value>-14</Value>
 											</ValueList>
 										</Property>
 									</PropertyList>
 									<ReferenceList>
+										<Reference Name="Attenuation">
+											<ObjectRef Name="ATN_WPN_Impact_Default" ID="{02FD8E94-C99D-4362-9DCD-BAF59B93A518}" WorkUnitID="{0FF05D3F-153E-4D02-A6CC-FC77CC0CAD81}"/>
+										</Reference>
 										<Reference Name="Conversion">
 											<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
 										</Reference>
@@ -646,7 +719,7 @@
 											</PropertyList>
 											<ReferenceList>
 												<Reference Name="Attenuation">
-													<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 												</Reference>
 												<Reference Name="Conversion">
 													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -676,7 +749,7 @@
 									<PropertyList>
 										<Property Name="Volume" Type="Real64">
 											<ValueList>
-												<Value>-16</Value>
+												<Value>-22</Value>
 											</ValueList>
 										</Property>
 									</PropertyList>
@@ -696,7 +769,7 @@
 											</PropertyList>
 											<ReferenceList>
 												<Reference Name="Attenuation">
-													<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 												</Reference>
 												<Reference Name="Conversion">
 													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -726,7 +799,7 @@
 									<PropertyList>
 										<Property Name="Volume" Type="Real64">
 											<ValueList>
-												<Value>-10</Value>
+												<Value>-17</Value>
 											</ValueList>
 										</Property>
 									</PropertyList>
@@ -746,7 +819,7 @@
 											</PropertyList>
 											<ReferenceList>
 												<Reference Name="Attenuation">
-													<ObjectRef Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+													<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
 												</Reference>
 												<Reference Name="Conversion">
 													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -778,11 +851,6 @@
 						<ActorMixer Name="LaserPistol" ID="{EDDB579D-D07E-4F19-BB5A-7E045FC48DA5}" ShortID="466269689">
 							<PropertyList>
 								<Property Name="BelowThresholdBehavior" Type="int16" Value="3"/>
-								<Property Name="Volume" Type="Real64">
-									<ValueList>
-										<Value>-17</Value>
-									</ValueList>
-								</Property>
 							</PropertyList>
 							<ReferenceList>
 								<Reference Name="Conversion">
@@ -797,90 +865,15 @@
 									<PropertyList>
 										<Property Name="3DSpatialization" Type="int16" Value="2"/>
 										<Property Name="EnableDiffraction" Type="bool" Value="True"/>
-										<Property Name="OverridePositioning" Type="bool" Value="True"/>
 										<Property Name="Volume" Type="Real64">
 											<ValueList>
-												<Value>-6</Value>
+												<Value>-9</Value>
 											</ValueList>
 										</Property>
 									</PropertyList>
 									<ReferenceList>
 										<Reference Name="Attenuation">
-											<Custom CreatedFrom="{735A8852-2B4F-4658-879C-B45EA3EE9407}">
-												<Attenuation Name="ATN_WPN_Fire_Default (Custom)" ID="{6E9A50EB-7609-4CEF-8C6F-CC898E16C812}" ShortID="913938192">
-													<CurveUsageInfoList>
-														<VolumeDryUsage>
-															<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
-																<Curve Name="VolumeDry" ID="{45644E62-4AC1-498F-9A8B-7E34BABB280C}">
-																	<PropertyList>
-																		<Property Name="Flags" Type="int32" Value="3"/>
-																	</PropertyList>
-																	<PointList>
-																		<Point>
-																			<XPos>0</XPos>
-																			<YPos>0</YPos>
-																			<Flags>5</Flags>
-																			<SegmentShape>Log2</SegmentShape>
-																		</Point>
-																		<Point>
-																			<XPos>100</XPos>
-																			<YPos>-200</YPos>
-																			<Flags>37</Flags>
-																		</Point>
-																	</PointList>
-																</Curve>
-															</CurveUsageInfo>
-														</VolumeDryUsage>
-														<VolumeWetGameUsage>
-															<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
-														</VolumeWetGameUsage>
-														<VolumeWetUserUsage>
-															<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
-														</VolumeWetUserUsage>
-														<LowPassFilterUsage>
-															<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-														</LowPassFilterUsage>
-														<HighPassFilterUsage>
-															<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-														</HighPassFilterUsage>
-														<SpreadUsage>
-															<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
-																<Curve Name="Spread" ID="{ACE099A4-8173-4760-B101-71DD93615874}">
-																	<PropertyList>
-																		<Property Name="Flags" Type="int32" Value="1"/>
-																	</PropertyList>
-																	<PointList>
-																		<Point>
-																			<XPos>0</XPos>
-																			<YPos>100</YPos>
-																			<Flags>5</Flags>
-																		</Point>
-																		<Point>
-																			<XPos>1</XPos>
-																			<YPos>100</YPos>
-																			<Flags>0</Flags>
-																			<SegmentShape>Log3</SegmentShape>
-																		</Point>
-																		<Point>
-																			<XPos>16</XPos>
-																			<YPos>0</YPos>
-																			<Flags>0</Flags>
-																		</Point>
-																		<Point>
-																			<XPos>100</XPos>
-																			<YPos>0</YPos>
-																			<Flags>37</Flags>
-																		</Point>
-																	</PointList>
-																</Curve>
-															</CurveUsageInfo>
-														</SpreadUsage>
-														<FocusUsage>
-															<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-														</FocusUsage>
-													</CurveUsageInfoList>
-												</Attenuation>
-											</Custom>
+											<ObjectRef Name="ATN_WPN_Fire_Default" ID="{735A8852-2B4F-4658-879C-B45EA3EE9407}" WorkUnitID="{0FF05D3F-153E-4D02-A6CC-FC77CC0CAD81}"/>
 										</Reference>
 										<Reference Name="Conversion">
 											<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
@@ -1038,7 +1031,7 @@
 										<Property Name="OverridePositioning" Type="bool" Value="True"/>
 										<Property Name="Volume" Type="Real64">
 											<ValueList>
-												<Value>-6</Value>
+												<Value>-19</Value>
 											</ValueList>
 										</Property>
 									</PropertyList>

+ 1167 - 12
Sounds/wwise_project/Attenuations/AMPS.wwu

@@ -18,7 +18,25 @@
 													<XPos>0</XPos>
 													<YPos>0</YPos>
 													<Flags>5</Flags>
-													<SegmentShape>Log2</SegmentShape>
+													<SegmentShape>Log3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>4</XPos>
+													<YPos>0</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Log3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>60</XPos>
+													<YPos>-20</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Exp3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>90</XPos>
+													<YPos>-20</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Exp2</SegmentShape>
 												</Point>
 												<Point>
 													<XPos>100</XPos>
@@ -36,10 +54,53 @@
 									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
 								</VolumeWetUserUsage>
 								<LowPassFilterUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="LowPassFilter" ID="{84A952DA-51B7-4804-B060-E8D99110165C}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="65537"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>0</YPos>
+													<Flags>5</Flags>
+													<SegmentShape>Log3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>50</XPos>
+													<YPos>40</YPos>
+													<Flags>0</Flags>
+												</Point>
+												<Point>
+													<XPos>100</XPos>
+													<YPos>60</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
 								</LowPassFilterUsage>
 								<HighPassFilterUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="HighPassFilter" ID="{220FD10E-F9ED-4BC6-9CC5-C5F64A847D0F}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="65537"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>0</YPos>
+													<Flags>5</Flags>
+													<SegmentShape>Log3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>100</XPos>
+													<YPos>40</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
 								</HighPassFilterUsage>
 								<SpreadUsage>
 									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
@@ -61,7 +122,7 @@
 												</Point>
 												<Point>
 													<XPos>16</XPos>
-													<YPos>-0</YPos>
+													<YPos>0</YPos>
 													<Flags>0</Flags>
 												</Point>
 												<Point>
@@ -80,7 +141,7 @@
 						</Attenuation>
 						<Attenuation Name="ATN_WPN_Impact_Default" ID="{02FD8E94-C99D-4362-9DCD-BAF59B93A518}" ShortID="506241271">
 							<PropertyList>
-								<Property Name="RadiusMax" Type="Real64" Value="20"/>
+								<Property Name="RadiusMax" Type="Real64" Value="40"/>
 							</PropertyList>
 							<CurveUsageInfoList>
 								<VolumeDryUsage>
@@ -94,10 +155,22 @@
 													<XPos>0</XPos>
 													<YPos>0</YPos>
 													<Flags>5</Flags>
-													<SegmentShape>Log2</SegmentShape>
+													<SegmentShape>Log3</SegmentShape>
 												</Point>
 												<Point>
 													<XPos>20</XPos>
+													<YPos>-20</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Exp3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>38</XPos>
+													<YPos>-20</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Exp2</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>40</XPos>
 													<YPos>-200</YPos>
 													<Flags>37</Flags>
 												</Point>
@@ -112,10 +185,53 @@
 									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
 								</VolumeWetUserUsage>
 								<LowPassFilterUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="LowPassFilter" ID="{29A6ED50-6EB2-4A38-8792-DC534E9B9155}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="65537"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>0</YPos>
+													<Flags>5</Flags>
+													<SegmentShape>Log3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>40</XPos>
+													<YPos>50</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
 								</LowPassFilterUsage>
 								<HighPassFilterUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="HighPassFilter" ID="{A37B2274-26B3-4872-B6FE-0E04B3DBAF86}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="65537"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>0</YPos>
+													<Flags>5</Flags>
+													<SegmentShape>SCurve</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>16</XPos>
+													<YPos>28</YPos>
+													<Flags>0</Flags>
+												</Point>
+												<Point>
+													<XPos>40</XPos>
+													<YPos>38</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
 								</HighPassFilterUsage>
 								<SpreadUsage>
 									<CurveUsageInfo Platform="Linked" CurveToUse="None">
@@ -130,18 +246,1057 @@
 													<Flags>5</Flags>
 												</Point>
 												<Point>
-													<XPos>0.2</XPos>
+													<XPos>0.4</XPos>
 													<YPos>100</YPos>
 													<Flags>0</Flags>
 													<SegmentShape>Log3</SegmentShape>
 												</Point>
 												<Point>
-													<XPos>3.2</XPos>
-													<YPos>-0</YPos>
+													<XPos>6.4</XPos>
+													<YPos>0</YPos>
 													<Flags>0</Flags>
 												</Point>
 												<Point>
-													<XPos>20</XPos>
+													<XPos>40</XPos>
+													<YPos>0</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
+								</SpreadUsage>
+								<FocusUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
+								</FocusUsage>
+							</CurveUsageInfoList>
+						</Attenuation>
+						<Attenuation Name="ATN_WPN_Projectile_Default" ID="{875233F6-6B3F-48E9-9ECD-11FB1B195CCC}" ShortID="164817628">
+							<PropertyList>
+								<Property Name="RadiusMax" Type="Real64" Value="10"/>
+							</PropertyList>
+							<CurveUsageInfoList>
+								<VolumeDryUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="VolumeDry" ID="{769F8389-45C6-4596-B2C1-344B6B07ED1D}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="3"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>0</YPos>
+													<Flags>5</Flags>
+													<SegmentShape>Log3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>10</XPos>
+													<YPos>-200</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
+								</VolumeDryUsage>
+								<VolumeWetGameUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
+								</VolumeWetGameUsage>
+								<VolumeWetUserUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
+								</VolumeWetUserUsage>
+								<LowPassFilterUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
+								</LowPassFilterUsage>
+								<HighPassFilterUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
+								</HighPassFilterUsage>
+								<SpreadUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
+								</SpreadUsage>
+								<FocusUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
+								</FocusUsage>
+							</CurveUsageInfoList>
+						</Attenuation>
+						<Attenuation Name="ATN_WPN_Explosion_Large" ID="{10812A45-46F3-492A-A38E-A2FF15AC8130}" ShortID="688939232">
+							<CurveUsageInfoList>
+								<VolumeDryUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="VolumeDry" ID="{7116B302-B44B-4B06-B5FB-34054A74732A}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="3"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>0</YPos>
+													<Flags>5</Flags>
+													<SegmentShape>SCurve</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>3.33333333333333</XPos>
+													<YPos>0</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Log2</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>10</XPos>
+													<YPos>-6</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Log2</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>60.16548</XPos>
+													<YPos>-18</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Exp2</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>97.51773</XPos>
+													<YPos>-18</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Exp3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>100</XPos>
+													<YPos>-200</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
+								</VolumeDryUsage>
+								<VolumeWetGameUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
+								</VolumeWetGameUsage>
+								<VolumeWetUserUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
+								</VolumeWetUserUsage>
+								<LowPassFilterUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="LowPassFilter" ID="{63239F8B-5F4E-4EA3-A3BE-112D602AB43A}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="65537"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>0</YPos>
+													<Flags>5</Flags>
+												</Point>
+												<Point>
+													<XPos>3.5461</XPos>
+													<YPos>0</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Log1</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>10</XPos>
+													<YPos>20</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Log1</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>60</XPos>
+													<YPos>50</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Exp2</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>100</XPos>
+													<YPos>64</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
+								</LowPassFilterUsage>
+								<HighPassFilterUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="HighPassFilter" ID="{07B2FD5F-815C-4D28-B571-BA3FC7825FEC}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="65537"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>0</YPos>
+													<Flags>5</Flags>
+												</Point>
+												<Point>
+													<XPos>27.18676</XPos>
+													<YPos>0</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Exp1</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>100</XPos>
+													<YPos>35</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
+								</HighPassFilterUsage>
+								<SpreadUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="Spread" ID="{C4374277-CCE5-4A22-9C29-6BB5642C43C2}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="1"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>100</YPos>
+													<Flags>5</Flags>
+													<SegmentShape>Exp2</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>2</XPos>
+													<YPos>100</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Exp1</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>6</XPos>
+													<YPos>80</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Log3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>20</XPos>
+													<YPos>0</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Exp3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>100</XPos>
+													<YPos>0</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
+								</SpreadUsage>
+								<FocusUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
+								</FocusUsage>
+							</CurveUsageInfoList>
+						</Attenuation>
+					</ChildrenList>
+				</Folder>
+				<Folder Name="Player" ID="{58F24B37-E586-4C36-84CF-2A53BCD25975}" ShortID="42341575">
+					<ChildrenList>
+						<Attenuation Name="ATN_Player_Footstep" ID="{2CBFBB08-A412-464C-A918-162ED89CF12D}" ShortID="9304360">
+							<CurveUsageInfoList>
+								<VolumeDryUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="VolumeDry" ID="{F85A2118-FA10-4ADD-888E-C277A3B8AD09}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="3"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>0</YPos>
+													<Flags>5</Flags>
+												</Point>
+												<Point>
+													<XPos>1</XPos>
+													<YPos>0</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Log3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>50</XPos>
+													<YPos>-19.35387</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Exp3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>80</XPos>
+													<YPos>-200</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Log3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>100</XPos>
+													<YPos>-200</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
+								</VolumeDryUsage>
+								<VolumeWetGameUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
+								</VolumeWetGameUsage>
+								<VolumeWetUserUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
+								</VolumeWetUserUsage>
+								<LowPassFilterUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="LowPassFilter" ID="{0479A20F-E173-4692-81E7-F4CE1DF9C5E1}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="65537"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>0</YPos>
+													<Flags>5</Flags>
+													<SegmentShape>Log1</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>2</XPos>
+													<YPos>0</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Log3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>100</XPos>
+													<YPos>30</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
+								</LowPassFilterUsage>
+								<HighPassFilterUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="HighPassFilter" ID="{4DF45A60-A84A-4CFC-B6BA-D0244F347FA5}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="65537"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>0</YPos>
+													<Flags>5</Flags>
+													<SegmentShape>Log3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>2</XPos>
+													<YPos>0</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>SCurve</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>20</XPos>
+													<YPos>42</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Log3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>100</XPos>
+													<YPos>41</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
+								</HighPassFilterUsage>
+								<SpreadUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
+								</SpreadUsage>
+								<FocusUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
+								</FocusUsage>
+							</CurveUsageInfoList>
+						</Attenuation>
+						<Attenuation Name="ATN_Player_Vocal" ID="{34BA0793-0676-4024-9BC1-70EE08D65091}" ShortID="563079459">
+							<PropertyList>
+								<Property Name="RadiusMax" Type="Real64" Value="50"/>
+							</PropertyList>
+							<CurveUsageInfoList>
+								<VolumeDryUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="VolumeDry" ID="{F39FC552-A810-4D4E-B57E-647A4C7B1FDD}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="3"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>0</YPos>
+													<Flags>5</Flags>
+												</Point>
+												<Point>
+													<XPos>0.5</XPos>
+													<YPos>0</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Log3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>46.867615</XPos>
+													<YPos>-17.54564</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Exp3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>50</XPos>
+													<YPos>-200</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
+								</VolumeDryUsage>
+								<VolumeWetGameUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
+								</VolumeWetGameUsage>
+								<VolumeWetUserUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
+								</VolumeWetUserUsage>
+								<LowPassFilterUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="LowPassFilter" ID="{F4A0429C-6557-4E8F-9E6C-70F7EC423595}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="65537"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>0</YPos>
+													<Flags>5</Flags>
+													<SegmentShape>Log1</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>1</XPos>
+													<YPos>0</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Log3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>10.04728</XPos>
+													<YPos>31</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Log3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>50</XPos>
+													<YPos>40</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
+								</LowPassFilterUsage>
+								<HighPassFilterUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="HighPassFilter" ID="{CAECF3AC-752A-40F7-B681-4D49C39C571F}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="65537"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>0</YPos>
+													<Flags>5</Flags>
+													<SegmentShape>Log2</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>10</XPos>
+													<YPos>36</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Log2</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>50</XPos>
+													<YPos>41</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
+								</HighPassFilterUsage>
+								<SpreadUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
+								</SpreadUsage>
+								<FocusUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
+								</FocusUsage>
+							</CurveUsageInfoList>
+						</Attenuation>
+						<Attenuation Name="ATN_Player_Foley" ID="{D1468F89-B5C8-485A-80D3-B8D1BC0B99C8}" ShortID="328882184">
+							<PropertyList>
+								<Property Name="RadiusMax" Type="Real64" Value="25"/>
+							</PropertyList>
+							<CurveUsageInfoList>
+								<VolumeDryUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="VolumeDry" ID="{50126EF7-7F4E-431D-9452-352346F35B04}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="3"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>0</YPos>
+													<Flags>5</Flags>
+												</Point>
+												<Point>
+													<XPos>0.25</XPos>
+													<YPos>0</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Log3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>12.52955</XPos>
+													<YPos>-16</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Constant</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>20</XPos>
+													<YPos>-16</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Exp3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>25</XPos>
+													<YPos>-200</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
+								</VolumeDryUsage>
+								<VolumeWetGameUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
+								</VolumeWetGameUsage>
+								<VolumeWetUserUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
+								</VolumeWetUserUsage>
+								<LowPassFilterUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="LowPassFilter" ID="{A8A8B4AB-335F-4E6E-A9DB-3909360027D4}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="65537"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>0</YPos>
+													<Flags>5</Flags>
+													<SegmentShape>Log1</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>0.5</XPos>
+													<YPos>0</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Log1</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>25</XPos>
+													<YPos>40</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
+								</LowPassFilterUsage>
+								<HighPassFilterUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="HighPassFilter" ID="{6C912B60-499A-4036-818A-37C05A9CF1D7}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="65537"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>0</YPos>
+													<Flags>5</Flags>
+													<SegmentShape>Log1</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>11.02837</XPos>
+													<YPos>38</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Log3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>25</XPos>
+													<YPos>47</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
+								</HighPassFilterUsage>
+								<SpreadUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
+								</SpreadUsage>
+								<FocusUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
+								</FocusUsage>
+							</CurveUsageInfoList>
+						</Attenuation>
+						<Attenuation Name="ATN_Player_Default" ID="{FBAC22E1-6462-4EE3-938F-D28EB1F09354}" ShortID="1045757703">
+							<CurveUsageInfoList>
+								<VolumeDryUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="VolumeDry" ID="{ED7319F1-9AA2-482E-84BF-C79CC438C7FF}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="3"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>0</YPos>
+													<Flags>5</Flags>
+													<SegmentShape>Log3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>95.03547</XPos>
+													<YPos>-20</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Exp3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>100</XPos>
+													<YPos>-200</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
+								</VolumeDryUsage>
+								<VolumeWetGameUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
+								</VolumeWetGameUsage>
+								<VolumeWetUserUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
+								</VolumeWetUserUsage>
+								<LowPassFilterUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="LowPassFilter" ID="{C097C854-1E30-45C7-91C5-01A586162B18}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="65537"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>0</YPos>
+													<Flags>5</Flags>
+													<SegmentShape>Log2</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>100</XPos>
+													<YPos>40</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
+								</LowPassFilterUsage>
+								<HighPassFilterUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="HighPassFilter" ID="{2475BF8F-1E05-4013-A011-D7A8A1F264EE}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="65537"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>0</YPos>
+													<Flags>5</Flags>
+													<SegmentShape>Log3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>100</XPos>
+													<YPos>45</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
+								</HighPassFilterUsage>
+								<SpreadUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
+								</SpreadUsage>
+								<FocusUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
+								</FocusUsage>
+							</CurveUsageInfoList>
+						</Attenuation>
+					</ChildrenList>
+				</Folder>
+				<Folder Name="ENV" ID="{5D635415-88BA-42A1-AF5A-BE2D3C8DC7F7}" ShortID="802730428"/>
+				<Folder Name="INT" ID="{BFA227DB-358D-414D-8E7D-8FE006F848FE}" ShortID="170141906">
+					<ChildrenList>
+						<Attenuation Name="ATN_INT_Default" ID="{F4475714-3770-46C9-92A5-6067FD1C17BB}" ShortID="997860463">
+							<PropertyList>
+								<Property Name="RadiusMax" Type="Real64" Value="22"/>
+							</PropertyList>
+							<CurveUsageInfoList>
+								<VolumeDryUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="VolumeDry" ID="{A9B2EB1E-08A0-4005-9E42-A8CADB9CEF67}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="3"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>0</YPos>
+													<Flags>5</Flags>
+													<SegmentShape>Log2</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>10</XPos>
+													<YPos>-16</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Exp2</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>20.00001</XPos>
+													<YPos>-16</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Exp2</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>22</XPos>
+													<YPos>-200</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
+								</VolumeDryUsage>
+								<VolumeWetGameUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
+								</VolumeWetGameUsage>
+								<VolumeWetUserUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
+								</VolumeWetUserUsage>
+								<LowPassFilterUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="LowPassFilter" ID="{8AD619ED-833A-4EAD-AE81-96169F44FD02}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="65537"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>0</YPos>
+													<Flags>5</Flags>
+												</Point>
+												<Point>
+													<XPos>2</XPos>
+													<YPos>0</YPos>
+													<Flags>0</Flags>
+												</Point>
+												<Point>
+													<XPos>22</XPos>
+													<YPos>50</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
+								</LowPassFilterUsage>
+								<HighPassFilterUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="HighPassFilter" ID="{9DEF3A15-B7F2-4864-B270-84B205E9B1BF}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="65537"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>0</YPos>
+													<Flags>5</Flags>
+												</Point>
+												<Point>
+													<XPos>1</XPos>
+													<YPos>0</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Log2</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>22</XPos>
+													<YPos>55</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
+								</HighPassFilterUsage>
+								<SpreadUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
+								</SpreadUsage>
+								<FocusUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
+								</FocusUsage>
+							</CurveUsageInfoList>
+						</Attenuation>
+						<Attenuation Name="ATN_INT_Trap" ID="{AFE142B5-7438-4098-9291-18BCDCD34D7B}" ShortID="432914534">
+							<PropertyList>
+								<Property Name="RadiusMax" Type="Real64" Value="80"/>
+							</PropertyList>
+							<CurveUsageInfoList>
+								<VolumeDryUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="VolumeDry" ID="{D4C030C8-D805-4C04-9173-30EC56C6100C}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="3"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>0</YPos>
+													<Flags>5</Flags>
+													<SegmentShape>Log3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>3.2</XPos>
+													<YPos>0</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Log3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>40</XPos>
+													<YPos>-20</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Exp3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>72</XPos>
+													<YPos>-20</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Exp2</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>80</XPos>
+													<YPos>-200</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
+								</VolumeDryUsage>
+								<VolumeWetGameUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
+								</VolumeWetGameUsage>
+								<VolumeWetUserUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
+								</VolumeWetUserUsage>
+								<LowPassFilterUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="LowPassFilter" ID="{008D69E7-1A4A-447B-9FB1-E0C627D9648E}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="65537"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>0</YPos>
+													<Flags>5</Flags>
+													<SegmentShape>Log3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>40</XPos>
+													<YPos>40</YPos>
+													<Flags>0</Flags>
+												</Point>
+												<Point>
+													<XPos>80</XPos>
+													<YPos>60</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
+								</LowPassFilterUsage>
+								<HighPassFilterUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="HighPassFilter" ID="{99E5D64C-2A30-4215-8B11-51B01C50ABD8}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="65537"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>0</YPos>
+													<Flags>5</Flags>
+													<SegmentShape>Log3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>80</XPos>
+													<YPos>40</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
+								</HighPassFilterUsage>
+								<SpreadUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="Spread" ID="{7F32F242-F7C8-4017-A3AF-EA37AB4C3A72}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="1"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>100</YPos>
+													<Flags>5</Flags>
+												</Point>
+												<Point>
+													<XPos>0.8</XPos>
+													<YPos>100</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Log3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>12.8</XPos>
+													<YPos>0</YPos>
+													<Flags>0</Flags>
+												</Point>
+												<Point>
+													<XPos>80</XPos>
+													<YPos>0</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
+								</SpreadUsage>
+								<FocusUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
+								</FocusUsage>
+							</CurveUsageInfoList>
+						</Attenuation>
+						<Attenuation Name="ATN_INT_JumpPad" ID="{B20BF362-B310-4C42-AC31-ED627834073C}" ShortID="762028383">
+							<PropertyList>
+								<Property Name="RadiusMax" Type="Real64" Value="22"/>
+							</PropertyList>
+							<CurveUsageInfoList>
+								<VolumeDryUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="VolumeDry" ID="{B5B9BB04-0799-43B4-B1D1-10E463D709E9}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="3"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>0</YPos>
+													<Flags>5</Flags>
+													<SegmentShape>Log2</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>10</XPos>
+													<YPos>-12</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Exp2</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>20.00001</XPos>
+													<YPos>-12</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Exp2</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>22</XPos>
+													<YPos>-200</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
+								</VolumeDryUsage>
+								<VolumeWetGameUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
+								</VolumeWetGameUsage>
+								<VolumeWetUserUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
+								</VolumeWetUserUsage>
+								<LowPassFilterUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="LowPassFilter" ID="{AD26CD4B-7891-4C52-B059-83EC5D49DDA6}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="65537"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>0</YPos>
+													<Flags>5</Flags>
+												</Point>
+												<Point>
+													<XPos>2</XPos>
+													<YPos>0</YPos>
+													<Flags>0</Flags>
+												</Point>
+												<Point>
+													<XPos>22</XPos>
+													<YPos>50</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
+								</LowPassFilterUsage>
+								<HighPassFilterUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="HighPassFilter" ID="{6F44C84A-641E-4E67-8D32-B8F4AF3CACF3}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="65537"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>0</YPos>
+													<Flags>5</Flags>
+												</Point>
+												<Point>
+													<XPos>1</XPos>
+													<YPos>0</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Log2</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>22</XPos>
+													<YPos>55</YPos>
+													<Flags>37</Flags>
+												</Point>
+											</PointList>
+										</Curve>
+									</CurveUsageInfo>
+								</HighPassFilterUsage>
+								<SpreadUsage>
+									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
+										<Curve Name="Spread" ID="{35F9FD4A-75D5-43C4-B97E-4E51763F3C15}">
+											<PropertyList>
+												<Property Name="Flags" Type="int32" Value="1"/>
+											</PropertyList>
+											<PointList>
+												<Point>
+													<XPos>0</XPos>
+													<YPos>100</YPos>
+													<Flags>5</Flags>
+												</Point>
+												<Point>
+													<XPos>1</XPos>
+													<YPos>100</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Exp3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>5</XPos>
+													<YPos>85</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Log3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>12.5</XPos>
+													<YPos>0</YPos>
+													<Flags>0</Flags>
+													<SegmentShape>Exp3</SegmentShape>
+												</Point>
+												<Point>
+													<XPos>22</XPos>
 													<YPos>0</YPos>
 													<Flags>37</Flags>
 												</Point>

+ 13 - 569
Sounds/wwise_project/Attenuations/ATN_Defaults.wwu

@@ -3,565 +3,9 @@
 	<Attenuations>
 		<WorkUnit Name="ATN_Defaults" ID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}" PersistMode="Standalone">
 			<ChildrenList>
-				<Folder Name="Unreal (meters)" ID="{3C4F442C-ACF3-4C60-A8B4-52D4A517542E}" ShortID="428333294">
+				<Folder Name="Meters" ID="{1359E276-BE1D-4735-9EB9-FF12D076443E}" ShortID="642862621">
 					<ChildrenList>
-						<Attenuation Name="ATN_Default_500m" ID="{B82DF5D1-519A-4EFE-A99A-9A0A91D7C867}" ShortID="257501951">
-							<PropertyList>
-								<Property Name="RadiusMax" Type="Real64" Value="50000"/>
-							</PropertyList>
-							<CurveUsageInfoList>
-								<VolumeDryUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
-										<Curve Name="VolumeDry" ID="{222CAFE3-249F-4143-900C-B6D96EBF068C}">
-											<PropertyList>
-												<Property Name="Flags" Type="int32" Value="3"/>
-											</PropertyList>
-											<PointList>
-												<Point>
-													<XPos>0</XPos>
-													<YPos>0</YPos>
-													<Flags>5</Flags>
-												</Point>
-												<Point>
-													<XPos>50000</XPos>
-													<YPos>-200</YPos>
-													<Flags>37</Flags>
-												</Point>
-											</PointList>
-										</Curve>
-									</CurveUsageInfo>
-								</VolumeDryUsage>
-								<VolumeWetGameUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
-								</VolumeWetGameUsage>
-								<VolumeWetUserUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
-								</VolumeWetUserUsage>
-								<LowPassFilterUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</LowPassFilterUsage>
-								<HighPassFilterUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</HighPassFilterUsage>
-								<SpreadUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</SpreadUsage>
-								<FocusUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</FocusUsage>
-							</CurveUsageInfoList>
-						</Attenuation>
-						<Attenuation Name="ATN_Default_300m" ID="{BBE17C62-B9A0-4B67-B96F-C93C849322E4}" ShortID="1013316828">
-							<PropertyList>
-								<Property Name="RadiusMax" Type="Real64" Value="30000"/>
-							</PropertyList>
-							<CurveUsageInfoList>
-								<VolumeDryUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
-										<Curve Name="VolumeDry" ID="{70F02E0F-B58E-481C-A57C-C6E7EDE7356B}">
-											<PropertyList>
-												<Property Name="Flags" Type="int32" Value="3"/>
-											</PropertyList>
-											<PointList>
-												<Point>
-													<XPos>0</XPos>
-													<YPos>0</YPos>
-													<Flags>5</Flags>
-												</Point>
-												<Point>
-													<XPos>30000</XPos>
-													<YPos>-200</YPos>
-													<Flags>37</Flags>
-												</Point>
-											</PointList>
-										</Curve>
-									</CurveUsageInfo>
-								</VolumeDryUsage>
-								<VolumeWetGameUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
-								</VolumeWetGameUsage>
-								<VolumeWetUserUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
-								</VolumeWetUserUsage>
-								<LowPassFilterUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</LowPassFilterUsage>
-								<HighPassFilterUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</HighPassFilterUsage>
-								<SpreadUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</SpreadUsage>
-								<FocusUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</FocusUsage>
-							</CurveUsageInfoList>
-						</Attenuation>
-						<Attenuation Name="ATN_Default_750m" ID="{EFDB60A7-E56A-4F76-B307-E46E6764C691}" ShortID="358864119">
-							<PropertyList>
-								<Property Name="RadiusMax" Type="Real64" Value="75000"/>
-							</PropertyList>
-							<CurveUsageInfoList>
-								<VolumeDryUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
-										<Curve Name="VolumeDry" ID="{50E4412D-EE0B-4159-B84E-62225493D9F6}">
-											<PropertyList>
-												<Property Name="Flags" Type="int32" Value="3"/>
-											</PropertyList>
-											<PointList>
-												<Point>
-													<XPos>0</XPos>
-													<YPos>0</YPos>
-													<Flags>5</Flags>
-												</Point>
-												<Point>
-													<XPos>75000</XPos>
-													<YPos>-200</YPos>
-													<Flags>37</Flags>
-												</Point>
-											</PointList>
-										</Curve>
-									</CurveUsageInfo>
-								</VolumeDryUsage>
-								<VolumeWetGameUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
-								</VolumeWetGameUsage>
-								<VolumeWetUserUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
-								</VolumeWetUserUsage>
-								<LowPassFilterUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</LowPassFilterUsage>
-								<HighPassFilterUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</HighPassFilterUsage>
-								<SpreadUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</SpreadUsage>
-								<FocusUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</FocusUsage>
-							</CurveUsageInfoList>
-						</Attenuation>
-						<Attenuation Name="ATN_Default_1000m" ID="{00A7E9D8-61E7-4210-903C-84175B77C65D}" ShortID="118422186">
-							<PropertyList>
-								<Property Name="RadiusMax" Type="Real64" Value="100000"/>
-							</PropertyList>
-							<CurveUsageInfoList>
-								<VolumeDryUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
-										<Curve Name="VolumeDry" ID="{67A24C09-4D91-4436-B993-0CA6A9D1C166}">
-											<PropertyList>
-												<Property Name="Flags" Type="int32" Value="3"/>
-											</PropertyList>
-											<PointList>
-												<Point>
-													<XPos>0</XPos>
-													<YPos>0</YPos>
-													<Flags>5</Flags>
-												</Point>
-												<Point>
-													<XPos>100000</XPos>
-													<YPos>-200</YPos>
-													<Flags>37</Flags>
-												</Point>
-											</PointList>
-										</Curve>
-									</CurveUsageInfo>
-								</VolumeDryUsage>
-								<VolumeWetGameUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
-								</VolumeWetGameUsage>
-								<VolumeWetUserUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
-								</VolumeWetUserUsage>
-								<LowPassFilterUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</LowPassFilterUsage>
-								<HighPassFilterUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</HighPassFilterUsage>
-								<SpreadUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</SpreadUsage>
-								<FocusUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</FocusUsage>
-							</CurveUsageInfoList>
-						</Attenuation>
-						<Attenuation Name="ATN_Default_400m" ID="{46BA2C72-2E0C-4563-86CA-0B396084AB41}" ShortID="46138354">
-							<PropertyList>
-								<Property Name="RadiusMax" Type="Real64" Value="40000"/>
-							</PropertyList>
-							<CurveUsageInfoList>
-								<VolumeDryUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
-										<Curve Name="VolumeDry" ID="{E1962591-AF54-4D0E-B08B-DC4CE5250BD6}">
-											<PropertyList>
-												<Property Name="Flags" Type="int32" Value="3"/>
-											</PropertyList>
-											<PointList>
-												<Point>
-													<XPos>0</XPos>
-													<YPos>0</YPos>
-													<Flags>5</Flags>
-												</Point>
-												<Point>
-													<XPos>40000</XPos>
-													<YPos>-200</YPos>
-													<Flags>37</Flags>
-												</Point>
-											</PointList>
-										</Curve>
-									</CurveUsageInfo>
-								</VolumeDryUsage>
-								<VolumeWetGameUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
-								</VolumeWetGameUsage>
-								<VolumeWetUserUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
-								</VolumeWetUserUsage>
-								<LowPassFilterUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</LowPassFilterUsage>
-								<HighPassFilterUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</HighPassFilterUsage>
-								<SpreadUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</SpreadUsage>
-								<FocusUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</FocusUsage>
-							</CurveUsageInfoList>
-						</Attenuation>
-						<Attenuation Name="ATN_Default_200m" ID="{2698728C-1E7D-400F-8588-19567CDA98CF}" ShortID="1001998630">
-							<PropertyList>
-								<Property Name="RadiusMax" Type="Real64" Value="20000"/>
-							</PropertyList>
-							<CurveUsageInfoList>
-								<VolumeDryUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
-										<Curve Name="VolumeDry" ID="{F39D3D1A-1A0D-4F9F-9F74-AE853C5528B0}">
-											<PropertyList>
-												<Property Name="Flags" Type="int32" Value="3"/>
-											</PropertyList>
-											<PointList>
-												<Point>
-													<XPos>0</XPos>
-													<YPos>0</YPos>
-													<Flags>5</Flags>
-												</Point>
-												<Point>
-													<XPos>20000</XPos>
-													<YPos>-200</YPos>
-													<Flags>37</Flags>
-												</Point>
-											</PointList>
-										</Curve>
-									</CurveUsageInfo>
-								</VolumeDryUsage>
-								<VolumeWetGameUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
-								</VolumeWetGameUsage>
-								<VolumeWetUserUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
-								</VolumeWetUserUsage>
-								<LowPassFilterUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</LowPassFilterUsage>
-								<HighPassFilterUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</HighPassFilterUsage>
-								<SpreadUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</SpreadUsage>
-								<FocusUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</FocusUsage>
-							</CurveUsageInfoList>
-						</Attenuation>
-						<Attenuation Name="ATN_Default_05m" ID="{79002AE0-94C7-474A-AB23-0200460EF16A}" ShortID="274031157">
-							<PropertyList>
-								<Property Name="RadiusMax" Type="Real64" Value="500"/>
-							</PropertyList>
-							<CurveUsageInfoList>
-								<VolumeDryUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
-										<Curve Name="VolumeDry" ID="{A46B4507-0D5D-4768-BC85-4132B4069BD0}">
-											<PropertyList>
-												<Property Name="Flags" Type="int32" Value="3"/>
-											</PropertyList>
-											<PointList>
-												<Point>
-													<XPos>0</XPos>
-													<YPos>0</YPos>
-													<Flags>5</Flags>
-												</Point>
-												<Point>
-													<XPos>500</XPos>
-													<YPos>-200</YPos>
-													<Flags>37</Flags>
-												</Point>
-											</PointList>
-										</Curve>
-									</CurveUsageInfo>
-								</VolumeDryUsage>
-								<VolumeWetGameUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
-								</VolumeWetGameUsage>
-								<VolumeWetUserUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
-								</VolumeWetUserUsage>
-								<LowPassFilterUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</LowPassFilterUsage>
-								<HighPassFilterUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</HighPassFilterUsage>
-								<SpreadUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</SpreadUsage>
-								<FocusUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</FocusUsage>
-							</CurveUsageInfoList>
-						</Attenuation>
-						<Attenuation Name="ATN_Default_10m" ID="{6BCF4641-9B7E-4A92-8C1C-BA1631D7A694}" ShortID="745367512">
-							<PropertyList>
-								<Property Name="RadiusMax" Type="Real64" Value="1000"/>
-							</PropertyList>
-							<CurveUsageInfoList>
-								<VolumeDryUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
-										<Curve Name="VolumeDry" ID="{65A1C898-823D-42A1-8418-74EAD25462D2}">
-											<PropertyList>
-												<Property Name="Flags" Type="int32" Value="3"/>
-											</PropertyList>
-											<PointList>
-												<Point>
-													<XPos>0</XPos>
-													<YPos>0</YPos>
-													<Flags>5</Flags>
-												</Point>
-												<Point>
-													<XPos>1000</XPos>
-													<YPos>-200</YPos>
-													<Flags>37</Flags>
-												</Point>
-											</PointList>
-										</Curve>
-									</CurveUsageInfo>
-								</VolumeDryUsage>
-								<VolumeWetGameUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
-								</VolumeWetGameUsage>
-								<VolumeWetUserUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
-								</VolumeWetUserUsage>
-								<LowPassFilterUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</LowPassFilterUsage>
-								<HighPassFilterUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</HighPassFilterUsage>
-								<SpreadUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</SpreadUsage>
-								<FocusUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</FocusUsage>
-							</CurveUsageInfoList>
-						</Attenuation>
-						<Attenuation Name="ATN_Default_75m" ID="{EC7087F6-8411-4F07-9183-CF4B9A6B4574}" ShortID="443269391">
-							<PropertyList>
-								<Property Name="RadiusMax" Type="Real64" Value="7500"/>
-							</PropertyList>
-							<CurveUsageInfoList>
-								<VolumeDryUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
-										<Curve Name="VolumeDry" ID="{1D41DBAB-D846-45CE-82C9-C4553DD4A9D6}">
-											<PropertyList>
-												<Property Name="Flags" Type="int32" Value="3"/>
-											</PropertyList>
-											<PointList>
-												<Point>
-													<XPos>0</XPos>
-													<YPos>0</YPos>
-													<Flags>5</Flags>
-												</Point>
-												<Point>
-													<XPos>7500</XPos>
-													<YPos>-200</YPos>
-													<Flags>37</Flags>
-												</Point>
-											</PointList>
-										</Curve>
-									</CurveUsageInfo>
-								</VolumeDryUsage>
-								<VolumeWetGameUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
-								</VolumeWetGameUsage>
-								<VolumeWetUserUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
-								</VolumeWetUserUsage>
-								<LowPassFilterUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</LowPassFilterUsage>
-								<HighPassFilterUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</HighPassFilterUsage>
-								<SpreadUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</SpreadUsage>
-								<FocusUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</FocusUsage>
-							</CurveUsageInfoList>
-						</Attenuation>
-						<Attenuation Name="ATN_Default_100m" ID="{DC93A13F-9BAB-4EE1-9CDA-11F91BC9ECB5}" ShortID="989266400">
-							<PropertyList>
-								<Property Name="RadiusMax" Type="Real64" Value="10000"/>
-							</PropertyList>
-							<CurveUsageInfoList>
-								<VolumeDryUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
-										<Curve Name="VolumeDry" ID="{91CBF6AA-7541-447D-956B-7F6A61D0BA10}">
-											<PropertyList>
-												<Property Name="Flags" Type="int32" Value="3"/>
-											</PropertyList>
-											<PointList>
-												<Point>
-													<XPos>0</XPos>
-													<YPos>0</YPos>
-													<Flags>5</Flags>
-												</Point>
-												<Point>
-													<XPos>10000</XPos>
-													<YPos>-200</YPos>
-													<Flags>37</Flags>
-												</Point>
-											</PointList>
-										</Curve>
-									</CurveUsageInfo>
-								</VolumeDryUsage>
-								<VolumeWetGameUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
-								</VolumeWetGameUsage>
-								<VolumeWetUserUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
-								</VolumeWetUserUsage>
-								<LowPassFilterUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</LowPassFilterUsage>
-								<HighPassFilterUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</HighPassFilterUsage>
-								<SpreadUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</SpreadUsage>
-								<FocusUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</FocusUsage>
-							</CurveUsageInfoList>
-						</Attenuation>
-						<Attenuation Name="ATN_Default_50m" ID="{F6BAF2EE-2A98-45AC-81E5-26C46ECA8698}" ShortID="497503472">
-							<PropertyList>
-								<Property Name="RadiusMax" Type="Real64" Value="5000"/>
-							</PropertyList>
-							<CurveUsageInfoList>
-								<VolumeDryUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
-										<Curve Name="VolumeDry" ID="{84B59BB3-5605-492B-8F66-3598FC95A653}">
-											<PropertyList>
-												<Property Name="Flags" Type="int32" Value="3"/>
-											</PropertyList>
-											<PointList>
-												<Point>
-													<XPos>0</XPos>
-													<YPos>0</YPos>
-													<Flags>5</Flags>
-												</Point>
-												<Point>
-													<XPos>5000</XPos>
-													<YPos>-200</YPos>
-													<Flags>37</Flags>
-												</Point>
-											</PointList>
-										</Curve>
-									</CurveUsageInfo>
-								</VolumeDryUsage>
-								<VolumeWetGameUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
-								</VolumeWetGameUsage>
-								<VolumeWetUserUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
-								</VolumeWetUserUsage>
-								<LowPassFilterUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</LowPassFilterUsage>
-								<HighPassFilterUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</HighPassFilterUsage>
-								<SpreadUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</SpreadUsage>
-								<FocusUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</FocusUsage>
-							</CurveUsageInfoList>
-						</Attenuation>
-						<Attenuation Name="ATN_Default_20m" ID="{5C7EE052-307A-4EB4-90C3-55E54B68E819}" ShortID="133593456">
-							<PropertyList>
-								<Property Name="RadiusMax" Type="Real64" Value="2000"/>
-							</PropertyList>
-							<CurveUsageInfoList>
-								<VolumeDryUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
-										<Curve Name="VolumeDry" ID="{0FCFEC12-26F8-4078-84F0-0D4AE72EE469}">
-											<PropertyList>
-												<Property Name="Flags" Type="int32" Value="3"/>
-											</PropertyList>
-											<PointList>
-												<Point>
-													<XPos>0</XPos>
-													<YPos>0</YPos>
-													<Flags>5</Flags>
-												</Point>
-												<Point>
-													<XPos>2000</XPos>
-													<YPos>-200</YPos>
-													<Flags>37</Flags>
-												</Point>
-											</PointList>
-										</Curve>
-									</CurveUsageInfo>
-								</VolumeDryUsage>
-								<VolumeWetGameUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
-								</VolumeWetGameUsage>
-								<VolumeWetUserUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="UseVolumeDry"/>
-								</VolumeWetUserUsage>
-								<LowPassFilterUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</LowPassFilterUsage>
-								<HighPassFilterUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</HighPassFilterUsage>
-								<SpreadUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</SpreadUsage>
-								<FocusUsage>
-									<CurveUsageInfo Platform="Linked" CurveToUse="None"/>
-								</FocusUsage>
-							</CurveUsageInfoList>
-						</Attenuation>
-					</ChildrenList>
-				</Folder>
-				<Folder Name="Unity (units)" ID="{1359E276-BE1D-4735-9EB9-FF12D076443E}" ShortID="642862621">
-					<ChildrenList>
-						<Attenuation Name="ATN_Default_10u" ID="{CADD0C94-A66F-475F-A061-620A6D76B155}" ShortID="417068652">
+						<Attenuation Name="ATN_Default_10" ID="{CADD0C94-A66F-475F-A061-620A6D76B155}" ShortID="417068652">
 							<PropertyList>
 								<Property Name="RadiusMax" Type="Real64" Value="10"/>
 							</PropertyList>
@@ -607,7 +51,7 @@
 								</FocusUsage>
 							</CurveUsageInfoList>
 						</Attenuation>
-						<Attenuation Name="ATN_Default_20u" ID="{9A356296-FB49-4226-8845-131AFAB59884}" ShortID="215729688">
+						<Attenuation Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" ShortID="215729688">
 							<PropertyList>
 								<Property Name="RadiusMax" Type="Real64" Value="20"/>
 							</PropertyList>
@@ -653,7 +97,7 @@
 								</FocusUsage>
 							</CurveUsageInfoList>
 						</Attenuation>
-						<Attenuation Name="ATN_Default_50u" ID="{26519701-82FD-4427-895C-D3B2B2506AA0}" ShortID="856982434">
+						<Attenuation Name="ATN_Default_50" ID="{26519701-82FD-4427-895C-D3B2B2506AA0}" ShortID="856982434">
 							<PropertyList>
 								<Property Name="RadiusMax" Type="Real64" Value="50"/>
 							</PropertyList>
@@ -699,7 +143,7 @@
 								</FocusUsage>
 							</CurveUsageInfoList>
 						</Attenuation>
-						<Attenuation Name="ATN_Default_75u" ID="{100FFC58-71AB-4365-9972-8F440775FA51}" ShortID="968406228">
+						<Attenuation Name="ATN_Default_75" ID="{100FFC58-71AB-4365-9972-8F440775FA51}" ShortID="968406228">
 							<PropertyList>
 								<Property Name="RadiusMax" Type="Real64" Value="75"/>
 							</PropertyList>
@@ -745,7 +189,7 @@
 								</FocusUsage>
 							</CurveUsageInfoList>
 						</Attenuation>
-						<Attenuation Name="ATN_Default_100u" ID="{843F411D-9E89-41AB-ACE0-64E2F827389D}" ShortID="130605509">
+						<Attenuation Name="ATN_Default_100" ID="{843F411D-9E89-41AB-ACE0-64E2F827389D}" ShortID="130605509">
 							<CurveUsageInfoList>
 								<VolumeDryUsage>
 									<CurveUsageInfo Platform="Linked" CurveToUse="Custom">
@@ -788,7 +232,7 @@
 								</FocusUsage>
 							</CurveUsageInfoList>
 						</Attenuation>
-						<Attenuation Name="ATN_Default_200u" ID="{CCC35267-4AAF-4759-ADDE-B34985C2C322}" ShortID="279960911">
+						<Attenuation Name="ATN_Default_200" ID="{CCC35267-4AAF-4759-ADDE-B34985C2C322}" ShortID="279960911">
 							<PropertyList>
 								<Property Name="RadiusMax" Type="Real64" Value="200"/>
 							</PropertyList>
@@ -834,7 +278,7 @@
 								</FocusUsage>
 							</CurveUsageInfoList>
 						</Attenuation>
-						<Attenuation Name="ATN_Default_300u" ID="{A8902DDC-0ADE-4944-A58C-CB6368141260}" ShortID="1035589728">
+						<Attenuation Name="ATN_Default_300" ID="{A8902DDC-0ADE-4944-A58C-CB6368141260}" ShortID="1035589728">
 							<PropertyList>
 								<Property Name="RadiusMax" Type="Real64" Value="300"/>
 							</PropertyList>
@@ -880,7 +324,7 @@
 								</FocusUsage>
 							</CurveUsageInfoList>
 						</Attenuation>
-						<Attenuation Name="ATN_Default_400u" ID="{DFEEC3ED-CA32-4922-9D53-F0F24286DB4C}" ShortID="22316307">
+						<Attenuation Name="ATN_Default_400" ID="{DFEEC3ED-CA32-4922-9D53-F0F24286DB4C}" ShortID="22316307">
 							<PropertyList>
 								<Property Name="RadiusMax" Type="Real64" Value="400"/>
 							</PropertyList>
@@ -926,7 +370,7 @@
 								</FocusUsage>
 							</CurveUsageInfoList>
 						</Attenuation>
-						<Attenuation Name="ATN_Default_500u" ID="{B4944803-A962-4E07-80E3-3DE70A8CB8FA}" ShortID="600303360">
+						<Attenuation Name="ATN_Default_500" ID="{B4944803-A962-4E07-80E3-3DE70A8CB8FA}" ShortID="600303360">
 							<PropertyList>
 								<Property Name="RadiusMax" Type="Real64" Value="500"/>
 							</PropertyList>
@@ -972,7 +416,7 @@
 								</FocusUsage>
 							</CurveUsageInfoList>
 						</Attenuation>
-						<Attenuation Name="ATN_Default_750u" ID="{CB10EE43-7115-45D6-8609-BA101678C95B}" ShortID="1012433382">
+						<Attenuation Name="ATN_Default_750" ID="{CB10EE43-7115-45D6-8609-BA101678C95B}" ShortID="1012433382">
 							<PropertyList>
 								<Property Name="RadiusMax" Type="Real64" Value="750"/>
 							</PropertyList>
@@ -1018,7 +462,7 @@
 								</FocusUsage>
 							</CurveUsageInfoList>
 						</Attenuation>
-						<Attenuation Name="ATN_Default_1000u" ID="{307C310E-269D-43F8-8CBB-109B2585A559}" ShortID="326875694">
+						<Attenuation Name="ATN_Default_1000" ID="{307C310E-269D-43F8-8CBB-109B2585A559}" ShortID="326875694">
 							<PropertyList>
 								<Property Name="RadiusMax" Type="Real64" Value="1000"/>
 							</PropertyList>
@@ -1064,7 +508,7 @@
 								</FocusUsage>
 							</CurveUsageInfoList>
 						</Attenuation>
-						<Attenuation Name="ATN_Default_05u" ID="{1100DBF0-42C6-494C-BD3A-2B9740ED2E02}" ShortID="87271275">
+						<Attenuation Name="ATN_Default_05" ID="{1100DBF0-42C6-494C-BD3A-2B9740ED2E02}" ShortID="87271275">
 							<PropertyList>
 								<Property Name="RadiusMax" Type="Real64" Value="5"/>
 							</PropertyList>

+ 57 - 1
Sounds/wwise_project/Events/AMPS/AMB.wwu

@@ -1,6 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
 <WwiseDocument Type="WorkUnit" ID="{DE9FC369-2076-4F07-9C00-6203DBF0184F}" SchemaVersion="103" RootDocumentID="{5EB6A947-AE29-4177-BEA7-75AF5B08CEB0}" ParentDocumentID="{8511C95E-B420-4253-A69E-69820604C20C}">
 	<Events>
-		<WorkUnit Name="AMB" ID="{DE9FC369-2076-4F07-9C00-6203DBF0184F}" OwnerID="{8511C95E-B420-4253-A69E-69820604C20C}" PersistMode="Nested"/>
+		<WorkUnit Name="AMB" ID="{DE9FC369-2076-4F07-9C00-6203DBF0184F}" OwnerID="{8511C95E-B420-4253-A69E-69820604C20C}" PersistMode="Nested">
+			<ChildrenList>
+				<Event Name="play_sx_amb_ext_general" ID="{118E75AA-7412-45A0-AAA9-52CD47DB9E41}">
+					<ChildrenList>
+						<Action Name="" ID="{E12EFB24-AB65-4232-BD67-8F6925C157F0}" ShortID="745775555">
+							<PropertyList>
+								<Property Name="FadeTime" Type="Real64" Value="0.3"/>
+							</PropertyList>
+							<ReferenceList>
+								<Reference Name="Target">
+									<ObjectRef Name="sx_amb_ext_generalWindLoop" ID="{F55CE3A4-96C3-4E54-8267-FBB6A47AAAE1}" WorkUnitID="{FF882DA0-D34E-47CD-9819-576540D5FB1C}"/>
+								</Reference>
+							</ReferenceList>
+						</Action>
+						<Action Name="" ID="{90FAC99A-15CA-4434-89B0-2906D678B469}" ShortID="355469111">
+							<PropertyList>
+								<Property Name="ActionType" Type="int16" Value="36"/>
+								<Property Name="SeekPercent" Type="Real64" Value="50">
+									<ModifierList>
+										<ModifierInfo>
+											<Modifier Name="" ID="{813D250F-9D3B-45B4-8143-1B30257417AB}">
+												<PropertyList>
+													<Property Name="Enabled" Type="bool" Value="True"/>
+													<Property Name="Max" Type="Real64" Value="40"/>
+													<Property Name="Min" Type="Real64" Value="-50"/>
+												</PropertyList>
+											</Modifier>
+										</ModifierInfo>
+									</ModifierList>
+								</Property>
+							</PropertyList>
+							<ReferenceList>
+								<Reference Name="Target">
+									<ObjectRef Name="sx_amb_ext_generalWindLoop_01" ID="{D5B887EE-2886-4A8E-BAC5-02801D416970}" WorkUnitID="{FF882DA0-D34E-47CD-9819-576540D5FB1C}"/>
+								</Reference>
+							</ReferenceList>
+						</Action>
+					</ChildrenList>
+				</Event>
+				<Event Name="stop_sx_amb_ext_general" ID="{878488C5-91CC-4BD6-BB55-865BCF349D98}">
+					<ChildrenList>
+						<Action Name="" ID="{5D8B88D1-AA79-4563-80EF-6DD90C7FED26}" ShortID="925183539">
+							<PropertyList>
+								<Property Name="ActionType" Type="int16" Value="2"/>
+								<Property Name="FadeTime" Type="Real64" Value="0.3"/>
+								<Property Name="Scope" Type="int16" Value="1"/>
+							</PropertyList>
+							<ReferenceList>
+								<Reference Name="Target">
+									<ObjectRef Name="sx_amb_ext_generalWindLoop" ID="{F55CE3A4-96C3-4E54-8267-FBB6A47AAAE1}" WorkUnitID="{FF882DA0-D34E-47CD-9819-576540D5FB1C}"/>
+								</Reference>
+							</ReferenceList>
+						</Action>
+					</ChildrenList>
+				</Event>
+			</ChildrenList>
+		</WorkUnit>
 	</Events>
 </WwiseDocument>

+ 54 - 0
Sounds/wwise_project/Events/AMPS/ENV.wwu

@@ -6,6 +6,60 @@
 				<Property Name="Color" Type="int16" Value="17"/>
 				<Property Name="OverrideColor" Type="bool" Value="True"/>
 			</PropertyList>
+			<ChildrenList>
+				<Event Name="stop_sx_env_lamp_loop" ID="{9535925F-7734-4771-805A-5654AF45FD2E}">
+					<ChildrenList>
+						<Action Name="" ID="{E1306458-7896-404C-9581-CA96315DDCF7}" ShortID="600979851">
+							<PropertyList>
+								<Property Name="ActionType" Type="int16" Value="2"/>
+								<Property Name="FadeTime" Type="Real64" Value="0.2"/>
+							</PropertyList>
+							<ReferenceList>
+								<Reference Name="Target">
+									<ObjectRef Name="sx_env_lamp_loop" ID="{3E4B8120-39EA-47E4-987D-27398375B187}" WorkUnitID="{FF882DA0-D34E-47CD-9819-576540D5FB1C}"/>
+								</Reference>
+							</ReferenceList>
+						</Action>
+					</ChildrenList>
+				</Event>
+				<Event Name="play_sx_env_lamp_loop" ID="{0886768C-CEF7-4F54-BBDE-690BFC89B2AB}">
+					<ChildrenList>
+						<Action Name="" ID="{A2D76779-99C8-4A0C-B0F8-0D386826BD2A}" ShortID="771346820">
+							<PropertyList>
+								<Property Name="FadeTime" Type="Real64" Value="0.2"/>
+							</PropertyList>
+							<ReferenceList>
+								<Reference Name="Target">
+									<ObjectRef Name="sx_env_lamp_loop" ID="{3E4B8120-39EA-47E4-987D-27398375B187}" WorkUnitID="{FF882DA0-D34E-47CD-9819-576540D5FB1C}"/>
+								</Reference>
+							</ReferenceList>
+						</Action>
+						<Action Name="" ID="{629EC9FE-5385-483E-8904-FDC74A46B607}" ShortID="197086360">
+							<PropertyList>
+								<Property Name="ActionType" Type="int16" Value="36"/>
+								<Property Name="SeekPercent" Type="Real64" Value="50">
+									<ModifierList>
+										<ModifierInfo>
+											<Modifier Name="" ID="{72FA06C6-B540-4EDB-8AD7-DA52C033BF65}">
+												<PropertyList>
+													<Property Name="Enabled" Type="bool" Value="True"/>
+													<Property Name="Max" Type="Real64" Value="40"/>
+													<Property Name="Min" Type="Real64" Value="-50"/>
+												</PropertyList>
+											</Modifier>
+										</ModifierInfo>
+									</ModifierList>
+								</Property>
+							</PropertyList>
+							<ReferenceList>
+								<Reference Name="Target">
+									<ObjectRef Name="sx_env_lamp_loop" ID="{3E4B8120-39EA-47E4-987D-27398375B187}" WorkUnitID="{FF882DA0-D34E-47CD-9819-576540D5FB1C}"/>
+								</Reference>
+							</ReferenceList>
+						</Action>
+					</ChildrenList>
+				</Event>
+			</ChildrenList>
 		</WorkUnit>
 	</Events>
 </WwiseDocument>

+ 120 - 0
Sounds/wwise_project/Events/AMPS/INT.wwu

@@ -151,6 +151,63 @@
 										</Reference>
 									</ReferenceList>
 								</Action>
+								<Action Name="" ID="{4BC2142E-AA7E-41F0-A4E2-336C0ED62181}" ShortID="592893929">
+									<PropertyList>
+										<Property Name="AbsoluteOrRelative" Type="int16" Value="1"/>
+										<Property Name="ActionType" Type="int16" Value="12"/>
+										<Property Name="FadeInCurve" Type="int16" Value="1"/>
+										<Property Name="FadeTime" Type="Real64" Value="2"/>
+										<Property Name="Volume" Type="Real64" Value="-12"/>
+									</PropertyList>
+									<ReferenceList>
+										<Reference Name="Target">
+											<ObjectRef Name="sx_int_malfunctioningShieldGenerator_idle" ID="{9296EE8C-3BD6-4B3F-A169-EA06BE7E2C0C}" WorkUnitID="{91FC1C7C-6270-4F53-848A-9AD118F4D59E}"/>
+										</Reference>
+									</ReferenceList>
+								</Action>
+								<Action Name="" ID="{E51425A8-4870-4304-ACA2-83D5F32BF986}" ShortID="786633629">
+									<PropertyList>
+										<Property Name="ActionType" Type="int16" Value="16"/>
+										<Property Name="Delay" Type="Real64" Value="2"/>
+										<Property Name="FadeOutCurve" Type="int16" Value="6"/>
+										<Property Name="FadeTime" Type="Real64" Value="1"/>
+										<Property Name="Volume" Type="Real64" Value="-6"/>
+									</PropertyList>
+									<ReferenceList>
+										<Reference Name="Target">
+											<ObjectRef Name="sx_int_malfunctioningShieldGenerator_idle" ID="{9296EE8C-3BD6-4B3F-A169-EA06BE7E2C0C}" WorkUnitID="{91FC1C7C-6270-4F53-848A-9AD118F4D59E}"/>
+										</Reference>
+									</ReferenceList>
+								</Action>
+								<Action Name="" ID="{E7E7B892-065E-4A71-B167-B80B6F6AE07B}" ShortID="528820851">
+									<PropertyList>
+										<Property Name="AbsoluteOrRelative" Type="int16" Value="1"/>
+										<Property Name="ActionType" Type="int16" Value="13"/>
+										<Property Name="FadeInCurve" Type="int16" Value="1"/>
+										<Property Name="FadeTime" Type="Real64" Value="0.5"/>
+										<Property Name="Pitch" Type="int32" Value="-1200"/>
+										<Property Name="Volume" Type="Real64" Value="-12"/>
+									</PropertyList>
+									<ReferenceList>
+										<Reference Name="Target">
+											<ObjectRef Name="sx_int_malfunctioningShieldGenerator_idle" ID="{9296EE8C-3BD6-4B3F-A169-EA06BE7E2C0C}" WorkUnitID="{91FC1C7C-6270-4F53-848A-9AD118F4D59E}"/>
+										</Reference>
+									</ReferenceList>
+								</Action>
+								<Action Name="" ID="{D8CA4CEC-9E8D-4E40-BA65-A578A2A32B9E}" ShortID="797702470">
+									<PropertyList>
+										<Property Name="ActionType" Type="int16" Value="18"/>
+										<Property Name="Delay" Type="Real64" Value="2"/>
+										<Property Name="FadeOutCurve" Type="int16" Value="6"/>
+										<Property Name="FadeTime" Type="Real64" Value="1"/>
+										<Property Name="Volume" Type="Real64" Value="-6"/>
+									</PropertyList>
+									<ReferenceList>
+										<Reference Name="Target">
+											<ObjectRef Name="sx_int_malfunctioningShieldGenerator_idle" ID="{9296EE8C-3BD6-4B3F-A169-EA06BE7E2C0C}" WorkUnitID="{91FC1C7C-6270-4F53-848A-9AD118F4D59E}"/>
+										</Reference>
+									</ReferenceList>
+								</Action>
 							</ChildrenList>
 						</Event>
 						<Event Name="play_sx_int_malfunctioningshieldgenerator_idle" ID="{8D875A6A-108D-4C08-9A16-851A7A80EA24}">
@@ -207,6 +264,69 @@
 						</Event>
 					</ChildrenList>
 				</Folder>
+				<Folder Name="teleporter" ID="{BFA50D18-FFEC-4DA0-A57D-149ABE555EFF}" ShortID="922100800">
+					<ChildrenList>
+						<Event Name="play_sx_int_teleporter_activate" ID="{3C5F4354-C671-41F4-A1E2-6B5777C87900}">
+							<ChildrenList>
+								<Action Name="" ID="{2B73797E-BE01-4561-BC0D-FDB121A50805}" ShortID="713534394">
+									<ReferenceList>
+										<Reference Name="Target">
+											<ObjectRef Name="sx_int_teleporter_activate" ID="{1FDF3977-BF55-431F-BF82-01497FE2688C}" WorkUnitID="{91FC1C7C-6270-4F53-848A-9AD118F4D59E}"/>
+										</Reference>
+									</ReferenceList>
+								</Action>
+							</ChildrenList>
+						</Event>
+						<Event Name="stop_sx_int_teleporter_idle" ID="{09E442B7-D17C-4E77-A6AC-16483F2C91E9}">
+							<ChildrenList>
+								<Action Name="" ID="{2B7EF360-068A-4BD4-B9E0-B94EA8D46E45}" ShortID="455138360">
+									<PropertyList>
+										<Property Name="ActionType" Type="int16" Value="2"/>
+									</PropertyList>
+									<ReferenceList>
+										<Reference Name="Target">
+											<ObjectRef Name="sx_int_teleporter_loop" ID="{D7945CD0-C24B-464C-AD49-BB6C722139B2}" WorkUnitID="{91FC1C7C-6270-4F53-848A-9AD118F4D59E}"/>
+										</Reference>
+									</ReferenceList>
+								</Action>
+							</ChildrenList>
+						</Event>
+						<Event Name="play_sx_int_teleporter_idle" ID="{8F688EFE-210A-46A8-963C-00FF3FA7A1EB}">
+							<ChildrenList>
+								<Action Name="" ID="{1B5305A6-F2E7-4F05-B1A6-432958822A0F}" ShortID="460735492">
+									<ReferenceList>
+										<Reference Name="Target">
+											<ObjectRef Name="sx_int_teleporter_loop" ID="{D7945CD0-C24B-464C-AD49-BB6C722139B2}" WorkUnitID="{91FC1C7C-6270-4F53-848A-9AD118F4D59E}"/>
+										</Reference>
+									</ReferenceList>
+								</Action>
+								<Action Name="" ID="{ACF03B52-C0BC-4890-95DD-374B657A302A}" ShortID="24364970">
+									<PropertyList>
+										<Property Name="ActionType" Type="int16" Value="36"/>
+										<Property Name="SeekPercent" Type="Real64">
+											<ModifierList>
+												<ModifierInfo>
+													<Modifier Name="" ID="{2FABFBD2-BA95-4DDA-B893-B2CA5328432E}">
+														<PropertyList>
+															<Property Name="Enabled" Type="bool" Value="True"/>
+															<Property Name="Max" Type="Real64" Value="40"/>
+															<Property Name="Min" Type="Real64" Value="-50"/>
+														</PropertyList>
+													</Modifier>
+												</ModifierInfo>
+											</ModifierList>
+										</Property>
+									</PropertyList>
+									<ReferenceList>
+										<Reference Name="Target">
+											<ObjectRef Name="sx_int_teleporter_loop" ID="{D7945CD0-C24B-464C-AD49-BB6C722139B2}" WorkUnitID="{91FC1C7C-6270-4F53-848A-9AD118F4D59E}"/>
+										</Reference>
+									</ReferenceList>
+								</Action>
+							</ChildrenList>
+						</Event>
+					</ChildrenList>
+				</Folder>
 			</ChildrenList>
 		</WorkUnit>
 	</Events>

+ 6 - 6
Sounds/wwise_project/Events/AMPS/PLAYER.wwu

@@ -12,7 +12,7 @@
 						<Action Name="" ID="{042CA152-FCA4-457A-8519-629AF8876399}" ShortID="956070608">
 							<ReferenceList>
 								<Reference Name="Target">
-									<ObjectRef Name="sx_player_knockdown_01" ID="{9ED693FE-C615-4D64-94E4-044316E5B9E2}" WorkUnitID="{0AD14DD5-1CBD-4F2A-B1DE-F678C986F4EB}"/>
+									<ObjectRef Name="sx_player_knockdown" ID="{0E73ED35-DB3F-427D-A4B4-E101DF26D6FD}" WorkUnitID="{0AD14DD5-1CBD-4F2A-B1DE-F678C986F4EB}"/>
 								</Reference>
 							</ReferenceList>
 						</Action>
@@ -23,7 +23,7 @@
 						<Action Name="" ID="{2B0CE622-085F-405B-A50B-EC9E3BF735EE}" ShortID="336158473">
 							<ReferenceList>
 								<Reference Name="Target">
-									<ObjectRef Name="sx_player_armor_mend_01" ID="{CCDB1957-7071-4B14-8543-C8DBF50F9598}" WorkUnitID="{0AD14DD5-1CBD-4F2A-B1DE-F678C986F4EB}"/>
+									<ObjectRef Name="sx_player_armor_mend" ID="{749D1AB5-A275-4CBC-896D-86EAF9433184}" WorkUnitID="{0AD14DD5-1CBD-4F2A-B1DE-F678C986F4EB}"/>
 								</Reference>
 							</ReferenceList>
 						</Action>
@@ -45,7 +45,7 @@
 						<Action Name="" ID="{8697169C-C700-4530-86B4-851A8DE77B4E}" ShortID="268395960">
 							<ReferenceList>
 								<Reference Name="Target">
-									<ObjectRef Name="sx_player_pain_01" ID="{9E449328-0A38-4EDD-B07B-2C99C6B27D76}" WorkUnitID="{0AD14DD5-1CBD-4F2A-B1DE-F678C986F4EB}"/>
+									<ObjectRef Name="sx_player_pain" ID="{13911024-07BA-4613-B59D-F89D0D5D5511}" WorkUnitID="{0AD14DD5-1CBD-4F2A-B1DE-F678C986F4EB}"/>
 								</Reference>
 							</ReferenceList>
 						</Action>
@@ -56,7 +56,7 @@
 						<Action Name="" ID="{F2BFB7FF-79B8-4772-B3EA-FEEF3558CC92}" ShortID="392183870">
 							<ReferenceList>
 								<Reference Name="Target">
-									<ObjectRef Name="sx_player_armor_breaking_01" ID="{3472ED94-6F73-493C-9683-EAE98D22549A}" WorkUnitID="{0AD14DD5-1CBD-4F2A-B1DE-F678C986F4EB}"/>
+									<ObjectRef Name="sx_player_armor_breaking" ID="{8EF29755-5E68-4C65-BB2D-699ACB861272}" WorkUnitID="{0AD14DD5-1CBD-4F2A-B1DE-F678C986F4EB}"/>
 								</Reference>
 							</ReferenceList>
 						</Action>
@@ -67,7 +67,7 @@
 						<Action Name="" ID="{86F14C9F-02F5-4A07-800A-CE7AD0DB00AD}" ShortID="943484311">
 							<ReferenceList>
 								<Reference Name="Target">
-									<ObjectRef Name="sx_player_ladder_climb_01" ID="{D3547F8E-A8AD-432F-8131-9B5703DDDC30}" WorkUnitID="{0AD14DD5-1CBD-4F2A-B1DE-F678C986F4EB}"/>
+									<ObjectRef Name="sx_player_ladder_climb" ID="{2426AFCA-9DF0-49C1-88AF-92FEAF02740A}" WorkUnitID="{0AD14DD5-1CBD-4F2A-B1DE-F678C986F4EB}"/>
 								</Reference>
 							</ReferenceList>
 						</Action>
@@ -78,7 +78,7 @@
 						<Action Name="" ID="{62529911-BF89-4155-A325-51EAED2BA349}" ShortID="126130053">
 							<ReferenceList>
 								<Reference Name="Target">
-									<ObjectRef Name="sx_player_exertion_01" ID="{9C552880-F1C0-44D8-8A56-1B833330B39A}" WorkUnitID="{0AD14DD5-1CBD-4F2A-B1DE-F678C986F4EB}"/>
+									<ObjectRef Name="sx_player_exertion" ID="{D444457E-155F-492E-8A20-BB716CE4649B}" WorkUnitID="{0AD14DD5-1CBD-4F2A-B1DE-F678C986F4EB}"/>
 								</Reference>
 							</ReferenceList>
 						</Action>

+ 10 - 0
Sounds/wwise_project/Game Parameters/AMPS/Gameplay.wwu

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WwiseDocument Type="WorkUnit" ID="{D60874B7-5FAB-4447-8270-6E376BE4D56E}" SchemaVersion="103">
+	<GameParameters>
+		<WorkUnit Name="Gameplay" ID="{D60874B7-5FAB-4447-8270-6E376BE4D56E}" PersistMode="Standalone">
+			<ChildrenList>
+				<GameParameter Name="Health" ID="{75BE07F7-C6AF-4285-A0B8-FDA621BA5C2C}"/>
+			</ChildrenList>
+		</WorkUnit>
+	</GameParameters>
+</WwiseDocument>

+ 15 - 0
Sounds/wwise_project/Game Parameters/AMPS/Physics.wwu

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WwiseDocument Type="WorkUnit" ID="{9C07B0EB-9E59-49DA-AC16-8DF7F1A9ADB7}" SchemaVersion="103">
+	<GameParameters>
+		<WorkUnit Name="Physics" ID="{9C07B0EB-9E59-49DA-AC16-8DF7F1A9ADB7}" PersistMode="Standalone">
+			<ChildrenList>
+				<GameParameter Name="Velocity" ID="{F57DCC68-303A-43A8-A338-D5352274478F}">
+					<PropertyList>
+						<Property Name="InitialValue" Type="Real64" Value="1"/>
+						<Property Name="Max" Type="Real64" Value="1"/>
+					</PropertyList>
+				</GameParameter>
+			</ChildrenList>
+		</WorkUnit>
+	</GameParameters>
+</WwiseDocument>

+ 6 - 3
Sounds/wwise_project/Game Parameters/AMPS/VolumeControls.wwu

@@ -5,17 +5,20 @@
 			<ChildrenList>
 				<GameParameter Name="Volume_Master" ID="{78897677-B23A-458F-99E0-7053C9C317C5}">
 					<PropertyList>
-						<Property Name="InitialValue" Type="Real64" Value="100"/>
+						<Property Name="InitialValue" Type="Real64" Value="1"/>
+						<Property Name="Max" Type="Real64" Value="1"/>
 					</PropertyList>
 				</GameParameter>
 				<GameParameter Name="Volume_SFX" ID="{ED75F40C-CDF0-4F71-9326-36D39C711C17}">
 					<PropertyList>
-						<Property Name="InitialValue" Type="Real64" Value="100"/>
+						<Property Name="InitialValue" Type="Real64" Value="1"/>
+						<Property Name="Max" Type="Real64" Value="1"/>
 					</PropertyList>
 				</GameParameter>
 				<GameParameter Name="Volume_Music" ID="{8B8E79C6-3210-497C-B430-EF7745F2A6B1}">
 					<PropertyList>
-						<Property Name="InitialValue" Type="Real64" Value="100"/>
+						<Property Name="InitialValue" Type="Real64" Value="1"/>
+						<Property Name="Max" Type="Real64" Value="1"/>
 					</PropertyList>
 				</GameParameter>
 			</ChildrenList>

+ 3 - 0
Sounds/wwise_project/GeneratedSoundBanks/Windows/Init.bnk

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cd174d7ca3c76e2fc92ae87d7ba1aa5dbd4154cbe95d3cffc48c5c4ccc13cbd3
+size 2311

+ 3 - 0
Sounds/wwise_project/GeneratedSoundBanks/Windows/MultiplayerSample_SoundBank.bnk

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1aa8975c3de6dd0011f9465387f8e30e144f89af31db65f17c3099ee4a4ffb51
+size 50096843

+ 1 - 1
Sounds/wwise_project/Master-Mixer Hierarchy/AMPS/AMPS.wwu

@@ -24,7 +24,7 @@
 												<Flags>5</Flags>
 											</Point>
 											<Point>
-												<XPos>100</XPos>
+												<XPos>1</XPos>
 												<YPos>0</YPos>
 												<Flags>37</Flags>
 											</Point>

+ 30 - 2
Sounds/wwise_project/Master-Mixer Hierarchy/AMPS/Mixer_Main.wwu

@@ -28,7 +28,7 @@
 														<Flags>5</Flags>
 													</Point>
 													<Point>
-														<XPos>100</XPos>
+														<XPos>1</XPos>
 														<YPos>0</YPos>
 														<Flags>37</Flags>
 													</Point>
@@ -61,7 +61,7 @@
 														<Flags>5</Flags>
 													</Point>
 													<Point>
-														<XPos>100</XPos>
+														<XPos>1</XPos>
 														<YPos>0</YPos>
 														<Flags>37</Flags>
 													</Point>
@@ -137,6 +137,34 @@
 													<ObjectLists/>
 												</AuxBus>
 												<AuxBus Name="RVB_EXT_Main" ID="{F8DF5907-D7A9-43AF-B130-2AB20EED85E3}">
+													<ReferenceList>
+														<Reference Name="Effect0">
+															<Custom CreatedFrom="{FE29AE8D-FD86-4652-A95D-68D32F5760EC}">
+																<Effect Name="Have_U_Ever_Been_Outside (Custom)" ID="{39AB30F0-F264-457A-BA5C-311C8FA0B77E}" ShortID="185506306" PluginName="Wwise RoomVerb" CompanyID="0" PluginID="118" PluginType="3">
+																	<PropertyList>
+																		<Property Name="DecayTime" Type="Real32" Value="3"/>
+																		<Property Name="Diffusion" Type="Real32" Value="50"/>
+																		<Property Name="ERFrontBackDelay" Type="Real32" Value="14"/>
+																		<Property Name="ERPattern" Type="int32" Value="20"/>
+																		<Property Name="EnableToneControls" Type="bool" Value="True"/>
+																		<Property Name="Filter1Freq" Type="Real32" Value="210"/>
+																		<Property Name="Filter1Gain" Type="Real32" Value="4"/>
+																		<Property Name="Filter2Freq" Type="Real32" Value="6830"/>
+																		<Property Name="Filter2Gain" Type="Real32" Value="9"/>
+																		<Property Name="Filter2Q" Type="Real32" Value="0.65"/>
+																		<Property Name="Filter3Freq" Type="Real32" Value="960"/>
+																		<Property Name="Filter3Gain" Type="Real32" Value="-24"/>
+																		<Property Name="HFDamping" Type="Real32" Value="10"/>
+																		<Property Name="PreDelay" Type="Real32" Value="28"/>
+																		<Property Name="Quality" Type="int32" Value="12"/>
+																		<Property Name="ReverbLevel" Type="Real32" Value="-6"/>
+																		<Property Name="RoomSize" Type="Real32" Value="76"/>
+																		<Property Name="StereoWidth" Type="Real32" Value="120"/>
+																	</PropertyList>
+																</Effect>
+															</Custom>
+														</Reference>
+													</ReferenceList>
 													<ObjectLists/>
 												</AuxBus>
 											</ChildrenList>

+ 3 - 0
Sounds/wwise_project/Originals/SFX/Hexany/LVL/sx_amb_ext_generalWindLoop_01.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8eb957f07e0b5a51d849f252828c310beaf95e176fdc05da98f060fd6480cc81
+size 13060424

+ 3 - 0
Sounds/wwise_project/Originals/SFX/Hexany/LVL/sx_env_lamp_loop_01.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:64e3d93c8dfcae085402e08970ab3e083cda7e4603a5844af3707d8402f4424e
+size 1785704

+ 3 - 0
Sounds/wwise_project/Originals/SFX/Hexany/LVL/sx_env_lamp_loop_02.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3e431cb7d8a0963eda24c0912d9d9a821e76d9e733f9506b0d44ecd5e90ef74c
+size 1782902

+ 3 - 0
Sounds/wwise_project/Originals/SFX/Hexany/LVL/sx_env_lamp_loop_03.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:43d028102ca1b2388d865b0b3ba18dedb18ffd1bd54cc824eaed149f239cf955
+size 1571228

+ 3 - 0
Sounds/wwise_project/Originals/SFX/Hexany/LVL/sx_env_lamp_loop_04.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:049cd7844e617349c9fbaaea0a7a901f5743d7296e83b2c1f8f5a8a8a1198cc4
+size 1641704

+ 3 - 0
Sounds/wwise_project/Originals/SFX/Hexany/LVL/sx_env_lamp_loop_05.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0590212d6773128f8afa525d16b9572bde98b12c69ca5035a1fa8e1e12ea99ed
+size 1641704

+ 2 - 2
Sounds/wwise_project/Originals/SFX/Hexany/laserPistol/sx_wpn_laserPistol_fire_01.wav

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e50c8ed23a9d3ddca7f8e169604e840624ee98a719115d9df17ca383f641d019
-size 424640
+oid sha256:9e08ace8a3110d711f0d1a1f4117080965629a3289a35d3fe1e298bafbe79681
+size 648044

+ 2 - 2
Sounds/wwise_project/Originals/SFX/Hexany/laserPistol/sx_wpn_laserPistol_fire_02.wav

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f16c1604e478163165e1c665b12b1d3165ba8a4c5f9daa4c4ce4bc0f811fa2d
-size 425918
+oid sha256:1f5a5e9bcb5bad6704362c3a09fa40f12e9ece43fa828c9d1cf960d824c2280d
+size 641726

+ 2 - 2
Sounds/wwise_project/Originals/SFX/Hexany/laserPistol/sx_wpn_laserPistol_fire_03.wav

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:446d1130ce777138ba67109ada1c08a638b213eed80fd038a35ee5d1faf3bee9
-size 446138
+oid sha256:356c63cbc42a8e2b9f359f91e5b9a632eacd71ce7ddf5d44acc05daf6cc389e1
+size 565784

+ 2 - 2
Sounds/wwise_project/Originals/SFX/Hexany/laserPistol/sx_wpn_laserPistol_fire_04.wav

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e0e7841276d44b5bbd501061d07e6e11c9f84d582b00169ece6fbfecf17f0025
-size 462272
+oid sha256:c890e33026780d3a909a002b61675b2c27f70212d7fca903836a4d1edda2e41f
+size 562970

+ 2 - 2
Sounds/wwise_project/Originals/SFX/Hexany/laserPistol/sx_wpn_laserPistol_fire_05.wav

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c7c4beb6ba0caf14c43861b0d4731cb94f38bc77777cae88c2ac107212e66edd
-size 434738
+oid sha256:41f4cda3c4a647dd1c33cad1bb2a7cf9d0f465127211aa48d7112424780e3df7
+size 584066

+ 2 - 2
Sounds/wwise_project/Originals/SFX/Hexany/laserPistol/sx_wpn_laserPistol_fire_06.wav

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:887a9031f91cc8cfcb12c2545c746d5b66165de7e98798d488e43d38592b50a0
-size 463226
+oid sha256:82754239013b50d0fcdd53066d0b23b50458f3c0104d050f7c59e356c80689ca
+size 541538

+ 3 - 0
Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_foley_knockdown_01.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:37dbef4919a733c6359e99aafe8e9cf1ee215213a776df67164342d84c6c0a4c
+size 309054

+ 3 - 0
Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_shieldBreak_01.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b50c64f9f9854f0091618b4410762ce727d649c2a2ba19f74038ca1d3aee2354
+size 365216

+ 3 - 0
Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_shieldBreak_02.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e38470e8dbbd15f5a26b4d7f2991f8434dc625ea923c5f9678f42b7288bfad1e
+size 361772

+ 3 - 0
Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_shieldBreak_03.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c17d40093f6c6863cce3c480f08adbbf6943a7ea194e633848ae95f1ab403568
+size 424232

+ 3 - 0
Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_vocal_exert_01.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c5223ce7c6b15106ecf99c7e1b2f7114cb1a0523c0e70a1477395e2c3d987775
+size 132462

+ 3 - 0
Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_vocal_exert_02.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0cb6b2a2290d6ac80843571a1ec77115f3763dabe774992a92028b1ab2b18730
+size 132296

+ 3 - 0
Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_vocal_exert_03.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d826a4b4066562c8a75fb4def10949fc9be3f911297589c0975d52e94093f7cd
+size 127664

+ 3 - 0
Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_vocal_exert_04.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4ec8d166626b90cb8b3440a11865c50922ff66d61103e1990260ffa767f779b6
+size 130502

+ 3 - 0
Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_vocal_exert_05.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2f58373e4f21cc3cb15c7002b1e80f16f141bb878d4f3865d3988264b54c1fad
+size 140900

+ 3 - 0
Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_vocal_exert_06.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fdf6deccd7d8471a65645c8c22646d46ffe18c9cd3ef5d9d86d27d521f4236bb
+size 146208

+ 3 - 0
Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_vocal_pain_01.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6ec3134d34bc2167cd0cd3398eb8fd6ab218e2383ca81e31d4e6cd8a3bf65112
+size 121760

+ 3 - 0
Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_vocal_pain_02.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c40a1ff5b8fef851d4521c37187e933356a3f805411997b918d45e0f6d6abb94
+size 127154

+ 3 - 0
Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_vocal_pain_03.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9d37ed11ad0679a8cd642e873785e83be3f07a5c3804470278d29d52046a1ec0
+size 136034

+ 3 - 0
Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_vocal_pain_04.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:574dff7ab74abd45ab65e1bf013f0e01a2140f8a617034f368a6e0a48cefead0
+size 117786

+ 3 - 0
Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_vocal_pain_05.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2ffea13b56784182e1b1801a02a5f1fea094d0de5d3160fb9f082fa168a3ec95
+size 125414

+ 3 - 0
Sounds/wwise_project/Originals/SFX/Hexany/player/sx_char_vocal_pain_06.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c67767617df1f779d9ec80e576048b962f687940ec4089381e03482eae8c20c6
+size 124364

+ 3 - 0
Sounds/wwise_project/Originals/SFX/Hexany/teleporter/sx_int_teleporter_activate_01.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1c63571fee40e9b1f61edd6be27b73a6b15f20b047185a863db5ae450b8e607e
+size 892718

+ 3 - 0
Sounds/wwise_project/Originals/SFX/Hexany/teleporter/sx_int_teleporter_loop_01.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5e136e31e5c9ea516ef42cac16d812e3370fe5aaad1a6f83a0e289582be59578
+size 3398798

+ 110 - 1
Sounds/wwise_project/Soundcaster Sessions/Default Work Unit.wwu

@@ -1,6 +1,115 @@
 <?xml version="1.0" encoding="utf-8"?>
 <WwiseDocument Type="WorkUnit" ID="{EFF6DF5F-F035-4B47-A908-9BFE8386E85D}" SchemaVersion="103">
 	<SoundcasterSessions>
-		<WorkUnit Name="Default Work Unit" ID="{EFF6DF5F-F035-4B47-A908-9BFE8386E85D}" PersistMode="Standalone"/>
+		<WorkUnit Name="Default Work Unit" ID="{EFF6DF5F-F035-4B47-A908-9BFE8386E85D}" PersistMode="Standalone">
+			<ChildrenList>
+				<SoundcasterSession Name="SCS_Hexany" ID="{4977E544-DDD0-4520-B491-11810538F1D0}">
+					<ModuleList>
+						<Module>
+							<ObjectRef Name="play_sx_int_malfunctioningshieldgenerator_idle" ID="{8D875A6A-108D-4C08-9A16-851A7A80EA24}" WorkUnitID="{5D3AE987-B23A-43C3-8065-135D4594325B}"/>
+							<Position X="0" Y="0"/>
+						</Module>
+						<Module>
+							<ObjectRef Name="play_sx_amb_ext_general" ID="{118E75AA-7412-45A0-AAA9-52CD47DB9E41}" WorkUnitID="{DE9FC369-2076-4F07-9C00-6203DBF0184F}"/>
+							<Position X="0" Y="2"/>
+						</Module>
+						<Module>
+							<ObjectRef Name="play_sx_int_malfunctioningshieldgenerator_explo" ID="{A910A681-E6E6-47EF-9061-B9753C009A61}" WorkUnitID="{5D3AE987-B23A-43C3-8065-135D4594325B}"/>
+							<Position X="1" Y="0"/>
+						</Module>
+						<Module>
+							<ObjectRef Name="play_sx_env_lamp_loop" ID="{0886768C-CEF7-4F54-BBDE-690BFC89B2AB}" WorkUnitID="{60C2233B-F472-46D2-9B6E-A898FA28885E}"/>
+							<Position X="1" Y="2"/>
+						</Module>
+						<Module>
+							<ObjectRef Name="play_sx_player_footstep" ID="{1FFADD80-2B41-4080-BCCC-C50E8E9F54A4}" WorkUnitID="{6146481B-5849-48AD-9DBA-B2D263C55E44}"/>
+							<Position X="2" Y="1"/>
+						</Module>
+						<Module>
+							<ObjectRef Name="play_sx_wpn_bubblegun_fire" ID="{624DC077-3E40-4059-8E74-18F4F7782353}" WorkUnitID="{E8F53651-A80E-47A5-A3D1-FE5D411A6327}"/>
+							<Position X="2" Y="2"/>
+						</Module>
+						<Module>
+							<ObjectRef Name="play_sx_wpn_laserpistol_fire" ID="{FA50B607-E2A8-4E18-B8FC-632C1F353C41}" WorkUnitID="{E8F53651-A80E-47A5-A3D1-FE5D411A6327}"/>
+							<Position X="2" Y="3"/>
+						</Module>
+						<Module>
+							<ObjectRef Name="play_sx_player_pain" ID="{C4E4C612-D934-451D-873B-D9B4AE45A646}" WorkUnitID="{6146481B-5849-48AD-9DBA-B2D263C55E44}"/>
+							<Position X="3" Y="1"/>
+						</Module>
+						<Module>
+							<ObjectRef Name="play_sx_int_energycollector_explosion" ID="{E0E34EE2-738E-4E96-BF07-6FEBB42C3C2E}" WorkUnitID="{5D3AE987-B23A-43C3-8065-135D4594325B}"/>
+							<Position X="3" Y="2"/>
+						</Module>
+						<Module>
+							<ObjectRef Name="play_sx_int_malfunctioningshieldgenerator_explo" ID="{A910A681-E6E6-47EF-9061-B9753C009A61}" WorkUnitID="{5D3AE987-B23A-43C3-8065-135D4594325B}"/>
+							<Position X="3" Y="3"/>
+						</Module>
+					</ModuleList>
+					<RTPCValueList ShowAll="true">
+						<RTPCValue>
+							<GameParameterRef Name="Distance_10000" ID="{709EB988-5740-40FE-9C8A-ED9C9BCBD8A3}"/>
+							<Value>0</Value>
+						</RTPCValue>
+						<RTPCValue>
+							<GameParameterRef Name="TransmissionLoss" ID="{A754CED1-3C58-414B-B4D6-B2C2B35208CB}"/>
+							<Value>50</Value>
+						</RTPCValue>
+						<RTPCValue>
+							<GameParameterRef Name="Health" ID="{75BE07F7-C6AF-4285-A0B8-FDA621BA5C2C}"/>
+							<Value>50</Value>
+						</RTPCValue>
+						<RTPCValue>
+							<GameParameterRef Name="Velocity" ID="{F57DCC68-303A-43A8-A338-D5352274478F}"/>
+							<Value>1</Value>
+						</RTPCValue>
+						<RTPCValue>
+							<GameParameterRef Name="Distance_1000" ID="{6E6314F2-1870-4431-9A3F-D1F592760A4A}"/>
+							<Value>0</Value>
+						</RTPCValue>
+						<RTPCValue>
+							<GameParameterRef Name="Elevation" ID="{0161502A-405D-456E-B653-F5A438B0B913}"/>
+							<Value>0</Value>
+						</RTPCValue>
+						<RTPCValue>
+							<GameParameterRef Name="Volume_Master" ID="{78897677-B23A-458F-99E0-7053C9C317C5}"/>
+							<Value>1</Value>
+						</RTPCValue>
+						<RTPCValue>
+							<GameParameterRef Name="Occlusion" ID="{18F5D7C4-9785-464F-8EBF-1868C914FBE7}"/>
+							<Value>0</Value>
+						</RTPCValue>
+						<RTPCValue>
+							<GameParameterRef Name="Obstruction" ID="{686AD302-4979-4680-93A4-4FA8D4814F4B}"/>
+							<Value>0</Value>
+						</RTPCValue>
+						<RTPCValue>
+							<GameParameterRef Name="Azimuth" ID="{8E427819-A024-47B4-B731-F17DCFE0191E}"/>
+							<Value>0</Value>
+						</RTPCValue>
+						<RTPCValue>
+							<GameParameterRef Name="Volume_Music" ID="{8B8E79C6-3210-497C-B430-EF7745F2A6B1}"/>
+							<Value>1</Value>
+						</RTPCValue>
+						<RTPCValue>
+							<GameParameterRef Name="Diffraction" ID="{46987FA0-EBDF-4D7E-AC38-218C3DB9ED91}"/>
+							<Value>0</Value>
+						</RTPCValue>
+						<RTPCValue>
+							<GameParameterRef Name="Distance_100" ID="{F3EEAFF4-46E7-4EAD-9336-DAE7EB3F7B50}"/>
+							<Value>100</Value>
+						</RTPCValue>
+						<RTPCValue>
+							<GameParameterRef Name="Volume_SFX" ID="{ED75F40C-CDF0-4F71-9326-36D39C711C17}"/>
+							<Value>1</Value>
+						</RTPCValue>
+					</RTPCValueList>
+					<CurrentStateList ShowAll="true"/>
+					<CurrentSwitchList ShowAll="true">
+						<CurrentSwitchRef Name="Concrete" ID="{B14FAA96-8A3C-4226-A4DC-B002918E495B}"/>
+					</CurrentSwitchList>
+				</SoundcasterSession>
+			</ChildrenList>
+		</WorkUnit>
 	</SoundcasterSessions>
 </WwiseDocument>

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1450 - 142
UICanvases/BasicHUD.uicanvas


+ 0 - 485
UICanvases/HUD.uicanvas

@@ -1,485 +0,0 @@
-<ObjectStream version="3">
-	<Class name="UiCanvasFileObject" version="2" type="{1F02632F-F113-49B1-85AD-8CD0FA78B8AA}">
-		<Class name="AZ::Entity" field="CanvasEntity" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
-			<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-				<Class name="AZ::u64" field="id" value="17238485189693985416" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-			</Class>
-			<Class name="AZStd::string" field="Name" value="UiCanvasEntity" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-			<Class name="AZStd::vector&lt;AZ::Component*, allocator&gt;" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
-				<Class name="UiCanvasComponent" field="element" version="4" type="{50B8CF6C-B19A-4D86-AFE9-96EFB820D422}">
-					<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
-						<Class name="AZ::u64" field="Id" value="1887923795691627254" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-					</Class>
-					<Class name="AZ::u64" field="UniqueId" value="13374032056661591595" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-					<Class name="EntityId" field="RootElement" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-						<Class name="AZ::u64" field="id" value="17238485198283920008" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-					</Class>
-					<Class name="unsigned int" field="LastElement" value="43" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-					<Class name="Vector2" field="CanvasSize" value="1280.0000000 720.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
-					<Class name="bool" field="IsSnapEnabled" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-					<Class name="int" field="DrawOrder" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
-					<Class name="bool" field="IsPixelAligned" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-					<Class name="bool" field="IsTextPixelAligned" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-					<Class name="bool" field="RenderToTexture" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-					<Class name="Asset&lt;AttachmentImageAsset&gt;" field="AttachmentImageAsset" value="id={00000000-0000-0000-0000-000000000000}:0,type={82CEA86B-E891-4969-8F35-D8017E8902C8},hint={},loadBehavior=1" version="3" type="{61538C1C-2EDA-593B-AA53-701FF7D854E7}"/>
-					<Class name="bool" field="IsPosInputSupported" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-					<Class name="bool" field="IsConsumingAllInput" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-					<Class name="bool" field="IsMultiTouchSupported" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-					<Class name="bool" field="IsNavigationSupported" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-					<Class name="float" field="NavigationThreshold" value="0.4000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
-					<Class name="AZ::u64" field="NavigationRepeatDelay" value="300" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-					<Class name="AZ::u64" field="NavigationRepeatPeriod" value="150" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-					<Class name="EntityId" field="FirstHoverElement" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-						<Class name="AZ::u64" field="id" value="17240041569877938824" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-					</Class>
-					<Class name="UiAnimationSystem" field="AnimSystem" version="1" type="{2592269B-EF74-4409-B29F-682DC0B45DAF}">
-						<Class name="AZStd::vector&lt;AZStd::intrusive_ptr&lt;IUiAnimSequence&gt;, allocator&gt;" field="Sequences" type="{9F8D44A9-9731-5314-885E-B958D4216073}"/>
-					</Class>
-					<Class name="AnimationData" field="AnimationData" version="1" type="{FDC58CF7-8109-48F2-8D5D-BCBAF774ABB7}">
-						<Class name="AZStd::string" field="SerializeString" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-					</Class>
-					<Class name="EntityId" field="TooltipDisplayElement" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-						<Class name="AZ::u64" field="id" value="17259805978581979784" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-					</Class>
-					<Class name="float" field="SnapDistance" value="10.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
-					<Class name="float" field="SnapRotationDegrees" value="10.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
-					<Class name="AZStd::vector&lt;float, allocator&gt;" field="HorizontalGuides" type="{6106BF95-5ACD-5071-8D0E-4F846C2138AD}"/>
-					<Class name="AZStd::vector&lt;float, allocator&gt;" field="VerticalGuides" type="{6106BF95-5ACD-5071-8D0E-4F846C2138AD}"/>
-					<Class name="Color" field="GuideColor" value="0.2500000 1.0000000 0.2500000 1.0000000" type="{7894072A-9050-4F0F-901B-34B1A0D29417}"/>
-					<Class name="bool" field="GuidesLocked" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-					<Class name="AZStd::vector&lt;SimpleAssetReference&lt;TextureAtlasAsset&gt;, allocator&gt;" field="TextureAtlases" type="{73F8CC7B-8504-5F80-BD45-1620CD7EF9AB}"/>
-				</Class>
-			</Class>
-			<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-			<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-		</Class>
-		<Class name="AZ::Entity" field="RootSliceEntity" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
-			<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-				<Class name="AZ::u64" field="id" value="17269393569652331144" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-			</Class>
-			<Class name="AZStd::string" field="Name" value="17269393569652331144" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-			<Class name="AZStd::vector&lt;AZ::Component*, allocator&gt;" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
-				<Class name="SliceComponent" field="element" version="3" type="{AFD304E4-1773-47C8-855A-8B622398934F}">
-					<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
-						<Class name="AZ::u64" field="Id" value="2210838908681138030" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-					</Class>
-					<Class name="AZStd::vector&lt;AZ::Entity*, allocator&gt;" field="Entities" type="{21786AF0-2606-5B9A-86EB-0892E2820E6C}">
-						<Class name="AZ::Entity" field="element" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
-							<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-								<Class name="AZ::u64" field="id" value="17238485198283920008" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-							</Class>
-							<Class name="AZStd::string" field="Name" value="_root" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-							<Class name="AZStd::vector&lt;AZ::Component*, allocator&gt;" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
-								<Class name="EditorOnlyEntityComponent" field="element" type="{22A16F1D-6D49-422D-AAE9-91AE45B5D3E7}">
-									<Class name="EditorComponentBase" field="BaseClass1" version="1" type="{D5346BD4-7F20-444E-B370-327ACD03D4A0}">
-										<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
-											<Class name="AZ::u64" field="Id" value="17404221702327990060" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-										</Class>
-									</Class>
-									<Class name="bool" field="IsEditorOnly" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-								</Class>
-								<Class name="UiTransform2dComponent" field="element" version="3" type="{2751A5A5-3291-4A4D-9FC0-9CB0EB8D1DE6}">
-									<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
-										<Class name="AZ::u64" field="Id" value="6325440611361591872" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-									</Class>
-									<Class name="Anchors" field="Anchors" type="{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}">
-										<Class name="float" field="left" value="0.5000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
-										<Class name="float" field="top" value="0.5000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
-										<Class name="float" field="right" value="0.5000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
-										<Class name="float" field="bottom" value="0.5000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
-									</Class>
-									<Class name="Offsets" field="Offsets" type="{F681BA9D-245C-4630-B20E-05DD752FAD57}">
-										<Class name="float" field="left" value="-50.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
-										<Class name="float" field="top" value="-50.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
-										<Class name="float" field="right" value="50.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
-										<Class name="float" field="bottom" value="50.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
-									</Class>
-									<Class name="Vector2" field="Pivot" value="0.5000000 0.5000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
-									<Class name="float" field="Rotation" value="0.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
-									<Class name="Vector2" field="Scale" value="1.0000000 1.0000000" type="{3D80F623-C85C-4741-90D0-E4E66164E6BF}"/>
-									<Class name="int" field="ScaleToDevice" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
-								</Class>
-								<Class name="UiElementComponent" field="element" version="3" type="{4A97D63E-CE7A-45B6-AAE4-102DB4334688}">
-									<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
-										<Class name="AZ::u64" field="Id" value="8344820006263208779" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-									</Class>
-									<Class name="unsigned int" field="Id" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-									<Class name="bool" field="IsEnabled" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-									<Class name="bool" field="IsVisibleInEditor" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-									<Class name="bool" field="IsSelectableInEditor" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-									<Class name="bool" field="IsSelectedInEditor" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-									<Class name="bool" field="IsExpandedInEditor" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-									<Class name="AZStd::vector&lt;ChildEntityIdOrderEntry, allocator&gt;" field="ChildEntityIdOrder" type="{0DE523D9-AEAE-5FC4-9D40-967A2E2B8A62}">
-										<Class name="ChildEntityIdOrderEntry" field="element" version="1" type="{D6F3CC55-6C7C-4D64-818F-FA3378EC8DA2}">
-											<Class name="EntityId" field="ChildEntityId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-												<Class name="AZ::u64" field="id" value="17276740974500565640" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-											</Class>
-											<Class name="AZ::u64" field="SortIndex" value="0" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-										</Class>
-										<Class name="ChildEntityIdOrderEntry" field="element" version="1" type="{D6F3CC55-6C7C-4D64-818F-FA3378EC8DA2}">
-											<Class name="EntityId" field="ChildEntityId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-												<Class name="AZ::u64" field="id" value="668333916185" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-											</Class>
-											<Class name="AZ::u64" field="SortIndex" value="1" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-										</Class>
-									</Class>
-								</Class>
-							</Class>
-							<Class name="bool" field="IsDependencyReady" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-							<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-						</Class>
-					</Class>
-					<Class name="AZStd::list&lt;SliceReference, allocator&gt;" field="Prefabs" type="{DAD45EB6-5853-5645-B762-3A37F8775E12}">
-						<Class name="SliceReference" field="element" version="2" type="{F181B80D-44F0-4093-BB0D-C638A9A734BE}">
-							<Class name="AZStd::unordered_set&lt;SliceInstance, AZStd::hash&lt;SliceInstance&gt;, AZStd::equal_to&lt;SliceInstance&gt;, allocator&gt;" field="Instances" type="{989A5786-8D1B-525B-8DE3-6C70A775EA1C}">
-								<Class name="SliceInstance" field="element" version="3" type="{E6F11FB3-E9BF-43BA-BD78-2A19F51D0ED3}">
-									<Class name="AZ::Uuid" field="Id" value="{125374A3-B018-42A5-B866-479151E07EFE}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-									<Class name="AZStd::unordered_map&lt;EntityId, EntityId, AZStd::hash&lt;EntityId&gt;, AZStd::equal_to&lt;EntityId&gt;, allocator&gt;" field="EntityIdMap" type="{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}">
-										<Class name="AZStd::pair&lt;EntityId, EntityId&gt;" field="element" type="{30DDE93C-E899-5AB9-856D-FC456D054EDB}">
-											<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-												<Class name="AZ::u64" field="id" value="6861939221656" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-											</Class>
-											<Class name="EntityId" field="value2" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-												<Class name="AZ::u64" field="id" value="818193968430" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-											</Class>
-										</Class>
-										<Class name="AZStd::pair&lt;EntityId, EntityId&gt;" field="element" type="{30DDE93C-E899-5AB9-856D-FC456D054EDB}">
-											<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-												<Class name="AZ::u64" field="id" value="17239193631664558728" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-											</Class>
-											<Class name="EntityId" field="value2" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-												<Class name="AZ::u64" field="id" value="17276740974500565640" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-											</Class>
-										</Class>
-										<Class name="AZStd::pair&lt;EntityId, EntityId&gt;" field="element" type="{30DDE93C-E899-5AB9-856D-FC456D054EDB}">
-											<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-												<Class name="AZ::u64" field="id" value="6763154973848" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-											</Class>
-											<Class name="EntityId" field="value2" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-												<Class name="AZ::u64" field="id" value="822488935726" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-											</Class>
-										</Class>
-									</Class>
-									<Class name="DataPatch" field="DataPatch" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
-										<Class name="AZ::Uuid" field="m_targetClassId" value="{05038EF7-9EF7-40D8-A29B-503D85B85AF8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-										<Class name="unsigned int" field="m_targetClassVersion" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-										<Class name="AZStd::unordered_map&lt;AddressType, AZStd::any, AZStd::hash&lt;AddressType&gt;, AZStd::equal_to&lt;AddressType&gt;, allocator&gt;" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
-											<Class name="AZStd::pair&lt;AddressType, AZStd::any&gt;" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
-												<Class name="AddressType" field="value1" value="AZStd::vector&lt;AZ::Entity*, allocator&gt;({21786AF0-2606-5B9A-86EB-0892E2820E6C})::Entities·0/AZ::Entity({75651658-8663-478D-9090-2432DFCAFA44})#17239193631664558728·2/AZStd::string({03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9})::Name·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-												<Class name="AZStd::any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
-													<Class name="AZStd::string" field="m_data" value="Round Timer" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-												</Class>
-											</Class>
-											<Class name="AZStd::pair&lt;AddressType, AZStd::any&gt;" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
-												<Class name="AddressType" field="value1" value="AZStd::vector&lt;AZ::Entity*, allocator&gt;({21786AF0-2606-5B9A-86EB-0892E2820E6C})::Entities·0/AZ::Entity({75651658-8663-478D-9090-2432DFCAFA44})#17239193631664558728·2/AZStd::vector&lt;AZ::Component*, allocator&gt;({13D58FF9-1088-5C69-9A1F-C2A144B57B78})::Components·0/UiTextComponent({5B3FB2A7-5DC4-4033-A970-001CEC85B6C4})#3068610810953516373·9/Color({7894072A-9050-4F0F-901B-34B1A0D29417})::Color·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-												<Class name="AZStd::any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
-													<Class name="Color" field="m_data" value="1.0000000 1.0000000 0.0000000 1.0000000" type="{7894072A-9050-4F0F-901B-34B1A0D29417}"/>
-												</Class>
-											</Class>
-											<Class name="AZStd::pair&lt;AddressType, AZStd::any&gt;" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
-												<Class name="AddressType" field="value1" value="AZStd::vector&lt;AZ::Entity*, allocator&gt;({21786AF0-2606-5B9A-86EB-0892E2820E6C})::Entities·0/AZ::Entity({75651658-8663-478D-9090-2432DFCAFA44})#17239193631664558728·2/AZStd::vector&lt;AZ::Component*, allocator&gt;({13D58FF9-1088-5C69-9A1F-C2A144B57B78})::Components·0/UiTransform2dComponent({2751A5A5-3291-4A4D-9FC0-9CB0EB8D1DE6})#12566577726618989226·3/Offsets({F681BA9D-245C-4630-B20E-05DD752FAD57})::Offsets·0/float({EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D})::right·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-												<Class name="AZStd::any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
-													<Class name="float" field="m_data" value="285.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
-												</Class>
-											</Class>
-											<Class name="AZStd::pair&lt;AddressType, AZStd::any&gt;" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
-												<Class name="AddressType" field="value1" value="AZStd::vector&lt;AZ::Entity*, allocator&gt;({21786AF0-2606-5B9A-86EB-0892E2820E6C})::Entities·0/AZ::Entity({75651658-8663-478D-9090-2432DFCAFA44})#17239193631664558728·2/AZStd::vector&lt;AZ::Component*, allocator&gt;({13D58FF9-1088-5C69-9A1F-C2A144B57B78})::Components·0/UiTextComponent({5B3FB2A7-5DC4-4033-A970-001CEC85B6C4})#3068610810953516373·9/AZStd::string({03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9})::Text·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-												<Class name="AZStd::any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
-													<Class name="AZStd::string" field="m_data" value="120" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-												</Class>
-											</Class>
-											<Class name="AZStd::pair&lt;AddressType, AZStd::any&gt;" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
-												<Class name="AddressType" field="value1" value="AZStd::vector&lt;AZ::Entity*, allocator&gt;({21786AF0-2606-5B9A-86EB-0892E2820E6C})::Entities·0/AZ::Entity({75651658-8663-478D-9090-2432DFCAFA44})#17239193631664558728·2/AZStd::vector&lt;AZ::Component*, allocator&gt;({13D58FF9-1088-5C69-9A1F-C2A144B57B78})::Components·0/UiTransform2dComponent({2751A5A5-3291-4A4D-9FC0-9CB0EB8D1DE6})#12566577726618989226·3/Offsets({F681BA9D-245C-4630-B20E-05DD752FAD57})::Offsets·0/float({EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D})::left·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-												<Class name="AZStd::any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
-													<Class name="float" field="m_data" value="34.9999924" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
-												</Class>
-											</Class>
-											<Class name="AZStd::pair&lt;AddressType, AZStd::any&gt;" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
-												<Class name="AddressType" field="value1" value="AZStd::vector&lt;AZ::Entity*, allocator&gt;({21786AF0-2606-5B9A-86EB-0892E2820E6C})::Entities·0/AZ::Entity({75651658-8663-478D-9090-2432DFCAFA44})#17239193631664558728·2/AZStd::vector&lt;AZ::Component*, allocator&gt;({13D58FF9-1088-5C69-9A1F-C2A144B57B78})::Components·0/UiElementComponent({4A97D63E-CE7A-45B6-AAE4-102DB4334688})#7596997558223279386·3/unsigned int({43DA906B-7DEF-4CA8-9790-854106D3F983})::Id·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-												<Class name="AZStd::any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
-													<Class name="unsigned int" field="m_data" value="11" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-												</Class>
-											</Class>
-											<Class name="AZStd::pair&lt;AddressType, AZStd::any&gt;" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
-												<Class name="AddressType" field="value1" value="AZStd::vector&lt;AZ::Entity*, allocator&gt;({21786AF0-2606-5B9A-86EB-0892E2820E6C})::Entities·0/AZ::Entity({75651658-8663-478D-9090-2432DFCAFA44})#17239193631664558728·2/AZStd::vector&lt;AZ::Component*, allocator&gt;({13D58FF9-1088-5C69-9A1F-C2A144B57B78})::Components·0/UiTextComponent({5B3FB2A7-5DC4-4033-A970-001CEC85B6C4})#3068610810953516373·9/int({72039442-EB38-4D42-A1AD-CB68F7E0EEF6})::TextHAlignment·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-												<Class name="AZStd::any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
-													<Class name="int" field="m_data" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
-												</Class>
-											</Class>
-										</Class>
-									</Class>
-									<Class name="DataFlagsPerEntity" field="DataFlags" version="1" type="{57FE7B9E-B2AF-4F6F-9F8D-87F671E91C99}">
-										<Class name="AZStd::unordered_map&lt;EntityId, AZStd::unordered_map&lt;AddressType, unsigned char, AZStd::hash&lt;AddressType&gt;, AZStd::equal_to&lt;AddressType&gt;, allocator&gt;, AZStd::hash&lt;EntityId&gt;, AZStd::equal_to&lt;EntityId&gt;, allocator&gt;" field="EntityToDataFlags" type="{CAB9E1F5-761E-54B8-916E-E7FB597E5EDE}"/>
-									</Class>
-								</Class>
-								<Class name="SliceInstance" field="element" version="3" type="{E6F11FB3-E9BF-43BA-BD78-2A19F51D0ED3}">
-									<Class name="AZ::Uuid" field="Id" value="{C141DE49-B0D6-4B08-9F87-F7E825F20B8E}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-									<Class name="AZStd::unordered_map&lt;EntityId, EntityId, AZStd::hash&lt;EntityId&gt;, AZStd::equal_to&lt;EntityId&gt;, allocator&gt;" field="EntityIdMap" type="{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}">
-										<Class name="AZStd::pair&lt;EntityId, EntityId&gt;" field="element" type="{30DDE93C-E899-5AB9-856D-FC456D054EDB}">
-											<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-												<Class name="AZ::u64" field="id" value="6861939221656" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-											</Class>
-											<Class name="EntityId" field="value2" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-												<Class name="AZ::u64" field="id" value="672628883481" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-											</Class>
-										</Class>
-										<Class name="AZStd::pair&lt;EntityId, EntityId&gt;" field="element" type="{30DDE93C-E899-5AB9-856D-FC456D054EDB}">
-											<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-												<Class name="AZ::u64" field="id" value="6763154973848" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-											</Class>
-											<Class name="EntityId" field="value2" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-												<Class name="AZ::u64" field="id" value="676923850777" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-											</Class>
-										</Class>
-										<Class name="AZStd::pair&lt;EntityId, EntityId&gt;" field="element" type="{30DDE93C-E899-5AB9-856D-FC456D054EDB}">
-											<Class name="EntityId" field="value1" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-												<Class name="AZ::u64" field="id" value="17239193631664558728" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-											</Class>
-											<Class name="EntityId" field="value2" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-												<Class name="AZ::u64" field="id" value="668333916185" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-											</Class>
-										</Class>
-									</Class>
-									<Class name="DataPatch" field="DataPatch" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
-										<Class name="AZ::Uuid" field="m_targetClassId" value="{05038EF7-9EF7-40D8-A29B-503D85B85AF8}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
-										<Class name="unsigned int" field="m_targetClassVersion" value="2" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-										<Class name="AZStd::unordered_map&lt;AddressType, AZStd::any, AZStd::hash&lt;AddressType&gt;, AZStd::equal_to&lt;AddressType&gt;, allocator&gt;" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}">
-											<Class name="AZStd::pair&lt;AddressType, AZStd::any&gt;" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
-												<Class name="AddressType" field="value1" value="AZStd::vector&lt;AZ::Entity*, allocator&gt;({21786AF0-2606-5B9A-86EB-0892E2820E6C})::MetadataEntities·0/AZ::Entity({75651658-8663-478D-9090-2432DFCAFA44})#6763154973848·2/bool({A0CA880C-AFE4-43CB-926C-59AC48496112})::IsDependencyReady·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-												<Class name="AZStd::any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
-													<Class name="bool" field="m_data" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-												</Class>
-											</Class>
-											<Class name="AZStd::pair&lt;AddressType, AZStd::any&gt;" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
-												<Class name="AddressType" field="value1" value="AZStd::vector&lt;AZ::Entity*, allocator&gt;({21786AF0-2606-5B9A-86EB-0892E2820E6C})::MetadataEntities·0/AZ::Entity({75651658-8663-478D-9090-2432DFCAFA44})#6861939221656·2/AZStd::vector&lt;AZ::Component*, allocator&gt;({13D58FF9-1088-5C69-9A1F-C2A144B57B78})::Components·0/EditorEntitySortComponent({6EA1E03D-68B2-466D-97F7-83998C8C27F0})#15407709509726618703·2/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-												<Class name="AZStd::any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
-													<Class name="EditorEntitySortComponent" field="m_data" version="2" type="{6EA1E03D-68B2-466D-97F7-83998C8C27F0}">
-														<Class name="EditorComponentBase" field="BaseClass1" version="1" type="{D5346BD4-7F20-444E-B370-327ACD03D4A0}">
-															<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
-																<Class name="AZ::u64" field="Id" value="15407709509726618703" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-															</Class>
-														</Class>
-														<Class name="AZStd::vector&lt;EntityOrderEntry, allocator&gt;" field="ChildEntityOrderEntryArray" type="{BE163120-C1ED-5F69-A650-DC2528A8FF94}"/>
-													</Class>
-												</Class>
-											</Class>
-											<Class name="AZStd::pair&lt;AddressType, AZStd::any&gt;" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
-												<Class name="AddressType" field="value1" value="AZStd::vector&lt;AZ::Entity*, allocator&gt;({21786AF0-2606-5B9A-86EB-0892E2820E6C})::MetadataEntities·0/AZ::Entity({75651658-8663-478D-9090-2432DFCAFA44})#6763154973848·2/AZStd::vector&lt;AZ::Component*, allocator&gt;({13D58FF9-1088-5C69-9A1F-C2A144B57B78})::Components·0/EditorDisabledCompositionComponent({E77AE6AC-897D-4035-8353-637449B6DCFB})#2903817997948028437·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-												<Class name="AZStd::any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
-													<Class name="EditorDisabledCompositionComponent" field="m_data" type="{E77AE6AC-897D-4035-8353-637449B6DCFB}">
-														<Class name="EditorComponentBase" field="BaseClass1" version="1" type="{D5346BD4-7F20-444E-B370-327ACD03D4A0}">
-															<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
-																<Class name="AZ::u64" field="Id" value="2903817997948028437" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-															</Class>
-														</Class>
-														<Class name="AZStd::vector&lt;AZ::Component*, allocator&gt;" field="DisabledComponents" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}"/>
-													</Class>
-												</Class>
-											</Class>
-											<Class name="AZStd::pair&lt;AddressType, AZStd::any&gt;" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
-												<Class name="AddressType" field="value1" value="AZStd::vector&lt;AZ::Entity*, allocator&gt;({21786AF0-2606-5B9A-86EB-0892E2820E6C})::Entities·0/AZ::Entity({75651658-8663-478D-9090-2432DFCAFA44})#17239193631664558728·2/AZStd::string({03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9})::Name·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-												<Class name="AZStd::any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
-													<Class name="AZStd::string" field="m_data" value="Round Number" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-												</Class>
-											</Class>
-											<Class name="AZStd::pair&lt;AddressType, AZStd::any&gt;" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
-												<Class name="AddressType" field="value1" value="AZStd::vector&lt;AZ::Entity*, allocator&gt;({21786AF0-2606-5B9A-86EB-0892E2820E6C})::MetadataEntities·0/AZ::Entity({75651658-8663-478D-9090-2432DFCAFA44})#6861939221656·2/AZStd::vector&lt;AZ::Component*, allocator&gt;({13D58FF9-1088-5C69-9A1F-C2A144B57B78})::Components·0/EditorPendingCompositionComponent({D40FCB35-153D-45B3-AF6D-7BA576D8AFBB})#1246356597916671467·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-												<Class name="AZStd::any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
-													<Class name="EditorPendingCompositionComponent" field="m_data" type="{D40FCB35-153D-45B3-AF6D-7BA576D8AFBB}">
-														<Class name="EditorComponentBase" field="BaseClass1" version="1" type="{D5346BD4-7F20-444E-B370-327ACD03D4A0}">
-															<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
-																<Class name="AZ::u64" field="Id" value="1246356597916671467" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-															</Class>
-														</Class>
-														<Class name="AZStd::vector&lt;AZ::Component*, allocator&gt;" field="PendingComponents" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}"/>
-													</Class>
-												</Class>
-											</Class>
-											<Class name="AZStd::pair&lt;AddressType, AZStd::any&gt;" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
-												<Class name="AddressType" field="value1" value="AZStd::vector&lt;AZ::Entity*, allocator&gt;({21786AF0-2606-5B9A-86EB-0892E2820E6C})::Entities·0/AZ::Entity({75651658-8663-478D-9090-2432DFCAFA44})#17239193631664558728·2/AZStd::vector&lt;AZ::Component*, allocator&gt;({13D58FF9-1088-5C69-9A1F-C2A144B57B78})::Components·0/UiTextComponent({5B3FB2A7-5DC4-4033-A970-001CEC85B6C4})#3068610810953516373·9/Color({7894072A-9050-4F0F-901B-34B1A0D29417})::Color·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-												<Class name="AZStd::any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
-													<Class name="Color" field="m_data" value="1.0000000 1.0000000 0.0000000 1.0000000" type="{7894072A-9050-4F0F-901B-34B1A0D29417}"/>
-												</Class>
-											</Class>
-											<Class name="AZStd::pair&lt;AddressType, AZStd::any&gt;" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
-												<Class name="AddressType" field="value1" value="AZStd::vector&lt;AZ::Entity*, allocator&gt;({21786AF0-2606-5B9A-86EB-0892E2820E6C})::MetadataEntities·0/AZ::Entity({75651658-8663-478D-9090-2432DFCAFA44})#6861939221656·2/bool({A0CA880C-AFE4-43CB-926C-59AC48496112})::IsDependencyReady·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-												<Class name="AZStd::any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
-													<Class name="bool" field="m_data" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-												</Class>
-											</Class>
-											<Class name="AZStd::pair&lt;AddressType, AZStd::any&gt;" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
-												<Class name="AddressType" field="value1" value="AZStd::vector&lt;AZ::Entity*, allocator&gt;({21786AF0-2606-5B9A-86EB-0892E2820E6C})::MetadataEntities·0/AZ::Entity({75651658-8663-478D-9090-2432DFCAFA44})#6763154973848·2/AZStd::vector&lt;AZ::Component*, allocator&gt;({13D58FF9-1088-5C69-9A1F-C2A144B57B78})::Components·0/EditorEntitySortComponent({6EA1E03D-68B2-466D-97F7-83998C8C27F0})#7339048627830873948·2/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-												<Class name="AZStd::any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
-													<Class name="EditorEntitySortComponent" field="m_data" version="2" type="{6EA1E03D-68B2-466D-97F7-83998C8C27F0}">
-														<Class name="EditorComponentBase" field="BaseClass1" version="1" type="{D5346BD4-7F20-444E-B370-327ACD03D4A0}">
-															<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
-																<Class name="AZ::u64" field="Id" value="7339048627830873948" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-															</Class>
-														</Class>
-														<Class name="AZStd::vector&lt;EntityOrderEntry, allocator&gt;" field="ChildEntityOrderEntryArray" type="{BE163120-C1ED-5F69-A650-DC2528A8FF94}"/>
-													</Class>
-												</Class>
-											</Class>
-											<Class name="AZStd::pair&lt;AddressType, AZStd::any&gt;" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
-												<Class name="AddressType" field="value1" value="AZStd::vector&lt;AZ::Entity*, allocator&gt;({21786AF0-2606-5B9A-86EB-0892E2820E6C})::Entities·0/AZ::Entity({75651658-8663-478D-9090-2432DFCAFA44})#17239193631664558728·2/AZStd::vector&lt;AZ::Component*, allocator&gt;({13D58FF9-1088-5C69-9A1F-C2A144B57B78})::Components·0/UiTransform2dComponent({2751A5A5-3291-4A4D-9FC0-9CB0EB8D1DE6})#12566577726618989226·3/Offsets({F681BA9D-245C-4630-B20E-05DD752FAD57})::Offsets·0/float({EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D})::right·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-												<Class name="AZStd::any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
-													<Class name="float" field="m_data" value="85.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
-												</Class>
-											</Class>
-											<Class name="AZStd::pair&lt;AddressType, AZStd::any&gt;" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
-												<Class name="AddressType" field="value1" value="AZStd::vector&lt;AZ::Entity*, allocator&gt;({21786AF0-2606-5B9A-86EB-0892E2820E6C})::Entities·0/AZ::Entity({75651658-8663-478D-9090-2432DFCAFA44})#17239193631664558728·2/AZStd::vector&lt;AZ::Component*, allocator&gt;({13D58FF9-1088-5C69-9A1F-C2A144B57B78})::Components·0/UiTextComponent({5B3FB2A7-5DC4-4033-A970-001CEC85B6C4})#3068610810953516373·9/AZStd::string({03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9})::Text·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-												<Class name="AZStd::any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
-													<Class name="AZStd::string" field="m_data" value="Round 1/3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-												</Class>
-											</Class>
-											<Class name="AZStd::pair&lt;AddressType, AZStd::any&gt;" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
-												<Class name="AddressType" field="value1" value="AZStd::vector&lt;AZ::Entity*, allocator&gt;({21786AF0-2606-5B9A-86EB-0892E2820E6C})::MetadataEntities·0/AZ::Entity({75651658-8663-478D-9090-2432DFCAFA44})#6861939221656·2/AZStd::vector&lt;AZ::Component*, allocator&gt;({13D58FF9-1088-5C69-9A1F-C2A144B57B78})::Components·0/EditorDisabledCompositionComponent({E77AE6AC-897D-4035-8353-637449B6DCFB})#11712855761242361458·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-												<Class name="AZStd::any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
-													<Class name="EditorDisabledCompositionComponent" field="m_data" type="{E77AE6AC-897D-4035-8353-637449B6DCFB}">
-														<Class name="EditorComponentBase" field="BaseClass1" version="1" type="{D5346BD4-7F20-444E-B370-327ACD03D4A0}">
-															<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
-																<Class name="AZ::u64" field="Id" value="11712855761242361458" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-															</Class>
-														</Class>
-														<Class name="AZStd::vector&lt;AZ::Component*, allocator&gt;" field="DisabledComponents" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}"/>
-													</Class>
-												</Class>
-											</Class>
-											<Class name="AZStd::pair&lt;AddressType, AZStd::any&gt;" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
-												<Class name="AddressType" field="value1" value="AZStd::vector&lt;AZ::Entity*, allocator&gt;({21786AF0-2606-5B9A-86EB-0892E2820E6C})::Entities·0/AZ::Entity({75651658-8663-478D-9090-2432DFCAFA44})#17239193631664558728·2/AZStd::vector&lt;AZ::Component*, allocator&gt;({13D58FF9-1088-5C69-9A1F-C2A144B57B78})::Components·0/UiTransform2dComponent({2751A5A5-3291-4A4D-9FC0-9CB0EB8D1DE6})#12566577726618989226·3/Offsets({F681BA9D-245C-4630-B20E-05DD752FAD57})::Offsets·0/float({EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D})::left·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-												<Class name="AZStd::any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
-													<Class name="float" field="m_data" value="-165.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
-												</Class>
-											</Class>
-											<Class name="AZStd::pair&lt;AddressType, AZStd::any&gt;" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
-												<Class name="AddressType" field="value1" value="AZStd::vector&lt;AZ::Entity*, allocator&gt;({21786AF0-2606-5B9A-86EB-0892E2820E6C})::Entities·0/AZ::Entity({75651658-8663-478D-9090-2432DFCAFA44})#17239193631664558728·2/AZStd::vector&lt;AZ::Component*, allocator&gt;({13D58FF9-1088-5C69-9A1F-C2A144B57B78})::Components·0/UiElementComponent({4A97D63E-CE7A-45B6-AAE4-102DB4334688})#7596997558223279386·3/unsigned int({43DA906B-7DEF-4CA8-9790-854106D3F983})::Id·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-												<Class name="AZStd::any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
-													<Class name="unsigned int" field="m_data" value="43" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
-												</Class>
-											</Class>
-											<Class name="AZStd::pair&lt;AddressType, AZStd::any&gt;" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
-												<Class name="AddressType" field="value1" value="AZStd::vector&lt;AZ::Entity*, allocator&gt;({21786AF0-2606-5B9A-86EB-0892E2820E6C})::Entities·0/AZ::Entity({75651658-8663-478D-9090-2432DFCAFA44})#17239193631664558728·2/AZStd::vector&lt;AZ::Component*, allocator&gt;({13D58FF9-1088-5C69-9A1F-C2A144B57B78})::Components·0/UiTextComponent({5B3FB2A7-5DC4-4033-A970-001CEC85B6C4})#3068610810953516373·9/int({72039442-EB38-4D42-A1AD-CB68F7E0EEF6})::TextHAlignment·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-												<Class name="AZStd::any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
-													<Class name="int" field="m_data" value="0" type="{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}"/>
-												</Class>
-											</Class>
-											<Class name="AZStd::pair&lt;AddressType, AZStd::any&gt;" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
-												<Class name="AddressType" field="value1" value="AZStd::vector&lt;AZ::Entity*, allocator&gt;({21786AF0-2606-5B9A-86EB-0892E2820E6C})::MetadataEntities·0/AZ::Entity({75651658-8663-478D-9090-2432DFCAFA44})#6861939221656·2/AZStd::vector&lt;AZ::Component*, allocator&gt;({13D58FF9-1088-5C69-9A1F-C2A144B57B78})::Components·0/EditorInspectorComponent({47DE3DDA-50C5-4F50-B1DB-BA4AE66AB056})#5119908684912102702·2/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-												<Class name="AZStd::any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
-													<Class name="EditorInspectorComponent" field="m_data" version="2" type="{47DE3DDA-50C5-4F50-B1DB-BA4AE66AB056}">
-														<Class name="EditorComponentBase" field="BaseClass1" version="1" type="{D5346BD4-7F20-444E-B370-327ACD03D4A0}">
-															<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
-																<Class name="AZ::u64" field="Id" value="5119908684912102702" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-															</Class>
-														</Class>
-														<Class name="AZStd::vector&lt;ComponentOrderEntry, allocator&gt;" field="ComponentOrderEntryArray" type="{B6EFED5B-19B4-5084-9D92-42DECCE83872}"/>
-													</Class>
-												</Class>
-											</Class>
-											<Class name="AZStd::pair&lt;AddressType, AZStd::any&gt;" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
-												<Class name="AddressType" field="value1" value="AZStd::vector&lt;AZ::Entity*, allocator&gt;({21786AF0-2606-5B9A-86EB-0892E2820E6C})::MetadataEntities·0/AZ::Entity({75651658-8663-478D-9090-2432DFCAFA44})#6763154973848·2/AZStd::vector&lt;AZ::Component*, allocator&gt;({13D58FF9-1088-5C69-9A1F-C2A144B57B78})::Components·0/EditorPendingCompositionComponent({D40FCB35-153D-45B3-AF6D-7BA576D8AFBB})#15271082352181121589·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-												<Class name="AZStd::any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
-													<Class name="EditorPendingCompositionComponent" field="m_data" type="{D40FCB35-153D-45B3-AF6D-7BA576D8AFBB}">
-														<Class name="EditorComponentBase" field="BaseClass1" version="1" type="{D5346BD4-7F20-444E-B370-327ACD03D4A0}">
-															<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
-																<Class name="AZ::u64" field="Id" value="15271082352181121589" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-															</Class>
-														</Class>
-														<Class name="AZStd::vector&lt;AZ::Component*, allocator&gt;" field="PendingComponents" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}"/>
-													</Class>
-												</Class>
-											</Class>
-											<Class name="AZStd::pair&lt;AddressType, AZStd::any&gt;" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
-												<Class name="AddressType" field="value1" value="AZStd::vector&lt;AZ::Entity*, allocator&gt;({21786AF0-2606-5B9A-86EB-0892E2820E6C})::MetadataEntities·0/AZ::Entity({75651658-8663-478D-9090-2432DFCAFA44})#6763154973848·2/AZStd::vector&lt;AZ::Component*, allocator&gt;({13D58FF9-1088-5C69-9A1F-C2A144B57B78})::Components·0/EditorInspectorComponent({47DE3DDA-50C5-4F50-B1DB-BA4AE66AB056})#17031546321691674706·2/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
-												<Class name="AZStd::any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
-													<Class name="EditorInspectorComponent" field="m_data" version="2" type="{47DE3DDA-50C5-4F50-B1DB-BA4AE66AB056}">
-														<Class name="EditorComponentBase" field="BaseClass1" version="1" type="{D5346BD4-7F20-444E-B370-327ACD03D4A0}">
-															<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
-																<Class name="AZ::u64" field="Id" value="17031546321691674706" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-															</Class>
-														</Class>
-														<Class name="AZStd::vector&lt;ComponentOrderEntry, allocator&gt;" field="ComponentOrderEntryArray" type="{B6EFED5B-19B4-5084-9D92-42DECCE83872}"/>
-													</Class>
-												</Class>
-											</Class>
-										</Class>
-									</Class>
-									<Class name="DataFlagsPerEntity" field="DataFlags" version="1" type="{57FE7B9E-B2AF-4F6F-9F8D-87F671E91C99}">
-										<Class name="AZStd::unordered_map&lt;EntityId, AZStd::unordered_map&lt;AddressType, unsigned char, AZStd::hash&lt;AddressType&gt;, AZStd::equal_to&lt;AddressType&gt;, allocator&gt;, AZStd::hash&lt;EntityId&gt;, AZStd::equal_to&lt;EntityId&gt;, allocator&gt;" field="EntityToDataFlags" type="{CAB9E1F5-761E-54B8-916E-E7FB597E5EDE}"/>
-									</Class>
-								</Class>
-							</Class>
-							<Class name="Asset&lt;SliceAsset&gt;" field="Asset" value="id={3CEE3DCB-26AA-5D57-89F1-67946F2D28DD}:1,type={C62C7A87-9C09-4148-A985-12F2C99C0A45},hint={ui/slices/lyshineexamples/screentitle.slice},loadBehavior=0" version="3" type="{30C4B578-3D9F-5357-944B-0BF91907D00B}"/>
-						</Class>
-					</Class>
-					<Class name="bool" field="IsDynamic" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-					<Class name="AZ::Entity" field="MetadataEntity" version="2" type="{75651658-8663-478D-9090-2432DFCAFA44}">
-						<Class name="EntityId" field="Id" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-							<Class name="AZ::u64" field="id" value="421867742786" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-						</Class>
-						<Class name="AZStd::string" field="Name" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
-						<Class name="AZStd::vector&lt;AZ::Component*, allocator&gt;" field="Components" type="{13D58FF9-1088-5C69-9A1F-C2A144B57B78}">
-							<Class name="SliceMetadataInfoComponent" field="element" version="2" type="{25EE4D75-8A17-4449-81F4-E561005BAABD}">
-								<Class name="AZ::Component" field="BaseClass1" type="{EDFCB2CF-F75D-43BE-B26B-F35821B29247}">
-									<Class name="AZ::u64" field="Id" value="17690397741007819979" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-								</Class>
-								<Class name="AZStd::set&lt;EntityId, AZStd::less&lt;EntityId&gt;, allocator&gt;" field="AssociatedIds" type="{78E024C3-0143-53FC-B393-0675227839AF}">
-									<Class name="EntityId" field="element" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-										<Class name="AZ::u64" field="id" value="17238485198283920008" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-									</Class>
-									<Class name="EntityId" field="element" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-										<Class name="AZ::u64" field="id" value="17238487143904105096" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-									</Class>
-								</Class>
-								<Class name="EntityId" field="ParentId" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-									<Class name="AZ::u64" field="id" value="421867742786" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-								</Class>
-								<Class name="AZStd::unordered_set&lt;EntityId, AZStd::hash&lt;EntityId&gt;, AZStd::equal_to&lt;EntityId&gt;, allocator&gt;" field="ChildrenIds" type="{6C8F8E52-AB4A-5C1F-8E56-9AC390290B94}">
-									<Class name="EntityId" field="element" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-										<Class name="AZ::u64" field="id" value="529241925186" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-									</Class>
-									<Class name="EntityId" field="element" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-										<Class name="AZ::u64" field="id" value="769760093762" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-									</Class>
-									<Class name="EntityId" field="element" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-										<Class name="AZ::u64" field="id" value="546421794370" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-									</Class>
-									<Class name="EntityId" field="element" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-										<Class name="AZ::u64" field="id" value="666680878658" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-									</Class>
-									<Class name="EntityId" field="element" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-										<Class name="AZ::u64" field="id" value="563601663554" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-									</Class>
-									<Class name="EntityId" field="element" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-										<Class name="AZ::u64" field="id" value="653795976770" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-									</Class>
-									<Class name="EntityId" field="element" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-										<Class name="AZ::u64" field="id" value="580781532738" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-									</Class>
-									<Class name="EntityId" field="element" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-										<Class name="AZ::u64" field="id" value="640911074882" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-									</Class>
-									<Class name="EntityId" field="element" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-										<Class name="AZ::u64" field="id" value="597961401922" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-									</Class>
-									<Class name="EntityId" field="element" version="1" type="{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}">
-										<Class name="AZ::u64" field="id" value="615141271106" type="{D6597933-47CD-4FC8-B911-63F3E2B0993A}"/>
-									</Class>
-								</Class>
-								<Class name="bool" field="PersistenceFlag" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-							</Class>
-						</Class>
-						<Class name="bool" field="IsDependencyReady" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-						<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-					</Class>
-					<Class name="DataFlagsPerEntity" field="DataFlagsForNewEntities" version="1" type="{57FE7B9E-B2AF-4F6F-9F8D-87F671E91C99}">
-						<Class name="AZStd::unordered_map&lt;EntityId, AZStd::unordered_map&lt;AddressType, unsigned char, AZStd::hash&lt;AddressType&gt;, AZStd::equal_to&lt;AddressType&gt;, allocator&gt;, AZStd::hash&lt;EntityId&gt;, AZStd::equal_to&lt;EntityId&gt;, allocator&gt;" field="EntityToDataFlags" type="{CAB9E1F5-761E-54B8-916E-E7FB597E5EDE}"/>
-					</Class>
-				</Class>
-			</Class>
-			<Class name="bool" field="IsDependencyReady" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-			<Class name="bool" field="IsRuntimeActive" value="true" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
-		</Class>
-	</Class>
-</ObjectStream>
-

+ 2 - 2
UICanvases/UiFx/PlayerHitFlash.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f7640e154255ee76594b92a4b90f387e9b08d64024c26d16a4040ca755198af7
-size 420248
+oid sha256:bf56fc2d21c5d4b137c8613f3080825ee4c8af16231c55b74b1cb6d5f5cbb8b1
+size 780678

+ 9 - 10
libs/gameaudio/wwise/Wwise_IDs.h

@@ -17,11 +17,8 @@ namespace AK
         static const AkUniqueID GET_FOCUS = 4280413250U;
         static const AkUniqueID LOSE_FOCUS = 3350149075U;
         static const AkUniqueID MUTE_ALL = 1739713018U;
-        static const AkUniqueID PLAY_GEM_PICKUP = 854025974U;
-        static const AkUniqueID PLAY_LASER_GUN_IMPACT = 2978351713U;
-        static const AkUniqueID PLAY_ROUND_BEGIN = 1345793836U;
-        static const AkUniqueID PLAY_ROUND_END = 1932934032U;
-        static const AkUniqueID PLAY_SOUND_GUN_FIRING = 850206754U;
+        static const AkUniqueID PLAY_SX_AMB_EXT_GENERAL = 1593597659U;
+        static const AkUniqueID PLAY_SX_ENV_LAMP_LOOP = 1589077493U;
         static const AkUniqueID PLAY_SX_INT_ENERGYBALLTRAP_BUILDUP = 1394544692U;
         static const AkUniqueID PLAY_SX_INT_ENERGYBALLTRAP_IMPACT = 3130133043U;
         static const AkUniqueID PLAY_SX_INT_ENERGYBALLTRAP_ONCOOLDOWN = 2009335613U;
@@ -33,6 +30,8 @@ namespace AK
         static const AkUniqueID PLAY_SX_INT_MALFUNCTIONINGSHIELDGENERATOR_BUILDUP = 4040956934U;
         static const AkUniqueID PLAY_SX_INT_MALFUNCTIONINGSHIELDGENERATOR_EXPLO = 3532523743U;
         static const AkUniqueID PLAY_SX_INT_MALFUNCTIONINGSHIELDGENERATOR_IDLE = 3971492149U;
+        static const AkUniqueID PLAY_SX_INT_TELEPORTER_ACTIVATE = 2479494560U;
+        static const AkUniqueID PLAY_SX_INT_TELEPORTER_IDLE = 2491323057U;
         static const AkUniqueID PLAY_SX_PLAYER_ARMOR_BREAKING = 2969244755U;
         static const AkUniqueID PLAY_SX_PLAYER_ARMOR_MEND = 4115785916U;
         static const AkUniqueID PLAY_SX_PLAYER_EXERTION = 1387321888U;
@@ -56,13 +55,11 @@ namespace AK
         static const AkUniqueID PLAY_SX_WPN_BUBBLEGUN_READY = 2608530362U;
         static const AkUniqueID PLAY_SX_WPN_LASERPISTOL_FIRE = 2665115109U;
         static const AkUniqueID PLAY_SX_WPN_LASERPISTOL_IMPACT = 172245811U;
-        static const AkUniqueID STOP_GEM_PICKUP = 1367930484U;
-        static const AkUniqueID STOP_LASER_GUN_IMPACT = 452471019U;
-        static const AkUniqueID STOP_ROUND_BEGIN = 3173054466U;
-        static const AkUniqueID STOP_ROUND_END = 1822575350U;
-        static const AkUniqueID STOP_SOUND_GUN_FIRING = 1390826636U;
+        static const AkUniqueID STOP_SX_AMB_EXT_GENERAL = 802626345U;
+        static const AkUniqueID STOP_SX_ENV_LAMP_LOOP = 860941867U;
         static const AkUniqueID STOP_SX_INT_ENERGYBALLTRAP_PROJECTILE = 2825372966U;
         static const AkUniqueID STOP_SX_INT_MALFUNCTIONINGSHIELDGENERATOR_IDLE = 1399787879U;
+        static const AkUniqueID STOP_SX_INT_TELEPORTER_IDLE = 1815794527U;
         static const AkUniqueID STOP_SX_WPN_BUBBLEGUN_PROJECTILE = 3507985354U;
         static const AkUniqueID UNMUTE_ALL = 4003578643U;
     } // namespace EVENTS
@@ -93,9 +90,11 @@ namespace AK
         static const AkUniqueID DISTANCE_1000 = 2385509740U;
         static const AkUniqueID DISTANCE_10000 = 1099690292U;
         static const AkUniqueID ELEVATION = 2141048674U;
+        static const AkUniqueID HEALTH = 3677180323U;
         static const AkUniqueID OBSTRUCTION = 4251783213U;
         static const AkUniqueID OCCLUSION = 183903552U;
         static const AkUniqueID TRANSMISSIONLOSS = 2536503308U;
+        static const AkUniqueID VELOCITY = 3519441192U;
         static const AkUniqueID VOLUME_MASTER = 3695994288U;
         static const AkUniqueID VOLUME_MUSIC = 3891337659U;
         static const AkUniqueID VOLUME_SFX = 3673881719U;

+ 57 - 30
libs/gameaudio/wwise/multiplayersample_controls.xml

@@ -1,5 +1,47 @@
 <ATLConfig atl_name="multiplayersample_controls">
 	<AudioTriggers>
+		<ATLTrigger atl_name="Stop_Gem_Pickup" path="z_placeholders">
+			<WwiseEvent wwise_name="Stop_Gem_Pickup"/>
+		</ATLTrigger>
+		<ATLTrigger atl_name="Play_Gem_Pickup" path="z_placeholders">
+			<WwiseEvent wwise_name="Play_Gem_Pickup"/>
+		</ATLTrigger>
+		<ATLTrigger atl_name="Stop_Laser_Gun_Impact" path="z_placeholders">
+			<WwiseEvent wwise_name="Stop_Laser_Gun_Impact"/>
+		</ATLTrigger>
+		<ATLTrigger atl_name="Play_Laser_Gun_Impact" path="z_placeholders">
+			<WwiseEvent wwise_name="Play_Laser_Gun_Impact"/>
+		</ATLTrigger>
+		<ATLTrigger atl_name="Stop_Round_End" path="z_placeholders">
+			<WwiseEvent wwise_name="Stop_Round_End"/>
+		</ATLTrigger>
+		<ATLTrigger atl_name="Stop_Round_Begin" path="z_placeholders">
+			<WwiseEvent wwise_name="Stop_Round_Begin"/>
+		</ATLTrigger>
+		<ATLTrigger atl_name="Play_Round_End" path="z_placeholders">
+			<WwiseEvent wwise_name="Play_Round_End"/>
+		</ATLTrigger>
+		<ATLTrigger atl_name="Play_Round_Begin" path="z_placeholders">
+			<WwiseEvent wwise_name="Play_Round_Begin"/>
+		</ATLTrigger>
+		<ATLTrigger atl_name="Stop_Sound_Gun_Firing" path="z_placeholders">
+			<WwiseEvent wwise_name="Stop_Sound_Gun_Firing"/>
+		</ATLTrigger>
+		<ATLTrigger atl_name="Play_Sound_Gun_Firing" path="z_placeholders">
+			<WwiseEvent wwise_name="Play_Sound_Gun_Firing"/>
+		</ATLTrigger>
+		<ATLTrigger atl_name="stop_sx_env_lamp_loop" path="Events/SX/LVL">
+			<WwiseEvent wwise_name="stop_sx_env_lamp_loop"/>
+		</ATLTrigger>
+		<ATLTrigger atl_name="stop_sx_amb_ext_general" path="Events/SX/LVL">
+			<WwiseEvent wwise_name="stop_sx_amb_ext_general"/>
+		</ATLTrigger>
+		<ATLTrigger atl_name="play_sx_env_lamp_loop" path="Events/SX/LVL">
+			<WwiseEvent wwise_name="play_sx_env_lamp_loop"/>
+		</ATLTrigger>
+		<ATLTrigger atl_name="play_sx_amb_ext_general" path="Events/SX/LVL">
+			<WwiseEvent wwise_name="play_sx_amb_ext_general"/>
+		</ATLTrigger>
 		<ATLTrigger atl_name="play_sx_player_pain" path="Events/SX/PLAYER">
 			<WwiseEvent wwise_name="play_sx_player_pain"/>
 		</ATLTrigger>
@@ -72,6 +114,15 @@
 		<ATLTrigger atl_name="play_sx_wpn_laserpistol_fire" path="Events/SX/WPN/laserPistol">
 			<WwiseEvent wwise_name="play_sx_wpn_laserpistol_fire"/>
 		</ATLTrigger>
+		<ATLTrigger atl_name="stop_sx_int_teleporter_idle" path="Events/SX/INT/teleporter">
+			<WwiseEvent wwise_name="stop_sx_int_teleporter_idle"/>
+		</ATLTrigger>
+		<ATLTrigger atl_name="play_sx_int_teleporter_idle" path="Events/SX/INT/teleporter">
+			<WwiseEvent wwise_name="play_sx_int_teleporter_idle"/>
+		</ATLTrigger>
+		<ATLTrigger atl_name="play_sx_int_teleporter_activate" path="Events/SX/INT/teleporter">
+			<WwiseEvent wwise_name="play_sx_int_teleporter_activate"/>
+		</ATLTrigger>
 		<ATLTrigger atl_name="play_sx_int_malfunctioningshieldgenerator_idle" path="Events/SX/INT/shieldGenerator">
 			<WwiseEvent wwise_name="play_sx_int_malfunctioningshieldgenerator_idle"/>
 		</ATLTrigger>
@@ -111,38 +162,14 @@
 		<ATLTrigger atl_name="play_sx_int_energyballtrap_buildup" path="Events/SX/INT/energyballTrap">
 			<WwiseEvent wwise_name="play_sx_int_energyballtrap_buildup"/>
 		</ATLTrigger>
-		<ATLTrigger atl_name="Stop_Gem_Pickup">
-			<WwiseEvent wwise_name="Stop_Gem_Pickup"/>
-		</ATLTrigger>
-		<ATLTrigger atl_name="Play_Gem_Pickup">
-			<WwiseEvent wwise_name="Play_Gem_Pickup"/>
-		</ATLTrigger>
-		<ATLTrigger atl_name="Stop_Laser_Gun_Impact">
-			<WwiseEvent wwise_name="Stop_Laser_Gun_Impact"/>
-		</ATLTrigger>
-		<ATLTrigger atl_name="Play_Laser_Gun_Impact">
-			<WwiseEvent wwise_name="Play_Laser_Gun_Impact"/>
-		</ATLTrigger>
-		<ATLTrigger atl_name="Stop_Round_End">
-			<WwiseEvent wwise_name="Stop_Round_End"/>
-		</ATLTrigger>
-		<ATLTrigger atl_name="Stop_Round_Begin">
-			<WwiseEvent wwise_name="Stop_Round_Begin"/>
-		</ATLTrigger>
-		<ATLTrigger atl_name="Play_Round_End">
-			<WwiseEvent wwise_name="Play_Round_End"/>
-		</ATLTrigger>
-		<ATLTrigger atl_name="Play_Round_Begin">
-			<WwiseEvent wwise_name="Play_Round_Begin"/>
-		</ATLTrigger>
-		<ATLTrigger atl_name="Stop_Sound_Gun_Firing">
-			<WwiseEvent wwise_name="Stop_Sound_Gun_Firing"/>
-		</ATLTrigger>
-		<ATLTrigger atl_name="Play_Sound_Gun_Firing">
-			<WwiseEvent wwise_name="Play_Sound_Gun_Firing"/>
-		</ATLTrigger>
 	</AudioTriggers>
 	<AudioRtpcs>
+		<ATLRtpc atl_name="Velocity" path="GameSyncs/RTPCs/Physics">
+			<WwiseRtpc wwise_name="Velocity"/>
+		</ATLRtpc>
+		<ATLRtpc atl_name="Health" path="GameSyncs/RTPCs/Gameplay">
+			<WwiseRtpc wwise_name="Health"/>
+		</ATLRtpc>
 		<ATLRtpc atl_name="Volume_SFX" path="GameSyncs/RTPCs/VolumeSettings">
 			<WwiseRtpc wwise_name="Volume_SFX"/>
 		</ATLRtpc>

Vissa filer visades inte eftersom för många filer har ändrats