Explorar el Código

Fixes from merge

Signed-off-by: Ken Pruiksma <[email protected]>
Ken Pruiksma hace 2 años
padre
commit
8ae2f1644f

+ 1 - 1
Gem/Code/Include/DecalBus.h

@@ -61,7 +61,7 @@ namespace MultiplayerSample
                     ->DataElement(AZ::Edit::UIHandlers::Slider, &SpawnDecalConfig::m_opacity, "Opacity", "The opacity of the decal.")
                         ->Attribute(AZ::Edit::Attributes::Min, 0.0f)
                         ->Attribute(AZ::Edit::Attributes::Max, 1.0f)
-                    ->DataElement(AZ::Edit::UIHandlers::Slider, &SpawnDecalConfig::m_attenutationAngle, "Angle attenuation", "How much to attenuate the opacity of the decal based on the different in the angle between the decal and the surface.")
+                    ->DataElement(AZ::Edit::UIHandlers::Slider, &SpawnDecalConfig::m_attenuationAngle, "Angle attenuation", "How much to attenuate the opacity of the decal based on the different in the angle between the decal and the surface.")
                         ->Attribute(AZ::Edit::Attributes::Min, 0.0f)
                         ->Attribute(AZ::Edit::Attributes::Max, 1.0f)
                     ->DataElement(AZ::Edit::UIHandlers::Default, &SpawnDecalConfig::m_lifeTimeSec, "Life time", "Length of time the decal lives between fading in and out, in seconds")

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

@@ -105,7 +105,7 @@ namespace MultiplayerSample
 
         // Check for bad state.
         if (config.m_scale <= 0.0f || !config.m_materialAssetId.IsValid() || config.m_opacity <= 0.0f ||
-            (config.m_fadeInTime + config.m_lifeTime + config.m_fadeOutTime <= 0.0f))
+            (config.m_fadeInTimeSec + config.m_lifeTimeSec + config.m_fadeOutTimeSec <= 0.0f))
         {
             return;
         }

+ 1 - 1
Prefabs/Player.prefab

@@ -280,7 +280,7 @@
                                             },
                                             "Scale": 0.25,
                                             "LifeTimeSec": 12.0,
-                                            "FadeOutTimeSec": 4.0
+                                            "FadeOutTimeSec": 4.0,
                                             "Thickness": 0.10000000149011612
                                         }
                                     },

+ 181 - 190
scriptcanvas/WeaponImpactDecal.scriptcanvas

