Merge remote-tracking branch 'upstream/stabilization/2305' into stabilization/audio

Gem/Code/Include/DecalBus.h

@@ -19,6 +19,8 @@ namespace MultiplayerSample
         AZ_RTTI(MultiplayerSample::SpawnDecalConfig, "{FC3DA616-174B-48FD-9BFB-BC277132FB47}");
         inline static void Reflect(AZ::ReflectContext* context);
 
+        virtual ~SpawnDecalConfig() = default;
+
         AZ::Data::AssetId m_materialAssetId; // Asset Id of the material.
         float m_scale = 1.0f;                // Scale in meters.
         float m_opacity = 1.0f;              // How visible the decal is.

Gem/Code/Source/Components/Multiplayer/GemSpawnerComponent.cpp

@@ -185,7 +185,7 @@ namespace MultiplayerSample
 
     AZStd::optional<const GemSpawnable> GemSpawnerComponentController::GetGemSpawnable(AZ::Crc32 gemTag) const
     {
-        for (const GemSpawnable gemType : GetParent().GetGemSpawnables())
+        for (const GemSpawnable& gemType : GetParent().GetGemSpawnables())
         {
             if (gemTag == AZ::Crc32(gemType.m_tag.c_str()))
             {

Gem/Code/Source/Components/NetworkMatchComponent.cpp

@@ -364,7 +364,7 @@ namespace MultiplayerSample
             });
 
         AZStd::string prettyPrintMatchResults = "";
-        prettyPrintMatchResults += AZStd::string::format("Match Results (%u players)\n", results.m_playerStates.size());
+        prettyPrintMatchResults += AZStd::string::format("Match Results (%lu 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);

Levels/NewStarbase/NewStarbase.prefab

@@ -94,6 +94,13 @@
                 "$type": "EditorDisabledCompositionComponent",
                 "Id": 16239496886950819870
             },
+            "Component_[16520239860090643580]": {
+                "$type": "GenericComponentWrapper",
+                "Id": 16520239860090643580,
+                "m_template": {
+                    "$type": "MultiplayerSample::ScriptableDecalComponent"
+                }
+            },
             "Component_[17471965783633674556]": {
                 "$type": "AZ::Render::RenderDebugEditorComponent",
                 "Id": 17471965783633674556
@@ -11160,7 +11167,8 @@
                         "Entity_[60296164746127]",
                         "Entity_[60309049648015]",
                         "Entity_[102544484832835]",
-                        "Entity_[2310094587453688]"
+                        "Entity_[2310094587453688]",
+                        "Entity_[689364352119803]"
                     ]
                 },
                 "Component_[9277695270015777859]": {
@@ -11557,6 +11565,71 @@
                 }
             }
         },
