From 13361b220e8a3499ee91377753f27cd1394fae13 Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Mon, 29 Nov 2021 10:40:07 -0800 Subject: [PATCH 1/4] Updated GameLift names, improved Getter/Setter generation Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../AWSGameLiftAcceptMatchRequest.names | 147 ++++++++ ...SGameLiftCreateSessionOnQueueRequest.names | 275 +++++++++++++++ .../AWSGameLiftCreateSessionRequest.names | 317 ++++++++++++++++++ .../AWSGameLiftJoinSessionRequest.names | 147 ++++++++ .../Classes/AWSGameLiftPlayer.names | 183 ++++++++++ .../AWSGameLiftSearchSessionsRequest.names | 317 ++++++++++++++++++ .../AWSGameLiftStartMatchmakingRequest.names | 143 ++++++++ .../AWSGameLiftStopMatchmakingRequest.names | 59 ++++ .../GeneralNodePaletteTreeItemTypes.h | 8 +- .../ScriptCanvasNodePaletteDockWidget.cpp | 2 +- .../Code/Tools/TranslationGeneration.cpp | 10 + 11 files changed, 1604 insertions(+), 4 deletions(-) create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftAcceptMatchRequest.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftCreateSessionOnQueueRequest.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftCreateSessionRequest.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftJoinSessionRequest.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftPlayer.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftSearchSessionsRequest.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftStartMatchmakingRequest.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftStopMatchmakingRequest.names diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftAcceptMatchRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftAcceptMatchRequest.names new file mode 100644 index 0000000000..fbcc3c69c0 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftAcceptMatchRequest.names @@ -0,0 +1,147 @@ +{ + "entries": [ + { + "base": "AWSGameLiftAcceptMatchRequest", + "context": "BehaviorClass", + "variant": "", + "details": { + "name": "Accept Match Request", + "category": "AWS Game Lift" + }, + "methods": [ + { + "base": "GetAcceptMatch", + "details": { + "name": "Get Accept Match" + }, + "params": [ + { + "typeid": "{AD289D76-CEE2-424F-847E-E62AA83B7D79}", + "details": { + "name": "Accept Match Request", + "tooltip": "The container for AcceptMatch request parameters" + } + } + ], + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Accept Match" + } + } + ] + }, + { + "base": "SetAcceptMatch", + "details": { + "name": "Set Accept Match" + }, + "params": [ + { + "typeid": "{AD289D76-CEE2-424F-847E-E62AA83B7D79}", + "details": { + "name": "Accept Match Request", + "tooltip": "The container for AcceptMatch request parameters" + } + }, + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Accept Match" + } + } + ] + }, + { + "base": "GetPlayerIds", + "details": { + "name": "Get Player Ids" + }, + "params": [ + { + "typeid": "{AD289D76-CEE2-424F-847E-E62AA83B7D79}", + "details": { + "name": "Accept Match Request", + "tooltip": "The container for AcceptMatch request parameters" + } + } + ], + "results": [ + { + "typeid": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", + "details": { + "name": "Player Ids" + } + } + ] + }, + { + "base": "SetPlayerIds", + "details": { + "name": "Set Player Ids" + }, + "params": [ + { + "typeid": "{AD289D76-CEE2-424F-847E-E62AA83B7D79}", + "details": { + "name": "Accept Match Request", + "tooltip": "The container for AcceptMatch request parameters" + } + }, + { + "typeid": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", + "details": { + "name": "Player Ids" + } + } + ] + }, + { + "base": "GetTicketId", + "details": { + "name": "Get Ticket Id" + }, + "params": [ + { + "typeid": "{AD289D76-CEE2-424F-847E-E62AA83B7D79}", + "details": { + "name": "Accept Match Request", + "tooltip": "The container for AcceptMatch request parameters" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Ticket Id" + } + } + ] + }, + { + "base": "SetTicketId", + "details": { + "name": "Set Ticket Id" + }, + "params": [ + { + "typeid": "{AD289D76-CEE2-424F-847E-E62AA83B7D79}", + "details": { + "name": "Accept Match Request", + "tooltip": "The container for AcceptMatch request parameters" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Ticket Id" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftCreateSessionOnQueueRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftCreateSessionOnQueueRequest.names new file mode 100644 index 0000000000..38de95185f --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftCreateSessionOnQueueRequest.names @@ -0,0 +1,275 @@ +{ + "entries": [ + { + "base": "AWSGameLiftCreateSessionOnQueueRequest", + "context": "BehaviorClass", + "variant": "", + "details": { + "name": "Create Session On Queue Request", + "category": "AWS Game Lift" + }, + "methods": [ + { + "base": "GetPlacementId", + "details": { + "name": "Get Placement Id" + }, + "params": [ + { + "typeid": "{2B99E594-CE81-4EB0-8888-74EF4242B59F}", + "details": { + "name": "AWS Game Lift Create Session On Queue Request" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Placement Id" + } + } + ] + }, + { + "base": "SetPlacementId", + "details": { + "name": "Set Placement Id" + }, + "params": [ + { + "typeid": "{2B99E594-CE81-4EB0-8888-74EF4242B59F}", + "details": { + "name": "AWS Game Lift Create Session On Queue Request" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Placement Id" + } + } + ] + }, + { + "base": "GetQueueName", + "details": { + "name": "Get Queue Name" + }, + "params": [ + { + "typeid": "{2B99E594-CE81-4EB0-8888-74EF4242B59F}", + "details": { + "name": "AWS Game Lift Create Session On Queue Request" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Queue Name" + } + } + ] + }, + { + "base": "SetQueueName", + "details": { + "name": "Set Queue Name" + }, + "params": [ + { + "typeid": "{2B99E594-CE81-4EB0-8888-74EF4242B59F}", + "details": { + "name": "AWS Game Lift Create Session On Queue Request" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Queue Name" + } + } + ] + }, + { + "base": "GetSessionName", + "details": { + "name": "Get Session Name" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Session Name" + } + } + ] + }, + { + "base": "SetSessionName", + "details": { + "name": "Set Session Name" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Session Name" + } + } + ] + }, + { + "base": "GetMaxPlayer", + "details": { + "name": "Get Max Player" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + } + ], + "results": [ + { + "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", + "details": { + "name": "Max Player" + } + } + ] + }, + { + "base": "SetMaxPlayer", + "details": { + "name": "Set Max Player" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + }, + { + "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", + "details": { + "name": "Max Player" + } + } + ] + }, + { + "base": "GetSessionProperties", + "details": { + "name": "Get Session Properties" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + } + ], + "results": [ + { + "typeid": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}", + "details": { + "name": "Session Properties" + } + } + ] + }, + { + "base": "SetSessionProperties", + "details": { + "name": "Set Session Properties" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + }, + { + "typeid": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}", + "details": { + "name": "Session Properties" + } + } + ] + }, + { + "base": "GetCreatorId", + "details": { + "name": "Get Creator Id" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Creator Id" + } + } + ] + }, + { + "base": "SetCreatorId", + "details": { + "name": "Set Creator Id" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Creator Id" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftCreateSessionRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftCreateSessionRequest.names new file mode 100644 index 0000000000..3924b7164d --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftCreateSessionRequest.names @@ -0,0 +1,317 @@ +{ + "entries": [ + { + "base": "AWSGameLiftCreateSessionRequest", + "context": "BehaviorClass", + "variant": "", + "details": { + "name": "Create Session Request", + "category": "AWS Game Lift" + }, + "methods": [ + { + "base": "GetIdempotencyToken", + "details": { + "name": "Get Idempotency Token" + }, + "params": [ + { + "typeid": "{69612D5D-F899-4DEB-AD63-4C497ABC5C0D}", + "details": { + "name": "AWS Game Lift Create Session Request" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Idempotency Token" + } + } + ] + }, + { + "base": "SetIdempotencyToken", + "details": { + "name": "Set Idempotency Token" + }, + "params": [ + { + "typeid": "{69612D5D-F899-4DEB-AD63-4C497ABC5C0D}", + "details": { + "name": "AWS Game Lift Create Session Request" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Idempotency Token" + } + } + ] + }, + { + "base": "GetAliasId", + "details": { + "name": "Get Alias Id" + }, + "params": [ + { + "typeid": "{69612D5D-F899-4DEB-AD63-4C497ABC5C0D}", + "details": { + "name": "AWS Game Lift Create Session Request" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Alias Id" + } + } + ] + }, + { + "base": "SetAliasId", + "details": { + "name": "Set Alias Id" + }, + "params": [ + { + "typeid": "{69612D5D-F899-4DEB-AD63-4C497ABC5C0D}", + "details": { + "name": "AWS Game Lift Create Session Request" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Alias Id" + } + } + ] + }, + { + "base": "GetSessionName", + "details": { + "name": "Get Session Name" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Session Name" + } + } + ] + }, + { + "base": "SetSessionName", + "details": { + "name": "Set Session Name" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Session Name" + } + } + ] + }, + { + "base": "GetMaxPlayer", + "details": { + "name": "Get Max Player" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + } + ], + "results": [ + { + "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", + "details": { + "name": "Max Player" + } + } + ] + }, + { + "base": "SetMaxPlayer", + "details": { + "name": "Set Max Player" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + }, + { + "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", + "details": { + "name": "Max Player" + } + } + ] + }, + { + "base": "GetSessionProperties", + "details": { + "name": "Get Session Properties" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + } + ], + "results": [ + { + "typeid": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}", + "details": { + "name": "Session Properties" + } + } + ] + }, + { + "base": "SetSessionProperties", + "details": { + "name": "Set Session Properties" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + }, + { + "typeid": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}", + "details": { + "name": "Session Properties" + } + } + ] + }, + { + "base": "GetFleetId", + "details": { + "name": "Get Fleet Id" + }, + "params": [ + { + "typeid": "{69612D5D-F899-4DEB-AD63-4C497ABC5C0D}", + "details": { + "name": "AWS Game Lift Create Session Request" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Fleet Id" + } + } + ] + }, + { + "base": "SetFleetId", + "details": { + "name": "Set Fleet Id" + }, + "params": [ + { + "typeid": "{69612D5D-F899-4DEB-AD63-4C497ABC5C0D}", + "details": { + "name": "AWS Game Lift Create Session Request" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Fleet Id" + } + } + ] + }, + { + "base": "GetCreatorId", + "details": { + "name": "Get Creator Id" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Creator Id" + } + } + ] + }, + { + "base": "SetCreatorId", + "details": { + "name": "Set Creator Id" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Creator Id" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftJoinSessionRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftJoinSessionRequest.names new file mode 100644 index 0000000000..c4a8a515de --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftJoinSessionRequest.names @@ -0,0 +1,147 @@ +{ + "entries": [ + { + "base": "AWSGameLiftJoinSessionRequest", + "context": "BehaviorClass", + "variant": "", + "details": { + "name": "Join Session Request", + "category": "AWS Game Lift" + }, + "methods": [ + { + "base": "GetPlayerData", + "details": { + "name": "Get Player Data" + }, + "params": [ + { + "typeid": "{519769E8-3CDE-4385-A0D7-24DBB3685657}", + "details": { + "name": "Join Session Request", + "tooltip": "The container for JoinSession request parameters" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Player Data" + } + } + ] + }, + { + "base": "SetPlayerData", + "details": { + "name": "Set Player Data" + }, + "params": [ + { + "typeid": "{519769E8-3CDE-4385-A0D7-24DBB3685657}", + "details": { + "name": "Join Session Request", + "tooltip": "The container for JoinSession request parameters" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Player Data" + } + } + ] + }, + { + "base": "GetPlayerId", + "details": { + "name": "Get Player Id" + }, + "params": [ + { + "typeid": "{519769E8-3CDE-4385-A0D7-24DBB3685657}", + "details": { + "name": "Join Session Request", + "tooltip": "The container for JoinSession request parameters" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Player Id" + } + } + ] + }, + { + "base": "SetPlayerId", + "details": { + "name": "Set Player Id" + }, + "params": [ + { + "typeid": "{519769E8-3CDE-4385-A0D7-24DBB3685657}", + "details": { + "name": "Join Session Request", + "tooltip": "The container for JoinSession request parameters" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Player Id" + } + } + ] + }, + { + "base": "GetSessionId", + "details": { + "name": "Get Session Id" + }, + "params": [ + { + "typeid": "{519769E8-3CDE-4385-A0D7-24DBB3685657}", + "details": { + "name": "Join Session Request", + "tooltip": "The container for JoinSession request parameters" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Session Id" + } + } + ] + }, + { + "base": "SetSessionId", + "details": { + "name": "Set Session Id" + }, + "params": [ + { + "typeid": "{519769E8-3CDE-4385-A0D7-24DBB3685657}", + "details": { + "name": "Join Session Request", + "tooltip": "The container for JoinSession request parameters" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Session Id" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftPlayer.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftPlayer.names new file mode 100644 index 0000000000..372cbdb019 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftPlayer.names @@ -0,0 +1,183 @@ +{ + "entries": [ + { + "base": "AWSGameLiftPlayer", + "context": "BehaviorClass", + "variant": "", + "details": { + "name": "Player", + "category": "AWS Game Lift" + }, + "methods": [ + { + "base": "GetLatencyInMs", + "details": { + "name": "Get Latency In Ms" + }, + "params": [ + { + "typeid": "{B62C118E-C55D-4903-8ECB-E58E8CA613C4}", + "details": { + "name": "AWS Game Lift Player" + } + } + ], + "results": [ + { + "typeid": "{3F80885A-9011-5172-8D94-87108B31D950}", + "details": { + "name": "Latency In Ms" + } + } + ] + }, + { + "base": "SetLatencyInMs", + "details": { + "name": "Set Latency In Ms" + }, + "params": [ + { + "typeid": "{B62C118E-C55D-4903-8ECB-E58E8CA613C4}", + "details": { + "name": "AWS Game Lift Player" + } + }, + { + "typeid": "{3F80885A-9011-5172-8D94-87108B31D950}", + "details": { + "name": "Latency In Ms" + } + } + ] + }, + { + "base": "GetPlayerAttributes", + "details": { + "name": "Get Player Attributes" + }, + "params": [ + { + "typeid": "{B62C118E-C55D-4903-8ECB-E58E8CA613C4}", + "details": { + "name": "AWS Game Lift Player" + } + } + ], + "results": [ + { + "typeid": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}", + "details": { + "name": "Player Attributes" + } + } + ] + }, + { + "base": "SetPlayerAttributes", + "details": { + "name": "Set Player Attributes" + }, + "params": [ + { + "typeid": "{B62C118E-C55D-4903-8ECB-E58E8CA613C4}", + "details": { + "name": "AWS Game Lift Player" + } + }, + { + "typeid": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}", + "details": { + "name": "Player Attributes" + } + } + ] + }, + { + "base": "GetPlayerId", + "details": { + "name": "Get Player Id" + }, + "params": [ + { + "typeid": "{B62C118E-C55D-4903-8ECB-E58E8CA613C4}", + "details": { + "name": "AWS Game Lift Player" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Player Id" + } + } + ] + }, + { + "base": "SetPlayerId", + "details": { + "name": "Set Player Id" + }, + "params": [ + { + "typeid": "{B62C118E-C55D-4903-8ECB-E58E8CA613C4}", + "details": { + "name": "AWS Game Lift Player" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Player Id" + } + } + ] + }, + { + "base": "GetTeam", + "details": { + "name": "Get Team" + }, + "params": [ + { + "typeid": "{B62C118E-C55D-4903-8ECB-E58E8CA613C4}", + "details": { + "name": "AWS Game Lift Player" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Team" + } + } + ] + }, + { + "base": "SetTeam", + "details": { + "name": "Set Team" + }, + "params": [ + { + "typeid": "{B62C118E-C55D-4903-8ECB-E58E8CA613C4}", + "details": { + "name": "AWS Game Lift Player" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Team" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftSearchSessionsRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftSearchSessionsRequest.names new file mode 100644 index 0000000000..c2300b23bc --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftSearchSessionsRequest.names @@ -0,0 +1,317 @@ +{ + "entries": [ + { + "base": "AWSGameLiftSearchSessionsRequest", + "context": "BehaviorClass", + "variant": "", + "details": { + "name": "Search Sessions Request", + "category": "AWS Game Lift" + }, + "methods": [ + { + "base": "GetLocation", + "details": { + "name": "Get Location" + }, + "params": [ + { + "typeid": "{864C91C0-CA53-4585-BF07-066C0DF3E198}", + "details": { + "name": "AWS Game Lift Search Sessions Request" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Location" + } + } + ] + }, + { + "base": "SetLocation", + "details": { + "name": "Set Location" + }, + "params": [ + { + "typeid": "{864C91C0-CA53-4585-BF07-066C0DF3E198}", + "details": { + "name": "AWS Game Lift Search Sessions Request" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Location" + } + } + ] + }, + { + "base": "GetFleetId", + "details": { + "name": "Get Fleet Id" + }, + "params": [ + { + "typeid": "{864C91C0-CA53-4585-BF07-066C0DF3E198}", + "details": { + "name": "AWS Game Lift Search Sessions Request" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Fleet Id" + } + } + ] + }, + { + "base": "SetFleetId", + "details": { + "name": "Set Fleet Id" + }, + "params": [ + { + "typeid": "{864C91C0-CA53-4585-BF07-066C0DF3E198}", + "details": { + "name": "AWS Game Lift Search Sessions Request" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Fleet Id" + } + } + ] + }, + { + "base": "GetNextToken", + "details": { + "name": "Get Next Token" + }, + "params": [ + { + "typeid": "{B49207A8-8549-4ADB-B7D9-D7A4932F9B4B}", + "details": { + "name": "Search Sessions Request", + "tooltip": "The container for SearchSessions request parameters" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Next Token" + } + } + ] + }, + { + "base": "SetNextToken", + "details": { + "name": "Set Next Token" + }, + "params": [ + { + "typeid": "{B49207A8-8549-4ADB-B7D9-D7A4932F9B4B}", + "details": { + "name": "Search Sessions Request", + "tooltip": "The container for SearchSessions request parameters" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Next Token" + } + } + ] + }, + { + "base": "GetSortExpression", + "details": { + "name": "Get Sort Expression" + }, + "params": [ + { + "typeid": "{B49207A8-8549-4ADB-B7D9-D7A4932F9B4B}", + "details": { + "name": "Search Sessions Request", + "tooltip": "The container for SearchSessions request parameters" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Sort Expression" + } + } + ] + }, + { + "base": "SetSortExpression", + "details": { + "name": "Set Sort Expression" + }, + "params": [ + { + "typeid": "{B49207A8-8549-4ADB-B7D9-D7A4932F9B4B}", + "details": { + "name": "Search Sessions Request", + "tooltip": "The container for SearchSessions request parameters" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Sort Expression" + } + } + ] + }, + { + "base": "GetAliasId", + "details": { + "name": "Get Alias Id" + }, + "params": [ + { + "typeid": "{864C91C0-CA53-4585-BF07-066C0DF3E198}", + "details": { + "name": "AWS Game Lift Search Sessions Request" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Alias Id" + } + } + ] + }, + { + "base": "SetAliasId", + "details": { + "name": "Set Alias Id" + }, + "params": [ + { + "typeid": "{864C91C0-CA53-4585-BF07-066C0DF3E198}", + "details": { + "name": "AWS Game Lift Search Sessions Request" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Alias Id" + } + } + ] + }, + { + "base": "GetFilterExpression", + "details": { + "name": "Get Filter Expression" + }, + "params": [ + { + "typeid": "{B49207A8-8549-4ADB-B7D9-D7A4932F9B4B}", + "details": { + "name": "Search Sessions Request", + "tooltip": "The container for SearchSessions request parameters" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Filter Expression" + } + } + ] + }, + { + "base": "SetFilterExpression", + "details": { + "name": "Set Filter Expression" + }, + "params": [ + { + "typeid": "{B49207A8-8549-4ADB-B7D9-D7A4932F9B4B}", + "details": { + "name": "Search Sessions Request", + "tooltip": "The container for SearchSessions request parameters" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Filter Expression" + } + } + ] + }, + { + "base": "GetMaxResult", + "details": { + "name": "Get Max Result" + }, + "params": [ + { + "typeid": "{B49207A8-8549-4ADB-B7D9-D7A4932F9B4B}", + "details": { + "name": "Search Sessions Request", + "tooltip": "The container for SearchSessions request parameters" + } + } + ], + "results": [ + { + "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}", + "details": { + "name": "Max Result" + } + } + ] + }, + { + "base": "SetMaxResult", + "details": { + "name": "Set Max Result" + }, + "params": [ + { + "typeid": "{B49207A8-8549-4ADB-B7D9-D7A4932F9B4B}", + "details": { + "name": "Search Sessions Request", + "tooltip": "The container for SearchSessions request parameters" + } + }, + { + "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}", + "details": { + "name": "Max Result" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftStartMatchmakingRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftStartMatchmakingRequest.names new file mode 100644 index 0000000000..735f6d77f6 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftStartMatchmakingRequest.names @@ -0,0 +1,143 @@ +{ + "entries": [ + { + "base": "AWSGameLiftStartMatchmakingRequest", + "context": "BehaviorClass", + "variant": "", + "details": { + "name": "Start Matchmaking Request", + "category": "AWS Game Lift" + }, + "methods": [ + { + "base": "GetTicketId", + "details": { + "name": "Get Ticket Id" + }, + "params": [ + { + "typeid": "{70B47776-E8E7-4993-BEC3-5CAEC3D48E47}", + "details": { + "name": "Start Matchmaking Request", + "tooltip": "The container for StartMatchmaking request parameters" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Ticket Id" + } + } + ] + }, + { + "base": "SetTicketId", + "details": { + "name": "Set Ticket Id" + }, + "params": [ + { + "typeid": "{70B47776-E8E7-4993-BEC3-5CAEC3D48E47}", + "details": { + "name": "Start Matchmaking Request", + "tooltip": "The container for StartMatchmaking request parameters" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Ticket Id" + } + } + ] + }, + { + "base": "GetConfigurationName", + "details": { + "name": "Get Configuration Name" + }, + "params": [ + { + "typeid": "{D273DF71-9C55-48C1-95F9-8D7B66B9CF3E}", + "details": { + "name": "AWS Game Lift Start Matchmaking Request" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Configuration Name" + } + } + ] + }, + { + "base": "SetConfigurationName", + "details": { + "name": "Set Configuration Name" + }, + "params": [ + { + "typeid": "{D273DF71-9C55-48C1-95F9-8D7B66B9CF3E}", + "details": { + "name": "AWS Game Lift Start Matchmaking Request" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Configuration Name" + } + } + ] + }, + { + "base": "GetPlayers", + "details": { + "name": "Get Players" + }, + "params": [ + { + "typeid": "{D273DF71-9C55-48C1-95F9-8D7B66B9CF3E}", + "details": { + "name": "AWS Game Lift Start Matchmaking Request" + } + } + ], + "results": [ + { + "typeid": "{EE12B610-77DD-56DD-AB5A-16A537F2CE5E}", + "details": { + "name": "Players" + } + } + ] + }, + { + "base": "SetPlayers", + "details": { + "name": "Set Players" + }, + "params": [ + { + "typeid": "{D273DF71-9C55-48C1-95F9-8D7B66B9CF3E}", + "details": { + "name": "AWS Game Lift Start Matchmaking Request" + } + }, + { + "typeid": "{EE12B610-77DD-56DD-AB5A-16A537F2CE5E}", + "details": { + "name": "Players" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftStopMatchmakingRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftStopMatchmakingRequest.names new file mode 100644 index 0000000000..fa9c71dae6 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftStopMatchmakingRequest.names @@ -0,0 +1,59 @@ +{ + "entries": [ + { + "base": "AWSGameLiftStopMatchmakingRequest", + "context": "BehaviorClass", + "variant": "", + "details": { + "name": "Stop Matchmaking Request", + "category": "AWS Game Lift" + }, + "methods": [ + { + "base": "GetTicketId", + "details": { + "name": "Get Ticket Id" + }, + "params": [ + { + "typeid": "{6132E293-65EF-4DC2-A8A0-00269697229D}", + "details": { + "name": "Stop Matchmaking Request", + "tooltip": "The container for StopMatchmaking request parameters" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Ticket Id" + } + } + ] + }, + { + "base": "SetTicketId", + "details": { + "name": "Set Ticket Id" + }, + "params": [ + { + "typeid": "{6132E293-65EF-4DC2-A8A0-00269697229D}", + "details": { + "name": "Stop Matchmaking Request", + "tooltip": "The container for StopMatchmaking request parameters" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Ticket Id" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.h index 65a5e10cf7..57035e224d 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.h +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.h @@ -71,9 +71,11 @@ namespace ScriptCanvasEditor const char* className = m_className.toUtf8().data(); auto behaviorClass = behaviorContext->m_classes.find(className); - - ScriptCanvasEditorTools::TranslationGeneration translation; - translation.TranslateBehaviorClass(behaviorClass->second); + if (behaviorClass != behaviorContext->m_classes.end()) + { + ScriptCanvasEditorTools::TranslationGeneration translation; + translation.TranslateBehaviorClass(behaviorClass->second); + } } private: diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp index 7ea4af9032..45316778fe 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp @@ -639,7 +639,7 @@ namespace ScriptCanvasEditor m_mimeType = NodePaletteDockWidget::GetMimeType(); m_isInContextMenu = isInContextMenu; m_allowArrowKeyNavigation = isInContextMenu; - m_saveIdentifier = m_isInContextMenu ? "ScriptCanvas" : "ScriptCnavas_ContextMenu"; + m_saveIdentifier = m_isInContextMenu ? "ScriptCanvas" : "ScriptCanvas_ContextMenu"; m_rootTreeItem = Widget::NodePaletteWidget::ExternalCreateNodePaletteRoot(nodePaletteModel, assetModel); } diff --git a/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp b/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp index 844401d141..dd1f8074b1 100644 --- a/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp +++ b/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp @@ -922,6 +922,11 @@ namespace ScriptCanvasEditorTools TranslateMethod(behaviorProperty->m_getter, method); + // We know this is a getter, so there will only be one parameter, we will use the method name as a best + // guess for the argument name + SplitCamelCase(cleanName); + method.m_arguments[1].m_details.m_name = cleanName; + entry->m_methods.push_back(method); } @@ -944,6 +949,11 @@ namespace ScriptCanvasEditorTools TranslateMethod(behaviorProperty->m_setter, method); + // We know this is a setter, so there will only be one parameter, we will use the method name as a best + // guess for the argument name + SplitCamelCase(cleanName); + method.m_arguments[1].m_details.m_name = cleanName; + entry->m_methods.push_back(method); } From 637c12836db22d77e8470e5dda344f3cfd8e92a2 Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Mon, 29 Nov 2021 14:14:11 -0800 Subject: [PATCH 2/4] Removed code that lead to double asset handler registration Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../Code/Source/Translation/TranslationBuilder.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp b/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp index 1b01f7885d..6ae2253fd8 100644 --- a/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp +++ b/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp @@ -31,15 +31,8 @@ namespace GraphCanvas { // Use AssetCatalog service to register ScriptCanvas asset type and extension AZ::Data::AssetType assetType(azrtti_typeid()); - AZ::Data::AssetCatalogRequestBus::Broadcast(&AZ::Data::AssetCatalogRequests::AddAssetType, assetType); - AZ::Data::AssetCatalogRequestBus::Broadcast(&AZ::Data::AssetCatalogRequests::EnableCatalogForAsset, assetType); - AZ::Data::AssetCatalogRequestBus::Broadcast(&AZ::Data::AssetCatalogRequests::AddExtension, TranslationAsset::GetFileFilter()); m_assetHandler = AZStd::make_unique(); - if (!AZ::Data::AssetManager::Instance().GetHandler(assetType)) - { - AZ::Data::AssetManager::Instance().RegisterHandler(m_assetHandler.get(), assetType); - } AssetBuilderSDK::AssetBuilderCommandBus::Handler::BusConnect(GetUUID()); } From 612ca4f66ac85b3c43702eb4e1cb6d782516d039 Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Mon, 29 Nov 2021 14:18:37 -0800 Subject: [PATCH 3/4] PR feedback Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.h index 57035e224d..c14d6c62ae 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.h +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.h @@ -70,9 +70,10 @@ namespace ScriptCanvasEditor AZ::ComponentApplicationBus::BroadcastResult(behaviorContext, &AZ::ComponentApplicationRequests::GetBehaviorContext); const char* className = m_className.toUtf8().data(); - auto behaviorClass = behaviorContext->m_classes.find(className); - if (behaviorClass != behaviorContext->m_classes.end()) + if (behaviorContext->m_classes.contains(className)) { + auto behaviorClass = behaviorContext->m_classes.find(className); + ScriptCanvasEditorTools::TranslationGeneration translation; translation.TranslateBehaviorClass(behaviorClass->second); } From d2595272dc8f59afe4c2c388cee5b0cb6dff3d80 Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Mon, 29 Nov 2021 15:46:19 -0800 Subject: [PATCH 4/4] Removed unused variable Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp b/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp index 6ae2253fd8..01a661684a 100644 --- a/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp +++ b/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp @@ -30,8 +30,6 @@ namespace GraphCanvas void TranslationAssetWorker::Activate() { // Use AssetCatalog service to register ScriptCanvas asset type and extension - AZ::Data::AssetType assetType(azrtti_typeid()); - m_assetHandler = AZStd::make_unique(); AssetBuilderSDK::AssetBuilderCommandBus::Handler::BusConnect(GetUUID());