@@ -5,7 +5,7 @@
     "ClassData": {
         "m_scriptCanvas": {
             "Id": {
-                "id": 98275852222777
+                "id": 18141335447636
             },
             "Name": "Script Canvas Graph",
             "Components": {
@@ -45,7 +45,7 @@
                         "m_nodes": [
                             {
                                 "Id": {
-                                    "id": 98297327059257
+                                    "id": 18167105251412
                                 },
                                 "Name": "SC-Node(EqualTo)",
                                 "Components": {
@@ -198,17 +198,17 @@
                             },
                             {
                                 "Id": {
-                                    "id": 98293032091961
+                                    "id": 37241055012948
                                 },
                                 "Name": "SC-Node(SpawnDecal)",
                                 "Components": {
-                                    "Component_[16033158792265912827]": {
+                                    "Component_[13279494901284247922]": {
                                         "$type": "{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF} Method",
-                                        "Id": 16033158792265912827,
+                                        "Id": 13279494901284247922,
                                         "Slots": [
                                             {
                                                 "id": {
-                                                    "m_id": "{59C348BC-EED5-4C24-BB16-347FA01B3E23}"
+                                                    "m_id": "{135E833B-6553-448D-B2CD-2DA65BD4F36D}"
                                                 },
                                                 "contracts": [
                                                     {
@@ -224,7 +224,7 @@
                                             },
                                             {
                                                 "id": {
-                                                    "m_id": "{64A0FE07-2914-4C74-8D28-550C434F04C6}"
+                                                    "m_id": "{F861D814-26B3-48FB-BDD0-BAD7021B70B6}"
                                                 },
                                                 "contracts": [
                                                     {
@@ -240,14 +240,14 @@
                                             },
                                             {
                                                 "id": {
-                                                    "m_id": "{515D66E9-99CF-4A7D-B411-1AB25387D2E1}"
+                                                    "m_id": "{BE735B23-FB8F-4BF6-B7E4-4EDE6355CA14}"
                                                 },
                                                 "contracts": [
                                                     {
                                                         "$type": "SlotTypeContract"
                                                     }
                                                 ],
-                                                "slotName": "AssetId: 2",
+                                                "slotName": "SpawnDecalConfig: 2",
                                                 "Descriptor": {
                                                     "ConnectionType": 1,
                                                     "SlotType": 2
@@ -256,23 +256,7 @@
                                             },
                                             {
                                                 "id": {
-                                                    "m_id": "{2EBD4606-D04F-41CB-9F14-56993DE185BF}"
-                                                },
-                                                "contracts": [
-                                                    {
-                                                        "$type": "SlotTypeContract"
-                                                    }
-                                                ],
-                                                "slotName": "SpawnDecalConfig: 3",
-                                                "Descriptor": {
-                                                    "ConnectionType": 1,
-                                                    "SlotType": 2
-                                                },
-                                                "DataType": 1
-                                            },
-                                            {
-                                                "id": {
-                                                    "m_id": "{01B97E7D-CD67-407C-BF02-DA7EA6DCEC66}"
+                                                    "m_id": "{EA69C101-8368-40B2-9B0C-A34DB730A4C3}"
                                                 },
                                                 "contracts": [
                                                     {
@@ -287,7 +271,7 @@
                                             },
                                             {
                                                 "id": {
-                                                    "m_id": "{7C540E6C-2F37-4C96-81B9-73F8C648648C}"
+                                                    "m_id": "{ACD63D64-8142-47B7-A094-89A148339725}"
                                                 },
                                                 "contracts": [
                                                     {
@@ -308,9 +292,7 @@
                                                     "m_type": 4,
                                                     "m_azType": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"
                                                 },
-                                                "isNullPointer": false,
-                                                "$type": "AZ::Uuid",
-                                                "value": "{00000000-0000-0000-0000-000000000000}",
+                                                "isNullPointer": true,
                                                 "label": "Source"
                                             },
                                             {
@@ -336,47 +318,28 @@
                                                 },
                                                 "label": "Transform: 1"
                                             },
-                                            {
-                                                "isOverloadedStorage": false,
-                                                "scriptCanvasType": {
-                                                    "m_type": 19
-                                                },
-                                                "isNullPointer": false,
-                                                "$type": "AssetId",
-                                                "value": {
-                                                    "guid": "{FD203077-616F-53C5-9553-660CCB88DB7B}"
-                                                },
-                                                "label": "AssetId: 2"
-                                            },
                                             {
                                                 "isOverloadedStorage": false,
                                                 "scriptCanvasType": {
                                                     "m_type": 4,
                                                     "m_azType": "{FC3DA616-174B-48FD-9BFB-BC277132FB47}"
                                                 },
-                                                "isNullPointer": false,
-                                                "$type": "MultiplayerSample::SpawnDecalConfig",
-                                                "label": "SpawnDecalConfig: 3"
+                                                "isNullPointer": true,
+                                                "label": "SpawnDecalConfig: 2"
                                             }
                                         ],
                                         "methodType": 0,
                                         "methodName": "SpawnDecal",
                                         "className": "RequestBus",
-                                        "resultSlotIDs": [
-                                            {}
-                                        ],
                                         "inputSlots": [
                                             {
-                                                "m_id": "{59C348BC-EED5-4C24-BB16-347FA01B3E23}"
+                                                "m_id": "{135E833B-6553-448D-B2CD-2DA65BD4F36D}"
                                             },
                                             {
-                                                "m_id": "{64A0FE07-2914-4C74-8D28-550C434F04C6}"
+                                                "m_id": "{F861D814-26B3-48FB-BDD0-BAD7021B70B6}"
                                             },
                                             {
-                                                "m_id": "{515D66E9-99CF-4A7D-B411-1AB25387D2E1}"
-                                            },
-                                            {
-                                                "m_id": "{2EBD4606-D04F-41CB-9F14-56993DE185BF}"
+                                                "m_id": "{BE735B23-FB8F-4BF6-B7E4-4EDE6355CA14}"
                                             }
                                         ],
                                         "prettyClassName": "RequestBus"
@@ -385,7 +348,7 @@
                             },
                             {
                                 "Id": {
-                                    "id": 98288737124665
+                                    "id": 18158515316820
                                 },
                                 "Name": "EBusEventHandler",
                                 "Components": {
@@ -837,7 +800,7 @@
                             },
                             {
                                 "Id": {
-                                    "id": 98284442157369
+                                    "id": 18154220349524
                                 },
                                 "Name": "SC-Node(IfAgentTypeNodeableNode)",
                                 "Components": {
@@ -981,7 +944,7 @@
                             },
                             {
                                 "Id": {
-                                    "id": 98280147190073
+                                    "id": 18149925382228
                                 },
                                 "Name": "SC-Node(GetRenderSceneIdByName)",
                                 "Components": {
@@ -1084,17 +1047,17 @@
                             },
                             {
                                 "Id": {
-                                    "id": 98301622026553
+                                    "id": 24884434102356
                                 },
                                 "Name": "SC Node(GetVariable)",
                                 "Components": {
-                                    "Component_[6229210135518624657]": {
+                                    "Component_[6670285999244204522]": {
                                         "$type": "GetVariableNode",
-                                        "Id": 6229210135518624657,
+                                        "Id": 6670285999244204522,
                                         "Slots": [
                                             {
                                                 "id": {
-                                                    "m_id": "{FF2E3C4E-3E61-4F71-94F1-2087DAED27D1}"
+                                                    "m_id": "{60585556-6BC1-492F-9749-C6F25DBDDEEC}"
                                                 },
                                                 "contracts": [
                                                     {
@@ -1110,7 +1073,7 @@
                                             },
                                             {
                                                 "id": {
-                                                    "m_id": "{83BC9588-F739-43C3-A761-6E0CA3955467}"
+                                                    "m_id": "{2F3873D7-93E9-4C89-8BE6-73B9C1990B1E}"
                                                 },
                                                 "contracts": [
                                                     {
@@ -1126,7 +1089,7 @@
                                             },
                                             {
                                                 "id": {
-                                                    "m_id": "{8D526034-7D53-4669-9E31-49AE49A81482}"
+                                                    "m_id": "{54F886F9-C840-46D2-8F9B-5E33705FC6ED}"
                                                 },
                                                 "contracts": [
                                                     {
@@ -1146,14 +1109,33 @@
                                             },
                                             {
                                                 "id": {
-                                                    "m_id": "{789E41E2-A09A-4F2F-A1BA-313E0DEB3B26}"
+                                                    "m_id": "{8159607F-B21B-4962-8735-531A83338480}"
                                                 },
                                                 "contracts": [
                                                     {
                                                         "$type": "SlotTypeContract"
                                                     }
                                                 ],
-                                                "slotName": "scale",
+                                                "slotName": "material",
+                                                "DisplayDataType": {
+                                                    "m_type": 19
+                                                },
+                                                "Descriptor": {
+                                                    "ConnectionType": 2,
+                                                    "SlotType": 2
+                                                },
+                                                "DataType": 1
+                                            },
+                                            {
+                                                "id": {
+                                                    "m_id": "{7E58A1D5-46BE-462A-9C50-8EA0807A8728}"
+                                                },
+                                                "contracts": [
+                                                    {
+                                                        "$type": "SlotTypeContract"
+                                                    }
+                                                ],
+                                                "slotName": "fadeInTimeSec",
                                                 "DisplayDataType": {
                                                     "m_type": 3
                                                 },
@@ -1165,14 +1147,14 @@
                                             },
                                             {
                                                 "id": {
-                                                    "m_id": "{2994B32A-1A22-4869-8C1E-D915DD481303}"
+                                                    "m_id": "{06A8C417-6842-40B4-969D-C18DCA471F55}"
                                                 },
                                                 "contracts": [
                                                     {
                                                         "$type": "SlotTypeContract"
                                                     }
                                                 ],
-                                                "slotName": "opacity",
+                                                "slotName": "scale",
                                                 "DisplayDataType": {
                                                     "m_type": 3
                                                 },
@@ -1184,14 +1166,14 @@
                                             },
                                             {
                                                 "id": {
-                                                    "m_id": "{00C61C58-82D4-4E27-9DEC-11455944BA91}"
+                                                    "m_id": "{6EA9D47D-18B7-4AF6-B143-2229DF3F3F15}"
                                                 },
                                                 "contracts": [
                                                     {
                                                         "$type": "SlotTypeContract"
                                                     }
                                                 ],
-                                                "slotName": "attenuationAngle",
+                                                "slotName": "opacity",
                                                 "DisplayDataType": {
                                                     "m_type": 3
                                                 },
@@ -1203,14 +1185,14 @@
                                             },
                                             {
                                                 "id": {
-                                                    "m_id": "{D87060B9-10F5-4D65-BD4D-EB4EB4CEB7FB}"
+                                                    "m_id": "{B88FC4EE-6D71-4289-A1F0-66A664C0C4C1}"
                                                 },
                                                 "contracts": [
                                                     {
                                                         "$type": "SlotTypeContract"
                                                     }
                                                 ],
-                                                "slotName": "lifeTimeSec",
+                                                "slotName": "attenuationAngle",
                                                 "DisplayDataType": {
                                                     "m_type": 3
                                                 },
@@ -1222,14 +1204,14 @@
                                             },
                                             {
                                                 "id": {
-                                                    "m_id": "{7BF0F927-71A7-44B0-8E9C-B77B3396DF14}"
+                                                    "m_id": "{4E22AB48-9AA4-4F58-920E-EEE8D5A53305}"
                                                 },
                                                 "contracts": [
                                                     {
                                                         "$type": "SlotTypeContract"
                                                     }
                                                 ],
-                                                "slotName": "fadeInTimeSec",
+                                                "slotName": "lifeTimeSec",
                                                 "DisplayDataType": {
                                                     "m_type": 3
                                                 },
@@ -1241,7 +1223,7 @@
                                             },
                                             {
                                                 "id": {
-                                                    "m_id": "{80BCE03D-2A77-42B6-82CC-0064B693FE19}"
+                                                    "m_id": "{5891A7F8-02B8-412B-A099-2407D6CC1600}"
                                                 },
                                                 "contracts": [
                                                     {
@@ -1260,7 +1242,7 @@
                                             },
                                             {
                                                 "id": {
-                                                    "m_id": "{E174357F-65A0-44C6-BFCA-85ADF44AF159}"
+                                                    "m_id": "{F2168D81-1EA9-4F52-AC5A-183EF0D775A0}"
                                                 },
                                                 "contracts": [
                                                     {
@@ -1279,7 +1261,7 @@
                                             },
                                             {
                                                 "id": {
-                                                    "m_id": "{0DBDE792-0A8B-43C3-BB34-2E0267CE844F}"
+                                                    "m_id": "{E7012119-4DDE-4536-A811-0C0506C5B7F4}"
                                                 },
                                                 "contracts": [
                                                     {
@@ -1301,57 +1283,66 @@
                                             "m_id": "{1850E939-4A77-4323-807E-6EFF953D8810}"
                                         },
                                         "m_variableDataOutSlotId": {
-                                            "m_id": "{8D526034-7D53-4669-9E31-49AE49A81482}"
+                                            "m_id": "{54F886F9-C840-46D2-8F9B-5E33705FC6ED}"
                                         },
                                         "m_propertyAccounts": [
                                             {
                                                 "m_propertySlotId": {
-                                                    "m_id": "{789E41E2-A09A-4F2F-A1BA-313E0DEB3B26}"
+                                                    "m_id": "{8159607F-B21B-4962-8735-531A83338480}"
+                                                },
+                                                "m_propertyType": {
+                                                    "m_type": 19
+                                                },
+                                                "m_propertyName": "material"
+                                            },
+                                            {
+                                                "m_propertySlotId": {
+                                                    "m_id": "{7E58A1D5-46BE-462A-9C50-8EA0807A8728}"
                                                 },
                                                 "m_propertyType": {
                                                     "m_type": 3
                                                 },
-                                                "m_propertyName": "scale"
+                                                "m_propertyName": "fadeInTimeSec"
                                             },
                                             {
                                                 "m_propertySlotId": {
-                                                    "m_id": "{2994B32A-1A22-4869-8C1E-D915DD481303}"
+                                                    "m_id": "{06A8C417-6842-40B4-969D-C18DCA471F55}"
                                                 },
                                                 "m_propertyType": {
                                                     "m_type": 3
                                                 },
-                                                "m_propertyName": "opacity"
+                                                "m_propertyName": "scale"
                                             },
                                             {
                                                 "m_propertySlotId": {
-                                                    "m_id": "{00C61C58-82D4-4E27-9DEC-11455944BA91}"
+                                                    "m_id": "{6EA9D47D-18B7-4AF6-B143-2229DF3F3F15}"
                                                 },
                                                 "m_propertyType": {
                                                     "m_type": 3
                                                 },
-                                                "m_propertyName": "attenuationAngle"
+                                                "m_propertyName": "opacity"
                                             },
                                             {
                                                 "m_propertySlotId": {
-                                                    "m_id": "{D87060B9-10F5-4D65-BD4D-EB4EB4CEB7FB}"
+                                                    "m_id": "{B88FC4EE-6D71-4289-A1F0-66A664C0C4C1}"
                                                 },
                                                 "m_propertyType": {
                                                     "m_type": 3
                                                 },
-                                                "m_propertyName": "lifeTimeSec"
+                                                "m_propertyName": "attenuationAngle"
                                             },
                                             {
                                                 "m_propertySlotId": {
-                                                    "m_id": "{7BF0F927-71A7-44B0-8E9C-B77B3396DF14}"
+                                                    "m_id": "{4E22AB48-9AA4-4F58-920E-EEE8D5A53305}"
                                                 },
                                                 "m_propertyType": {
                                                     "m_type": 3
                                                 },
-                                                "m_propertyName": "fadeInTimeSec"
+                                                "m_propertyName": "lifeTimeSec"
                                             },
                                             {
                                                 "m_propertySlotId": {
-                                                    "m_id": "{80BCE03D-2A77-42B6-82CC-0064B693FE19}"
+                                                    "m_id": "{5891A7F8-02B8-412B-A099-2407D6CC1600}"
                                                 },
                                                 "m_propertyType": {
                                                     "m_type": 3
@@ -1360,7 +1351,7 @@
                                             },
                                             {
                                                 "m_propertySlotId": {
-                                                    "m_id": "{E174357F-65A0-44C6-BFCA-85ADF44AF159}"
+                                                    "m_id": "{F2168D81-1EA9-4F52-AC5A-183EF0D775A0}"
                                                 },
                                                 "m_propertyType": {
                                                     "m_type": 3
@@ -1369,7 +1360,7 @@
                                             },
                                             {
                                                 "m_propertySlotId": {
-                                                    "m_id": "{0DBDE792-0A8B-43C3-BB34-2E0267CE844F}"
+                                                    "m_id": "{E7012119-4DDE-4536-A811-0C0506C5B7F4}"
                                                 },
                                                 "m_propertyType": {
                                                     "m_type": 3
@@ -1384,35 +1375,7 @@
                         "m_connections": [
                             {
                                 "Id": {
-                                    "id": 98305916993849
-                                },
-                                "Name": "srcEndpoint=(GetRenderSceneIdByName: Uuid), destEndpoint=(SpawnDecal: Uuid: 0)",
-                                "Components": {
-                                    "Component_[15050823617284946957]": {
-                                        "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection",
-                                        "Id": 15050823617284946957,
-                                        "sourceEndpoint": {
-                                            "nodeId": {
-                                                "id": 98280147190073
-                                            },
-                                            "slotId": {
-                                                "m_id": "{C93D559F-BC84-446A-AD0F-A29EC77DD894}"
-                                            }
-                                        },
-                                        "targetEndpoint": {
-                                            "nodeId": {
-                                                "id": 98293032091961
-                                            },
-                                            "slotId": {
-                                                "m_id": "{59C348BC-EED5-4C24-BB16-347FA01B3E23}"
-                                            }
-                                        }
-                                    }
-                                }
-                            },
-                            {
-                                "Id": {
-                                    "id": 98310211961145
+                                    "id": 18175695186004
                                 },
                                 "Name": "srcEndpoint=(IfMultiplayerAgentType: If Client Type), destEndpoint=(GetRenderSceneIdByName: In)",
                                 "Components": {
@@ -1421,7 +1384,7 @@
                                         "Id": 2703780263841702711,
                                         "sourceEndpoint": {
                                             "nodeId": {
-                                                "id": 98284442157369
+                                                "id": 18154220349524
                                             },
                                             "slotId": {
                                                 "m_id": "{A79B433B-57E2-4B0C-8026-BF742A1F0994}"
@@ -1429,7 +1392,7 @@
                                         },
                                         "targetEndpoint": {
                                             "nodeId": {
-                                                "id": 98280147190073
+                                                "id": 18149925382228
                                             },
                                             "slotId": {
                                                 "m_id": "{24906429-04AF-4674-AD8F-4C059AAFEC0E}"
@@ -1440,7 +1403,7 @@
                             },
                             {
                                 "Id": {
-                                    "id": 98314506928441
+                                    "id": 18179990153300
                                 },
                                 "Name": "srcEndpoint=(IfMultiplayerAgentType: If ClientServer Type), destEndpoint=(GetRenderSceneIdByName: In)",
                                 "Components": {
@@ -1449,7 +1412,7 @@
                                         "Id": 10018351341783483527,
                                         "sourceEndpoint": {
                                             "nodeId": {
-                                                "id": 98284442157369
+                                                "id": 18154220349524
                                             },
                                             "slotId": {
                                                 "m_id": "{1350D1E4-F79E-42DA-AF41-2DAC7B868C1F}"
@@ -1457,7 +1420,7 @@
                                         },
                                         "targetEndpoint": {
                                             "nodeId": {
-                                                "id": 98280147190073
+                                                "id": 18149925382228
                                             },
                                             "slotId": {
                                                 "m_id": "{24906429-04AF-4674-AD8F-4C059AAFEC0E}"
@@ -1468,7 +1431,7 @@
                             },
                             {
                                 "Id": {
-                                    "id": 98318801895737
+                                    "id": 18184285120596
                                 },
                                 "Name": "srcEndpoint=(IfMultiplayerAgentType: If Singleplayer), destEndpoint=(GetRenderSceneIdByName: In)",
                                 "Components": {
@@ -1477,7 +1440,7 @@
                                         "Id": 12066342146685190189,
                                         "sourceEndpoint": {
                                             "nodeId": {
-                                                "id": 98284442157369
+                                                "id": 18154220349524
                                             },
                                             "slotId": {
                                                 "m_id": "{B5631986-30EC-4A58-838B-A1A7EB522BB6}"
@@ -1485,7 +1448,7 @@
                                         },
                                         "targetEndpoint": {
                                             "nodeId": {
-                                                "id": 98280147190073
+                                                "id": 18149925382228
                                             },
                                             "slotId": {
                                                 "m_id": "{24906429-04AF-4674-AD8F-4C059AAFEC0E}"
@@ -1496,7 +1459,7 @@
                             },
                             {
                                 "Id": {
-                                    "id": 98323096863033
+                                    "id": 18188580087892
                                 },
                                 "Name": "srcEndpoint=(WeaponNotificationBus Handler: EntityId), destEndpoint=(Equal To (==): Value A)",
                                 "Components": {
@@ -1505,7 +1468,7 @@
                                         "Id": 114957198274854096,
                                         "sourceEndpoint": {
                                             "nodeId": {
-                                                "id": 98288737124665
+                                                "id": 18158515316820
                                             },
                                             "slotId": {
                                                 "m_id": "{435AEA8A-5692-4005-8760-38E678E87589}"
@@ -1513,7 +1476,7 @@
                                         },
                                         "targetEndpoint": {
                                             "nodeId": {
-                                                "id": 98297327059257
+                                                "id": 18167105251412
                                             },
                                             "slotId": {
                                                 "m_id": "{3C0A925B-B9DF-4346-A6C8-8B52C664BB4F}"
@@ -1524,7 +1487,7 @@
                             },
                             {
                                 "Id": {
-                                    "id": 98327391830329
+                                    "id": 18192875055188
                                 },
                                 "Name": "srcEndpoint=(Equal To (==): True), destEndpoint=(IfMultiplayerAgentType: In)",
                                 "Components": {
@@ -1533,7 +1496,7 @@
                                         "Id": 13210480970754208944,
                                         "sourceEndpoint": {
                                             "nodeId": {
-                                                "id": 98297327059257
+                                                "id": 18167105251412
                                             },
                                             "slotId": {
                                                 "m_id": "{83EAE830-D299-49A8-935A-7E0DCBBCFE9C}"
@@ -1541,7 +1504,7 @@
                                         },
                                         "targetEndpoint": {
                                             "nodeId": {
-                                                "id": 98284442157369
+                                                "id": 18154220349524
                                             },
                                             "slotId": {
                                                 "m_id": "{DB5FBFEF-C276-46E3-84A0-BC4549A0912C}"
@@ -1552,7 +1515,7 @@
                             },
                             {
                                 "Id": {
-                                    "id": 98331686797625
+                                    "id": 18197170022484
                                 },
                                 "Name": "srcEndpoint=(WeaponNotificationBus Handler: ExecutionSlot:OnWeaponImpact), destEndpoint=(Equal To (==): In)",
                                 "Components": {
@@ -1561,7 +1524,7 @@
                                         "Id": 15021622587972159701,
                                         "sourceEndpoint": {
                                             "nodeId": {
-                                                "id": 98288737124665
+                                                "id": 18158515316820
                                             },
                                             "slotId": {
                                                 "m_id": "{4D2D6DEF-6658-4CB2-A0AF-CDFBE5A18760}"
@@ -1569,7 +1532,7 @@
                                         },
                                         "targetEndpoint": {
                                             "nodeId": {
-                                                "id": 98297327059257
+                                                "id": 18167105251412
                                             },
                                             "slotId": {
                                                 "m_id": "{633068BE-124A-4291-9B4A-12E9F232A988}"
@@ -1580,27 +1543,27 @@
                             },
                             {
                                 "Id": {
-                                    "id": 98335981764921
+                                    "id": 26611010955348
                                 },
-                                "Name": "srcEndpoint=(WeaponNotificationBus Handler: Transform), destEndpoint=(SpawnDecal: Transform: 1)",
+                                "Name": "srcEndpoint=(GetRenderSceneIdByName: Out), destEndpoint=(Get Variable: In)",
                                 "Components": {
-                                    "Component_[10732036210755567709]": {
+                                    "Component_[9268406966892681121]": {
                                         "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection",
-                                        "Id": 10732036210755567709,
+                                        "Id": 9268406966892681121,
                                         "sourceEndpoint": {
                                             "nodeId": {
-                                                "id": 98288737124665
+                                                "id": 18149925382228
                                             },
                                             "slotId": {
-                                                "m_id": "{B16F917B-D68D-4E40-B0D1-81B7BBF05D85}"
+                                                "m_id": "{51A62B12-7E10-44D3-8329-E8EC1BA88994}"
                                             }
                                         },
                                         "targetEndpoint": {
                                             "nodeId": {
-                                                "id": 98293032091961
+                                                "id": 24884434102356
                                             },
                                             "slotId": {
-                                                "m_id": "{64A0FE07-2914-4C74-8D28-550C434F04C6}"
+                                                "m_id": "{60585556-6BC1-492F-9749-C6F25DBDDEEC}"
                                             }
                                         }
                                     }
@@ -1608,27 +1571,27 @@
                             },
                             {
                                 "Id": {
-                                    "id": 98340276732217
+                                    "id": 38357746509908
                                 },
-                                "Name": "srcEndpoint=(GetRenderSceneIdByName: Out), destEndpoint=(Get Variable: In)",
+                                "Name": "srcEndpoint=(Get Variable: Out), destEndpoint=(SpawnDecal: In)",
                                 "Components": {
-                                    "Component_[16860386449667108785]": {
+                                    "Component_[8463797473777258651]": {
                                         "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection",
-                                        "Id": 16860386449667108785,
+                                        "Id": 8463797473777258651,
                                         "sourceEndpoint": {
                                             "nodeId": {
-                                                "id": 98280147190073
+                                                "id": 24884434102356
                                             },
                                             "slotId": {
-                                                "m_id": "{51A62B12-7E10-44D3-8329-E8EC1BA88994}"
+                                                "m_id": "{2F3873D7-93E9-4C89-8BE6-73B9C1990B1E}"
                                             }
                                         },
                                         "targetEndpoint": {
                                             "nodeId": {
-                                                "id": 98301622026553
+                                                "id": 37241055012948
                                             },
                                             "slotId": {
-                                                "m_id": "{FF2E3C4E-3E61-4F71-94F1-2087DAED27D1}"
+                                                "m_id": "{EA69C101-8368-40B2-9B0C-A34DB730A4C3}"
                                             }
                                         }
                                     }
@@ -1636,27 +1599,27 @@
                             },
                             {
                                 "Id": {
-                                    "id": 98344571699513
+                                    "id": 38688458991700
                                 },
-                                "Name": "srcEndpoint=(Get Variable: SpawnDecalConfig), destEndpoint=(SpawnDecal: SpawnDecalConfig: 3)",
+                                "Name": "srcEndpoint=(GetRenderSceneIdByName: Uuid), destEndpoint=(SpawnDecal: Uuid: 0)",
                                 "Components": {
-                                    "Component_[5237335253929168477]": {
+                                    "Component_[16029061990498217012]": {
                                         "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection",
-                                        "Id": 5237335253929168477,
+                                        "Id": 16029061990498217012,
                                         "sourceEndpoint": {
                                             "nodeId": {
-                                                "id": 98301622026553
+                                                "id": 18149925382228
                                             },
                                             "slotId": {
-                                                "m_id": "{8D526034-7D53-4669-9E31-49AE49A81482}"
+                                                "m_id": "{C93D559F-BC84-446A-AD0F-A29EC77DD894}"
                                             }
                                         },
                                         "targetEndpoint": {
                                             "nodeId": {
-                                                "id": 98293032091961
+                                                "id": 37241055012948
                                             },
                                             "slotId": {
-                                                "m_id": "{2EBD4606-D04F-41CB-9F14-56993DE185BF}"
+                                                "m_id": "{135E833B-6553-448D-B2CD-2DA65BD4F36D}"
                                             }
                                         }
                                     }
@@ -1664,27 +1627,55 @@
                             },
                             {
                                 "Id": {
-                                    "id": 98348866666809
+                                    "id": 39276869511252
                                 },
-                                "Name": "srcEndpoint=(Get Variable: Out), destEndpoint=(SpawnDecal: In)",
+                                "Name": "srcEndpoint=(WeaponNotificationBus Handler: Transform), destEndpoint=(SpawnDecal: Transform: 1)",
+                                "Components": {
+                                    "Component_[2712125283736436105]": {
+                                        "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection",
+                                        "Id": 2712125283736436105,
+                                        "sourceEndpoint": {
+                                            "nodeId": {
+                                                "id": 18158515316820
+                                            },
+                                            "slotId": {
+                                                "m_id": "{B16F917B-D68D-4E40-B0D1-81B7BBF05D85}"
+                                            }
+                                        },
+                                        "targetEndpoint": {
+                                            "nodeId": {
+                                                "id": 37241055012948
+                                            },
+                                            "slotId": {
+                                                "m_id": "{F861D814-26B3-48FB-BDD0-BAD7021B70B6}"
+                                            }
+                                        }
+                                    }
+                                }
+                            },
+                            {
+                                "Id": {
+                                    "id": 39577517221972
+                                },
+                                "Name": "srcEndpoint=(Get Variable: SpawnDecalConfig), destEndpoint=(SpawnDecal: SpawnDecalConfig: 2)",
                                 "Components": {
-                                    "Component_[12247993153576705434]": {
+                                    "Component_[11982032547558231432]": {
                                         "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection",
-                                        "Id": 12247993153576705434,
+                                        "Id": 11982032547558231432,
                                         "sourceEndpoint": {
                                             "nodeId": {
-                                                "id": 98301622026553
+                                                "id": 24884434102356
                                             },
                                             "slotId": {
-                                                "m_id": "{83BC9588-F739-43C3-A761-6E0CA3955467}"
+                                                "m_id": "{54F886F9-C840-46D2-8F9B-5E33705FC6ED}"
                                             }
                                         },
                                         "targetEndpoint": {
                                             "nodeId": {
-                                                "id": 98293032091961
+                                                "id": 37241055012948
                                             },
                                             "slotId": {
-                                                "m_id": "{01B97E7D-CD67-407C-BF02-DA7EA6DCEC66}"
+                                                "m_id": "{BE735B23-FB8F-4BF6-B7E4-4EDE6355CA14}"
                                             }
                                         }
                                     }
@@ -1701,7 +1692,7 @@
                     "GraphCanvasData": [
                         {
                             "Key": {
-                                "id": 98275852222777
+                                "id": 18141335447636
                             },
                             "Value": {
                                 "ComponentData": {
@@ -1718,7 +1709,7 @@
                         },
                         {
                             "Key": {
-                                "id": 98280147190073
+                                "id": 18149925382228
                             },
                             "Value": {
                                 "ComponentData": {
@@ -1749,7 +1740,7 @@
                         },
                         {
                             "Key": {
-                                "id": 98284442157369
+                                "id": 18154220349524
                             },
                             "Value": {
                                 "ComponentData": {
@@ -1779,7 +1770,7 @@
                         },
                         {
                             "Key": {
-                                "id": 98288737124665
+                                "id": 18158515316820
                             },
                             "Value": {
                                 "ComponentData": {
@@ -1813,7 +1804,7 @@
                         },
                         {
                             "Key": {
-                                "id": 98293032091961
+                                "id": 18167105251412
                             },
                             "Value": {
                                 "ComponentData": {
@@ -1822,29 +1813,28 @@
                                     },
                                     "{328FF15C-C302-458F-A43D-E1794DE0904E}": {
                                         "$type": "GeneralNodeTitleComponentSaveData",
-                                        "PaletteOverride": "MethodNodeTitlePalette"
+                                        "PaletteOverride": "MathNodeTitlePalette"
                                     },
                                     "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": {
                                         "$type": "GeometrySaveData",
                                         "Position": [
-                                            1460.0,
-                                            100.0
+                                            -100.0,
+                                            120.0
                                         ]
                                     },
                                     "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": {
-                                        "$type": "StylingComponentSaveData",
-                                        "SubStyle": ".method"
+                                        "$type": "StylingComponentSaveData"
                                     },
                                     "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": {
                                         "$type": "PersistentIdComponentSaveData",
-                                        "PersistentId": "{4E9AD80A-7724-41BA-A524-99B2FF0C229A}"
+                                        "PersistentId": "{DFA35CD7-9FE1-4C4D-9A83-BDA8D57118C7}"
                                     }
                                 }
                             }
                         },
                         {
                             "Key": {
-                                "id": 98297327059257
+                                "id": 24884434102356
                             },
                             "Value": {
                                 "ComponentData": {
@@ -1853,28 +1843,29 @@
                                     },
                                     "{328FF15C-C302-458F-A43D-E1794DE0904E}": {
                                         "$type": "GeneralNodeTitleComponentSaveData",
-                                        "PaletteOverride": "MathNodeTitlePalette"
+                                        "PaletteOverride": "GetVariableNodeTitlePalette"
                                     },
                                     "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": {
                                         "$type": "GeometrySaveData",
                                         "Position": [
-                                            -100.0,
-                                            120.0
+                                            1160.0,
+                                            80.0
                                         ]
                                     },
                                     "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": {
-                                        "$type": "StylingComponentSaveData"
+                                        "$type": "StylingComponentSaveData",
+                                        "SubStyle": ".getVariable"
                                     },
                                     "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": {
                                         "$type": "PersistentIdComponentSaveData",
-                                        "PersistentId": "{DFA35CD7-9FE1-4C4D-9A83-BDA8D57118C7}"
+                                        "PersistentId": "{8067D04B-6EC0-49C3-B77F-0D199779EF63}"
                                     }
                                 }
                             }
                         },
                         {
                             "Key": {
-                                "id": 98301622026553
+                                "id": 37241055012948
                             },
                             "Value": {
                                 "ComponentData": {
@@ -1883,22 +1874,22 @@
                                     },
                                     "{328FF15C-C302-458F-A43D-E1794DE0904E}": {
                                         "$type": "GeneralNodeTitleComponentSaveData",
-                                        "PaletteOverride": "GetVariableNodeTitlePalette"
+                                        "PaletteOverride": "MethodNodeTitlePalette"
                                     },
                                     "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": {
                                         "$type": "GeometrySaveData",
                                         "Position": [
-                                            1100.0,
+                                            1540.0,
                                             120.0
                                         ]
                                     },
                                     "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": {
                                         "$type": "StylingComponentSaveData",
-                                        "SubStyle": ".getVariable"
+                                        "SubStyle": ".method"
                                     },
                                     "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": {
                                         "$type": "PersistentIdComponentSaveData",
-                                        "PersistentId": "{93CB87B2-C8C4-4D8B-A326-A465EC0B23CC}"
+                                        "PersistentId": "{48FA9A40-160B-4502-BCC6-5E4E36B666BE}"
                                     }
                                 }
                             }