+        "Entity_[689364352119803]": {
+            "Id": "Entity_[689364352119803]",
+            "Name": "AmbientAudio",
+            "Components": {
+                "Component_[1109165014613855942]": {
+                    "$type": "GenericComponentWrapper",
+                    "Id": 1109165014613855942,
+                    "m_template": {
+                        "$type": "AudioProxyComponent"
+                    }
+                },
+                "Component_[12437199707940482581]": {
+                    "$type": "EditorVisibilityComponent",
+                    "Id": 12437199707940482581
+                },
+                "Component_[13145606173679161518]": {
+                    "$type": "EditorDisabledCompositionComponent",
+                    "Id": 13145606173679161518
+                },
+                "Component_[14774980749977237053]": {
+                    "$type": "EditorEntitySortComponent",
+                    "Id": 14774980749977237053
+                },
+                "Component_[17049943556665966323]": {
+                    "$type": "EditorEntityIconComponent",
+                    "Id": 17049943556665966323
+                },
+                "Component_[1792864520108972294]": {
+                    "$type": "EditorOnlyEntityComponent",
+                    "Id": 1792864520108972294
+                },
+                "Component_[1980429043338195521]": {
+                    "$type": "EditorAudioTriggerComponent",
+                    "Id": 1980429043338195521,
+                    "Play Trigger": {
+                        "controlName": "play_sx_amb_ext_general"
+                    },
+                    "Stop Trigger": {
+                        "controlName": "stop_sx_amb_ext_general"
+                    },
+                    "Plays Immediately": true
+                },
+                "Component_[2050855293059692604]": {
+                    "$type": "EditorInspectorComponent",
+                    "Id": 2050855293059692604
+                },
+                "Component_[4567703689688181026]": {
+                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+                    "Id": 4567703689688181026,
+                    "Parent Entity": "Entity_[60274689909647]"
+                },
+                "Component_[5334430927586120432]": {
+                    "$type": "EditorLockComponent",
+                    "Id": 5334430927586120432
+                },
+                "Component_[612576140938853376]": {
+                    "$type": "EditorPendingCompositionComponent",
+                    "Id": 612576140938853376
+                },
+                "Component_[9778753844251016872]": {
+                    "$type": "EditorBoxShapeComponent",
+                    "Id": 9778753844251016872
+                }
+            }
+        },
         "Entity_[7305267682447715]": {
             "Id": "Entity_[7305267682447715]",
             "Name": "New_Placement_3",
@@ -18411,38 +18484,38 @@
             "Patches": [
                 {
                     "op": "replace",
-                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[39629120857318069]/configuration/propertyOverrides/overrides/0/Datum/value/0",
-                    "value": 25.0
+                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Parent Entity",
+                    "value": "../Entity_[86126098064271]"
                 },
                 {
                     "op": "replace",
-                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[39629120857318069]/configuration/propertyOverrides/overrides/0/Datum/value/1",
-                    "value": 3.0
+                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Transform Data/Translate/0",
+                    "value": 2.6800479888916016
                 },
                 {
                     "op": "replace",
-                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[39629120857318069]/configuration/propertyOverrides/overrides/0/Datum/value/2",
-                    "value": 55.0
+                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Transform Data/Translate/1",
+                    "value": -55.9681282043457
                 },
                 {
                     "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Parent Entity",
-                    "value": "../Entity_[86126098064271]"
+                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Transform Data/Translate/2",
+                    "value": 1.6371240615844729
                 },
                 {
                     "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Transform Data/Translate/0",
-                    "value": 2.6800479888916016
+                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[39629120857318069]/configuration/propertyOverrides/overrides/0/Datum/value/0",
+                    "value": 25.0
                 },
                 {
                     "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Transform Data/Translate/1",
-                    "value": -55.9681282043457
+                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[39629120857318069]/configuration/propertyOverrides/overrides/0/Datum/value/1",
+                    "value": 3.0
                 },
                 {
                     "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Transform Data/Translate/2",
-                    "value": 1.6371240615844729
+                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[39629120857318069]/configuration/propertyOverrides/overrides/0/Datum/value/2",
+                    "value": 55.0
                 }
             ]
         },
@@ -19208,26 +19281,6 @@
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[16896350622714100755]/Transform Data/Rotate/2",
                     "value": -90.00000762939453
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/0",
-                    "value": -1.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/1",
-                    "value": 0.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/2",
-                    "value": 1.100000023841858
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[656261840212]/Components/Component_[16569145727191893785]/m_template/HitEffect/HitMagnitude",
-                    "value": 25.0
                 }
             ]
         },
@@ -20799,21 +20852,6 @@
         "Instance_[195069310473740]": {
             "Source": "Prefabs/Energy_Cannon_with_Energy_Ball.prefab",
             "Patches": [
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/0",
-                    "value": -1.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/1",
-                    "value": 0.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/2",
-                    "value": 1.100000023841858
-                },
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[16896350622714100755]/Parent Entity",
@@ -20868,21 +20906,6 @@
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[16896350622714100755]/Transform Data/Rotate/2",
                     "value": 84.67543029785156
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/0",
-                    "value": 1.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/1",
-                    "value": 0.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/2",
-                    "value": 1.100000023841858
                 }
             ]
         },
@@ -20913,16 +20936,6 @@
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[16896350622714100755]/Transform Data/Rotate/2",
                     "value": -179.99989318847656
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/1",
-                    "value": 1.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/2",
-                    "value": 1.100000023841858
                 }
             ]
         },
@@ -20953,21 +20966,6 @@
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[16896350622714100755]/Transform Data/Rotate/2",
                     "value": -90.00000762939453
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/0",
-                    "value": -1.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/1",
-                    "value": 0.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/2",
-                    "value": 1.100000023841858
                 }
             ]
         },
@@ -28961,43 +28959,43 @@
             "Patches": [
                 {
                     "op": "replace",
-                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[39629120857318069]/configuration/propertyOverrides/overrides/0/Datum/value/0",
-                    "value": 20.0
+                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Parent Entity",
+                    "value": "../Entity_[86126098064271]"
                 },
                 {
                     "op": "replace",
-                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[39629120857318069]/configuration/propertyOverrides/overrides/0/Datum/value/2",
-                    "value": 40.0
+                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Transform Data/Translate/0",
+                    "value": 38.52667236328125
                 },
                 {
                     "op": "replace",
-                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[4578986180761630609]/Transform Data/Translate/0",
-                    "value": -20.31949234008789
+                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Transform Data/Translate/1",
+                    "value": -14.429194450378418
                 },
                 {
                     "op": "replace",
-                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[4578986180761630609]/Transform Data/Translate/1",
-                    "value": 10.067258834838867
+                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Transform Data/Translate/2",
+                    "value": -2.6081390380859375
                 },
                 {
                     "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Parent Entity",
-                    "value": "../Entity_[86126098064271]"
+                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[39629120857318069]/configuration/propertyOverrides/overrides/0/Datum/value/0",
+                    "value": 20.0
                 },
                 {
                     "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Transform Data/Translate/0",
-                    "value": 38.52667236328125
+                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[39629120857318069]/configuration/propertyOverrides/overrides/0/Datum/value/2",
+                    "value": 40.0
                 },
                 {
                     "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Transform Data/Translate/1",
-                    "value": -14.429194450378418
+                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[4578986180761630609]/Transform Data/Translate/0",
+                    "value": -20.31949234008789
                 },
                 {
                     "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Transform Data/Translate/2",
-                    "value": -2.6081390380859375
+                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[4578986180761630609]/Transform Data/Translate/1",
+                    "value": 10.067258834838867
                 }
             ]
         },
@@ -35214,31 +35212,6 @@
         "Instance_[436387970701411]": {
             "Source": "Prefabs/Energy_Cannon_with_Energy_Ball.prefab",
             "Patches": [
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[656261840212]/Components/Component_[16569145727191893785]/m_template/ExplosionEffect/EffectOffset/0",
-                    "value": 1.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[656261840212]/Components/Component_[16569145727191893785]/m_template/ExplosionEffect/EffectOffset/2",
-                    "value": 1.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/0",
-                    "value": 1.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/1",
-                    "value": 0.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/2",
-                    "value": 1.100000023841858
-                },
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[16896350622714100755]/Parent Entity",
@@ -42629,16 +42602,6 @@
                     "path": "/ContainerEntity/Components/Component_[10406703446304744333]/Transform Data/Translate/2",
                     "value": -2.6080894470214844
                 },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[10277696138249967250]/AttributeList/AttributesRawData",
-                    "value": "mpmZPwAAAAAAAAAAAAAAAAAAAAAAAIA/GFRAPgAAgD//AAAA/wAAAP8AAAD/AAAAAACAPwAAAAAAAAAAAAAAAAAAoEAAAAAAAAAAAAAAAAAAAIA/AAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAA=="
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[1104171344821059]/Components/Component_[10277696138249967250]/EditorAttributeList/AttributeCategories/3/Attributes/0/ValueBX",
-                    "value": true
-                },
                 {
                     "op": "replace",
                     "path": "/Entities/Entity_[1104171344821059]/Components/Component_[39629120857318069]/configuration/propertyOverrides/overrides/0/Datum/value/0",
@@ -46863,16 +46826,6 @@
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[16896350622714100755]/Transform Data/Rotate/2",
                     "value": -179.99989318847656
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/1",
-                    "value": 1.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/2",
-                    "value": 1.100000023841858
                 }
             ]
         },
@@ -46903,21 +46856,6 @@
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[16896350622714100755]/Transform Data/Rotate/2",
                     "value": 1.5932101011276243
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/BallLifetimeMs",
-                    "value": 5000
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/1",
-                    "value": -1.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/2",
-                    "value": 1.100000023841858
                 }
             ]
         },
@@ -46948,37 +46886,6 @@
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[16896350622714100755]/Transform Data/Rotate/2",
                     "value": -90.00000762939453
-                },
-                {
-                    "op": "add",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[13923402908884303580]",
-                    "value": {
-                        "$type": "GenericComponentWrapper",
-                        "Id": 13923402908884303580,
-                        "m_template": {
-                            "$type": "MultiplayerSample::EnergyCannonComponent",
-                            "Id": 0,
-                            "RateOfFireMs": 4000,
-                            "BallLifetimeMs": 3800,
-                            "FiringEffect": {
-                                "ParticleAsset": {
-                                    "guid": "{F16C718B-7B3D-5F6B-877C-0CA15AAE7544}",
-                                    "subId": 0
-                                },
-                                "AudioTrigger": "play_sx_int_energyballtrap_buildup",
-                                "EffectOffset": [
-                                    -1.0,
-                                    0.0,
-                                    1.100000023841858
-                                ]
-                            },
-                            "EnergyBallEntity": "../Instance_[195069310473740]/Entity_[656261840212]"
-                        }
-                    }
-                },
-                {
-                    "op": "remove",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]"
                 }
             ]
         },
@@ -47009,21 +46916,6 @@
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[16896350622714100755]/Transform Data/Rotate/2",
                     "value": 89.99994659423828
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/0",
-                    "value": 1.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/1",
-                    "value": 0.0
-                },
-                {
-                    "op": "replace",
-                    "path": "/Entities/Entity_[660556807508]/Components/Component_[15034031694382477776]/m_template/FiringEffect/EffectOffset/2",
-                    "value": 1.100000023841858
                 }
             ]
         },

Materials/decal/scorch_01/scorch_01_decal_02_basecolorA.tif

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

Materials/decal/scorch_01/scorch_01_decal_02_normal.png

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

Materials/decal/scorch_01/scorch_01_decal_02_opacity.png

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

Materials/decal/scorch_01_decal.material

@@ -2,15 +2,14 @@
     "materialType": "@gemroot:Atom_Feature_Common@/Assets/Materials/Types/StandardPBR.materialtype",
     "materialTypeVersion": 5,
     "propertyValues": {
-        "baseColor.textureMap": "scorch_01_decal.tif",
-        "general.doubleSided": true,
-        "opacity.alphaSource": "Split",
-        "opacity.factor": 0.6899999976158142,
-        "opacity.mode": "Cutout",
-        "opacity.textureMap": "scorch_01_decal.tif",
-        "uv.center": [
-            0.0,
-            1.0
-        ]
+        "baseColor.textureBlendMode": "Lerp",
+        "baseColor.textureMap": "scorch_01/scorch_01_decal_02_basecolorA.tif",
+        "irradiance.irradianceColorSource": "BaseColor",
+        "normal.factor": 2.0,
+        "normal.textureMap": "scorch_01/scorch_01_decal_02_normal.png",
+        "opacity.alphaAffectsSpecular": 1.0,
+        "opacity.factor": 1.0,
+        "opacity.mode": "Blended",
+        "opacity.textureMap": "scorch_01/scorch_01_decal_02_opacity.png"
     }
 }

Prefabs/Energy_Cannon_with_Energy_Ball.prefab

@@ -230,6 +230,9 @@
                                         "isNullPointer": false,
                                         "$type": "MultiplayerSample::SpawnDecalConfig",
                                         "value": {
+                                            "MaterialAssetId": {
+                                                "guid": "{FD203077-616F-53C5-9553-660CCB88DB7B}"
+                                            },
                                             "Scale": 2.0,
                                             "Opacity": 0.800000011920929,
                                             "LifeTimeSec": 8.0,

Prefabs/GamePlay_Effects.prefab

@@ -138,7 +138,7 @@
                         "PlayerExertion": "play_sx_player_exertion",
                         "PlayerKnockedDown": "play_sx_player_knockdown",
                         "ArmorBreaking": "play_sx_player_armor_breaking",
-                        "ArmorMend": "play_sx_player_armor_mend",
+                        "ArmorMend": "",
                         "PlayerOuch": "play_sx_player_pain",
                         "CountDown": "play_sx_ui_game_countdown",
                         "GemPickup": "play_sx_int_gem_pickup",