Changed the match for returntype and added another match for variable returntype2 in gmatch. Returns now displays the return and value type for functions. valuetype is an optional field, this code sets that field to the return values type. Updated ESOAPI to new working condition to be dropped into api folder

Solvaring [07-07-17 - 08:34]
Changed the match for returntype and added another match for variable returntype2 in gmatch. Returns now displays the return and value type for functions. valuetype is an optional field, this code sets that field to the return values type. Updated ESOAPI to new working condition to be dropped into api folder
Filename
ESOAPI.lua
apimaker2.lua
diff --git a/ESOAPI.lua b/ESOAPI.lua
index d1e8001..c574098 100644
--- a/ESOAPI.lua
+++ b/ESOAPI.lua
@@ -15655,8 +15655,8 @@ SUB_SAMPLING_MODE_NORMAL = {
 GetCVar = {type = "function",
 description = "",
 args = "(*string* _CVarName_)",
-returns = "(string,)",
-valuetype = "value,",},
+returns = "(string:value,)",
+valuetype = "string,",},

 SetCVar = {type = "function",
 description = "",
@@ -15665,14 +15665,14 @@ args = "(*string* _CVarName_, *string* _value_)",},
 GetSetting = {type = "function",
 description = "",
 args = "(*integer* _system_, *integer* _settingId_)",
-returns = "(string,)",
-valuetype = "value,",},
+returns = "(string:value,)",
+valuetype = "string,",},

 GetSetting_Bool = {type = "function",
 description = "",
 args = "(*integer* _system_, *integer* _settingId_)",
-returns = "(bool,)",
-valuetype = "value,",},
+returns = "(bool:value,)",
+valuetype = "bool,",},

 SetSetting = {type = "function",
 description = "",
@@ -15697,50 +15697,50 @@ args = "()",},
 GetString = {type = "function",
 description = "",
 args = "(*string* _stringVariablePrefix_, *integer* _contextId_)",
-returns = "(string,)",
-valuetype = "stringValue,",},
+returns = "(string:stringValue,)",
+valuetype = "string,",},

 IsShiftKeyDown = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isShiftDown,",},
+returns = "(bool:isShiftDown,)",
+valuetype = "bool,",},

 IsControlKeyDown = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isCtrlDown,",},
+returns = "(bool:isCtrlDown,)",
+valuetype = "bool,",},

 IsAltKeyDown = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isAltDown,",},
+returns = "(bool:isAltDown,)",
+valuetype = "bool,",},

 IsCommandKeyDown = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isCommandDown,",},
+returns = "(bool:isCommandDown,)",
+valuetype = "bool,",},

 IsCapsLockOn = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isCapsLockOn,",},
+returns = "(bool:isCapsLockOn,)",
+valuetype = "bool,",},

 GetKeyName = {type = "function",
 description = "",
 args = "(*[KeyCode|#KeyCode]* _keyCode_)",
-returns = "(string,)",
-valuetype = "keyName,",},
+returns = "(string:keyName,)",
+valuetype = "string,",},

 GetKeyboardLayout = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "keyboardLayout,",},
+returns = "(string:keyboardLayout,)",
+valuetype = "string,",},

 PlaySound = {type = "function",
 description = "",
@@ -15753,8 +15753,8 @@ args = "(*string* _guiName_, *bool* _hidden_)",},
 GetGuiHidden = {type = "function",
 description = "",
 args = "(*string* _guiName_)",
-returns = "(bool,)",
-valuetype = "hidden,",},
+returns = "(bool:hidden,)",
+valuetype = "bool,",},

 ToggleFullScreen = {type = "function",
 description = "",
@@ -15763,134 +15763,132 @@ args = "()",},
 IsMouseWithinClientArea = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "insideClient,",},
+returns = "(bool:insideClient,)",
+valuetype = "bool,",},

 IsUserAdjustingClientWindow = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isAdjusting,",},
+returns = "(bool:isAdjusting,)",
+valuetype = "bool,",},

 GetInterfaceColor = {type = "function",
 description = "",
 args = "(*integer* _interfaceColorType_, *integer* _fieldValue_)",
-returns = "(number,number,number,number,)",
-valuetype = "alpha,blue,green,red,",},
+returns = "(number:alpha,number:blue,number:green,number:red,)",
+valuetype = "number,number,number,number,",},

 GetErrorString = {type = "function",
 description = "",
 args = "(*integer* _errorStringId_)",
-returns = "(string,)",
-valuetype = "stringValue,",},
+returns = "(string:stringValue,)",
+valuetype = "string,",},

 GetAllianceName = {type = "function",
 description = "",
 args = "(*[Alliance|#Alliance]* _alliance_)",
-returns = "(string,)",
-valuetype = "name,",},
+returns = "(string:name,)",
+valuetype = "string,",},

 GetBattlegroundAllianceName = {type = "function",
 description = "",
 args = "(*[BattlegroundAlliance|#BattlegroundAlliance]* _battlegroundAlliance_)",
-returns = "(string,)",
-valuetype = "name,",},
+returns = "(string:name,)",
+valuetype = "string,",},

 GetNumClasses = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "classCount,",},
+returns = "(integer:classCount,)",
+valuetype = "integer,",},

 GetClassInfo = {type = "function",
 description = "",
 args = "(*luaindex* _index_)",
-returns = "(textureName,textureName,textureName,textureName,bool,textureName,textureName,textureName,string,integer,)",
-valuetype = "pressedIconGamepad,normalIconGamepad,ingameIconGamepad,ingameIconKeyboard,isSelectable,mouseoverIconKeyboard,pressedIconKeyboard,normalIconKeyboard,lore,defId,",},
+returns = "(textureName:pressedIconGamepad,textureName:normalIconGamepad,textureName:ingameIconGamepad,textureName:ingameIconKeyboard,bool:isSelectable,textureName:mouseoverIconKeyboard,textureName:pressedIconKeyboard,textureName:normalIconKeyboard,string:lore,integer:defId,)",
+valuetype = "textureName,textureName,textureName,textureName,bool,textureName,textureName,textureName,string,integer,",},

 GetClassName = {type = "function",
 description = "",
 args = "(*[Gender|#Gender]* _gender_, *integer* _classId_)",
-returns = "(string,)",
-valuetype = "className,",},
+returns = "(string:className,)",
+valuetype = "string,",},

 GetRaceName = {type = "function",
 description = "",
 args = "(*[Gender|#Gender]* _gender_, *integer* _raceId_)",
-returns = "(string,)",
-valuetype = "raceName,",},
+returns = "(string:raceName,)",
+valuetype = "string,",},

 GetLocationName = {type = "function",
 description = "",
 args = "(*integer* _worldId_)",
-returns = "(string,)",
-valuetype = "worldName,",},
+returns = "(string:worldName,)",
+valuetype = "string,",},

 GetGenderFromNameDescriptor = {type = "function",
 description = "",
-args = "(*string* _nameDescriptor_)",
-returns = "()",
-valuetype = "gender,",},
+args = "(*string* _nameDescriptor_)",},

 PlainStringFind = {type = "function",
 description = "",
 args = "(*string* _string_, *string* _searchFor_)",
-returns = "(integer,integer,bool,)",
-valuetype = "endIndex,startIndex,found,",},
+returns = "(integer:endIndex,integer:startIndex,bool:found,)",
+valuetype = "integer,integer,bool,",},

 SplitString = {type = "function",
 description = "",
 args = "(*string* _delims_, *string* _stringToSplit_)",
-returns = "(string,)",
-valuetype = "strings,",},
+returns = "(string:strings,)",
+valuetype = "string,",},

 LocaleAwareToUpper = {type = "function",
 description = "",
 args = "(*string* _stringToUppercase_)",
-returns = "(string,)",
-valuetype = "upperCasedString,",},
+returns = "(string:upperCasedString,)",
+valuetype = "string,",},

 LocaleAwareToLower = {type = "function",
 description = "",
 args = "(*string* _stringToLowercase_)",
-returns = "(string,)",
-valuetype = "lowerCasedString,",},
+returns = "(string:lowerCasedString,)",
+valuetype = "string,",},

 GetDisplayModes = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,integer,)",
-valuetype = "height,width,",},
+returns = "(integer:height,integer:width,)",
+valuetype = "integer,integer,",},

 IsMinSpecMachine = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "minspec,",},
+returns = "(bool:minspec,)",
+valuetype = "bool,",},

 IsPrivateFunction = {type = "function",
 description = "",
 args = "(*string* _functionName_)",
-returns = "(bool,)",
-valuetype = "isPrivate,",},
+returns = "(bool:isPrivate,)",
+valuetype = "bool,",},

 IsProtectedFunction = {type = "function",
 description = "",
 args = "(*string* _functionName_)",
-returns = "(bool,)",
-valuetype = "isProtected,",},
+returns = "(bool:isProtected,)",
+valuetype = "bool,",},

 GetAPIVersion = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "version,",},
+returns = "(integer:version,)",
+valuetype = "integer,",},

 Id64ToString = {type = "function",
 description = "",
 args = "(*id64* _id_)",
-returns = "(string,)",
-valuetype = "stringDesc,",},
+returns = "(string:stringDesc,)",
+valuetype = "string,",},

 HideMouse = {type = "function",
 description = "",
@@ -15903,8 +15901,8 @@ args = "(*bool* _onlyConsiderWhileMoving_)",},
 IsInternalBuild = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isInternalBuild,",},
+returns = "(bool:isInternalBuild,)",
+valuetype = "bool,",},

 SaveLoadDialogResult = {type = "function",
 description = "",
@@ -15913,92 +15911,92 @@ args = "(*[SaveLoadDialogError|#SaveLoadDialogError]* _errorType_, *[SaveLoadDia
 GetSecondsSinceMidnight = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "secondsSinceMidnight,",},
+returns = "(integer:secondsSinceMidnight,)",
+valuetype = "integer,",},

 GetFrameTimeSeconds = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "frameTimeInSeconds,",},
+returns = "(number:frameTimeInSeconds,)",
+valuetype = "number,",},

 GetFrameDeltaTimeSeconds = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "frameDeltaTimeInSeconds,",},
+returns = "(number:frameDeltaTimeInSeconds,)",
+valuetype = "number,",},

 GetFrameTimeMilliseconds = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "frameTimeInMilliseconds,",},
+returns = "(integer:frameTimeInMilliseconds,)",
+valuetype = "integer,",},

 GetFrameDeltaTimeMilliseconds = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "frameDeltaTimeInMilliseconds,",},
+returns = "(integer:frameDeltaTimeInMilliseconds,)",
+valuetype = "integer,",},

 GetDateStringFromTimestamp = {type = "function",
 description = "",
 args = "(*integer* _timestamp_)",
-returns = "(string,)",
-valuetype = "dateString,",},
+returns = "(string:dateString,)",
+valuetype = "string,",},

 GetGameTimeMilliseconds = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "gameTimeInMilliseconds,",},
+returns = "(integer:gameTimeInMilliseconds,)",
+valuetype = "integer,",},

 GetFramerate = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "currentFramerate,",},
+returns = "(number:currentFramerate,)",
+valuetype = "number,",},

 GetTimeString = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "currentTimeString,",},
+returns = "(string:currentTimeString,)",
+valuetype = "string,",},

 GetDate = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "currentTime,",},
+returns = "(integer:currentTime,)",
+valuetype = "integer,",},

 GetTimeStamp = {type = "function",
 description = "",
 args = "()",
-returns = "(id64,)",
-valuetype = "timestamp,",},
+returns = "(id64:timestamp,)",
+valuetype = "id64,",},

 GetDiffBetweenTimeStamps = {type = "function",
 description = "",
 args = "(*id64* _laterTime_, *id64* _earlierTime_)",
-returns = "(number,)",
-valuetype = "difference,",},
+returns = "(number:difference,)",
+valuetype = "number,",},

 GetFormattedTime = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "formattedTime,",},
+returns = "(integer:formattedTime,)",
+valuetype = "integer,",},

 FormatTimeSeconds = {type = "function",
 description = "",
 args = "(*number* _timeValueInSeconds_, *[TimeFormatStyleCode|#TimeFormatStyleCode]* _formatType_, *[TimeFormatPrecisionCode|#TimeFormatPrecisionCode]* _precisionType_, *[TimeFormatDirectionCode|#TimeFormatDirectionCode]* _direction_)",
-returns = "(number,string,)",
-valuetype = "nextUpdateTimeInSec,formattedTimeString,",},
+returns = "(number:nextUpdateTimeInSec,string:formattedTimeString,)",
+valuetype = "number,string,",},

 FormatTimeMilliseconds = {type = "function",
 description = "",
 args = "(*integer* _timeValueInMilliseconds_, *[TimeFormatStyleCode|#TimeFormatStyleCode]* _formatType_, *[TimeFormatPrecisionCode|#TimeFormatPrecisionCode]* _precisionType_, *[TimeFormatDirectionCode|#TimeFormatDirectionCode]* _direction_)",
-returns = "(integer,string,)",
-valuetype = "nextUpdateTimeInMilliseconds,formattedTimeString,",},
+returns = "(integer:nextUpdateTimeInMilliseconds,string:formattedTimeString,)",
+valuetype = "integer,string,",},

 SetGameCameraUIMode = {type = "function",
 description = "",
@@ -16007,8 +16005,8 @@ args = "(*bool* _active_)",},
 IsGameCameraUIModeActive = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "active,",},
+returns = "(bool:active,)",
+valuetype = "bool,",},

 LockCameraRotation = {type = "function",
 description = "",
@@ -16021,80 +16019,76 @@ args = "(*bool* _enabled_, *[CameraOptionsPreview|#CameraOptionsPreview]* _optio
 GetGuildId = {type = "function",
 description = "",
 args = "(*luaindex* _index_)",
-returns = "(integer,)",
-valuetype = "guildId,",},
+returns = "(integer:guildId,)",
+valuetype = "integer,",},

 GetNumGuildPermissions = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numPermissions,",},
+returns = "(integer:numPermissions,)",
+valuetype = "integer,",},

 GetNumGuildHistoryCategories = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numCategories,",},
+returns = "(integer:numCategories,)",
+valuetype = "integer,",},

 GetNumGuildMembersRequiredForPrivilege = {type = "function",
 description = "",
 args = "(*[GuildPrivilege|#GuildPrivilege]* _privilege_)",
-returns = "(integer,)",
-valuetype = "numGuildMembers,",},
+returns = "(integer:numGuildMembers,)",
+valuetype = "integer,",},

 GetAvARankName = {type = "function",
 description = "",
 args = "(*[Gender|#Gender]* _gender_, *integer* _rank_)",
-returns = "(string,)",
-valuetype = "rankName,",},
+returns = "(string:rankName,)",
+valuetype = "string,",},

 GetAvARankIcon = {type = "function",
 description = "",
 args = "(*integer* _rank_)",
-returns = "(textureName,)",
-valuetype = "rankIcon,",},
+returns = "(textureName:rankIcon,)",
+valuetype = "textureName,",},

 CalculateCubicBezierEase = {type = "function",
 description = "",
 args = "(*number* _progress_, *number* _x1_, *number* _y1_, *number* _x2_, *number* _y2_)",
-returns = "(number,)",
-valuetype = "result,",},
+returns = "(number:result,)",
+valuetype = "number,",},

 GetGamepadIconPathForKeyCode = {type = "function",
 description = "",
-args = "(*[KeyCode|#KeyCode]* _key_)",
-returns = "()",
-valuetype = "height,width,gamepadIcon,",},
+args = "(*[KeyCode|#KeyCode]* _key_)",},

 GetMouseIconPathForKeyCode = {type = "function",
 description = "",
-args = "(*[KeyCode|#KeyCode]* _key_)",
-returns = "()",
-valuetype = "height,width,mouseIcon,",},
+args = "(*[KeyCode|#KeyCode]* _key_)",},

 FormatIntegerWithDigitGrouping = {type = "function",
 description = "",
 args = "(*integer* _number_, *string* _delimiter_, *integer* _digitGroupSize_)",
-returns = "(string,)",
-valuetype = "formattedNumber,",},
+returns = "(string:formattedNumber,)",
+valuetype = "string,",},

 DoesCurrentLanguageRequireIME = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "requiresIME,",},
+returns = "(bool:requiresIME,)",
+valuetype = "bool,",},

 IsVirtualKeyboardOnscreen = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "vkeyboardShowing,",},
+returns = "(bool:vkeyboardShowing,)",
+valuetype = "bool,",},

 HashString = {type = "function",
 description = "",
 args = "(*string* _text_)",
-returns = "(integer,)",
-valuetype = "hashValue,",},
+returns = "(integer:hashValue,)",
+valuetype = "integer,",},

 Set3DRenderSpaceToCurrentCamera = {type = "function",
 description = "",
@@ -16103,62 +16097,62 @@ args = "(*string* _controlName_)",},
 ComputeDepthAtWhichWorldWidthRendersAsUIWidth = {type = "function",
 description = "",
 args = "(*number* _worldWidth_, *number* _UIWidth_)",
-returns = "(number,)",
-valuetype = "depth,",},
+returns = "(number:depth,)",
+valuetype = "number,",},

 ComputeDepthAtWhichWorldHeightRendersAsUIHeight = {type = "function",
 description = "",
 args = "(*number* _worldHeight_, *number* _UIHeight_)",
-returns = "(number,)",
-valuetype = "depth,",},
+returns = "(number:depth,)",
+valuetype = "number,",},

 GetWorldDimensionsOfViewFrustumAtDepth = {type = "function",
 description = "",
 args = "(*number* _depth_)",
-returns = "(number,number,)",
-valuetype = "frustumHeight,frustumWidth,",},
+returns = "(number:frustumHeight,number:frustumWidth,)",
+valuetype = "number,number,",},

 GetESOVersionString = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "versionString,",},
+returns = "(string:versionString,)",
+valuetype = "string,",},

 Is64BitClient = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "is64Bit,",},
+returns = "(bool:is64Bit,)",
+valuetype = "bool,",},

 DoesSystemSupportConsoleEnhancedRenderQuality = {type = "function",
 description = "",
 args = "(*[ConsoleEnhancedRenderQuality|#ConsoleEnhancedRenderQuality]* _consoleEnhancedRenderQuality_)",
-returns = "(bool,)",
-valuetype = "hasSupport,",},
+returns = "(bool:hasSupport,)",
+valuetype = "bool,",},

 DoesSystemSupportHDR = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "supportsHDR,",},
+returns = "(bool:supportsHDR,)",
+valuetype = "bool,",},

 IsSystemUsingHDR = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "usesHDR,",},
+returns = "(bool:usesHDR,)",
+valuetype = "bool,",},

 GetEULADetails = {type = "function",
 description = "",
 args = "(*[EULAType|#EULAType]* _eulaType_)",
-returns = "(string,bool,string,string,string,)",
-valuetype = "dialogText,hasAgreed,disagreeText,agreeText,message,",},
+returns = "(string:dialogText,bool:hasAgreed,string:disagreeText,string:agreeText,string:message,)",
+valuetype = "string,bool,string,string,string,",},

 HasAgreedToEULA = {type = "function",
 description = "",
 args = "(*[EULAType|#EULAType]* _eulaType_)",
-returns = "(bool,)",
-valuetype = "hasAgreed,",},
+returns = "(bool:hasAgreed,)",
+valuetype = "bool,",},

 AgreeToEULA = {type = "function",
 description = "",
@@ -16167,8 +16161,8 @@ args = "(*[EULAType|#EULAType]* _eulaType_)",},
 HasViewedEULA = {type = "function",
 description = "",
 args = "(*[EULAType|#EULAType]* _eulaType_)",
-returns = "(bool,)",
-valuetype = "hasViewed,",},
+returns = "(bool:hasViewed,)",
+valuetype = "bool,",},

 MarkEULAAsViewed = {type = "function",
 description = "",
@@ -16177,8 +16171,8 @@ args = "(*[EULAType|#EULAType]* _eulaType_)",},
 ShouldShowEULA = {type = "function",
 description = "",
 args = "(*[EULAType|#EULAType]* _eulaType_)",
-returns = "(bool,)",
-valuetype = "shouldShow,",},
+returns = "(bool:shouldShow,)",
+valuetype = "bool,",},

 OpenURLByType = {type = "function",
 description = "",
@@ -16187,86 +16181,84 @@ args = "(*[ApprovedURLType|#ApprovedURLType]* _urlType_)",},
 GetURLTextByType = {type = "function",
 description = "",
 args = "(*[ApprovedURLType|#ApprovedURLType]* _urlType_)",
-returns = "(string,)",
-valuetype = "urlText,",},
+returns = "(string:urlText,)",
+valuetype = "string,",},

 ShouldOpenURLTypeInOverlay = {type = "function",
 description = "",
 args = "(*[ApprovedURLType|#ApprovedURLType]* _urlType_)",
-returns = "(bool,)",
-valuetype = "urlOpensInOverlay,",},
+returns = "(bool:urlOpensInOverlay,)",
+valuetype = "bool,",},

 GetPlatformServiceType = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "platformServiceType,",},
+args = "()",},

 GetFrameDeltaNormalizedForTargetFramerate = {type = "function",
 description = "",
 args = "(*number* _targetFramesPerSecond_)",
-returns = "(number,)",
-valuetype = "frameDeltaNormalizedForTargetFramerate,",},
+returns = "(number:frameDeltaNormalizedForTargetFramerate,)",
+valuetype = "number,",},

 GetDisplayName = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "displayName,",},
+returns = "(string:displayName,)",
+valuetype = "string,",},

 DecorateDisplayName = {type = "function",
 description = "",
 args = "(*string* _displayName_)",
-returns = "(string,)",
-valuetype = "decoratedDisplayName,",},
+returns = "(string:decoratedDisplayName,)",
+valuetype = "string,",},

 IsDecoratedDisplayName = {type = "function",
 description = "",
 args = "(*string* _displayName_)",
-returns = "(bool,)",
-valuetype = "isDecorated,",},
+returns = "(bool:isDecorated,)",
+valuetype = "bool,",},

 UndecorateDisplayName = {type = "function",
 description = "",
 args = "(*string* _displayName_)",
-returns = "(string,)",
-valuetype = "undecoratedDisplayName,",},
+returns = "(string:undecoratedDisplayName,)",
+valuetype = "string,",},

 GetNumFriends = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numFriends,",},
+returns = "(integer:numFriends,)",
+valuetype = "integer,",},

 GetFriendInfo = {type = "function",
 description = "",
 args = "(*luaindex* _friendIndex_)",
-returns = "(integer,integer,string,string,)",
-valuetype = "secsSinceLogoff,playerStatus,note,displayName,",},
+returns = "(integer:secsSinceLogoff,integer:playerStatus,string:note,string:displayName,)",
+valuetype = "integer,integer,string,string,",},

 GetFriendCharacterInfo = {type = "function",
 description = "",
 args = "(*luaindex* _friendIndex_)",
-returns = "(integer,integer,integer,integer,integer,string,string,bool,)",
-valuetype = "zoneId,championRank,level,alliance,classType,zoneName,characterName,hasCharacter,",},
+returns = "(integer:zoneId,integer:championRank,integer:level,integer:alliance,integer:classType,string:zoneName,string:characterName,bool:hasCharacter,)",
+valuetype = "integer,integer,integer,integer,integer,string,string,bool,",},

 GetNumIgnored = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numIgnored,",},
+returns = "(integer:numIgnored,)",
+valuetype = "integer,",},

 GetIgnoredInfo = {type = "function",
 description = "",
 args = "(*luaindex* _index_)",
-returns = "(string,string,)",
-valuetype = "note,displayName,",},
+returns = "(string:note,string:displayName,)",
+valuetype = "string,string,",},

 IsIgnored = {type = "function",
 description = "",
 args = "(*string* _characterName_)",
-returns = "(bool,)",
-valuetype = "isIgnored,",},
+returns = "(bool:isIgnored,)",
+valuetype = "bool,",},

 RequestFriend = {type = "function",
 description = "",
@@ -16295,32 +16287,32 @@ args = "(*luaindex* _ignoreIndex_, *string* _note_)",},
 IsFriend = {type = "function",
 description = "",
 args = "(*string* _charOrDisplayName_)",
-returns = "(bool,)",
-valuetype = "isFriend,",},
+returns = "(bool:isFriend,)",
+valuetype = "bool,",},

 GetNumIncomingFriendRequests = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numRequests,",},
+returns = "(integer:numRequests,)",
+valuetype = "integer,",},

 GetIncomingFriendRequestInfo = {type = "function",
 description = "",
 args = "(*luaindex* _index_)",
-returns = "(string,integer,string,)",
-valuetype = "message,secsSinceRequest,displayName,",},
+returns = "(string:message,integer:secsSinceRequest,string:displayName,)",
+valuetype = "string,integer,string,",},

 GetNumOutgoingFriendRequests = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numRequests,",},
+returns = "(integer:numRequests,)",
+valuetype = "integer,",},

 GetOutgoingFriendRequestInfo = {type = "function",
 description = "",
 args = "(*luaindex* _index_)",
-returns = "(string,integer,string,)",
-valuetype = "note,secsSinceRequest,displayName,",},
+returns = "(string:note,integer:secsSinceRequest,string:displayName,)",
+valuetype = "string,integer,string,",},

 AcceptFriendRequest = {type = "function",
 description = "",
@@ -16337,74 +16329,72 @@ args = "(*luaindex* _index_)",},
 GetNumGuilds = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numGuilds,",},
+returns = "(integer:numGuilds,)",
+valuetype = "integer,",},

 GetGuildName = {type = "function",
 description = "",
 args = "(*integer* _guildId_)",
-returns = "(string,)",
-valuetype = "name,",},
+returns = "(string:name,)",
+valuetype = "string,",},

 GetGuildDescription = {type = "function",
 description = "",
 args = "(*integer* _guildId_)",
-returns = "(string,)",
-valuetype = "description,",},
+returns = "(string:description,)",
+valuetype = "string,",},

 GetGuildMotD = {type = "function",
 description = "",
 args = "(*integer* _guildId_)",
-returns = "(string,)",
-valuetype = "motd,",},
+returns = "(string:motd,)",
+valuetype = "string,",},

 GetGuildFoundedDate = {type = "function",
 description = "",
 args = "(*integer* _guildId_)",
-returns = "(string,)",
-valuetype = "foundedDate,",},
+returns = "(string:foundedDate,)",
+valuetype = "string,",},

 GetGuildAlliance = {type = "function",
 description = "",
 args = "(*integer* _guildId_)",
-returns = "(integer,)",
-valuetype = "alliance,",},
+returns = "(integer:alliance,)",
+valuetype = "integer,",},

 GetNumGuildMembers = {type = "function",
 description = "",
 args = "(*integer* _guildId_)",
-returns = "(integer,)",
-valuetype = "numGuildMembers,",},
+returns = "(integer:numGuildMembers,)",
+valuetype = "integer,",},

 GetGuildInfo = {type = "function",
 description = "",
 args = "(*integer* _guildId_)",
-returns = "(string,integer,integer,)",
-valuetype = "leaderName,numOnline,numMembers,",},
+returns = "(string:leaderName,integer:numOnline,integer:numMembers,)",
+valuetype = "string,integer,integer,",},

 GetGuildMemberInfo = {type = "function",
 description = "",
 args = "(*integer* _guildId_, *luaindex* _memberIndex_)",
-returns = "(integer,integer,luaindex,string,string,)",
-valuetype = "secsSinceLogoff,playerStatus,rankIndex,note,name,",},
+returns = "(integer:secsSinceLogoff,integer:playerStatus,luaindex:rankIndex,string:note,string:name,)",
+valuetype = "integer,integer,luaindex,string,string,",},

 GetGuildMemberCharacterInfo = {type = "function",
 description = "",
 args = "(*integer* _guildId_, *luaindex* _memberIndex_)",
-returns = "(integer,integer,integer,integer,integer,string,string,bool,)",
-valuetype = "zoneId,championRank,level,alliance,classType,zoneName,characterName,hasCharacter,",},
+returns = "(integer:zoneId,integer:championRank,integer:level,integer:alliance,integer:classType,string:zoneName,string:characterName,bool:hasCharacter,)",
+valuetype = "integer,integer,integer,integer,integer,string,string,bool,",},

 GetGuildMemberIndexFromDisplayName = {type = "function",
 description = "",
-args = "(*integer* _guildId_, *string* _displayName_)",
-returns = "()",
-valuetype = "memberIndex,",},
+args = "(*integer* _guildId_, *string* _displayName_)",},

 GetPlayerGuildMemberIndex = {type = "function",
 description = "",
 args = "(*integer* _guildId_)",
-returns = "(luaindex,)",
-valuetype = "memberIndex,",},
+returns = "(luaindex:memberIndex,)",
+valuetype = "luaindex,",},

 GuildInvite = {type = "function",
 description = "",
@@ -16413,8 +16403,8 @@ args = "(*integer* _guildId_, *string* _displayName_)",},
 IsValidGuildName = {type = "function",
 description = "",
 args = "(*string* _guildName_)",
-returns = "(integer,)",
-valuetype = "violationCode,",},
+returns = "(integer:violationCode,)",
+valuetype = "integer,",},

 GuildCreate = {type = "function",
 description = "",
@@ -16439,14 +16429,14 @@ args = "(*integer* _guildId_, *string* _displayName_)",},
 ShouldDisplayGuildMemberRemoveAlert = {type = "function",
 description = "",
 args = "(*string* _characterName_)",
-returns = "(bool,)",
-valuetype = "shouldDisplay,",},
+returns = "(bool:shouldDisplay,)",
+valuetype = "bool,",},

 ShouldDisplaySelfKickedFromGuildAlert = {type = "function",
 description = "",
 args = "(*integer* _guildId_)",
-returns = "(bool,)",
-valuetype = "shouldDisplay,",},
+returns = "(bool:shouldDisplay,)",
+valuetype = "bool,",},

 SetGuildDescription = {type = "function",
 description = "",
@@ -16459,86 +16449,86 @@ args = "(*integer* _guildId_, *string* _motd_)",},
 DoesGuildRankHavePermission = {type = "function",
 description = "",
 args = "(*integer* _guildId_, *luaindex* _rankIndex_, *integer* _permission_)",
-returns = "(bool,)",
-valuetype = "hasPermission,",},
+returns = "(bool:hasPermission,)",
+valuetype = "bool,",},

 DoesPlayerHaveGuildPermission = {type = "function",
 description = "",
 args = "(*integer* _guildId_, *integer* _permission_)",
-returns = "(bool,)",
-valuetype = "hasPermission,",},
+returns = "(bool:hasPermission,)",
+valuetype = "bool,",},

 CanEditGuildRankPermission = {type = "function",
 description = "",
 args = "(*integer* _rankId_, *integer* _permission_)",
-returns = "(bool,)",
-valuetype = "hasPermission,",},
+returns = "(bool:hasPermission,)",
+valuetype = "bool,",},

 DoesGuildHavePrivilege = {type = "function",
 description = "",
 args = "(*integer* _guildId_, *[GuildPrivilege|#GuildPrivilege]* _privilege_)",
-returns = "(bool,)",
-valuetype = "hasPrivilege,",},
+returns = "(bool:hasPrivilege,)",
+valuetype = "bool,",},

 GetNumGuildRanks = {type = "function",
 description = "",
 args = "(*integer* _guildId_)",
-returns = "(integer,)",
-valuetype = "numRanks,",},
+returns = "(integer:numRanks,)",
+valuetype = "integer,",},

 GetGuildRankIconIndex = {type = "function",
 description = "",
 args = "(*integer* _guildId_, *luaindex* _rankIndex_)",
-returns = "(luaindex,)",
-valuetype = "iconIndex,",},
+returns = "(luaindex:iconIndex,)",
+valuetype = "luaindex,",},

 GetNumGuildRankIcons = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numGuildRankIcons,",},
+returns = "(integer:numGuildRankIcons,)",
+valuetype = "integer,",},

 GetGuildRankSmallIcon = {type = "function",
 description = "",
 args = "(*luaindex* _iconIndex_)",
-returns = "(textureName,)",
-valuetype = "icon,",},
+returns = "(textureName:icon,)",
+valuetype = "textureName,",},

 GetGuildRankLargeIcon = {type = "function",
 description = "",
 args = "(*luaindex* _iconIndex_)",
-returns = "(textureName,)",
-valuetype = "icon,",},
+returns = "(textureName:icon,)",
+valuetype = "textureName,",},

 GetGuildRankListHighlightIcon = {type = "function",
 description = "",
 args = "(*luaindex* _iconIndex_)",
-returns = "(textureName,)",
-valuetype = "icon,",},
+returns = "(textureName:icon,)",
+valuetype = "textureName,",},

 GetGuildRankListUpIcon = {type = "function",
 description = "",
 args = "(*luaindex* _iconIndex_)",
-returns = "(textureName,)",
-valuetype = "icon,",},
+returns = "(textureName:icon,)",
+valuetype = "textureName,",},

 GetGuildRankListDownIcon = {type = "function",
 description = "",
 args = "(*luaindex* _iconIndex_)",
-returns = "(textureName,)",
-valuetype = "icon,",},
+returns = "(textureName:icon,)",
+valuetype = "textureName,",},

 GetGuildRankId = {type = "function",
 description = "",
 args = "(*integer* _guildId_, *luaindex* _rankIndex_)",
-returns = "(integer,)",
-valuetype = "rankId,",},
+returns = "(integer:rankId,)",
+valuetype = "integer,",},

 IsGuildRankGuildMaster = {type = "function",
 description = "",
 args = "(*integer* _guildId_, *luaindex* _rankIndex_)",
-returns = "(bool,)",
-valuetype = "isGuildMaster,",},
+returns = "(bool:isGuildMaster,)",
+valuetype = "bool,",},

 InitializePendingGuildRanks = {type = "function",
 description = "",
@@ -16551,14 +16541,14 @@ args = "(*integer* _rankId_, *string* _name_, *integer* _permissions_, *luaindex
 SavePendingGuildRanks = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "success,",},
+returns = "(bool:success,)",
+valuetype = "bool,",},

 ComposeGuildRankPermissions = {type = "function",
 description = "",
 args = "(*integer* _permissions_, *integer* _permission_, *bool* _enabled_)",
-returns = "(integer,)",
-valuetype = "newPermissions,",},
+returns = "(integer:newPermissions,)",
+valuetype = "integer,",},

 RequestOfflineGuildMembers = {type = "function",
 description = "",
@@ -16567,38 +16557,38 @@ args = "(*integer* _guildId_)",},
 DoesGuildHistoryCategoryHaveMoreEvents = {type = "function",
 description = "",
 args = "(*integer* _guildId_, *[GuildHistoryCategory|#GuildHistoryCategory]* _category_)",
-returns = "(bool,)",
-valuetype = "hasMoreEvents,",},
+returns = "(bool:hasMoreEvents,)",
+valuetype = "bool,",},

 RequestGuildHistoryCategoryNewest = {type = "function",
 description = "",
 args = "(*integer* _guildId_, *[GuildHistoryCategory|#GuildHistoryCategory]* _category_)",
-returns = "(bool,)",
-valuetype = "requested,",},
+returns = "(bool:requested,)",
+valuetype = "bool,",},

 RequestGuildHistoryCategoryOlder = {type = "function",
 description = "",
 args = "(*integer* _guildId_, *[GuildHistoryCategory|#GuildHistoryCategory]* _category_)",
-returns = "(bool,)",
-valuetype = "requested,",},
+returns = "(bool:requested,)",
+valuetype = "bool,",},

 GetNumGuildEvents = {type = "function",
 description = "",
 args = "(*integer* _guildId_, *[GuildHistoryCategory|#GuildHistoryCategory]* _category_)",
-returns = "(integer,)",
-valuetype = "numEvents,",},
+returns = "(integer:numEvents,)",
+valuetype = "integer,",},

 GetGuildEventInfo = {type = "function",
 description = "",
 args = "(*integer* _guildId_, *[GuildHistoryCategory|#GuildHistoryCategory]* _category_, *luaindex* _eventIndex_)",
-returns = "(variant,variant,variant,variant,variant,variant,integer,integer,)",
-valuetype = "param6,param5,param4,param3,param2,param1,secsSinceEvent,eventType,",},
+returns = "(variant:param6,variant:param5,variant:param4,variant:param3,variant:param2,variant:param1,integer:secsSinceEvent,integer:eventType,)",
+valuetype = "variant,variant,variant,variant,variant,variant,integer,integer,",},

 GetGuildEventId = {type = "function",
 description = "",
 args = "(*integer* _guildId_, *[GuildHistoryCategory|#GuildHistoryCategory]* _category_, *luaindex* _eventIndex_)",
-returns = "(id64,)",
-valuetype = "guildEventId,",},
+returns = "(id64:guildEventId,)",
+valuetype = "id64,",},

 SetGuildMemberNote = {type = "function",
 description = "",
@@ -16607,20 +16597,20 @@ args = "(*integer* _guildId_, *luaindex* _memberIndex_, *string* _note_)",},
 GetGuildRankCustomName = {type = "function",
 description = "",
 args = "(*integer* _guildId_, *luaindex* _rankIndex_)",
-returns = "(string,)",
-valuetype = "rankName,",},
+returns = "(string:rankName,)",
+valuetype = "string,",},

 GetNumGuildInvites = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numGuildInvites,",},
+returns = "(integer:numGuildInvites,)",
+valuetype = "integer,",},

 GetGuildInviteInfo = {type = "function",
 description = "",
 args = "(*luaindex* _index_)",
-returns = "(string,string,string,integer,)",
-valuetype = "note,inviterDisplayName,guildAlliance,guildName,guildId,",},
+returns = "(string:note,string:inviterDisplayName,string:guildName,integer:guildId,)",
+valuetype = "string,string,string,integer,",},

 AcceptGuildInvite = {type = "function",
 description = "",
@@ -16637,26 +16627,26 @@ args = "(*string* _name_)",},
 GetGuildClaimedKeep = {type = "function",
 description = "",
 args = "(*integer* _guildLuaId_)",
-returns = "(integer,integer,)",
-valuetype = "claimedKeepCampaignId,claimedKeepId,",},
+returns = "(integer:claimedKeepCampaignId,integer:claimedKeepId,)",
+valuetype = "integer,integer,",},

 DoesGuildHaveClaimedKeep = {type = "function",
 description = "",
 args = "(*integer* _guildLuaId_)",
-returns = "(bool,)",
-valuetype = "hasClaimedKeep,",},
+returns = "(bool:hasClaimedKeep,)",
+valuetype = "bool,",},

 CheckGuildKeepClaim = {type = "function",
 description = "",
 args = "(*integer* _guildLuaId_, *integer* _keepId_)",
-returns = "(integer,)",
-valuetype = "result,",},
+returns = "(integer:result,)",
+valuetype = "integer,",},

 CheckGuildKeepRelease = {type = "function",
 description = "",
 args = "(*integer* _guildLuaId_)",
-returns = "(integer,)",
-valuetype = "result,",},
+returns = "(integer:result,)",
+valuetype = "integer,",},

 ReleaseKeepForGuild = {type = "function",
 description = "",
@@ -16672,21 +16662,19 @@ args = "()",},

 GetGuildOwnedKioskInfo = {type = "function",
 description = "",
-args = "(*integer* _guildId_)",
-returns = "()",
-valuetype = "ownedKioskName,",},
+args = "(*integer* _guildId_)",},

 GetNumGuildSpecificItems = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numItems,",},
+returns = "(integer:numItems,)",
+valuetype = "integer,",},

 GetGuildSpecificItemInfo = {type = "function",
 description = "",
 args = "(*luaindex* _index_)",
-returns = "(integer,integer,integer,integer,integer,string,textureName,)",
-valuetype = "currencyType,purchasePrice,requiredChampionRank,requiredLevel,stackCount,quality,itemName,icon,",},
+returns = "(integer:purchasePrice,integer:requiredChampionRank,integer:requiredLevel,integer:stackCount,integer:quality,string:itemName,textureName:icon,)",
+valuetype = "integer,integer,integer,integer,integer,string,textureName,",},

 BuyGuildSpecificItem = {type = "function",
 description = "",
@@ -16695,8 +16683,8 @@ args = "(*luaindex* _slotIndex_)",},
 GetGuildSpecificItemLink = {type = "function",
 description = "",
 args = "(*luaindex* _index_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 SetGamepadVibration = {type = "function",
 description = "",
@@ -16705,62 +16693,62 @@ args = "(*integer* _durationMs_, *number* _firstMotor_, *number* _secondMotor_,
 GetGamepadLeftStickX = {type = "function",
 description = "",
 args = "(*bool* _includeDeadzone_)",
-returns = "(number,)",
-valuetype = "x,",},
+returns = "(number:x,)",
+valuetype = "number,",},

 GetGamepadLeftStickY = {type = "function",
 description = "",
 args = "(*bool* _includeDeadzone_)",
-returns = "(number,)",
-valuetype = "y,",},
+returns = "(number:y,)",
+valuetype = "number,",},

 GetGamepadLeftStickDeltaX = {type = "function",
 description = "",
 args = "(*bool* _includeDeadzone_)",
-returns = "(number,)",
-valuetype = "deltaX,",},
+returns = "(number:deltaX,)",
+valuetype = "number,",},

 GetGamepadLeftStickDeltaY = {type = "function",
 description = "",
 args = "(*bool* _includeDeadzone_)",
-returns = "(number,)",
-valuetype = "deltaY,",},
+returns = "(number:deltaY,)",
+valuetype = "number,",},

 GetGamepadRightStickX = {type = "function",
 description = "",
 args = "(*bool* _includeDeadzone_)",
-returns = "(number,)",
-valuetype = "x,",},
+returns = "(number:x,)",
+valuetype = "number,",},

 GetGamepadRightStickY = {type = "function",
 description = "",
 args = "(*bool* _includeDeadzone_)",
-returns = "(number,)",
-valuetype = "y,",},
+returns = "(number:y,)",
+valuetype = "number,",},

 GetGamepadRightStickDeltaX = {type = "function",
 description = "",
 args = "(*bool* _includeDeadzone_)",
-returns = "(number,)",
-valuetype = "deltaX,",},
+returns = "(number:deltaX,)",
+valuetype = "number,",},

 GetGamepadRightStickDeltaY = {type = "function",
 description = "",
 args = "(*bool* _includeDeadzone_)",
-returns = "(number,)",
-valuetype = "deltaY,",},
+returns = "(number:deltaY,)",
+valuetype = "number,",},

 GetGamepadLeftTriggerMagnitude = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "magnitude,",},
+returns = "(number:magnitude,)",
+valuetype = "number,",},

 GetGamepadRightTriggerMagnitude = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "magnitude,",},
+returns = "(number:magnitude,)",
+valuetype = "number,",},

 SetGamepadLeftStickConsumedByUI = {type = "function",
 description = "",
@@ -16773,98 +16761,88 @@ args = "(*bool* _consumed_)",},
 GetGamepadTouchpadX = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "gamepadTouchpadX,",},
+returns = "(number:gamepadTouchpadX,)",
+valuetype = "number,",},

 GetGamepadTouchpadY = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "gamepadTouchpadY,",},
+returns = "(number:gamepadTouchpadY,)",
+valuetype = "number,",},

 IsGamepadTouchpadActive = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "gamepadTouchpadActive,",},
+returns = "(bool:gamepadTouchpadActive,)",
+valuetype = "bool,",},

 GetGamepadType = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "gamepadType,",},
+args = "()",},

 IsConsoleUI = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isConsoleUI,",},
+returns = "(bool:isConsoleUI,)",
+valuetype = "bool,",},

 IsInGamepadPreferredMode = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "inGamepadPreferredMode,",},
+returns = "(bool:inGamepadPreferredMode,)",
+valuetype = "bool,",},

 IsKeyCodeGamepadKey = {type = "function",
 description = "",
 args = "(*[KeyCode|#KeyCode]* _key_)",
-returns = "(bool,)",
-valuetype = "isGamepadKey,",},
+returns = "(bool:isGamepadKey,)",
+valuetype = "bool,",},

 IsKeyCodeMouseKey = {type = "function",
 description = "",
 args = "(*[KeyCode|#KeyCode]* _key_)",
-returns = "(bool,)",
-valuetype = "isMouseKey,",},
+returns = "(bool:isMouseKey,)",
+valuetype = "bool,",},

 IsKeyCodeKeyboardKey = {type = "function",
 description = "",
 args = "(*[KeyCode|#KeyCode]* _key_)",
-returns = "(bool,)",
-valuetype = "isKeyboardKey,",},
+returns = "(bool:isKeyboardKey,)",
+valuetype = "bool,",},

 IsKeyCodeChordKey = {type = "function",
 description = "",
 args = "(*[KeyCode|#KeyCode]* _key_)",
-returns = "(bool,)",
-valuetype = "isKeyChord,",},
+returns = "(bool:isKeyChord,)",
+valuetype = "bool,",},

 IsKeyCodeHoldKey = {type = "function",
 description = "",
 args = "(*[KeyCode|#KeyCode]* _key_)",
-returns = "(bool,)",
-valuetype = "isKeyHold,",},
+returns = "(bool:isKeyHold,)",
+valuetype = "bool,",},

 IsKeyDown = {type = "function",
 description = "",
 args = "(*[KeyCode|#KeyCode]* _key_)",
-returns = "(bool,)",
-valuetype = "isKeyDown,",},
+returns = "(bool:isKeyDown,)",
+valuetype = "bool,",},

 ConvertKeyPressToHold = {type = "function",
 description = "",
-args = "(*[KeyCode|#KeyCode]* _key_)",
-returns = "()",
-valuetype = "holdKey,",},
+args = "(*[KeyCode|#KeyCode]* _key_)",},

 ConvertHoldKeyPressToNonHold = {type = "function",
 description = "",
-args = "(*[KeyCode|#KeyCode]* _holdKey_)",
-returns = "()",
-valuetype = "key,",},
+args = "(*[KeyCode|#KeyCode]* _holdKey_)",},

 GetKeyChordsFromSingleKey = {type = "function",
 description = "",
-args = "(*[KeyCode|#KeyCode]* _key_)",
-returns = "()",
-valuetype = "keyChord,",},
+args = "(*[KeyCode|#KeyCode]* _key_)",},

 GetUIPlatform = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "platform,",},
+args = "()",},

 SetOverscanOffsets = {type = "function",
 description = "",
@@ -16873,14 +16851,14 @@ args = "(*integer* _offsetX_, *integer* _offsetY_, *integer* _offsetWidth_, *int
 GetOverscanOffsets = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,integer,integer,integer,)",
-valuetype = "offsetHeight,offsetWidth,offsetY,offsetX,",},
+returns = "(integer:offsetHeight,integer:offsetWidth,integer:offsetY,integer:offsetX,)",
+valuetype = "integer,integer,integer,integer,",},

 IsGUIResizing = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isGUIResizing,",},
+returns = "(bool:isGUIResizing,)",
+valuetype = "bool,",},

 UpdatePlayerPresenceInformation = {type = "function",
 description = "",
@@ -16905,80 +16883,78 @@ args = "(*[RemoteSceneStateChangeType|#RemoteSceneStateChangeType]* _sceneChange
 IsValidName = {type = "function",
 description = "",
 args = "(*string* _name_)",
-returns = "(bool,)",
-valuetype = "isValid,",},
+returns = "(bool:isValid,)",
+valuetype = "bool,",},

 GetDigitGroupingSize = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "digitGroupingSize,",},
+returns = "(integer:digitGroupingSize,)",
+valuetype = "integer,",},

 AbbreviateNumber = {type = "function",
 description = "",
 args = "(*integer* _number_, *[NumberAbbreviationPrecision|#NumberAbbreviationPrecision]* _precision_, *bool* _useUppercaseSuffix_)",
-returns = "(string,number,)",
-valuetype = "suffix,abbreviatedValue,",},
+returns = "(string:suffix,number:abbreviatedValue,)",
+valuetype = "string,number,",},

 IsESOPlusSubscriber = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isESOPlusSubscriber,",},
+returns = "(bool:isESOPlusSubscriber,)",
+valuetype = "bool,",},

 GetHighestUnlockedChapter = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "highestUnlockedChapter,",},
+args = "()",},

 GetChapterId = {type = "function",
 description = "",
 args = "(*[Chapter|#Chapter]* _chapter_)",
-returns = "(integer,)",
-valuetype = "chapterId,",},
+returns = "(integer:chapterId,)",
+valuetype = "integer,",},

 GetCurrentChapterCollectibleId = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "collectibleId,",},
+returns = "(integer:collectibleId,)",
+valuetype = "integer,",},

 HasCurrentChapter = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "hasChapter,",},
+returns = "(bool:hasChapter,)",
+valuetype = "bool,",},

 GetTrialInfo = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,string,string,integer,)",
-valuetype = "version,description,title,accountTypeId,",},
+returns = "(integer:version,string:description,string:title,integer:accountTypeId,)",
+valuetype = "integer,string,string,integer,",},

 GetPlayerCrowns = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "currentCrowns,",},
+returns = "(integer:currentCrowns,)",
+valuetype = "integer,",},

 GetPlayerCrownGems = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "currentCrownGems,",},
+returns = "(integer:currentCrownGems,)",
+valuetype = "integer,",},

 GetPlayerMarketCurrency = {type = "function",
 description = "",
 args = "(*[MarketCurrencyType|#MarketCurrencyType]* _type_)",
-returns = "(integer,)",
-valuetype = "currencyAmount,",},
+returns = "(integer:currencyAmount,)",
+valuetype = "integer,",},

 IsChromaSystemAvailable = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "systemAvailable,",},
+returns = "(bool:systemAvailable,)",
+valuetype = "bool,",},

 ChromaClearKeyboardEffect = {type = "function",
 description = "",
@@ -17111,14 +17087,14 @@ args = "(*integer* _effectId_)",},
 ChromaGetCustomEffectCellColor = {type = "function",
 description = "",
 args = "(*[ChromaDeviceType|#ChromaDeviceType]* _deviceType_, *luaindex* _rowIndex_, *luaindex* _columnIndex_)",
-returns = "(number,number,number,)",
-valuetype = "blue,green,red,",},
+returns = "(number:blue,number:green,number:red,)",
+valuetype = "number,number,number,",},

 ChromaGetCustomEffectDimensions = {type = "function",
 description = "",
 args = "(*[ChromaDeviceType|#ChromaDeviceType]* _deviceType_)",
-returns = "(integer,integer,)",
-valuetype = "numColumn,numRows,",},
+returns = "(integer:numColumn,integer:numRows,)",
+valuetype = "integer,integer,",},

 ChromaFinalizeCustomEffect = {type = "function",
 description = "",
@@ -17126,33 +17102,31 @@ args = "(*[ChromaDeviceType|#ChromaDeviceType]* _deviceType_)",},

 GetChromaKeyboardKeyByZoGuiKey = {type = "function",
 description = "",
-args = "(*[KeyCode|#KeyCode]* _zoGuiKeyCode_)",
-returns = "()",
-valuetype = "chromaKeyboardKey,",},
+args = "(*[KeyCode|#KeyCode]* _zoGuiKeyCode_)",},

 GetChromaKeyboardCellByChromaKeyboardKey = {type = "function",
 description = "",
 args = "(*[ChromaKeyboardKey|#ChromaKeyboardKey]* _chromaKeyboardKey_)",
-returns = "(luaindex,luaindex,)",
-valuetype = "columnIndex,rowIndex,",},
+returns = "(luaindex:columnIndex,luaindex:rowIndex,)",
+valuetype = "luaindex,luaindex,",},

 GetChromaMouseCellByLED = {type = "function",
 description = "",
 args = "(*[ChromaMouseLED2|#ChromaMouseLED2]* _ledId_)",
-returns = "(luaindex,luaindex,)",
-valuetype = "columnIndex,rowIndex,",},
+returns = "(luaindex:columnIndex,luaindex:rowIndex,)",
+valuetype = "luaindex,luaindex,",},

 GetChromaMousepadCellByLED = {type = "function",
 description = "",
 args = "(*[ChromaMousepadLED|#ChromaMousepadLED]* _ledId_)",
-returns = "(luaindex,luaindex,)",
-valuetype = "columnIndex,rowIndex,",},
+returns = "(luaindex:columnIndex,luaindex:rowIndex,)",
+valuetype = "luaindex,luaindex,",},

 ChromaGenerateCustomEffect = {type = "function",
 description = "",
 args = "(*[ChromaDeviceType|#ChromaDeviceType]* _deviceType_, *[ChromaCustomEffectType|#ChromaCustomEffectType]* _customEffectType_, *[ChromaCustomEffectGridStyle|#ChromaCustomEffectGridStyle]* _gridStyle_)",
-returns = "(integer,)",
-valuetype = "effectId,",},
+returns = "(integer:effectId,)",
+valuetype = "integer,",},

 ChromaDeleteCustomEffectById = {type = "function",
 description = "",
@@ -17185,8 +17159,8 @@ args = "(*integer* _effectId_, *bool* _useAlphaChannel_)",},
 CreateBackgroundListFilter = {type = "function",
 description = "",
 args = "(*[BackgroundListFilterTarget|#BackgroundListFilterTarget]* _target_, *string* _searchText_)",
-returns = "(integer,)",
-valuetype = "taskId,",},
+returns = "(integer:taskId,)",
+valuetype = "integer,",},

 AddBackgroundListFilterType = {type = "function",
 description = "",
@@ -17211,20 +17185,20 @@ args = "(*integer* _taskId_)",},
 GetNumBackgroundListFilterResults = {type = "function",
 description = "",
 args = "(*integer* _taskId_)",
-returns = "(integer,)",
-valuetype = "numResults,",},
+returns = "(integer:numResults,)",
+valuetype = "integer,",},

 GetBackgroundListFilterResult = {type = "function",
 description = "",
 args = "(*integer* _taskId_, *luaindex* _resultIndex_)",
-returns = "(integer,integer,)",
-valuetype = "value2,value1,",},
+returns = "(integer:value2,integer:value1,)",
+valuetype = "integer,integer,",},

 GetBackgroundListFilterResult64 = {type = "function",
 description = "",
 args = "(*integer* _taskId_, *luaindex* _resultIndex_)",
-returns = "(id64,)",
-valuetype = "value,",},
+returns = "(id64:value,)",
+valuetype = "id64,",},

 PlayVideo = {type = "function",
 description = "",
@@ -17253,8 +17227,8 @@ args = "(*number* _volume_, *number* _lerpTime_)",},
 ComputeStringDistance = {type = "function",
 description = "",
 args = "(*string* _source_, *string* _target_, *integer* _maxDistance_)",
-returns = "(integer,)",
-valuetype = "distance,",},
+returns = "(integer:distance,)",
+valuetype = "integer,",},

 ExecuteChatCommand = {type = "function",
 description = "",
@@ -17271,8 +17245,8 @@ args = "(*string* _guiName_)",},
 GetPlayerStatus = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "status,",},
+returns = "(integer:status,)",
+valuetype = "integer,",},

 SelectPlayerStatus = {type = "function",
 description = "",
@@ -17281,14 +17255,14 @@ args = "(*integer* _status_)",},
 GetNumPlayerStatuses = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numStatuses,",},
+returns = "(integer:numStatuses,)",
+valuetype = "integer,",},

 GetCriticalStrikeChance = {type = "function",
 description = "",
 args = "(*number* _statValue_)",
-returns = "(number,)",
-valuetype = "chance,",},
+returns = "(number:chance,)",
+valuetype = "number,",},

 TakeScreenshot = {type = "function",
 description = "",
@@ -17301,26 +17275,26 @@ args = "(*[FullscreenEffectType|#FullscreenEffectType]* _effectType_, *number* _
 DoesGameHaveFocus = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "hasFocus,",},
+returns = "(bool:hasFocus,)",
+valuetype = "bool,",},

 IsPlayerActivated = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "activated,",},
+returns = "(bool:activated,)",
+valuetype = "bool,",},

 GetSecondsPlayed = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "secondsPlayed,",},
+returns = "(integer:secondsPlayed,)",
+valuetype = "integer,",},

 GetLatency = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "latencyMS,",},
+returns = "(integer:latencyMS,)",
+valuetype = "integer,",},

 PlaceInTradeWindow = {type = "function",
 description = "",
@@ -17332,9 +17306,7 @@ args = "(*string* _target_)",},

 ConvertMouseButtonToKeyCode = {type = "function",
 description = "",
-args = "(*integer* _mouseButton_)",
-returns = "()",
-valuetype = "key,",},
+args = "(*integer* _mouseButton_)",},

 ResetAllBindsToDefault = {type = "function",
 description = "",
@@ -17351,488 +17323,476 @@ args = "()",},
 DoesUnitExist = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "exists,",},
+returns = "(bool:exists,)",
+valuetype = "bool,",},

 GetUnitName = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(string,)",
-valuetype = "name,",},
+returns = "(string:name,)",
+valuetype = "string,",},

 GetRawUnitName = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(string,)",
-valuetype = "rawName,",},
+returns = "(string:rawName,)",
+valuetype = "string,",},

 GetUnitDisplayName = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(string,)",
-valuetype = "displayName,",},
+returns = "(string:displayName,)",
+valuetype = "string,",},

 GetUnitGender = {type = "function",
 description = "",
-args = "(*string* _unitTag_)",
-returns = "()",
-valuetype = "gender,",},
+args = "(*string* _unitTag_)",},

 GetUnitNameHighlightedByReticle = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "name,",},
+returns = "(string:name,)",
+valuetype = "string,",},

 GetUnitClass = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(string,)",
-valuetype = "className,",},
+returns = "(string:className,)",
+valuetype = "string,",},

 GetUnitClassId = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(integer,)",
-valuetype = "classId,",},
+returns = "(integer:classId,)",
+valuetype = "integer,",},

 GetUnitChampionPoints = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(integer,)",
-valuetype = "championPoints,",},
+returns = "(integer:championPoints,)",
+valuetype = "integer,",},

 GetUnitEffectiveChampionPoints = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(integer,)",
-valuetype = "championPoints,",},
+returns = "(integer:championPoints,)",
+valuetype = "integer,",},

 CanUnitGainChampionPoints = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "canGainChampionPoints,",},
+returns = "(bool:canGainChampionPoints,)",
+valuetype = "bool,",},

 GetUnitEffectiveLevel = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(integer,)",
-valuetype = "level,",},
+returns = "(integer:level,)",
+valuetype = "integer,",},

 GetUnitZone = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(string,)",
-valuetype = "zoneName,",},
+returns = "(string:zoneName,)",
+valuetype = "string,",},

 GetUnitZoneIndex = {type = "function",
 description = "",
-args = "(*string* _unitTag_)",
-returns = "()",
-valuetype = "zoneIndex,",},
+args = "(*string* _unitTag_)",},

 GetUnitXP = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(integer,)",
-valuetype = "exp,",},
+returns = "(integer:exp,)",
+valuetype = "integer,",},

 GetUnitXPMax = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(integer,)",
-valuetype = "maxExp,",},
+returns = "(integer:maxExp,)",
+valuetype = "integer,",},

 IsUnitChampion = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "isChampion,",},
+returns = "(bool:isChampion,)",
+valuetype = "bool,",},

 IsUnitUsingVeteranDifficulty = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "isVeteranDifficulty,",},
+returns = "(bool:isVeteranDifficulty,)",
+valuetype = "bool,",},

 GetPlayerChampionXP = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "championExp,",},
+returns = "(integer:championExp,)",
+valuetype = "integer,",},

 GetPlayerChampionPointsEarned = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "points,",},
+returns = "(integer:points,)",
+valuetype = "integer,",},

 IsUnitBattleLeveled = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "isBattleLeveled,",},
+returns = "(bool:isBattleLeveled,)",
+valuetype = "bool,",},

 IsUnitChampionBattleLeveled = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "isChampBattleLeveled,",},
+returns = "(bool:isChampBattleLeveled,)",
+valuetype = "bool,",},

 GetUnitBattleLevel = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(integer,)",
-valuetype = "battleLevel,",},
+returns = "(integer:battleLevel,)",
+valuetype = "integer,",},

 GetUnitChampionBattleLevel = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(integer,)",
-valuetype = "champBattleLevel,",},
+returns = "(integer:champBattleLevel,)",
+valuetype = "integer,",},

 GetUnitDrownTime = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(number,number,)",
-valuetype = "endTime,startTime,",},
+returns = "(number:endTime,number:startTime,)",
+valuetype = "number,number,",},

 GetUnitEquipmentBonusRatingRelativeToLevel = {type = "function",
 description = "",
 args = "(*string* _unitTag_, *number* _rawEquipmentBonusRating_)",
-returns = "(number,)",
-valuetype = "relativeEquipmentBonusRating,",},
+returns = "(number:relativeEquipmentBonusRating,)",
+valuetype = "number,",},

 IsUnitInGroupSupportRange = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "result,",},
+returns = "(bool:result,)",
+valuetype = "bool,",},

 GetUnitType = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(integer,)",
-valuetype = "type,",},
+returns = "(integer:type,)",
+valuetype = "integer,",},

 CanUnitTrade = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "canTrade,",},
+returns = "(bool:canTrade,)",
+valuetype = "bool,",},

 AreUnitsEqual = {type = "function",
 description = "",
 args = "(*string* _unitTag_, *string* _secondUnitTag_)",
-returns = "(bool,)",
-valuetype = "areEqual,",},
+returns = "(bool:areEqual,)",
+valuetype = "bool,",},

 IsUnitGrouped = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "isGrouped,",},
+returns = "(bool:isGrouped,)",
+valuetype = "bool,",},

 IsUnitGroupLeader = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "isGroupLeader,",},
+returns = "(bool:isGroupLeader,)",
+valuetype = "bool,",},

 IsUnitSoloOrGroupLeader = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "isSoloOrGroupLeader,",},
+returns = "(bool:isSoloOrGroupLeader,)",
+valuetype = "bool,",},

 GetGroupLeaderUnitTag = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "leaderUnitTag,",},
+returns = "(string:leaderUnitTag,)",
+valuetype = "string,",},

 IsUnitFriend = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "isOnFriendList,",},
+returns = "(bool:isOnFriendList,)",
+valuetype = "bool,",},

 IsUnitIgnored = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "isIgnored,",},
+returns = "(bool:isIgnored,)",
+valuetype = "bool,",},

 IsUnitPlayer = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "isPlayer,",},
+returns = "(bool:isPlayer,)",
+valuetype = "bool,",},

 IsUnitPvPFlagged = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "isPvPFlagged,",},
+returns = "(bool:isPvPFlagged,)",
+valuetype = "bool,",},

 IsUnitAttackable = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "attackable,",},
+returns = "(bool:attackable,)",
+valuetype = "bool,",},

 IsUnitJusticeGuard = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "isJusticeGuard,",},
+returns = "(bool:isJusticeGuard,)",
+valuetype = "bool,",},

 IsUnitInvulnerableGuard = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "isInvulnerableGuard,",},
+returns = "(bool:isInvulnerableGuard,)",
+valuetype = "bool,",},

 IsUnitLivestock = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "isLivestock,",},
+returns = "(bool:isLivestock,)",
+valuetype = "bool,",},

 GetUnitAlliance = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(integer,)",
-valuetype = "alliance,",},
+returns = "(integer:alliance,)",
+valuetype = "integer,",},

 AreUnitsCurrentlyAllied = {type = "function",
 description = "",
 args = "(*string* _unitTag1_, *string* _unitTag2_)",
-returns = "(bool,)",
-valuetype = "allied,",},
+returns = "(bool:allied,)",
+valuetype = "bool,",},

 GetUnitBattlegroundAlliance = {type = "function",
 description = "",
-args = "(*string* _unitTag_)",
-returns = "()",
-valuetype = "battlegroundAlliance,",},
+args = "(*string* _unitTag_)",},

 GetUnitRace = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(string,)",
-valuetype = "race,",},
+returns = "(string:race,)",
+valuetype = "string,",},

 GetUnitRaceId = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(integer,)",
-valuetype = "raceId,",},
+returns = "(integer:raceId,)",
+valuetype = "integer,",},

 IsUnitFriendlyFollower = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "isFollowing,",},
+returns = "(bool:isFollowing,)",
+valuetype = "bool,",},

 GetUnitReaction = {type = "function",
 description = "",
-args = "(*string* _unitTag_)",
-returns = "()",
-valuetype = "unitReaction,",},
+args = "(*string* _unitTag_)",},

 GetUnitAvARankPoints = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(integer,)",
-valuetype = "AvARankPoints,",},
+returns = "(integer:AvARankPoints,)",
+valuetype = "integer,",},

 GetUnitAvARank = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(integer,integer,)",
-valuetype = "subRank,rank,",},
+returns = "(integer:subRank,integer:rank,)",
+valuetype = "integer,integer,",},

 GetLargeAvARankIcon = {type = "function",
 description = "",
 args = "(*integer* _rank_)",
-returns = "(textureName,)",
-valuetype = "largeRankIcon,",},
+returns = "(textureName:largeRankIcon,)",
+valuetype = "textureName,",},

 GetAvARankProgress = {type = "function",
 description = "",
 args = "(*integer* _currentRankPoints_)",
-returns = "(integer,integer,integer,integer,)",
-valuetype = "nextRankAt,rankStartsAt,nextSubRankAt,subRankStartsAt,",},
+returns = "(integer:nextRankAt,integer:rankStartsAt,integer:nextSubRankAt,integer:subRankStartsAt,)",
+valuetype = "integer,integer,integer,integer,",},

 GetNumPointsNeededForAvARank = {type = "function",
 description = "",
 args = "(*integer* _rank_)",
-returns = "(integer,)",
-valuetype = "numPointsRequired,",},
+returns = "(integer:numPointsRequired,)",
+valuetype = "integer,",},

 GetUnitReactionColor = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(number,number,number,)",
-valuetype = "blue,green,red,",},
+returns = "(number:blue,number:green,number:red,)",
+valuetype = "number,number,number,",},

 IsUnitInCombat = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "isInCombat,",},
+returns = "(bool:isInCombat,)",
+valuetype = "bool,",},

 IsUnitDead = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "isDead,",},
+returns = "(bool:isDead,)",
+valuetype = "bool,",},

 IsUnitReincarnating = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "isReincarnating,",},
+returns = "(bool:isReincarnating,)",
+valuetype = "bool,",},

 IsUnitDeadOrReincarnating = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "isDead,",},
+returns = "(bool:isDead,)",
+valuetype = "bool,",},

 IsUnitSwimming = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "isSwimming,",},
+returns = "(bool:isSwimming,)",
+valuetype = "bool,",},

 IsUnitResurrectableByPlayer = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "isResurrectable,",},
+returns = "(bool:isResurrectable,)",
+valuetype = "bool,",},

 IsUnitBeingResurrected = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "isBeingResurrected,",},
+returns = "(bool:isBeingResurrected,)",
+valuetype = "bool,",},

 DoesUnitHaveResurrectPending = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "hasResurrectPending,",},
+returns = "(bool:hasResurrectPending,)",
+valuetype = "bool,",},

 GetUnitStealthState = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(integer,)",
-valuetype = "stealthState,",},
+returns = "(integer:stealthState,)",
+valuetype = "integer,",},

 GetUnitDisguiseState = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(integer,)",
-valuetype = "disguiseState,",},
+returns = "(integer:disguiseState,)",
+valuetype = "integer,",},

 GetUnitHidingEndTime = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(number,)",
-valuetype = "endTime,",},
+returns = "(number:endTime,)",
+valuetype = "number,",},

 IsUnitOnline = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "isOnline,",},
+returns = "(bool:isOnline,)",
+valuetype = "bool,",},

 IsUnitInspectableSiege = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "isInspectableSiege,",},
+returns = "(bool:isInspectableSiege,)",
+valuetype = "bool,",},

 IsUnitInDungeon = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "isInDungeon,",},
+returns = "(bool:isInDungeon,)",
+valuetype = "bool,",},

 GetUnitCaption = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(string,)",
-valuetype = "caption,",},
+returns = "(string:caption,)",
+valuetype = "string,",},

 GetUnitSilhouetteTexture = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(string,)",
-valuetype = "icon,",},
+returns = "(string:icon,)",
+valuetype = "string,",},

 GetUnitPowerInfo = {type = "function",
 description = "",
 args = "(*string* _unitTag_, *luaindex* _poolIndex_)",
-returns = "(integer,integer,integer,)",
-valuetype = "effectiveMax,max,current,type,",},
+returns = "(integer:effectiveMax,integer:max,integer:current,)",
+valuetype = "integer,integer,integer,",},

 GetUnitPower = {type = "function",
 description = "",
 args = "(*string* _unitTag_, *[CombatMechanicType|#CombatMechanicType]* _powerType_)",
-returns = "(integer,integer,integer,)",
-valuetype = "effectiveMax,max,current,",},
+returns = "(integer:effectiveMax,integer:max,integer:current,)",
+valuetype = "integer,integer,integer,",},

 GetCurrentCharacterId = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "id,",},
+returns = "(string:id,)",
+valuetype = "string,",},

 GetPlayerStat = {type = "function",
 description = "",
 args = "(*[DerivedStats|#DerivedStats]* _derivedStat_, *[StatBonusOption|#StatBonusOption]* _statBonusOption_)",
-returns = "(integer,)",
-valuetype = "value,",},
+returns = "(integer:value,)",
+valuetype = "integer,",},

 GetAllUnitAttributeVisualizerEffectInfo = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(number,number,)",
-valuetype = "maxValue,value,powerType,attributeType,statType,unitAttributeVisual,",},
+returns = "(number:maxValue,number:value,)",
+valuetype = "number,number,",},

 GetUnitAttributeVisualizerEffectInfo = {type = "function",
 description = "",
-args = "(*string* _unitTag_, *[UnitAttributeVisual|#UnitAttributeVisual]* _unitAttributeVisual_, *[DerivedStats|#DerivedStats]* _statType_, *[Attributes|#Attributes]* _attributeType_, *[CombatMechanicType|#CombatMechanicType]* _powerType_)",
-returns = "()",
-valuetype = "maxValue,value,",},
+args = "(*string* _unitTag_, *[UnitAttributeVisual|#UnitAttributeVisual]* _unitAttributeVisual_, *[DerivedStats|#DerivedStats]* _statType_, *[Attributes|#Attributes]* _attributeType_, *[CombatMechanicType|#CombatMechanicType]* _powerType_)",},

 GetUnitDifficulty = {type = "function",
 description = "",
-args = "(*string* _unitTag_)",
-returns = "()",
-valuetype = "difficult,",},
+args = "(*string* _unitTag_)",},

 GetUnitTitle = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(string,)",
-valuetype = "title,",},
+returns = "(string:title,)",
+valuetype = "string,",},

 CancelCast = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "cancelled,",},
+returns = "(bool:cancelled,)",
+valuetype = "bool,",},

 IsTargetSameAsLastValidTarget = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "same,",},
+returns = "(bool:same,)",
+valuetype = "bool,",},

 TogglePlayerWield = {type = "function",
 description = "",
@@ -17841,50 +17801,48 @@ args = "()",},
 IsPlayerMoving = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "moving,",},
+returns = "(bool:moving,)",
+valuetype = "bool,",},

 IsPlayerGroundTargeting = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isGroundTargeting,",},
+returns = "(bool:isGroundTargeting,)",
+valuetype = "bool,",},

 IsPlayerEmoteOverridden = {type = "function",
 description = "",
 args = "(*integer* _emoteId_)",
-returns = "(bool,)",
-valuetype = "isOverridden,",},
+returns = "(bool:isOverridden,)",
+valuetype = "bool,",},

 GetGroundTargetingError = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "error,",},
+args = "()",},

 GetPlayerCameraHeading = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "heading,",},
+returns = "(number:heading,)",
+valuetype = "number,",},

 GetPlayerWorldPositionInHouse = {type = "function",
 description = "",
 args = "()",
-returns = "(number,integer,integer,integer,)",
-valuetype = "rotationRadians,worldZ,worldY,worldX,",},
+returns = "(number:rotationRadians,integer:worldZ,integer:worldY,integer:worldX,)",
+valuetype = "number,integer,integer,integer,",},

 GetUnitBuffInfo = {type = "function",
 description = "",
 args = "(*string* _unitTag_, *luaindex* _buffIndex_)",
-returns = "(bool,bool,integer,string,textureName,integer,integer,number,number,string,)",
-valuetype = "castByPlayer,canClickOff,abilityId,statusEffectType,abilityType,effectType,buffType,iconFilename,stackCount,buffSlot,timeEnding,timeStarted,buffName,",},
+returns = "(bool:castByPlayer,bool:canClickOff,integer:abilityId,string:buffType,textureName:iconFilename,integer:stackCount,integer:buffSlot,number:timeEnding,number:timeStarted,string:buffName,)",
+valuetype = "bool,bool,integer,string,textureName,integer,integer,number,number,string,",},

 GetNumBuffs = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(integer,)",
-valuetype = "numBuffs,",},
+returns = "(integer:numBuffs,)",
+valuetype = "integer,",},

 GroupInvite = {type = "function",
 description = "",
@@ -17901,8 +17859,8 @@ args = "(*string* _unitTag_)",},
 GetGroupMemberRoles = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,bool,bool,)",
-valuetype = "isTank,isHealer,isDps,",},
+returns = "(bool:isTank,bool:isHealer,bool:isDps,)",
+valuetype = "bool,bool,bool,",},

 CancelBuff = {type = "function",
 description = "",
@@ -17911,134 +17869,132 @@ args = "(*integer* _buffIndex_)",},
 GetWeaponSwapUnlockedLevel = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "level,",},
+returns = "(integer:level,)",
+valuetype = "integer,",},

 GetSlotType = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(integer,)",
-valuetype = "type,",},
+returns = "(integer:type,)",
+valuetype = "integer,",},

 GetSlotAbilityCost = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(integer,integer,)",
-valuetype = "mechanicType,abilityCost,",},
+returns = "(integer:mechanicType,integer:abilityCost,)",
+valuetype = "integer,integer,",},

 GetSlotBoundId = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(integer,)",
-valuetype = "id,",},
+returns = "(integer:id,)",
+valuetype = "integer,",},

 GetSlotTexture = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(string,string,string,)",
-valuetype = "activationAnimation,weapontexture,texture,",},
+returns = "(string:activationAnimation,string:weapontexture,string:texture,)",
+valuetype = "string,string,string,",},

 GetSlotName = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(string,)",
-valuetype = "name,",},
+returns = "(string:name,)",
+valuetype = "string,",},

 GetSlotItemQuality = {type = "function",
 description = "",
-args = "(*luaindex* _slotIndex_)",
-returns = "()",
-valuetype = "quality,",},
+args = "(*luaindex* _slotIndex_)",},

 GetSlotCooldownInfo = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(bool,integer,integer,)",
-valuetype = "globalSlotType,global,duration,remain,",},
+returns = "(bool:global,integer:duration,integer:remain,)",
+valuetype = "bool,integer,integer,",},

 IsSlotToggled = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "toggledOn,",},
+returns = "(bool:toggledOn,)",
+valuetype = "bool,",},

 IsSlotUsed = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "used,",},
+returns = "(bool:used,)",
+valuetype = "bool,",},

 IsSlotUsable = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "useable,",},
+returns = "(bool:useable,)",
+valuetype = "bool,",},

 HasCostFailure = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "status,",},
+returns = "(bool:status,)",
+valuetype = "bool,",},

 HasRequirementFailure = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "status,",},
+returns = "(bool:status,)",
+valuetype = "bool,",},

 HasWeaponSlotFailure = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "status,",},
+returns = "(bool:status,)",
+valuetype = "bool,",},

 HasTargetFailure = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "status,",},
+returns = "(bool:status,)",
+valuetype = "bool,",},

 HasRangeFailure = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "status,",},
+returns = "(bool:status,)",
+valuetype = "bool,",},

 HasStatusEffectFailure = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "status,",},
+returns = "(bool:status,)",
+valuetype = "bool,",},

 HasFallingFailure = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "status,",},
+returns = "(bool:status,)",
+valuetype = "bool,",},

 HasSwimmingFailure = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "status,",},
+returns = "(bool:status,)",
+valuetype = "bool,",},

 HasMountedFailure = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "status,",},
+returns = "(bool:status,)",
+valuetype = "bool,",},

 HasReincarnatingFailure = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "status,",},
+returns = "(bool:status,)",
+valuetype = "bool,",},

 HasActivationHighlight = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "status,",},
+returns = "(bool:status,)",
+valuetype = "bool,",},

 OnSlotDownAndUp = {type = "function",
 description = "",
@@ -18066,33 +18022,31 @@ args = "(*integer* _moveIndex_)",},

 GetSlotItemCount = {type = "function",
 description = "",
-args = "(*luaindex* _slotIndex_)",
-returns = "()",
-valuetype = "count,",},
+args = "(*luaindex* _slotIndex_)",},

 GetSlotItemSound = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(integer,)",
-valuetype = "itemSoundCategory,",},
+returns = "(integer:itemSoundCategory,)",
+valuetype = "integer,",},

 IsSlotItemConsumable = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "consumable,",},
+returns = "(bool:consumable,)",
+valuetype = "bool,",},

 DoesInventoryContainEmptySoulGem = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "hasEmptyGem,",},
+returns = "(bool:hasEmptyGem,)",
+valuetype = "bool,",},

 IsSlotSoulTrap = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "isSoulTrap,",},
+returns = "(bool:isSoulTrap,)",
+valuetype = "bool,",},

 SelectSlotSkillAbility = {type = "function",
 description = "",
@@ -18104,51 +18058,47 @@ args = "(*[SkillType|#SkillType]* _skillType_, *luaindex* _skillLineIndex_, *lua

 GetFirstFreeValidSlotForSkillAbility = {type = "function",
 description = "",
-args = "(*[SkillType|#SkillType]* _skillType_, *luaindex* _skillLineIndex_, *luaindex* _abilityIndex_)",
-returns = "()",
-valuetype = "freeSlot,",},
+args = "(*[SkillType|#SkillType]* _skillType_, *luaindex* _skillLineIndex_, *luaindex* _abilityIndex_)",},

 GetAssignedSlotFromSkillAbility = {type = "function",
 description = "",
-args = "(*[SkillType|#SkillType]* _skillType_, *luaindex* _skillLineIndex_, *luaindex* _abilityIndex_)",
-returns = "()",
-valuetype = "slotIndex,",},
+args = "(*[SkillType|#SkillType]* _skillType_, *luaindex* _skillLineIndex_, *luaindex* _abilityIndex_)",},

 GetNumAbilities = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "num,",},
+returns = "(integer:num,)",
+valuetype = "integer,",},

 GetAbilityInfoByIndex = {type = "function",
 description = "",
 args = "(*luaindex* _abilityIndex_)",
-returns = "(bool,bool,integer,integer,string,string,)",
-valuetype = "showInSpellbook,passive,actionSlotType,rank,texture,name,",},
+returns = "(bool:showInSpellbook,bool:passive,integer:actionSlotType,integer:rank,string:texture,string:name,)",
+valuetype = "bool,bool,integer,integer,string,string,",},

 IsValidAbilityForSlot = {type = "function",
 description = "",
 args = "(*luaindex* _abilityIndex_, *luaindex* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "valid,",},
+returns = "(bool:valid,)",
+valuetype = "bool,",},

 IsValidItemForSlot = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _bagSlotId_, *luaindex* _actionSlotIndex_)",
-returns = "(bool,)",
-valuetype = "valid,",},
+returns = "(bool:valid,)",
+valuetype = "bool,",},

 IsValidItemForSlotByItemInfo = {type = "function",
 description = "",
 args = "(*integer* _itemId_, *integer* _itemQualityDefId_, *integer* _itemRequiredLevel_, *integer* _itemInstanceData_, *luaindex* _actionSlotIndex_)",
-returns = "(bool,)",
-valuetype = "valid,",},
+returns = "(bool:valid,)",
+valuetype = "bool,",},

 IsValidCollectibleForSlot = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_, *luaindex* _actionSlotIndex_)",
-returns = "(bool,)",
-valuetype = "valid,",},
+returns = "(bool:valid,)",
+valuetype = "bool,",},

 CompleteQuest = {type = "function",
 description = "",
@@ -18161,8 +18111,8 @@ args = "(*luaindex* _journalQuestIndex_)",},
 GetIsQuestSharable = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_)",
-returns = "(bool,)",
-valuetype = "isSharable,",},
+returns = "(bool:isSharable,)",
+valuetype = "bool,",},

 ShareQuest = {type = "function",
 description = "",
@@ -18171,62 +18121,60 @@ args = "(*luaindex* _journalQuestIndex_)",},
 GetJournalQuestStepInfo = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_, *luaindex* _stepIndex_)",
-returns = "(integer,string,integer,string,)",
-valuetype = "numConditions,trackerOverrideText,stepType,visibility,stepText,",},
+returns = "(integer:numConditions,string:trackerOverrideText,integer:stepType,string:stepText,)",
+valuetype = "integer,string,integer,string,",},

 GetJournalQuestLocationInfo = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_)",
-returns = "(luaindex,luaindex,string,string,)",
-valuetype = "poiIndex,zoneIndex,objectiveName,zoneName,",},
+returns = "(luaindex:poiIndex,luaindex:zoneIndex,string:objectiveName,string:zoneName,)",
+valuetype = "luaindex,luaindex,string,string,",},

 GetJournalQuestEnding = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_)",
-returns = "(string,string,string,string,string,string,)",
-valuetype = "journalStepText,backgroundText,declineComplete,confirmComplete,dialog,goal,",},
+returns = "(string:journalStepText,string:backgroundText,string:declineComplete,string:confirmComplete,string:dialog,string:goal,)",
+valuetype = "string,string,string,string,string,string,",},

 GetJournalQuestNumConditions = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_, *luaindex* _stepIndex_)",
-returns = "(integer,)",
-valuetype = "conditionCount,",},
+returns = "(integer:conditionCount,)",
+valuetype = "integer,",},

 RequestJournalQuestConditionAssistance = {type = "function",
 description = "",
-args = "(*luaindex* _journalQuestIndex_, *luaindex* _stepIndex_, *luaindex* _conditionIndex_, *bool* _assisted_)",
-returns = "()",
-valuetype = "taskId,",},
+args = "(*luaindex* _journalQuestIndex_, *luaindex* _stepIndex_, *luaindex* _conditionIndex_, *bool* _assisted_)",},

 GetNearestQuestCondition = {type = "function",
 description = "",
 args = "(*integer* _considerType_)",
-returns = "(luaindex,luaindex,luaindex,bool,)",
-valuetype = "conditionIndex,stepIndex,journalQuestIndex,foundValidCondition,",},
+returns = "(luaindex:conditionIndex,luaindex:stepIndex,luaindex:journalQuestIndex,bool:foundValidCondition,)",
+valuetype = "luaindex,luaindex,luaindex,bool,",},

 GetJournalQuestTimerInfo = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_)",
-returns = "(bool,bool,number,number,)",
-valuetype = "isPaused,isVisible,timerEnd,timerStart,",},
+returns = "(bool:isPaused,bool:isVisible,number:timerEnd,number:timerStart,)",
+valuetype = "bool,bool,number,number,",},

 GetJournalQuestTimerCaption = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_)",
-returns = "(string,)",
-valuetype = "caption,",},
+returns = "(string:caption,)",
+valuetype = "string,",},

 GetJournalQuestNumSteps = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_)",
-returns = "(integer,)",
-valuetype = "numSteps,",},
+returns = "(integer:numSteps,)",
+valuetype = "integer,",},

 GetQuestToolCount = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_)",
-returns = "(integer,)",
-valuetype = "toolCount,",},
+returns = "(integer:toolCount,)",
+valuetype = "integer,",},

 SendChatMessage = {type = "function",
 description = "",
@@ -18395,116 +18343,110 @@ args = "(*integer* _interactionType_)",},
 GetChatterGreeting = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "optionString,",},
+returns = "(string:optionString,)",
+valuetype = "string,",},

 GetChatterData = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,integer,string,)",
-valuetype = "atGreeting,numOptions,text,",},
+returns = "(bool:atGreeting,integer:numOptions,string:text,)",
+valuetype = "bool,integer,string,",},

 GetMaxBags = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "maxBags,",},
+returns = "(integer:maxBags,)",
+valuetype = "integer,",},

 GetItemInstanceId = {type = "function",
 description = "",
-args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "()",
-valuetype = "id,",},
+args = "(*integer* _bagId_, *integer* _slotIndex_)",},

 GetItemTotalCount = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(integer,)",
-valuetype = "count,",},
+returns = "(integer:count,)",
+valuetype = "integer,",},

 IsItemConsumable = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "consumable,",},
+returns = "(bool:consumable,)",
+valuetype = "bool,",},

 GetItemLink = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 GetQuestToolLink = {type = "function",
 description = "",
 args = "(*luaindex* _aQuestIndex_, *luaindex* _aToolIndex_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 GetQuestItemLink = {type = "function",
 description = "",
 args = "(*luaindex* _aQuestIndex_, *luaindex* _aStepIndex_, *luaindex* _aConditionIndex_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 GetQuestItemNameFromLink = {type = "function",
 description = "",
 args = "(*string* _link_)",
-returns = "(string,)",
-valuetype = "name,",},
+returns = "(string:name,)",
+valuetype = "string,",},

 GetComparisonEquipSlotsFromItemLink = {type = "function",
 description = "",
-args = "(*string* _itemLink_)",
-returns = "()",
-valuetype = "comparisonSlot2,comparisonSlot1,",},
+args = "(*string* _itemLink_)",},

 GetComparisonEquipSlotsFromBagItem = {type = "function",
 description = "",
-args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "()",
-valuetype = "comparisonSlot2,comparisonSlot1,",},
+args = "(*integer* _bagId_, *integer* _slotIndex_)",},

 GetItemName = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(string,)",
-valuetype = "name,",},
+returns = "(string:name,)",
+valuetype = "string,",},

 IsItemUsable = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(bool,bool,)",
-valuetype = "usableOnlyFromActionSlot,usable,",},
+returns = "(bool:usableOnlyFromActionSlot,bool:usable,)",
+valuetype = "bool,bool,",},

 GetSlotStackSize = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(integer,integer,)",
-valuetype = "maxStack,stack,",},
+returns = "(integer:maxStack,integer:stack,)",
+valuetype = "integer,integer,",},

 GetEquippedItemInfo = {type = "function",
 description = "",
 args = "(*integer* _equipSlot_)",
-returns = "(bool,bool,bool,integer,bool,string,)",
-valuetype = "locked,isHeldNow,isHeldSlot,sellPrice,slotHasItem,icon,",},
+returns = "(bool:locked,bool:isHeldNow,bool:isHeldSlot,integer:sellPrice,bool:slotHasItem,string:icon,)",
+valuetype = "bool,bool,bool,integer,bool,string,",},

 GetHeldSlots = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,integer,integer,integer,)",
-valuetype = "lastHeldOff,lastHeldMain,heldOff,heldMain,",},
+returns = "(integer:lastHeldOff,integer:lastHeldMain,integer:heldOff,integer:heldMain,)",
+valuetype = "integer,integer,integer,integer,",},

 CheckInventorySpaceAndWarn = {type = "function",
 description = "",
 args = "(*integer* _numItems_)",
-returns = "(bool,)",
-valuetype = "haveSpace,",},
+returns = "(bool:haveSpace,)",
+valuetype = "bool,",},

 CheckInventorySpaceSilently = {type = "function",
 description = "",
 args = "(*integer* _numItems_)",
-returns = "(bool,)",
-valuetype = "haveSpace,",},
+returns = "(bool:haveSpace,)",
+valuetype = "bool,",},

 EquipItem = {type = "function",
 description = "",
@@ -18513,134 +18455,122 @@ args = "(*[Bag|#Bag]* _bagId_, *integer* _slotIndex_, *integer:nilable* _equipSl
 IsEquipable = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(integer,bool,)",
-valuetype = "resultErrorCodeIfFailed,isEquipable,",},
+returns = "(integer:resultErrorCodeIfFailed,bool:isEquipable,)",
+valuetype = "integer,bool,",},

 GetItemLinkInfo = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(integer,integer,bool,integer,string,)",
-valuetype = "itemStyle,equipType,meetsUsageRequirement,sellPrice,icon,",},
+returns = "(integer:itemStyle,integer:equipType,bool:meetsUsageRequirement,integer:sellPrice,string:icon,)",
+valuetype = "integer,integer,bool,integer,string,",},

 IsBankUpgradeAvailable = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isAvailable,",},
+returns = "(bool:isAvailable,)",
+valuetype = "bool,",},

 GetFirstFreeValidSlotForItem = {type = "function",
 description = "",
-args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "()",
-valuetype = "freeSlot,",},
+args = "(*integer* _bagId_, *integer* _slotIndex_)",},

 GetFirstFreeValidSlotForCollectible = {type = "function",
 description = "",
-args = "(*integer* _collectibleId_)",
-returns = "()",
-valuetype = "freeSlot,",},
+args = "(*integer* _collectibleId_)",},

 GetItemCurrentActionBarSlot = {type = "function",
 description = "",
-args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "()",
-valuetype = "currentSlot,",},
+args = "(*integer* _bagId_, *integer* _slotIndex_)",},

 GetCollectibleCurrentActionBarSlot = {type = "function",
 description = "",
-args = "(*integer* _collectibleId_)",
-returns = "()",
-valuetype = "currentSlot,",},
+args = "(*integer* _collectibleId_)",},

 GetItemSoundCategoryFromLink = {type = "function",
 description = "",
 args = "(*string* _link_)",
-returns = "(integer,)",
-valuetype = "itemSoundCategory,",},
+returns = "(integer:itemSoundCategory,)",
+valuetype = "integer,",},

 IsLockedWeaponSlot = {type = "function",
 description = "",
 args = "(*integer* _equipSlot_)",
-returns = "(bool,)",
-valuetype = "locked,",},
+returns = "(bool:locked,)",
+valuetype = "bool,",},

 GetSelectedGuildBankId = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "guildId,",},
+args = "()",},

 GetMapPlayerPosition = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(number,number,number,)",
-valuetype = "heading,normalizedZ,normalizedX,",},
+returns = "(number:heading,number:normalizedZ,number:normalizedX,)",
+valuetype = "number,number,number,",},

 GetMapPing = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(number,number,)",
-valuetype = "normalizedY,normalizedX,",},
+returns = "(number:normalizedY,number:normalizedX,)",
+valuetype = "number,number,",},

 GetMapRallyPoint = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,)",
-valuetype = "normalizedY,normalizedX,",},
+returns = "(number:normalizedY,number:normalizedX,)",
+valuetype = "number,number,",},

 GetMapPlayerWaypoint = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,)",
-valuetype = "normalizedY,normalizedX,",},
+returns = "(number:normalizedY,number:normalizedX,)",
+valuetype = "number,number,",},

 GetNumKeepTravelNetworkNodes = {type = "function",
 description = "",
 args = "(*[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _bgContext_)",
-returns = "(integer,)",
-valuetype = "numNodes,",},
+returns = "(integer:numNodes,)",
+valuetype = "integer,",},

 GetNumKeepTravelNetworkLinks = {type = "function",
 description = "",
 args = "(*[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _bgContext_)",
-returns = "(integer,)",
-valuetype = "numLinks,",},
+returns = "(integer:numLinks,)",
+valuetype = "integer,",},

 GetKeepTravelNetworkNodeInfo = {type = "function",
 description = "",
 args = "(*luaindex* _nodeIndex_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _bgContext_)",
-returns = "(number,number,bool,integer,)",
-valuetype = "normalizedY,normalizedX,accessible,keepId,",},
+returns = "(number:normalizedY,number:normalizedX,bool:accessible,integer:keepId,)",
+valuetype = "number,number,bool,integer,",},

 GetKeepTravelNetworkLinkInfo = {type = "function",
 description = "",
 args = "(*luaindex* _linkIndex_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _bgContext_)",
-returns = "(number,number,number,number,integer,integer,integer,)",
-valuetype = "endY,endX,startY,startX,restricedToAlliance,linkOwner,linkType,",},
+returns = "(number:endY,number:endX,number:startY,number:startX,integer:restricedToAlliance,integer:linkOwner,integer:linkType,)",
+valuetype = "number,number,number,number,integer,integer,integer,",},

 GetKeepTravelNetworkLinkEndpoints = {type = "function",
 description = "",
 args = "(*luaindex* _linkIndex_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _bgContext_)",
-returns = "(luaindex,luaindex,)",
-valuetype = "keepBIndex,keepAIndex,",},
+returns = "(luaindex:keepBIndex,luaindex:keepAIndex,)",
+valuetype = "luaindex,luaindex,",},

 GetKeepAccessible = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _bgContext_)",
-returns = "(bool,)",
-valuetype = "accessible,",},
+returns = "(bool:accessible,)",
+valuetype = "bool,",},

 GetKeepHasResourcesForTravel = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _bgContext_)",
-returns = "(bool,)",
-valuetype = "hasResources,",},
+returns = "(bool:hasResources,)",
+valuetype = "bool,",},

 GetKeepFastTravelInteraction = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "startKeepId,",},
+args = "()",},

 TravelToKeep = {type = "function",
 description = "",
@@ -18649,98 +18579,98 @@ args = "(*integer* _destinationKeepId_)",},
 GetRecallCooldown = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,integer,)",
-valuetype = "duration,remain,",},
+returns = "(integer:duration,integer:remain,)",
+valuetype = "integer,integer,",},

 IsPlayerInAvAWorld = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isInAvAWorld,",},
+returns = "(bool:isInAvAWorld,)",
+valuetype = "bool,",},

 GetCampaignAllianceScore = {type = "function",
 description = "",
 args = "(*integer* _campaignId_, *integer* _alliance_)",
-returns = "(integer,)",
-valuetype = "score,",},
+returns = "(integer:score,)",
+valuetype = "integer,",},

 GetSecondsUntilCampaignScoreReevaluation = {type = "function",
 description = "",
 args = "(*integer* _campaignId_)",
-returns = "(integer,)",
-valuetype = "seconds,",},
+returns = "(integer:seconds,)",
+valuetype = "integer,",},

 GetSecondsUntilCampaignStart = {type = "function",
 description = "",
 args = "(*integer* _campaignId_)",
-returns = "(integer,)",
-valuetype = "seconds,",},
+returns = "(integer:seconds,)",
+valuetype = "integer,",},

 GetSecondsUntilCampaignEnd = {type = "function",
 description = "",
 args = "(*integer* _campaignId_)",
-returns = "(integer,)",
-valuetype = "seconds,",},
+returns = "(integer:seconds,)",
+valuetype = "integer,",},

 GetCampaignUnderdogLeaderAlliance = {type = "function",
 description = "",
 args = "(*integer* _campaignId_)",
-returns = "(integer,)",
-valuetype = "alliance,",},
+returns = "(integer:alliance,)",
+valuetype = "integer,",},

 GetSecondsUntilCampaignUnderdogReevaluation = {type = "function",
 description = "",
 args = "(*integer* _campaignId_)",
-returns = "(integer,)",
-valuetype = "seconds,",},
+returns = "(integer:seconds,)",
+valuetype = "integer,",},

 GetCampaignHoldings = {type = "function",
 description = "",
 args = "(*integer* _campaignId_, *integer* _elementType_, *integer* _alliance_, *integer* _targetAlliance_)",
-returns = "(integer,)",
-valuetype = "elementsControlled,",},
+returns = "(integer:elementsControlled,)",
+valuetype = "integer,",},

 GetTotalCampaignHoldings = {type = "function",
 description = "",
 args = "(*integer* _campaignId_, *integer* _elementType_, *integer* _alliance_)",
-returns = "(integer,)",
-valuetype = "elementsControlled,",},
+returns = "(integer:elementsControlled,)",
+valuetype = "integer,",},

 GetCampaignAlliancePotentialScore = {type = "function",
 description = "",
 args = "(*integer* _campaignId_, *integer* _alliance_)",
-returns = "(integer,)",
-valuetype = "potentialScore,",},
+returns = "(integer:potentialScore,)",
+valuetype = "integer,",},

 GetCampaignHoldingScoreValues = {type = "function",
 description = "",
 args = "(*integer* _campaignId_)",
-returns = "(integer,integer,integer,integer,integer,)",
-valuetype = "offensiveArtifactValue,defensiveArtifactValue,outpostValue,resourceValue,keepValue,",},
+returns = "(integer:offensiveArtifactValue,integer:defensiveArtifactValue,integer:outpostValue,integer:resourceValue,integer:keepValue,)",
+valuetype = "integer,integer,integer,integer,integer,",},

 GetCampaignName = {type = "function",
 description = "",
 args = "(*integer* _campaignId_)",
-returns = "(string,)",
-valuetype = "campaignName,",},
+returns = "(string:campaignName,)",
+valuetype = "string,",},

 GetPendingAssignedCampaign = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "campaignId,",},
+returns = "(integer:campaignId,)",
+valuetype = "integer,",},

 GetNumCampaignRulesetTypes = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numRulesetTypes,",},
+returns = "(integer:numRulesetTypes,)",
+valuetype = "integer,",},

 GetCampaignSocialConnectionInfo = {type = "function",
 description = "",
 args = "(*integer* _connectionIndex_)",
-returns = "(bool,bool,integer,integer,integer,)",
-valuetype = "isGuildMate,isFriend,currentCampaignId,assignedCampaignId,alliance,accountId,",},
+returns = "(bool:isGuildMate,bool:isFriend,integer:currentCampaignId,integer:assignedCampaignId,integer:accountId,)",
+valuetype = "bool,bool,integer,integer,integer,",},

 SwitchGuestCampaign = {type = "function",
 description = "",
@@ -18749,104 +18679,100 @@ args = "(*integer* _campaignId_)",},
 GetMinLevelForCampaignTutorial = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "minLevelForCampaignTutorial,",},
+returns = "(integer:minLevelForCampaignTutorial,)",
+valuetype = "integer,",},

 GetNumLootItems = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "count,",},
+returns = "(integer:count,)",
+valuetype = "integer,",},

 GetNumKeepResourceTypes = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numTypes,",},
+returns = "(integer:numTypes,)",
+valuetype = "integer,",},

 GetNumKeepUpgradePaths = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numPaths,",},
+returns = "(integer:numPaths,)",
+valuetype = "integer,",},

 GetNumUpgradesForKeepAtResourceLevel = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_, *[KeepResourceType|#KeepResourceType]* _resourceType_, *integer* _level_)",
-returns = "(integer,)",
-valuetype = "numUpgrades,",},
+returns = "(integer:numUpgrades,)",
+valuetype = "integer,",},

 GetKeepUpgradeDetails = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_, *[KeepResourceType|#KeepResourceType]* _resourceType_, *integer* _level_, *luaindex* _index_)",
-returns = "(bool,integer,textureName,string,string,)",
-valuetype = "active,upgradeAtPercent,upgradeIcon,upgradeDetails,upgradeName,",},
+returns = "(bool:active,integer:upgradeAtPercent,textureName:upgradeIcon,string:upgradeDetails,string:upgradeName,)",
+valuetype = "bool,integer,textureName,string,string,",},

 GetKeepUpgradeLineFromResourceType = {type = "function",
 description = "",
-args = "(*[KeepResourceType|#KeepResourceType]* _resourceType_)",
-returns = "()",
-valuetype = "upgradeLine,",},
+args = "(*[KeepResourceType|#KeepResourceType]* _resourceType_)",},

 GetKeepUpgradeLineFromUpgradePath = {type = "function",
 description = "",
-args = "(*[KeepUpgradePath|#KeepUpgradePath]* _upgradePath_)",
-returns = "()",
-valuetype = "upgradeLine,",},
+args = "(*[KeepUpgradePath|#KeepUpgradePath]* _upgradePath_)",},

 GetNumUpgradesForKeepAtPathLevel = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_, *[KeepUpgradePath|#KeepUpgradePath]* _upgradePath_, *integer* _level_)",
-returns = "(integer,)",
-valuetype = "numUpgrades,",},
+returns = "(integer:numUpgrades,)",
+valuetype = "integer,",},

 GetKeepUpgradePathDetails = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_, *[KeepUpgradePath|#KeepUpgradePath]* _upgradePath_, *integer* _level_, *luaindex* _index_)",
-returns = "(bool,integer,textureName,string,string,)",
-valuetype = "active,upgradeAtPercent,icon,upgradeDetails,upgradeName,",},
+returns = "(bool:active,integer:upgradeAtPercent,textureName:icon,string:upgradeDetails,string:upgradeName,)",
+valuetype = "bool,integer,textureName,string,string,",},

 CanRespawnAtKeep = {type = "function",
 description = "",
 args = "(*integer* _keepId_)",
-returns = "(bool,)",
-valuetype = "canRespawn,",},
+returns = "(bool:canRespawn,)",
+valuetype = "bool,",},

 GetIsTracked = {type = "function",
 description = "",
 args = "(*integer* _trackType_, *integer* _param1_, *integer* _param2_)",
-returns = "(bool,)",
-valuetype = "tracked,",},
+returns = "(bool:tracked,)",
+valuetype = "bool,",},

 GetIsTrackedForContentId = {type = "function",
 description = "",
 args = "(*integer* _trackType_, *integer* _contentId_)",
-returns = "(bool,)",
-valuetype = "tracked,",},
+returns = "(bool:tracked,)",
+valuetype = "bool,",},

 SetTracked = {type = "function",
 description = "",
 args = "(*integer* _trackType_, *bool* _tracked_, *integer* _param1_, *integer* _param2_)",
-returns = "(bool,)",
-valuetype = "success,",},
+returns = "(bool:success,)",
+valuetype = "bool,",},

 GetNumTracked = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numTracked,",},
+returns = "(integer:numTracked,)",
+valuetype = "integer,",},

 GetTrackedByIndex = {type = "function",
 description = "",
 args = "(*luaindex* _index_)",
-returns = "(integer,integer,integer,)",
-valuetype = "param2,param1,trackType,",},
+returns = "(integer:param2,integer:param1,integer:trackType,)",
+valuetype = "integer,integer,integer,",},

 GetTrackedIsAssisted = {type = "function",
 description = "",
 args = "(*integer* _trackType_, *integer* _param1_, *integer* _param2_)",
-returns = "(bool,)",
-valuetype = "assisted,",},
+returns = "(bool:assisted,)",
+valuetype = "bool,",},

 SetTrackedIsAssisted = {type = "function",
 description = "",
@@ -18911,44 +18837,44 @@ args = "()",},
 CanSiegeWeaponPackUp = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "canPackup,",},
+returns = "(bool:canPackup,)",
+valuetype = "bool,",},

 CanSiegeWeaponFire = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "canFire,",},
+returns = "(bool:canFire,)",
+valuetype = "bool,",},

 CanSiegeWeaponAim = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "canAim,",},
+returns = "(bool:canAim,)",
+valuetype = "bool,",},

 IsPlayerControllingSiegeWeapon = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isPlayerControlling,",},
+returns = "(bool:isPlayerControlling,)",
+valuetype = "bool,",},

 IsPlayerEscortingRam = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isPlayerEscorting,",},
+returns = "(bool:isPlayerEscorting,)",
+valuetype = "bool,",},

 GetNumPlayersEscortingRam = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numPlayersEscorting,",},
+returns = "(integer:numPlayersEscorting,)",
+valuetype = "integer,",},

 GetMinMaxRamEscorts = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,integer,)",
-valuetype = "maxEscorts,minEscorts,",},
+returns = "(integer:maxEscorts,integer:minEscorts,)",
+valuetype = "integer,integer,",},

 SetHealthWarningStage = {type = "function",
 description = "",
@@ -18969,44 +18895,44 @@ args = "(*integer* _waitTimeMs_)",},
 GetMaxMailItems = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "maxMail,",},
+returns = "(integer:maxMail,)",
+valuetype = "integer,",},

 QueueItemAttachment = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_, *luaindex* _attachmentSlot_)",
-returns = "(integer,)",
-valuetype = "itemAttachmentResult,",},
+returns = "(integer:itemAttachmentResult,)",
+valuetype = "integer,",},

 FormatAchievementLinkTimestamp = {type = "function",
 description = "",
 args = "(*string* _timestamp_)",
-returns = "(string,string,)",
-valuetype = "time,date,",},
+returns = "(string:time,string:date,)",
+valuetype = "string,string,",},

 GetNumStats = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numStats,",},
+returns = "(integer:numStats,)",
+valuetype = "integer,",},

 GetNumAbilitiesLearnedForLevel = {type = "function",
 description = "",
 args = "(*integer* _level_, *bool* _progression_)",
-returns = "(integer,)",
-valuetype = "abilitiesLearned,",},
+returns = "(integer:abilitiesLearned,)",
+valuetype = "integer,",},

 GetLearnedAbilityInfoForLevel = {type = "function",
 description = "",
 args = "(*integer* _level_, *luaindex* _learnedIndex_, *bool* _progression_)",
-returns = "(luaindex,luaindex,string,string,)",
-valuetype = "progressionIndex,abilityIndex,texture,name,",},
+returns = "(luaindex:progressionIndex,luaindex:abilityIndex,string:texture,string:name,)",
+valuetype = "luaindex,luaindex,string,string,",},

 PlayerHasAttributeUpgrades = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "hasLevelUpgrades,",},
+returns = "(bool:hasLevelUpgrades,)",
+valuetype = "bool,",},

 ChooseAbilityProgressionMorph = {type = "function",
 description = "",
@@ -19015,56 +18941,54 @@ args = "(*luaindex* _progressionIndex_, *integer* _morph_)",},
 GetAbilityProgressionInfo = {type = "function",
 description = "",
 args = "(*luaindex* _progressionIndex_)",
-returns = "(integer,integer,string,)",
-valuetype = "rank,morph,name,",},
+returns = "(integer:rank,integer:morph,string:name,)",
+valuetype = "integer,integer,string,",},

 GetAbilityProgressionXPInfo = {type = "function",
 description = "",
 args = "(*luaindex* _progressionIndex_)",
-returns = "(bool,integer,integer,integer,)",
-valuetype = "atMorph,currentXP,nextRankXP,lastRankXp,",},
+returns = "(bool:atMorph,integer:currentXP,integer:nextRankXP,integer:lastRankXp,)",
+valuetype = "bool,integer,integer,integer,",},

 GetAbilityProgressionAbilityInfo = {type = "function",
 description = "",
 args = "(*luaindex* _progressionIndex_, *integer* _morph_, *integer* _rank_)",
-returns = "(luaindex,string,string,)",
-valuetype = "abilityIndex,texture,name,",},
+returns = "(luaindex:abilityIndex,string:texture,string:name,)",
+valuetype = "luaindex,string,string,",},

 GetAbilityProgressionRankFromAbilityId = {type = "function",
 description = "",
-args = "(*integer* _abilityId_)",
-returns = "()",
-valuetype = "rank,",},
+args = "(*integer* _abilityId_)",},

 GetAbilityProgressionXPInfoFromAbilityId = {type = "function",
 description = "",
 args = "(*integer* _abilityId_)",
-returns = "(bool,integer,integer,integer,luaindex,bool,)",
-valuetype = "atMorph,currentXP,nextRankXP,lastRankXp,progressionIndex,hasProgression,",},
+returns = "(bool:atMorph,integer:currentXP,integer:nextRankXP,integer:lastRankXp,luaindex:progressionIndex,bool:hasProgression,)",
+valuetype = "bool,integer,integer,integer,luaindex,bool,",},

 GetAttributeDerivedStatPerPointValue = {type = "function",
 description = "",
 args = "(*integer* _attribute_, *integer* _stat_)",
-returns = "(number,)",
-valuetype = "amountPerPoint,",},
+returns = "(number:amountPerPoint,)",
+valuetype = "number,",},

 GetActiveCombatTipInfo = {type = "function",
 description = "",
 args = "(*integer* _activeCombatTipId_)",
-returns = "(string,string,string,)",
-valuetype = "iconPath,tipText,name,",},
+returns = "(string:iconPath,string:tipText,string:name,)",
+valuetype = "string,string,string,",},

 IsGameCameraActive = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isActive,",},
+returns = "(bool:isActive,)",
+valuetype = "bool,",},

 IsInteractionCameraActive = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isActive,",},
+returns = "(bool:isActive,)",
+valuetype = "bool,",},

 BeginInteractCameraSpin = {type = "function",
 description = "",
@@ -19081,14 +19005,14 @@ args = "()",},
 IsReticleHidden = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isHidden,",},
+returns = "(bool:isHidden,)",
+valuetype = "bool,",},

 IsGameCameraUnitHighlightedAttackable = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "attackable,",},
+returns = "(bool:attackable,)",
+valuetype = "bool,",},

 GameCameraMouseFreeLookStart = {type = "function",
 description = "",
@@ -19105,8 +19029,8 @@ args = "()",},
 IsGameCameraPreferredTargetValid = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "valid,",},
+returns = "(bool:valid,)",
+valuetype = "bool,",},

 ClearGameCameraPreferredTarget = {type = "function",
 description = "",
@@ -19115,14 +19039,14 @@ args = "()",},
 GetGameCameraInteractableActionInfo = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,integer,bool,bool,)",
-valuetype = "isCriminalInteract,contextualLink,contextualInfo,additionalInfo,isOwned,interactBlocked,name,action,",},
+returns = "(bool:isCriminalInteract,integer:additionalInfo,bool:isOwned,bool:interactBlocked,)",
+valuetype = "bool,integer,bool,bool,",},

 GetNameOfGameCameraQuestToolTarget = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "name,",},
+returns = "(string:name,)",
+valuetype = "string,",},

 ToggleGameCameraFirstPerson = {type = "function",
 description = "",
@@ -19131,8 +19055,8 @@ args = "()",},
 IsGameCameraSiegeControlled = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "valid,",},
+returns = "(bool:valid,)",
+valuetype = "bool,",},

 ReleaseGameCameraSiegeControlled = {type = "function",
 description = "",
@@ -19141,20 +19065,18 @@ args = "()",},
 GetNumPendingFeedback = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "pendingFeedback,",},
+returns = "(integer:pendingFeedback,)",
+valuetype = "integer,",},

 GetFeedbackIdByIndex = {type = "function",
 description = "",
-args = "(*luaindex* _feedbackIndex_)",
-returns = "()",
-valuetype = "feedbackId,",},
+args = "(*luaindex* _feedbackIndex_)",},

 GetFeedbackType = {type = "function",
 description = "",
 args = "(*integer* _feedbackId_)",
-returns = "(integer,)",
-valuetype = "feedbackType,",},
+returns = "(integer:feedbackType,)",
+valuetype = "integer,",},

 RemovePendingFeedback = {type = "function",
 description = "",
@@ -19163,8 +19085,8 @@ args = "(*integer* _feedbackId_)",},
 IsFeedbackGatheringEnabled = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "enabled,",},
+returns = "(bool:enabled,)",
+valuetype = "bool,",},

 RequestOpenUnsafeURL = {type = "function",
 description = "",
@@ -19189,20 +19111,20 @@ args = "()",},
 GetIsNewCharacter = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isNewCharacter,",},
+returns = "(bool:isNewCharacter,)",
+valuetype = "bool,",},

 GetUniqueNameForCharacter = {type = "function",
 description = "",
 args = "(*string* _characterName_)",
-returns = "(string,)",
-valuetype = "uniqueName,",},
+returns = "(string:uniqueName,)",
+valuetype = "string,",},

 GetWorldName = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "worldName,",},
+returns = "(string:worldName,)",
+valuetype = "string,",},

 Disconnect = {type = "function",
 description = "",
@@ -19210,33 +19132,27 @@ args = "()",},

 GetTrialChatRestriction = {type = "function",
 description = "",
-args = "(*[MsgChannelType|#MsgChannelType]* _channel_, *string* _target_)",
-returns = "()",
-valuetype = "restrictionType,",},
+args = "(*[MsgChannelType|#MsgChannelType]* _channel_, *string* _target_)",},

 GetTrialChatIsRestrictedAndWarn = {type = "function",
 description = "",
 args = "(*[MsgChannelType|#MsgChannelType]* _channel_, *string* _target_)",
-returns = "(bool,)",
-valuetype = "handled,",},
+returns = "(bool:handled,)",
+valuetype = "bool,",},

 CanChangeBattleLevelPreference = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "canChangeBattleLevelPreference,",},
+returns = "(bool:canChangeBattleLevelPreference,)",
+valuetype = "bool,",},

 GetCursorBagId = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "originatingBag,",},
+args = "()",},

 GetCursorSlotIndex = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "slotIndex,",},
+args = "()",},

 PlaceInActionBar = {type = "function",
 description = "",
@@ -19325,44 +19241,40 @@ args = "()",},
 GetNumActionLayers = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "actionLayers,",},
+returns = "(integer:actionLayers,)",
+valuetype = "integer,",},

 GetActionLayerInfo = {type = "function",
 description = "",
 args = "(*luaindex* _layerIndex_)",
-returns = "(integer,string,)",
-valuetype = "numLayerCategories,layerName,",},
+returns = "(integer:numLayerCategories,string:layerName,)",
+valuetype = "integer,string,",},

 GetActionLayerCategoryInfo = {type = "function",
 description = "",
 args = "(*luaindex* _layerIndex_, *luaindex* _categoryIndex_)",
-returns = "(integer,string,)",
-valuetype = "numActions,categoryName,",},
+returns = "(integer:numActions,string:categoryName,)",
+valuetype = "integer,string,",},

 GetActionInfo = {type = "function",
 description = "",
 args = "(*luaindex* _layerIndex_, *luaindex* _categoryIndex_, *luaindex* _actionIndex_)",
-returns = "(bool,bool,string,)",
-valuetype = "isHidden,isRebindable,actionName,",},
+returns = "(bool:isHidden,bool:isRebindable,string:actionName,)",
+valuetype = "bool,bool,string,",},

 GetActionBindingInfo = {type = "function",
 description = "",
-args = "(*luaindex* _layerIndex_, *luaindex* _categoryIndex_, *luaindex* _actionIndex_, *luaindex* _bindingIndex_)",
-returns = "()",
-valuetype = "mod4,mod3,mod2,mod1,keyCode,",},
+args = "(*luaindex* _layerIndex_, *luaindex* _categoryIndex_, *luaindex* _actionIndex_, *luaindex* _bindingIndex_)",},

 GetHighestPriorityActionBindingInfoFromName = {type = "function",
 description = "",
-args = "(*string* _actionName_, *bool* _preferGamepad_)",
-returns = "()",
-valuetype = "mod4,mod3,mod2,mod1,keyCode,",},
+args = "(*string* _actionName_, *bool* _preferGamepad_)",},

 GetMaxBindingsPerAction = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "maxNumBindings,",},
+returns = "(integer:maxNumBindings,)",
+valuetype = "integer,",},

 CreateDefaultActionBind = {type = "function",
 description = "",
@@ -19382,21 +19294,17 @@ args = "(*luaindex* _layerIndex_, *luaindex* _categoryIndex_, *luaindex* _action

 GetActionIndicesFromName = {type = "function",
 description = "",
-args = "(*string* _actionName_)",
-returns = "()",
-valuetype = "actionIndex,categoryIndex,layerIndex,",},
+args = "(*string* _actionName_)",},

 GetBindingIndicesFromKeys = {type = "function",
 description = "",
-args = "(*luaindex* _layerIndex_, *[KeyCode|#KeyCode]* _keyCode_, *[KeyCode|#KeyCode]* _mod1_, *[KeyCode|#KeyCode]* _mod2_, *[KeyCode|#KeyCode]* _mod3_, *[KeyCode|#KeyCode]* _mod4_)",
-returns = "()",
-valuetype = "bindingIndex,actionIndex,categoryIndex,",},
+args = "(*luaindex* _layerIndex_, *[KeyCode|#KeyCode]* _keyCode_, *[KeyCode|#KeyCode]* _mod1_, *[KeyCode|#KeyCode]* _mod2_, *[KeyCode|#KeyCode]* _mod3_, *[KeyCode|#KeyCode]* _mod4_)",},

 GetActionNameFromKey = {type = "function",
 description = "",
 args = "(*string* _layerName_, *[KeyCode|#KeyCode]* _keyCode_)",
-returns = "(string,)",
-valuetype = "actionName,",},
+returns = "(string:actionName,)",
+valuetype = "string,",},

 PushActionLayerByName = {type = "function",
 description = "",
@@ -19417,8 +19325,8 @@ args = "(*string* _layerName_)",},
 IsActionLayerActiveByName = {type = "function",
 description = "",
 args = "(*string* _layerName_)",
-returns = "(bool,)",
-valuetype = "active,",},
+returns = "(bool:active,)",
+valuetype = "bool,",},

 PopActionLayer = {type = "function",
 description = "",
@@ -19427,74 +19335,68 @@ args = "()",},
 GetNumActiveActionLayers = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numActiveActionLayers,",},
+returns = "(integer:numActiveActionLayers,)",
+valuetype = "integer,",},

 GetActiveActionLayerIndex = {type = "function",
 description = "",
-args = "(*luaindex* _activeActionLayerIndex_)",
-returns = "()",
-valuetype = "layerIndex,",},
+args = "(*luaindex* _activeActionLayerIndex_)",},

 GetNumCharacters = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numCharacters,",},
+returns = "(integer:numCharacters,)",
+valuetype = "integer,",},

 GetCharacterInfo = {type = "function",
 description = "",
 args = "(*luaindex* _index_)",
-returns = "(integer,string,integer,integer,integer,string,)",
-valuetype = "locationId,id,alliance,raceId,classId,level,gender,name,",},
+returns = "(integer:locationId,string:id,integer:raceId,integer:classId,integer:level,string:name,)",
+valuetype = "integer,string,integer,integer,integer,string,",},

 GetNumAttributes = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numAttributes,",},
+returns = "(integer:numAttributes,)",
+valuetype = "integer,",},

 IsPlayerTryingToMove = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "tryingToMove,",},
+returns = "(bool:tryingToMove,)",
+valuetype = "bool,",},

 GetCon = {type = "function",
 description = "",
-args = "(*integer* _otherLevel_, *integer:nilable* _playerLevel_)",
-returns = "()",
-valuetype = "con,",},
+args = "(*integer* _otherLevel_, *integer:nilable* _playerLevel_)",},

 IsWerewolf = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isWerewolf,",},
+returns = "(bool:isWerewolf,)",
+valuetype = "bool,",},

 IsPlayerStunned = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isStunned,",},
+returns = "(bool:isStunned,)",
+valuetype = "bool,",},

 GetSynergyInfo = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "iconFilename,synergyName,",},
+args = "()",},

 HasSynergyEffects = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "hasSynergy,",},
+returns = "(bool:hasSynergy,)",
+valuetype = "bool,",},

 GetGroupInviteInfo = {type = "function",
 description = "",
 args = "()",
-returns = "(string,integer,string,)",
-valuetype = "displayName,millisecondsSinceRequest,characterName,",},
+returns = "(string:displayName,integer:millisecondsSinceRequest,string:characterName,)",
+valuetype = "string,integer,string,",},

 AcceptGroupInvite = {type = "function",
 description = "",
@@ -19507,8 +19409,8 @@ args = "()",},
 HasPendingGroupElectionVote = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "hasPendingVote,",},
+returns = "(bool:hasPendingVote,)",
+valuetype = "bool,",},

 CastGroupVote = {type = "function",
 description = "",
@@ -19533,14 +19435,14 @@ args = "()",},
 IsPlayerInGroup = {type = "function",
 description = "",
 args = "(*string* _name_)",
-returns = "(bool,)",
-valuetype = "inGroup,",},
+returns = "(bool:inGroup,)",
+valuetype = "bool,",},

 GetGroupSize = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "groupSize,",},
+returns = "(integer:groupSize,)",
+valuetype = "integer,",},

 JumpToGroupLeader = {type = "function",
 description = "",
@@ -19553,8 +19455,8 @@ args = "(*string* _name_)",},
 CanJumpToGroupMember = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "result,canJump,",},
+returns = "(bool:canJump,)",
+valuetype = "bool,",},

 SetVeteranDifficulty = {type = "function",
 description = "",
@@ -19562,195 +19464,179 @@ args = "(*bool* _isVeteranDifficulty_)",},

 GetGroupUnitTagByIndex = {type = "function",
 description = "",
-args = "(*luaindex* _sortIndex_)",
-returns = "()",
-valuetype = "unitTag,",},
+args = "(*luaindex* _sortIndex_)",},

 GetGroupIndexByUnitTag = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(luaindex,)",
-valuetype = "sortIndex,",},
+returns = "(luaindex:sortIndex,)",
+valuetype = "luaindex,",},

 GetInstanceKickTime = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "totalTimeMs,remainingTimeMs,",},
+args = "()",},

 IsGroupMemberInRemoteRegion = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(bool,)",
-valuetype = "inRemoteRegion,",},
+returns = "(bool:inRemoteRegion,)",
+valuetype = "bool,",},

 IsAnyGroupMemberInDungeon = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isAnyGroupMemberInDungeon,",},
+returns = "(bool:isAnyGroupMemberInDungeon,)",
+valuetype = "bool,",},

 IsGroupCrossAlliance = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isGroupCrossAlliance,",},
+returns = "(bool:isGroupCrossAlliance,)",
+valuetype = "bool,",},

 IsInLFGGroup = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isInLFGGroup,",},
+returns = "(bool:isInLFGGroup,)",
+valuetype = "bool,",},

 IsCurrentLFGActivityComplete = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isComplete,",},
+returns = "(bool:isComplete,)",
+valuetype = "bool,",},

 GetGroupMemberAssignedRole = {type = "function",
 description = "",
-args = "(*string* _unitTag_)",
-returns = "()",
-valuetype = "assignedRole,",},
+args = "(*string* _unitTag_)",},

 DoAllGroupMembersHavePreferredRole = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "allGroupMembersHavePreferredRoles,",},
+returns = "(bool:allGroupMembersHavePreferredRoles,)",
+valuetype = "bool,",},

 IsGroupUsingVeteranDifficulty = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isVeteran,",},
+returns = "(bool:isVeteran,)",
+valuetype = "bool,",},

 IsGroupModificationAvailable = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isAvailable,",},
+returns = "(bool:isAvailable,)",
+valuetype = "bool,",},

 DoesGroupModificationRequireVote = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "doesRequireVote,",},
+returns = "(bool:doesRequireVote,)",
+valuetype = "bool,",},

 CanPlayerChangeGroupDifficulty = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "reason,canChange,",},
+returns = "(bool:canChange,)",
+valuetype = "bool,",},

 GetGroupElectionInfo = {type = "function",
 description = "",
 args = "()",
-returns = "(string,string,integer,)",
-valuetype = "targetUnitTag,electionDescriptor,timeRemainingSeconds,electionType,",},
+returns = "(string:targetUnitTag,string:electionDescriptor,integer:timeRemainingSeconds,)",
+valuetype = "string,string,integer,",},

 BeginGroupElection = {type = "function",
 description = "",
 args = "(*[GroupElectionType|#GroupElectionType]* _electionType_, *string* _electionDescriptor_, *string* _targetUnitTag_)",
-returns = "(bool,)",
-valuetype = "sentSuccessfully,",},
+returns = "(bool:sentSuccessfully,)",
+valuetype = "bool,",},

 GetRaidReviveCountersRemaining = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "currentCounter,",},
+args = "()",},

 GetCurrentRaidScore = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "score,",},
+returns = "(integer:score,)",
+valuetype = "integer,",},

 GetCurrentRaidDeaths = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "deaths,",},
+args = "()",},

 GetCurrentRaidStartingReviveCounters = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "startingReviveCounters,",},
+args = "()",},

 GetCurrentRaidLifeScoreBonus = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "currentLifeScoreBonus,",},
+args = "()",},

 GetRaidBonusMultiplier = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "currentLifeScoreBonus,",},
+returns = "(integer:currentLifeScoreBonus,)",
+valuetype = "integer,",},

 IsRaidInProgress = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "inProgress,",},
+returns = "(bool:inProgress,)",
+valuetype = "bool,",},

 HasRaidEnded = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "ended,",},
+returns = "(bool:ended,)",
+valuetype = "bool,",},

 WasRaidSuccessful = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "successful,",},
+args = "()",},

 IsPlayerInRaid = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "inRaid,",},
+returns = "(bool:inRaid,)",
+valuetype = "bool,",},

 IsPlayerInReviveCounterRaid = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isInReviveCounterRaid,",},
+returns = "(bool:isInReviveCounterRaid,)",
+valuetype = "bool,",},

 IsPlayerInRaidStagingArea = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isInRaidStagingArea,",},
+returns = "(bool:isInRaidStagingArea,)",
+valuetype = "bool,",},

 GetRaidName = {type = "function",
 description = "",
 args = "(*integer* _raidId_)",
-returns = "(string,)",
-valuetype = "name,",},
+returns = "(string:name,)",
+valuetype = "string,",},

 GetCurrentParticipatingRaidId = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "currentRaidId,",},
+returns = "(integer:currentRaidId,)",
+valuetype = "integer,",},

 GetRaidTargetTime = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "raidTargetTime,",},
+returns = "(integer:raidTargetTime,)",
+valuetype = "integer,",},

 GetRaidDuration = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "raidTime,",},
+returns = "(integer:raidTime,)",
+valuetype = "integer,",},

 QueryRaidLeaderboardData = {type = "function",
 description = "",
@@ -19759,110 +19645,110 @@ args = "()",},
 GetNumRaidLeaderboards = {type = "function",
 description = "",
 args = "(*[RaidCategory|#RaidCategory]* _raidCategory_)",
-returns = "(bool,integer,)",
-valuetype = "hasWeekly,count,",},
+returns = "(bool:hasWeekly,integer:count,)",
+valuetype = "bool,integer,",},

 GetRaidOfTheWeekLeaderboardInfo = {type = "function",
 description = "",
 args = "(*[RaidCategory|#RaidCategory]* _raidCategory_)",
-returns = "(integer,string,)",
-valuetype = "raidId,name,",},
+returns = "(integer:raidId,string:name,)",
+valuetype = "integer,string,",},

 GetRaidLeaderboardInfo = {type = "function",
 description = "",
 args = "(*[RaidCategory|#RaidCategory]* _raidCategory_, *luaindex* _raidIndex_)",
-returns = "(integer,string,)",
-valuetype = "raidId,name,",},
+returns = "(integer:raidId,string:name,)",
+valuetype = "integer,string,",},

 GetRaidOfTheWeekLeaderboardLocalPlayerInfo = {type = "function",
 description = "",
 args = "(*[RaidCategory|#RaidCategory]* _raidCategory_)",
-returns = "(integer,integer,)",
-valuetype = "bestScore,rank,",},
+returns = "(integer:bestScore,integer:rank,)",
+valuetype = "integer,integer,",},

 GetRaidLeaderboardLocalPlayerInfo = {type = "function",
 description = "",
 args = "(*[RaidCategory|#RaidCategory]* _raidCategory_, *luaindex* _raidIndex_)",
-returns = "(integer,integer,)",
-valuetype = "bestScore,rank,",},
+returns = "(integer:bestScore,integer:rank,)",
+valuetype = "integer,integer,",},

 GetNumTrialOfTheWeekLeaderboardEntries = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "count,",},
+returns = "(integer:count,)",
+valuetype = "integer,",},

 GetNumTrialLeaderboardEntries = {type = "function",
 description = "",
 args = "(*luaindex* _raidIndex_)",
-returns = "(integer,)",
-valuetype = "count,",},
+returns = "(integer:count,)",
+valuetype = "integer,",},

 GetNumChallengeOfTheWeekLeaderboardEntries = {type = "function",
 description = "",
 args = "(*integer* _classId_)",
-returns = "(integer,)",
-valuetype = "count,",},
+returns = "(integer:count,)",
+valuetype = "integer,",},

 GetNumChallengeLeaderboardEntries = {type = "function",
 description = "",
 args = "(*luaindex* _raidIndex_, *integer* _classId_)",
-returns = "(integer,)",
-valuetype = "count,",},
+returns = "(integer:count,)",
+valuetype = "integer,",},

 GetTrialOfTheWeekLeaderboardEntryInfo = {type = "function",
 description = "",
 args = "(*luaindex* _entryIndex_)",
-returns = "(string,integer,integer,integer,string,integer,)",
-valuetype = "displayName,allianceId,classId,time,charName,ranking,",},
+returns = "(string:displayName,integer:allianceId,integer:classId,integer:time,string:charName,integer:ranking,)",
+valuetype = "string,integer,integer,integer,string,integer,",},

 GetTrialLeaderboardEntryInfo = {type = "function",
 description = "",
 args = "(*luaindex* _raidIndex_, *luaindex* _entryIndex_)",
-returns = "(string,integer,integer,integer,string,integer,)",
-valuetype = "displayName,allianceId,classId,time,charName,ranking,",},
+returns = "(string:displayName,integer:allianceId,integer:classId,integer:time,string:charName,integer:ranking,)",
+valuetype = "string,integer,integer,integer,string,integer,",},

 GetChallengeOfTheWeekLeaderboardEntryInfo = {type = "function",
 description = "",
 args = "(*integer* _classId_, *luaindex* _entryIndex_)",
-returns = "(string,integer,integer,integer,string,integer,)",
-valuetype = "displayName,allianceId,retClassId,time,charName,ranking,",},
+returns = "(string:displayName,integer:allianceId,integer:retClassId,integer:time,string:charName,integer:ranking,)",
+valuetype = "string,integer,integer,integer,string,integer,",},

 GetChallengeLeaderboardEntryInfo = {type = "function",
 description = "",
 args = "(*luaindex* _raidIndex_, *integer* _classId_, *luaindex* _entryIndex_)",
-returns = "(string,integer,integer,integer,string,integer,)",
-valuetype = "displayName,allianceId,retClassId,time,charName,ranking,",},
+returns = "(string:displayName,integer:allianceId,integer:retClassId,integer:time,string:charName,integer:ranking,)",
+valuetype = "string,integer,integer,integer,string,integer,",},

 GetRaidOfTheWeekTimes = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,integer,)",
-valuetype = "secondsUntilNextStart,secondsUntilEnd,",},
+returns = "(integer:secondsUntilNextStart,integer:secondsUntilEnd,)",
+valuetype = "integer,integer,",},

 GetPlayerRaidOfTheWeekParticipationInfo = {type = "function",
 description = "",
 args = "(*[RaidCategory|#RaidCategory]* _raidCategory_)",
-returns = "(bool,bool,)",
-valuetype = "isCredited,isParticipating,",},
+returns = "(bool:isCredited,bool:isParticipating,)",
+valuetype = "bool,bool,",},

 GetPlayerRaidParticipationInfo = {type = "function",
 description = "",
 args = "(*[RaidCategory|#RaidCategory]* _raidCategory_, *luaindex* _raidIndex_)",
-returns = "(bool,bool,)",
-valuetype = "isCredited,isParticipating,",},
+returns = "(bool:isCredited,bool:isParticipating,)",
+valuetype = "bool,bool,",},

 GetPlayerRaidOfTheWeekProgressInfo = {type = "function",
 description = "",
 args = "(*[RaidCategory|#RaidCategory]* _raidCategory_)",
-returns = "(bool,bool,)",
-valuetype = "complete,inProgress,",},
+returns = "(bool:complete,bool:inProgress,)",
+valuetype = "bool,bool,",},

 GetPlayerRaidProgressInfo = {type = "function",
 description = "",
 args = "(*[RaidCategory|#RaidCategory]* _raidCategory_, *luaindex* _raidIndex_)",
-returns = "(bool,bool,)",
-valuetype = "complete,inProgress,",},
+returns = "(bool:complete,bool:inProgress,)",
+valuetype = "bool,bool,",},

 QueryHomeShowLeaderboardData = {type = "function",
 description = "",
@@ -19871,38 +19757,38 @@ args = "()",},
 GetNumHomeShowVoteCategories = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numVoteCategories,",},
+returns = "(integer:numVoteCategories,)",
+valuetype = "integer,",},

 GetHomeShowLeaderboardVoteCategoryName = {type = "function",
 description = "",
 args = "(*integer* _voteCategory_)",
-returns = "(string,)",
-valuetype = "homeShowEventName,",},
+returns = "(string:homeShowEventName,)",
+valuetype = "string,",},

 GetHomeShowLeaderboardLocalPlayerInfo = {type = "function",
 description = "",
 args = "(*integer* _voteCategory_, *[HouseCategoryType|#HouseCategoryType]* _houseCategory_)",
-returns = "(integer,integer,)",
-valuetype = "personalBestScore,personalBestRank,",},
+returns = "(integer:personalBestScore,integer:personalBestRank,)",
+valuetype = "integer,integer,",},

 GetNumHomeShowLeaderboardEntries = {type = "function",
 description = "",
 args = "(*integer* _voteCategory_, *[HouseCategoryType|#HouseCategoryType]* _houseCategory_)",
-returns = "(integer,)",
-valuetype = "numEntries,",},
+returns = "(integer:numEntries,)",
+valuetype = "integer,",},

 GetHomeShowLeaderboardEntryInfo = {type = "function",
 description = "",
 args = "(*integer* _voteCategory_, *[HouseCategoryType|#HouseCategoryType]* _houseCategory_, *luaindex* _entryIndex_)",
-returns = "(integer,integer,string,integer,)",
-valuetype = "score,houseCollectibleId,playerDisplayname,rank,",},
+returns = "(integer:score,integer:houseCollectibleId,string:playerDisplayname,integer:rank,)",
+valuetype = "integer,integer,string,integer,",},

 GetHomeShowLeaderboardTimeInfo = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "secondsUntilNextUpdate,",},
+returns = "(integer:secondsUntilNextUpdate,)",
+valuetype = "integer,",},

 JumpToFriend = {type = "function",
 description = "",
@@ -19919,32 +19805,32 @@ args = "(*string* _displayName_, *integer* _houseId_)",},
 GetNumRaidScoreNotifications = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numNotifications,",},
+returns = "(integer:numNotifications,)",
+valuetype = "integer,",},

 GetRaidScoreNotificationId = {type = "function",
 description = "",
 args = "(*luaindex* _notificationIndex_)",
-returns = "(integer,)",
-valuetype = "notificationId,",},
+returns = "(integer:notificationId,)",
+valuetype = "integer,",},

 GetRaidScoreNotificationInfo = {type = "function",
 description = "",
 args = "(*integer* _notificationId_)",
-returns = "(integer,integer,integer,)",
-valuetype = "millisecondsSinceRequest,raidScore,raidId,",},
+returns = "(integer:millisecondsSinceRequest,integer:raidScore,integer:raidId,)",
+valuetype = "integer,integer,integer,",},

 GetNumRaidScoreNotificationMembers = {type = "function",
 description = "",
 args = "(*integer* _notificationId_)",
-returns = "(integer,)",
-valuetype = "numMembers,",},
+returns = "(integer:numMembers,)",
+valuetype = "integer,",},

 GetRaidScoreNotificationMemberInfo = {type = "function",
 description = "",
 args = "(*integer* _notificationId_, *luaindex* _memberIndex_)",
-returns = "(bool,bool,bool,string,string,)",
-valuetype = "isPlayer,isGuildMember,isFriend,characterName,displayName,",},
+returns = "(bool:isPlayer,bool:isGuildMember,bool:isFriend,string:characterName,string:displayName,)",
+valuetype = "bool,bool,bool,string,string,",},

 RemoveRaidScoreNotification = {type = "function",
 description = "",
@@ -19953,20 +19839,20 @@ args = "(*integer* _notificationId_)",},
 IsSlotLocked = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "locked,",},
+returns = "(bool:locked,)",
+valuetype = "bool,",},

 IsActionBarSlottingAllowed = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isAllowed,",},
+returns = "(bool:isAllowed,)",
+valuetype = "bool,",},

 GetActionBarPage = {type = "function",
 description = "",
 args = "(*luaindex* _physicalPageId_)",
-returns = "(luaindex,)",
-valuetype = "logicalPageId,",},
+returns = "(luaindex:logicalPageId,)",
+valuetype = "luaindex,",},

 SetActionBarPage = {type = "function",
 description = "",
@@ -20007,20 +19893,20 @@ args = "()",},
 GetLastSlottedItemLink = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "itemLink,",},
+returns = "(string:itemLink,)",
+valuetype = "string,",},

 GetSlotItemLink = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(string,)",
-valuetype = "itemLink,",},
+returns = "(string:itemLink,)",
+valuetype = "string,",},

 GetCurrentQuickslot = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "slotId,",},
+returns = "(integer:slotId,)",
+valuetype = "integer,",},

 SetCurrentQuickslot = {type = "function",
 description = "",
@@ -20029,38 +19915,38 @@ args = "(*integer* _slotId_)",},
 HasMountSkin = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "result,",},
+returns = "(bool:result,)",
+valuetype = "bool,",},

 GetMountSkinId = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "skinId,",},
+returns = "(integer:skinId,)",
+valuetype = "integer,",},

 GetRidingStats = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,integer,integer,integer,integer,integer,)",
-valuetype = "maxSpeedBonus,speedBonus,maxStaminaBonus,staminaBonus,maxInventoryBonus,inventoryBonus,",},
+returns = "(integer:maxSpeedBonus,integer:speedBonus,integer:maxStaminaBonus,integer:staminaBonus,integer:maxInventoryBonus,integer:inventoryBonus,)",
+valuetype = "integer,integer,integer,integer,integer,integer,",},

 GetMaxRidingTraining = {type = "function",
 description = "",
 args = "(*[RidingTrainType|#RidingTrainType]* _trainTypeIndex_)",
-returns = "(integer,)",
-valuetype = "maxValue,",},
+returns = "(integer:maxValue,)",
+valuetype = "integer,",},

 GetTimeUntilCanBeTrained = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,integer,)",
-valuetype = "totalDurationMs,timeMs,",},
+returns = "(integer:totalDurationMs,integer:timeMs,)",
+valuetype = "integer,integer,",},

 GetTrainingCost = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "cost,",},
+returns = "(integer:cost,)",
+valuetype = "integer,",},

 TrainRiding = {type = "function",
 description = "",
@@ -20069,8 +19955,8 @@ args = "(*[RidingTrainType|#RidingTrainType]* _trainTypeIndex_)",},
 IsMounted = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "mounted,",},
+returns = "(bool:mounted,)",
+valuetype = "bool,",},

 ToggleMount = {type = "function",
 description = "",
@@ -20079,122 +19965,120 @@ args = "()",},
 GetAbilityIdByIndex = {type = "function",
 description = "",
 args = "(*luaindex* _abilityIndex_)",
-returns = "(integer,)",
-valuetype = "abilityId,",},
+returns = "(integer:abilityId,)",
+valuetype = "integer,",},

 DoesAbilityExist = {type = "function",
 description = "",
 args = "(*integer* _abilityId_)",
-returns = "(bool,)",
-valuetype = "exists,",},
+returns = "(bool:exists,)",
+valuetype = "bool,",},

 GetAbilityName = {type = "function",
 description = "",
 args = "(*integer* _abilityId_)",
-returns = "(string,)",
-valuetype = "abilityName,",},
+returns = "(string:abilityName,)",
+valuetype = "string,",},

 IsAbilityPassive = {type = "function",
 description = "",
 args = "(*integer* _abilityId_)",
-returns = "(bool,)",
-valuetype = "isPassive,",},
+returns = "(bool:isPassive,)",
+valuetype = "bool,",},

 IsAbilityPermanent = {type = "function",
 description = "",
 args = "(*integer* _abilityId_)",
-returns = "(bool,)",
-valuetype = "isPermanent,",},
+returns = "(bool:isPermanent,)",
+valuetype = "bool,",},

 GetAbilityCastInfo = {type = "function",
 description = "",
 args = "(*integer* _abilityId_)",
-returns = "(integer,integer,bool,)",
-valuetype = "channelTime,castTime,channeled,",},
+returns = "(integer:channelTime,integer:castTime,bool:channeled,)",
+valuetype = "integer,integer,bool,",},

 GetAbilityTargetDescription = {type = "function",
 description = "",
-args = "(*integer* _abilityId_)",
-returns = "()",
-valuetype = "targetDescription,",},
+args = "(*integer* _abilityId_)",},

 GetAbilityRange = {type = "function",
 description = "",
 args = "(*integer* _abilityId_)",
-returns = "(integer,integer,)",
-valuetype = "maxRangeCM,minRangeCM,",},
+returns = "(integer:maxRangeCM,integer:minRangeCM,)",
+valuetype = "integer,integer,",},

 GetAbilityRadius = {type = "function",
 description = "",
 args = "(*integer* _abilityId_)",
-returns = "(integer,)",
-valuetype = "radius,",},
+returns = "(integer:radius,)",
+valuetype = "integer,",},

 GetAbilityAngleDistance = {type = "function",
 description = "",
 args = "(*integer* _abilityId_)",
-returns = "(integer,)",
-valuetype = "angleDistance,",},
+returns = "(integer:angleDistance,)",
+valuetype = "integer,",},

 GetAbilityDuration = {type = "function",
 description = "",
 args = "(*integer* _abilityId_)",
-returns = "(integer,)",
-valuetype = "duration,",},
+returns = "(integer:duration,)",
+valuetype = "integer,",},

 GetAbilityIcon = {type = "function",
 description = "",
 args = "(*integer* _abilityId_)",
-returns = "(textureName,)",
-valuetype = "icon,",},
+returns = "(textureName:icon,)",
+valuetype = "textureName,",},

 GetAbilityCost = {type = "function",
 description = "",
 args = "(*integer* _abilityId_)",
-returns = "(integer,)",
-valuetype = "mechanic,cost,",},
+returns = "(integer:cost,)",
+valuetype = "integer,",},

 GetAbilityRoles = {type = "function",
 description = "",
 args = "(*integer* _abilityId_)",
-returns = "(bool,bool,bool,)",
-valuetype = "isDamageRoleAbility,isHealerRoleAbility,isTankRoleAbility,",},
+returns = "(bool:isDamageRoleAbility,bool:isHealerRoleAbility,bool:isTankRoleAbility,)",
+valuetype = "bool,bool,bool,",},

 GetAbilityDescriptionHeader = {type = "function",
 description = "",
 args = "(*integer* _abilityId_)",
-returns = "(string,)",
-valuetype = "header,",},
+returns = "(string:header,)",
+valuetype = "string,",},

 GetAbilityDescription = {type = "function",
 description = "",
 args = "(*integer* _abilityId_)",
-returns = "(string,)",
-valuetype = "description,",},
+returns = "(string:description,)",
+valuetype = "string,",},

 GetAbilityEffectDescription = {type = "function",
 description = "",
 args = "(*integer* _effectSlotId_)",
-returns = "(string,)",
-valuetype = "description,",},
+returns = "(string:description,)",
+valuetype = "string,",},

 GetAbilityUpgradeLines = {type = "function",
 description = "",
 args = "(*integer* _abilityId_)",
-returns = "(string,string,string,)",
-valuetype = "newValue,oldValue,label,",},
+returns = "(string:newValue,string:oldValue,string:label,)",
+valuetype = "string,string,string,",},

 GetAbilityNewEffectLines = {type = "function",
 description = "",
 args = "(*integer* _abilityId_)",
-returns = "(string,)",
-valuetype = "newEffect,",},
+returns = "(string:newEffect,)",
+valuetype = "string,",},

 IsBlockActive = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "active,",},
+returns = "(bool:active,)",
+valuetype = "bool,",},

 StartSoulGemResurrection = {type = "function",
 description = "",
@@ -20223,26 +20107,26 @@ args = "()",},
 FormatFloatRelevantFraction = {type = "function",
 description = "",
 args = "(*number* _num_)",
-returns = "(string,)",
-valuetype = "formattedString,",},
+returns = "(string:formattedString,)",
+valuetype = "string,",},

 GetOfferedQuestInfo = {type = "function",
 description = "",
 args = "()",
-returns = "(string,string,)",
-valuetype = "response,dialogue,",},
+returns = "(string:response,string:dialogue,)",
+valuetype = "string,string,",},

 GetOfferedQuestShareInfo = {type = "function",
 description = "",
 args = "(*integer* _questId_)",
-returns = "(string,integer,string,string,)",
-valuetype = "displayName,millisecondsSinceRequest,characterName,questName,",},
+returns = "(string:displayName,integer:millisecondsSinceRequest,string:characterName,string:questName,)",
+valuetype = "string,integer,string,string,",},

 GetOfferedQuestShareIds = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "questId,",},
+returns = "(integer:questId,)",
+valuetype = "integer,",},

 AcceptOfferedQuest = {type = "function",
 description = "",
@@ -20259,86 +20143,84 @@ args = "(*integer* _questId_)",},
 GetNumJournalQuests = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numQuests,",},
+returns = "(integer:numQuests,)",
+valuetype = "integer,",},

 IsValidQuestIndex = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_)",
-returns = "(bool,)",
-valuetype = "isValid,",},
+returns = "(bool:isValid,)",
+valuetype = "bool,",},

 GetJournalQuestType = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_)",
-returns = "(integer,)",
-valuetype = "type,",},
+returns = "(integer:type,)",
+valuetype = "integer,",},

 GetJournalQuestRepeatType = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_)",
-returns = "(integer,)",
-valuetype = "repeatType,",},
+returns = "(integer:repeatType,)",
+valuetype = "integer,",},

 GetJournalQuestInstanceDisplayType = {type = "function",
 description = "",
-args = "(*luaindex* _journalQuestIndex_)",
-returns = "()",
-valuetype = "instanceDisplayType,",},
+args = "(*luaindex* _journalQuestIndex_)",},

 GetJournalQuestInfo = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_)",
-returns = "(integer,bool,integer,bool,bool,string,integer,string,string,string,)",
-valuetype = "instanceDisplayType,questType,pushed,questLevel,tracked,completed,activeStepTrackerOverrideText,activeStepType,activeStepText,backgroundText,questName,",},
+returns = "(integer:questType,bool:pushed,integer:questLevel,bool:tracked,bool:completed,string:activeStepTrackerOverrideText,integer:activeStepType,string:activeStepText,string:backgroundText,string:questName,)",
+valuetype = "integer,bool,integer,bool,bool,string,integer,string,string,string,",},

 GetJournalQuestIsComplete = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_)",
-returns = "(bool,)",
-valuetype = "completed,",},
+returns = "(bool:completed,)",
+valuetype = "bool,",},

 GetJournalQuestName = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_)",
-returns = "(string,)",
-valuetype = "questName,",},
+returns = "(string:questName,)",
+valuetype = "string,",},

 GetJournalQuestLevel = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_)",
-returns = "(integer,)",
-valuetype = "level,",},
+returns = "(integer:level,)",
+valuetype = "integer,",},

 GetJournalQuestConditionType = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_, *luaindex* _stepIndex_, *luaindex* _conditionIndex_, *bool* _assisted_)",
-returns = "(integer,)",
-valuetype = "pinType,",},
+returns = "(integer:pinType,)",
+valuetype = "integer,",},

 GetJournalQuestConditionInfo = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_, *luaindex* _stepIndex_, *luaindex* _conditionIndex_)",
-returns = "(bool,bool,bool,bool,integer,integer,string,)",
-valuetype = "isVisible,isCreditShared,isComplete,isFailCondition,max,current,conditionText,",},
+returns = "(bool:isVisible,bool:isCreditShared,bool:isComplete,bool:isFailCondition,integer:max,integer:current,string:conditionText,)",
+valuetype = "bool,bool,bool,bool,integer,integer,string,",},

 GetJournalQuestConditionValues = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_, *luaindex* _stepIndex_, *luaindex* _conditionIndex_)",
-returns = "(bool,bool,bool,bool,integer,integer,)",
-valuetype = "isVisible,isCreditShared,isComplete,isFailCondition,max,current,",},
+returns = "(bool:isVisible,bool:isCreditShared,bool:isComplete,bool:isFailCondition,integer:max,integer:current,)",
+valuetype = "bool,bool,bool,bool,integer,integer,",},

 GetQuestToolCooldownInfo = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_, *luaindex* _toolIndex_)",
-returns = "(integer,integer,)",
-valuetype = "duration,remain,",},
+returns = "(integer:duration,integer:remain,)",
+valuetype = "integer,integer,",},

 GetQuestItemCooldownInfo = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_, *luaindex* _stepIndex_, *luaindex* _conditionIndex_)",
-returns = "(integer,integer,)",
-valuetype = "duration,remain,",},
+returns = "(integer:duration,integer:remain,)",
+valuetype = "integer,integer,",},

 UseQuestItem = {type = "function",
 description = "",
@@ -20351,146 +20233,138 @@ args = "(*luaindex* _journalQuestIndex_, *luaindex* _toolIndex_)",},
 CanUseQuestItem = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_, *luaindex* _stepIndex_, *luaindex* _conditionIndex_)",
-returns = "(bool,)",
-valuetype = "canUse,",},
+returns = "(bool:canUse,)",
+valuetype = "bool,",},

 CanUseQuestTool = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_, *luaindex* _toolIndex_)",
-returns = "(bool,)",
-valuetype = "canUse,",},
+returns = "(bool:canUse,)",
+valuetype = "bool,",},

 IsJournalQuestInCurrentMapZone = {type = "function",
 description = "",
 args = "(*luaindex* _questIndex_)",
-returns = "(bool,)",
-valuetype = "isInCurrentZone,",},
+returns = "(bool:isInCurrentZone,)",
+valuetype = "bool,",},

 IsJournalQuestStepEnding = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_, *luaindex* _stepIndex_)",
-returns = "(bool,)",
-valuetype = "isEnding,",},
+returns = "(bool:isEnding,)",
+valuetype = "bool,",},

 DoesJournalQuestConditionHavePosition = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_, *luaindex* _stepIndex_, *luaindex* _conditionIndex_)",
-returns = "(bool,)",
-valuetype = "hasPosition,",},
+returns = "(bool:hasPosition,)",
+valuetype = "bool,",},

 SetMapToQuestCondition = {type = "function",
 description = "",
-args = "(*luaindex* _journalQuestIndex_, *luaindex* _stepIndex_, *luaindex* _conditionIndex_)",
-returns = "()",
-valuetype = "setMapResult,",},
+args = "(*luaindex* _journalQuestIndex_, *luaindex* _stepIndex_, *luaindex* _conditionIndex_)",},

 SetMapToQuestStepEnding = {type = "function",
 description = "",
-args = "(*luaindex* _journalQuestIndex_, *luaindex* _stepIndex_)",
-returns = "()",
-valuetype = "setMapResult,",},
+args = "(*luaindex* _journalQuestIndex_, *luaindex* _stepIndex_)",},

 SetMapToQuestZone = {type = "function",
 description = "",
-args = "(*luaindex* _questIndex_)",
-returns = "()",
-valuetype = "setMapResult,",},
+args = "(*luaindex* _questIndex_)",},

 GetJournalQuestNumRewards = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_)",
-returns = "(integer,)",
-valuetype = "count,",},
+returns = "(integer:count,)",
+valuetype = "integer,",},

 GetQuestRewardItemLink = {type = "function",
 description = "",
 args = "(*luaindex* _rewardIndex_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 GetNextCompletedQuestId = {type = "function",
 description = "",
-args = "(*integer:nilable* _lastQuestId_)",
-returns = "()",
-valuetype = "nextQuestId,",},
+args = "(*integer:nilable* _lastQuestId_)",},

 GetCompletedQuestInfo = {type = "function",
 description = "",
 args = "(*integer* _questId_)",
-returns = "(string,)",
-valuetype = "questType,name,",},
+returns = "(string:name,)",
+valuetype = "string,",},

 GetCompletedQuestLocationInfo = {type = "function",
 description = "",
 args = "(*integer* _questId_)",
-returns = "(luaindex,luaindex,string,string,)",
-valuetype = "poiIndex,zoneIndex,objectiveName,zoneName,",},
+returns = "(luaindex:poiIndex,luaindex:zoneIndex,string:objectiveName,string:zoneName,)",
+valuetype = "luaindex,luaindex,string,string,",},

 GetJournalQuestRewardInfo = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_, *luaindex* _rewardIndex_)",
-returns = "(bool,textureName,integer,string,)",
-valuetype = "itemType,itemQuality,meetsUsageRequirement,iconFile,amount,name,type,",},
+returns = "(bool:meetsUsageRequirement,textureName:iconFile,integer:amount,string:name,)",
+valuetype = "bool,textureName,integer,string,",},

 GetJournalQuestRewardItemId = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_, *luaindex* _rewardIndex_)",
-returns = "(integer,)",
-valuetype = "rewardItemDefId,",},
+returns = "(integer:rewardItemDefId,)",
+valuetype = "integer,",},

 GetJournalQuestRewardCollectibleId = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_, *luaindex* _rewardIndex_)",
-returns = "(integer,)",
-valuetype = "rewardCollectibleDefId,",},
+returns = "(integer:rewardCollectibleDefId,)",
+valuetype = "integer,",},

 GetJournalQuestRewardSkillLine = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_, *luaindex* _rewardIndex_)",
-returns = "(luaindex,)",
-valuetype = "skillIndex,skillType,",},
+returns = "(luaindex:skillIndex,)",
+valuetype = "luaindex,",},

 GetJournalQuestStartingZone = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_)",
-returns = "(luaindex,)",
-valuetype = "zoneIndex,",},
+returns = "(luaindex:zoneIndex,)",
+valuetype = "luaindex,",},

 GetQuestToolInfo = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_, *luaindex* _toolIndex_)",
-returns = "(integer,string,bool,integer,textureName,)",
-valuetype = "questItemId,name,isUsable,stackCount,iconFilename,",},
+returns = "(integer:questItemId,string:name,bool:isUsable,integer:stackCount,textureName:iconFilename,)",
+valuetype = "integer,string,bool,integer,textureName,",},

 GetQuestItemInfo = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_, *luaindex* _stepIndex_, *luaindex* _conditionIndex_)",
-returns = "(integer,string,integer,textureName,)",
-valuetype = "questItemId,name,stackCount,iconFilename,",},
+returns = "(integer:questItemId,string:name,integer:stackCount,textureName:iconFilename,)",
+valuetype = "integer,string,integer,textureName,",},

 GetQuestToolQuestItemId = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_, *luaindex* _toolIndex_)",
-returns = "(integer,)",
-valuetype = "questItemId,",},
+returns = "(integer:questItemId,)",
+valuetype = "integer,",},

 GetQuestConditionQuestItemId = {type = "function",
 description = "",
 args = "(*luaindex* _journalQuestIndex_, *luaindex* _stepIndex_, *luaindex* _conditionIndex_)",
-returns = "(integer,)",
-valuetype = "questItemId,",},
+returns = "(integer:questItemId,)",
+valuetype = "integer,",},

 GetQuestItemName = {type = "function",
 description = "",
 args = "(*integer* _questItemId_)",
-returns = "(string,)",
-valuetype = "itemName,",},
+returns = "(string:itemName,)",
+valuetype = "string,",},

 GetQuestItemTooltipText = {type = "function",
 description = "",
 args = "(*integer* _questItemId_)",
-returns = "(string,)",
-valuetype = "tooltipText,",},
+returns = "(string:tooltipText,)",
+valuetype = "string,",},

 CancelRequestJournalQuestConditionAssistance = {type = "function",
 description = "",
@@ -20499,50 +20373,50 @@ args = "(*integer* _taskId_)",},
 GetDynamicChatChannelName = {type = "function",
 description = "",
 args = "(*integer* _channelId_)",
-returns = "(string,)",
-valuetype = "name,",},
+returns = "(string:name,)",
+valuetype = "string,",},

 GetChatChannelId = {type = "function",
 description = "",
 args = "(*string* _name_)",
-returns = "(integer,)",
-valuetype = "channelId,",},
+returns = "(integer:channelId,)",
+valuetype = "integer,",},

 CanWriteGuildChannel = {type = "function",
 description = "",
 args = "(*integer* _channelId_)",
-returns = "(bool,)",
-valuetype = "canWrite,",},
+returns = "(bool:canWrite,)",
+valuetype = "bool,",},

 GetNumChatContainers = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numContainers,",},
+returns = "(integer:numContainers,)",
+valuetype = "integer,",},

 GetNumChatContainerTabs = {type = "function",
 description = "",
 args = "(*luaindex* _chatContainerIndex_)",
-returns = "(integer,)",
-valuetype = "numContainerTabs,",},
+returns = "(integer:numContainerTabs,)",
+valuetype = "integer,",},

 GetChatContainerTabInfo = {type = "function",
 description = "",
 args = "(*luaindex* _chatContainerIndex_, *luaindex* _tabIndex_)",
-returns = "(bool,bool,bool,bool,string,)",
-valuetype = "areTimestampsEnabled,isCombatLog,isInteractable,isLocked,name,",},
+returns = "(bool:areTimestampsEnabled,bool:isCombatLog,bool:isInteractable,bool:isLocked,string:name,)",
+valuetype = "bool,bool,bool,bool,string,",},

 GetNumChatCategories = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numCategories,",},
+returns = "(integer:numCategories,)",
+valuetype = "integer,",},

 IsChatContainerTabCategoryEnabled = {type = "function",
 description = "",
 args = "(*luaindex* _chatContainerIndex_, *luaindex* _tabIndex_, *[ChatChannelCategories|#ChatChannelCategories]* _chatCategory_)",
-returns = "(bool,)",
-valuetype = "enabled,",},
+returns = "(bool:enabled,)",
+valuetype = "bool,",},

 SetChatContainerTabCategoryEnabled = {type = "function",
 description = "",
@@ -20559,8 +20433,8 @@ args = "(*luaindex* _chatContainerIndex_, *luaindex* _tabIndex_)",},
 GetChatContainerColors = {type = "function",
 description = "",
 args = "(*luaindex* _chatContainerIndex_)",
-returns = "(number,number,number,number,number,)",
-valuetype = "bgMaxAlpha,bgMinAlpha,bgBlue,bgGreen,bgRed,",},
+returns = "(number:bgMaxAlpha,number:bgMinAlpha,number:bgBlue,number:bgGreen,number:bgRed,)",
+valuetype = "number,number,number,number,number,",},

 SetChatContainerColors = {type = "function",
 description = "",
@@ -20593,8 +20467,8 @@ args = "(*luaindex* _fromChatContainerIndex_, *luaindex* _fromTabIndex_, *luaind
 GetChatFontSize = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "fontSize,",},
+returns = "(integer:fontSize,)",
+valuetype = "integer,",},

 SetChatFontSize = {type = "function",
 description = "",
@@ -20603,8 +20477,8 @@ args = "(*integer* _fontSize_)",},
 GetGamepadChatFontSize = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "gamepadFontSize,",},
+returns = "(integer:gamepadFontSize,)",
+valuetype = "integer,",},

 SetGamepadChatFontSize = {type = "function",
 description = "",
@@ -20617,8 +20491,8 @@ args = "()",},
 GetChatCategoryColor = {type = "function",
 description = "",
 args = "(*[ChatChannelCategories|#ChatChannelCategories]* _category_)",
-returns = "(number,number,number,)",
-valuetype = "blue,green,red,",},
+returns = "(number:blue,number:green,number:red,)",
+valuetype = "number,number,number,",},

 SetChatCategoryColor = {type = "function",
 description = "",
@@ -20630,15 +20504,13 @@ args = "(*[ChatChannelCategories|#ChatChannelCategories]* _category_)",},

 GetChannelCategoryFromChannel = {type = "function",
 description = "",
-args = "(*[MsgChannelType|#MsgChannelType]* _channel_)",
-returns = "()",
-valuetype = "category,",},
+args = "(*[MsgChannelType|#MsgChannelType]* _channel_)",},

 IsChatBubbleCategoryEnabled = {type = "function",
 description = "",
 args = "(*[ChatChannelCategories|#ChatChannelCategories]* _category_)",
-returns = "(bool,)",
-valuetype = "enabled,",},
+returns = "(bool:enabled,)",
+valuetype = "bool,",},

 SetChatBubbleCategoryEnabled = {type = "function",
 description = "",
@@ -20647,8 +20519,8 @@ args = "(*[ChatChannelCategories|#ChatChannelCategories]* _category_, *bool* _en
 IsChatSystemAvailableForCurrentPlatform = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "enabled,",},
+returns = "(bool:enabled,)",
+valuetype = "bool,",},

 SetSessionIgnore = {type = "function",
 description = "",
@@ -20669,8 +20541,8 @@ args = "(*bool* _isEnabled_)",},
 IsChatLogEnabled = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isEnabled,",},
+returns = "(bool:isEnabled,)",
+valuetype = "bool,",},

 SetPendingInteractionConfirmed = {type = "function",
 description = "",
@@ -20679,38 +20551,38 @@ args = "(*bool* _isConfirmed_)",},
 IsUnderArrest = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "beingArrested,",},
+returns = "(bool:beingArrested,)",
+valuetype = "bool,",},

 GetGameCameraInteractableUnitAudioInfo = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,integer,integer,)",
-valuetype = "audioModelSize,audioModelMaterial,audioModelType,",},
+returns = "(integer:audioModelSize,integer:audioModelMaterial,integer:audioModelType,)",
+valuetype = "integer,integer,integer,",},

 IsGameCameraInteractableUnitMonster = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isUnitMonster,",},
+returns = "(bool:isUnitMonster,)",
+valuetype = "bool,",},

 GetGameCameraInteractableInfo = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,luaindex,luaindex,bool,bool,bool,bool,)",
-valuetype = "questToolOnCooldown,questToolIndex,questJournalIndex,questTargetBased,questInteraction,interactionAvailableNow,interactionExists,",},
+returns = "(bool:questToolOnCooldown,luaindex:questToolIndex,luaindex:questJournalIndex,bool:questTargetBased,bool:questInteraction,bool:interactionAvailableNow,bool:interactionExists,)",
+valuetype = "bool,luaindex,luaindex,bool,bool,bool,bool,",},

 GetGameCameraPickpocketingBonusInfo = {type = "function",
 description = "",
 args = "()",
-returns = "(string,bool,integer,bool,bool,)",
-valuetype = "monsterSocialClass,monsterSocialClassString,prospectiveResult,isEmpty,difficulty,percentChance,isHostile,inBonus,",},
+returns = "(string:monsterSocialClassString,bool:isEmpty,integer:percentChance,bool:isHostile,bool:inBonus,)",
+valuetype = "string,bool,integer,bool,bool,",},

 GetChatterOption = {type = "function",
 description = "",
 args = "(*luaindex* _optionIndex_)",
-returns = "(bool,bool,integer,integer,string,)",
-valuetype = "chosenBefore,isImportant,optionalArgument,optionType,optionString,",},
+returns = "(bool:chosenBefore,bool:isImportant,integer:optionalArgument,integer:optionType,string:optionString,)",
+valuetype = "bool,bool,integer,integer,string,",},

 SelectChatterOption = {type = "function",
 description = "",
@@ -20719,8 +20591,8 @@ args = "(*luaindex* _optionIndex_)",},
 IsInteractionPending = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isPending,",},
+returns = "(bool:isPending,)",
+valuetype = "bool,",},

 EndPendingInteraction = {type = "function",
 description = "",
@@ -20729,8 +20601,8 @@ args = "()",},
 GetChatterOptionCount = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "optionCount,",},
+returns = "(integer:optionCount,)",
+valuetype = "integer,",},

 ResetChatter = {type = "function",
 description = "",
@@ -20739,26 +20611,24 @@ args = "()",},
 GetChatterFarewell = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,string,string,)",
-valuetype = "isImportant,farewellString,backToTOCString,",},
+returns = "(bool:isImportant,string:farewellString,string:backToTOCString,)",
+valuetype = "bool,string,string,",},

 IsPlayerInteractingWithObject = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "areThey,",},
+returns = "(bool:areThey,)",
+valuetype = "bool,",},

 IsInteractingWithMyAssistant = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isAssistant,",},
+returns = "(bool:isAssistant,)",
+valuetype = "bool,",},

 GetInteractionType = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "interactMode,",},
+args = "()",},

 SetFrameLocalPlayerInGameCamera = {type = "function",
 description = "",
@@ -20782,57 +20652,53 @@ args = "(*integer* _audioModelType_, *bool* _closeLootWindow_)",},

 WhatIsVisualSlotShowing = {type = "function",
 description = "",
-args = "(*[VisualSlot|#VisualSlot]* _visualSlot_)",
-returns = "()",
-valuetype = "highestPriorityVisualLayerThatIsShowing,",},
+args = "(*[VisualSlot|#VisualSlot]* _visualSlot_)",},

 GetHiddenByStringForVisualLayer = {type = "function",
 description = "",
 args = "(*[VisualLayer|#VisualLayer]* _visualLayer_)",
-returns = "(string,)",
-valuetype = "hiddenByString,",},
+returns = "(string:hiddenByString,)",
+valuetype = "string,",},

 WouldEquipmentBeHidden = {type = "function",
 description = "",
 args = "(*[EquipSlot|#EquipSlot]* _equipSlot_)",
-returns = "(bool,)",
-valuetype = "highestPriorityVisualLayerThatIsShowing,isHidden,",},
+returns = "(bool:isHidden,)",
+valuetype = "bool,",},

 IsEquipSlotVisualCategoryHidden = {type = "function",
 description = "",
 args = "(*[EquipSlotVisualCategory|#EquipSlotVisualCategory]* _equipSlotVisualCategory_)",
-returns = "(bool,)",
-valuetype = "isHidden,",},
+returns = "(bool:isHidden,)",
+valuetype = "bool,",},

 WouldCollectibleBeHidden = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_)",
-returns = "(bool,)",
-valuetype = "highestPriorityVisualLayerThatIsShowing,isHidden,",},
+returns = "(bool:isHidden,)",
+valuetype = "bool,",},

 DoesCollectibleHaveVisibleAppearance = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_)",
-returns = "(bool,)",
-valuetype = "hasVisibleAppearance,",},
+returns = "(bool:hasVisibleAppearance,)",
+valuetype = "bool,",},

 GetKioskBidWindowSecondsRemaining = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "secondsRemaining,",},
+returns = "(integer:secondsRemaining,)",
+valuetype = "integer,",},

 GetKioskGuildInfo = {type = "function",
 description = "",
-args = "(*integer* _guildId_)",
-returns = "()",
-valuetype = "queryResult,existingBidKioskName,existingBidIsOnThisKiosk,existingBidAmount,bankedMoney,",},
+args = "(*integer* _guildId_)",},

 GetKioskPurchaseCost = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "cost,",},
+returns = "(integer:cost,)",
+valuetype = "integer,",},

 GuildKioskBid = {type = "function",
 description = "",
@@ -20845,68 +20711,66 @@ args = "(*integer* _guildId_)",},
 GetNumTradingHouseGuilds = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numGuilds,",},
+returns = "(integer:numGuilds,)",
+valuetype = "integer,",},

 GetTradingHouseGuildDetails = {type = "function",
 description = "",
 args = "(*luaindex* _index_)",
-returns = "(integer,string,integer,)",
-valuetype = "guildAlliance,guildName,guildId,",},
+returns = "(integer:guildAlliance,string:guildName,integer:guildId,)",
+valuetype = "integer,string,integer,",},

 GetCurrentTradingHouseGuildDetails = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,string,integer,)",
-valuetype = "guildAlliance,guildName,guildId,",},
+returns = "(integer:guildAlliance,string:guildName,integer:guildId,)",
+valuetype = "integer,string,integer,",},

 CanBuyFromTradingHouse = {type = "function",
 description = "",
 args = "(*integer* _guildId_)",
-returns = "(bool,)",
-valuetype = "canBuy,",},
+returns = "(bool:canBuy,)",
+valuetype = "bool,",},

 CanSellOnTradingHouse = {type = "function",
 description = "",
 args = "(*integer* _guildId_)",
-returns = "(bool,)",
-valuetype = "canSell,",},
+returns = "(bool:canSell,)",
+valuetype = "bool,",},

 GetSelectedTradingHouseGuildId = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "guildId,",},
+args = "()",},

 SelectTradingHouseGuildId = {type = "function",
 description = "",
 args = "(*integer* _guildId_)",
-returns = "(bool,)",
-valuetype = "success,",},
+returns = "(bool:success,)",
+valuetype = "bool,",},

 GetTradingHouseListingCounts = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,integer,)",
-valuetype = "maxListingCount,currentListingCount,",},
+returns = "(integer:maxListingCount,integer:currentListingCount,)",
+valuetype = "integer,integer,",},

 GetTradingHousePostPriceInfo = {type = "function",
 description = "",
 args = "(*integer* _desiredPostPrice_)",
-returns = "(integer,integer,integer,)",
-valuetype = "expectedProfit,tradingHouseCut,listingFee,",},
+returns = "(integer:expectedProfit,integer:tradingHouseCut,integer:listingFee,)",
+valuetype = "integer,integer,integer,",},

 GetTradingHouseListingPercentage = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "listingPercentage,",},
+returns = "(number:listingPercentage,)",
+valuetype = "number,",},

 GetTradingHouseCutPercentage = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "cutPercentage,",},
+returns = "(number:cutPercentage,)",
+valuetype = "number,",},

 SetPendingItemPost = {type = "function",
 description = "",
@@ -20915,8 +20779,8 @@ args = "(*[Bag|#Bag]* _bag_, *integer* _slot_, *integer* _quantity_)",},
 GetPendingItemPost = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,integer,)",
-valuetype = "quantity,slot,bag,",},
+returns = "(integer:quantity,integer:slot,)",
+valuetype = "integer,integer,",},

 RequestPostItemOnTradingHouse = {type = "function",
 description = "",
@@ -20953,14 +20817,14 @@ args = "(*integer* _page_, *[TradingHouseSortField|#TradingHouseSortField]* _sor
 GetTradingHouseSearchResultItemInfo = {type = "function",
 description = "",
 args = "(*luaindex* _index_)",
-returns = "(integer,integer,string,integer,integer,string,textureName,)",
-valuetype = "currencyType,purchasePrice,timeRemaining,sellerName,stackCount,quality,itemName,icon,",},
+returns = "(integer:purchasePrice,integer:timeRemaining,string:sellerName,integer:stackCount,integer:quality,string:itemName,textureName:icon,)",
+valuetype = "integer,integer,string,integer,integer,string,textureName,",},

 GetTradingHouseSearchResultItemLink = {type = "function",
 description = "",
 args = "(*luaindex* _index_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 RequestTradingHouseListings = {type = "function",
 description = "",
@@ -20969,8 +20833,8 @@ args = "()",},
 GetNumTradingHouseListings = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numListings,",},
+returns = "(integer:numListings,)",
+valuetype = "integer,",},

 CancelTradingHouseListing = {type = "function",
 description = "",
@@ -20979,260 +20843,236 @@ args = "(*luaindex* _index_)",},
 GetTradingHouseListingItemInfo = {type = "function",
 description = "",
 args = "(*luaindex* _index_)",
-returns = "(integer,integer,string,integer,integer,string,textureName,)",
-valuetype = "purchasePrice,timeRemaining,sellerName,stackCount,quality,itemName,icon,",},
+returns = "(integer:purchasePrice,integer:timeRemaining,string:sellerName,integer:stackCount,integer:quality,string:itemName,textureName:icon,)",
+valuetype = "integer,integer,string,integer,integer,string,textureName,",},

 GetTradingHouseListingItemLink = {type = "function",
 description = "",
 args = "(*luaindex* _index_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 GetEnchantmentSearchCategories = {type = "function",
 description = "",
 args = "(*[ItemType|#ItemType]* _itemType_)",
-returns = "(integer,)",
-valuetype = "category,",},
+returns = "(integer:category,)",
+valuetype = "integer,",},

 GetTradingHouseCooldownRemaining = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "cooldownMilliseconds,",},
+returns = "(integer:cooldownMilliseconds,)",
+valuetype = "integer,",},

 SetMapToPlayerLocation = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "setMapResult,",},
+args = "()",},

 DoesCurrentMapMatchMapForPlayerLocation = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "matches,",},
+returns = "(bool:matches,)",
+valuetype = "bool,",},

 SetMapToMapListIndex = {type = "function",
 description = "",
-args = "(*luaindex* _index_)",
-returns = "()",
-valuetype = "setMapResult,",},
+args = "(*luaindex* _index_)",},

 GetCurrentMapIndex = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "index,",},
+args = "()",},

 GetMapIndexByZoneId = {type = "function",
 description = "",
-args = "(*integer* _zoneId_)",
-returns = "()",
-valuetype = "index,",},
+args = "(*integer* _zoneId_)",},

 GetCyrodiilMapIndex = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "index,",},
+args = "()",},

 GetImperialCityMapIndex = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "index,",},
+args = "()",},

 GetCurrentMapZoneIndex = {type = "function",
 description = "",
 args = "()",
-returns = "(luaindex,)",
-valuetype = "zoneIndex,",},
+returns = "(luaindex:zoneIndex,)",
+valuetype = "luaindex,",},

 GetZoneNameByIndex = {type = "function",
 description = "",
 args = "(*luaindex* _zoneIndex_)",
-returns = "(string,)",
-valuetype = "zoneName,",},
+returns = "(string:zoneName,)",
+valuetype = "string,",},

 GetMapNameByIndex = {type = "function",
 description = "",
 args = "(*luaindex* _mapIndex_)",
-returns = "(string,)",
-valuetype = "mapName,",},
+returns = "(string:mapName,)",
+valuetype = "string,",},

 GetNumMaps = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numMaps,",},
+returns = "(integer:numMaps,)",
+valuetype = "integer,",},

 MapZoomOut = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "setMapResult,",},
+args = "()",},

 WouldProcessMapClick = {type = "function",
 description = "",
 args = "(*number* _normalizedClickX_, *number* _normalizedClickY_)",
-returns = "(bool,)",
-valuetype = "resultingMapIndex,wouldProcess,",},
+returns = "(bool:wouldProcess,)",
+valuetype = "bool,",},

 ProcessMapClick = {type = "function",
 description = "",
-args = "(*number* _normalizedClickX_, *number* _normalizedClickY_)",
-returns = "()",
-valuetype = "setMapResult,",},
+args = "(*number* _normalizedClickX_, *number* _normalizedClickY_)",},

 GetMapInfo = {type = "function",
 description = "",
 args = "(*luaindex* _index_)",
-returns = "(string,integer,string,)",
-valuetype = "description,zoneId,mapContentType,mapType,name,",},
+returns = "(string:description,integer:zoneId,string:name,)",
+valuetype = "string,integer,string,",},

 GetZoneDescription = {type = "function",
 description = "",
 args = "(*integer* _zoneIndex_)",
-returns = "(string,)",
-valuetype = "description,",},
+returns = "(string:description,)",
+valuetype = "string,",},

 GetZoneNameById = {type = "function",
 description = "",
 args = "(*integer* _zoneId_)",
-returns = "(string,)",
-valuetype = "name,",},
+returns = "(string:name,)",
+valuetype = "string,",},

 GetZoneDescriptionById = {type = "function",
 description = "",
 args = "(*integer* _zoneId_)",
-returns = "(string,)",
-valuetype = "description,",},
+returns = "(string:description,)",
+valuetype = "string,",},

 GetMapParentCategories = {type = "function",
 description = "",
 args = "(*luaindex* _index_)",
-returns = "(luaindex,string,)",
-valuetype = "categoryIndex,categoryName,",},
+returns = "(luaindex:categoryIndex,string:categoryName,)",
+valuetype = "luaindex,string,",},

 GetMapNumTiles = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,integer,)",
-valuetype = "numVerticalTiles,numHorizontalTiles,",},
+returns = "(integer:numVerticalTiles,integer:numHorizontalTiles,)",
+valuetype = "integer,integer,",},

 GetMapTileTexture = {type = "function",
 description = "",
 args = "(*luaindex* _tileIndex_)",
-returns = "(string,)",
-valuetype = "tileFilename,",},
+returns = "(string:tileFilename,)",
+valuetype = "string,",},

 GetMapName = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "mapName,",},
+returns = "(string:mapName,)",
+valuetype = "string,",},

 GetMapType = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "mapType,",},
+args = "()",},

 GetMapContentType = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "mapContentType,",},
+args = "()",},

 GetMapFilterType = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "mapFilterType,",},
+args = "()",},

 GetNumMapLocations = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numMapLocations,",},
+returns = "(integer:numMapLocations,)",
+valuetype = "integer,",},

 IsMapLocationVisible = {type = "function",
 description = "",
 args = "(*luaindex* _locationIndex_)",
-returns = "(bool,)",
-valuetype = "isVisible,",},
+returns = "(bool:isVisible,)",
+valuetype = "bool,",},

 GetMapLocationIcon = {type = "function",
 description = "",
 args = "(*luaindex* _locationIndex_)",
-returns = "(number,number,string,)",
-valuetype = "normalizedZ,normalizedX,icon,",},
+returns = "(number:normalizedZ,number:normalizedX,string:icon,)",
+valuetype = "number,number,string,",},

 GetNumMapLocationTooltipLines = {type = "function",
 description = "",
 args = "(*luaindex* _locationIndex_)",
-returns = "(integer,)",
-valuetype = "numLines,",},
+returns = "(integer:numLines,)",
+valuetype = "integer,",},

 IsMapLocationTooltipLineVisible = {type = "function",
 description = "",
 args = "(*luaindex* _locationIndex_, *luaindex* _tooltipLineIndex_)",
-returns = "(bool,)",
-valuetype = "isVisible,",},
+returns = "(bool:isVisible,)",
+valuetype = "bool,",},

 GetMapLocationTooltipLineInfo = {type = "function",
 description = "",
 args = "(*luaindex* _locationIndex_, *luaindex* _tooltipLineIndex_)",
-returns = "(string,integer,string,textureName,)",
-valuetype = "categoryName,grouping,name,icon,",},
+returns = "(string:categoryName,integer:grouping,string:name,textureName:icon,)",
+valuetype = "string,integer,string,textureName,",},

 GetMapLocationTooltipHeader = {type = "function",
 description = "",
 args = "(*luaindex* _locationIndex_)",
-returns = "(string,)",
-valuetype = "header,",},
+returns = "(string:header,)",
+valuetype = "string,",},

 GetMapMouseoverInfo = {type = "function",
 description = "",
 args = "(*number* _normalizedMouseX_, *number* _normalizedMouseY_)",
-returns = "(number,number,number,number,string,string,)",
-valuetype = "textureYOffsetNormalized,textureXOffsetNormalized,textureHeightNormalized,textureWidthNormalized,textureFile,locationName,",},
+returns = "(number:textureYOffsetNormalized,number:textureXOffsetNormalized,number:textureHeightNormalized,number:textureWidthNormalized,string:textureFile,string:locationName,)",
+valuetype = "number,number,number,number,string,string,",},

 GetNumMapKeySections = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numSections,",},
+returns = "(integer:numSections,)",
+valuetype = "integer,",},

 GetMapKeySectionName = {type = "function",
 description = "",
 args = "(*luaindex* _sectionIndex_)",
-returns = "(string,)",
-valuetype = "sectionName,",},
+returns = "(string:sectionName,)",
+valuetype = "string,",},

 GetNumMapKeySectionSymbols = {type = "function",
 description = "",
 args = "(*luaindex* _sectionIndex_)",
-returns = "(integer,)",
-valuetype = "numSymbols,",},
+returns = "(integer:numSymbols,)",
+valuetype = "integer,",},

 GetMapKeySectionSymbolInfo = {type = "function",
 description = "",
 args = "(*luaindex* _sectionIndex_, *luaindex* _symbolIndex_)",
-returns = "(string,textureName,string,)",
-valuetype = "tooltip,icon,name,",},
+returns = "(string:tooltip,textureName:icon,string:name,)",
+valuetype = "string,textureName,string,",},

 GetMapFloorInfo = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,luaindex,)",
-valuetype = "numFloors,currentFloor,",},
+returns = "(integer:numFloors,luaindex:currentFloor,)",
+valuetype = "integer,luaindex,",},

 SetMapFloor = {type = "function",
 description = "",
-args = "(*luaindex* _desiredFloorIndex_)",
-returns = "()",
-valuetype = "setMapResult,",},
+args = "(*luaindex* _desiredFloorIndex_)",},

 PingMap = {type = "function",
 description = "",
@@ -21241,8 +21081,8 @@ args = "(*[MapDisplayPinType|#MapDisplayPinType]* _pingType_, *[MapDisplayType|#
 SetPlayerWaypointByWorldLocation = {type = "function",
 description = "",
 args = "(*integer* _worldX_, *integer* _worldY_, *integer* _worldZ_)",
-returns = "(bool,)",
-valuetype = "success,",},
+returns = "(bool:success,)",
+valuetype = "bool,",},

 RemovePlayerWaypoint = {type = "function",
 description = "",
@@ -21255,272 +21095,266 @@ args = "()",},
 GenerateUnitNameTooltipLine = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(integer,string,)",
-valuetype = "color,interfaceColorType,text,",},
+returns = "(integer:color,string:text,)",
+valuetype = "integer,string,",},

 GenerateQuestEndingTooltipLine = {type = "function",
 description = "",
 args = "(*luaindex* _questIndex_)",
-returns = "(integer,string,)",
-valuetype = "color,interfaceColorType,text,",},
+returns = "(integer:color,string:text,)",
+valuetype = "integer,string,",},

 GenerateQuestConditionTooltipLine = {type = "function",
 description = "",
 args = "(*luaindex* _questIndex_, *luaindex* _stepIndex_, *luaindex* _conditionIndex_)",
-returns = "(integer,string,)",
-valuetype = "color,interfaceColorType,text,",},
+returns = "(integer:color,string:text,)",
+valuetype = "integer,string,",},

 GenerateMapPingTooltipLine = {type = "function",
 description = "",
 args = "(*[MapDisplayPinType|#MapDisplayPinType]* _mapPingType_, *string* _unitTag_)",
-returns = "(integer,string,)",
-valuetype = "color,interfaceColorType,text,",},
+returns = "(integer:color,string:text,)",
+valuetype = "integer,string,",},

 GenerateAvAObjectiveConditionTooltipLine = {type = "function",
 description = "",
 args = "(*[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _bgQueryType_, *integer* _keepId_, *integer* _objectiveId_, *[ObjectivePinTier|#ObjectivePinTier]* _objectivePinTier_)",
-returns = "(integer,string,)",
-valuetype = "color,interfaceColorType,text,",},
+returns = "(integer:color,string:text,)",
+valuetype = "integer,string,",},

 GenerateMasterWritBaseText = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(string,)",
-valuetype = "description,",},
+returns = "(string:description,)",
+valuetype = "string,",},

 GenerateMasterWritRewardText = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(string,)",
-valuetype = "description,",},
+returns = "(string:description,)",
+valuetype = "string,",},

 GetNumPOIs = {type = "function",
 description = "",
 args = "(*luaindex* _zoneIndex_)",
-returns = "(integer,)",
-valuetype = "numPOIs,",},
+returns = "(integer:numPOIs,)",
+valuetype = "integer,",},

 GetPOIInfo = {type = "function",
 description = "",
 args = "(*luaindex* _zoneIndex_, *luaindex* _poiIndex_)",
-returns = "(string,string,integer,string,)",
-valuetype = "finishedDescription,startDescription,objectiveLevel,objectiveName,",},
+returns = "(string:finishedDescription,string:startDescription,integer:objectiveLevel,string:objectiveName,)",
+valuetype = "string,string,integer,string,",},

 GetPOIType = {type = "function",
 description = "",
-args = "(*luaindex* _zoneIndex_, *luaindex* _poiIndex_)",
-returns = "()",
-valuetype = "poiType,",},
+args = "(*luaindex* _zoneIndex_, *luaindex* _poiIndex_)",},

 GetPOIMapInfo = {type = "function",
 description = "",
 args = "(*luaindex* _zoneIndex_, *luaindex* _poiIndex_)",
-returns = "(bool,bool,textureName,number,number,)",
-valuetype = "linkedCollectibleIsLocked,isShownInCurrentMap,icon,poiPinType,normalizedZ,normalizedX,",},
+returns = "(bool:linkedCollectibleIsLocked,bool:isShownInCurrentMap,textureName:icon,number:normalizedZ,number:normalizedX,)",
+valuetype = "bool,bool,textureName,number,number,",},

 GetCurrentSubZonePOIIndices = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "poiIndex,zoneIndex,",},
+args = "()",},

 IsInCyrodiil = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isInCyrodiil,",},
+returns = "(bool:isInCyrodiil,)",
+valuetype = "bool,",},

 IsInImperialCity = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isInImperialCity,",},
+returns = "(bool:isInImperialCity,)",
+valuetype = "bool,",},

 IsInAvAZone = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isInAvAZone,",},
+returns = "(bool:isInAvAZone,)",
+valuetype = "bool,",},

 IsInOutlawZone = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isInOutlawZone,",},
+returns = "(bool:isInOutlawZone,)",
+valuetype = "bool,",},

 IsInJusticeEnabledZone = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isInJusticeZone,",},
+returns = "(bool:isInJusticeZone,)",
+valuetype = "bool,",},

 IsInTutorialZone = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isInTutorialZone,",},
+returns = "(bool:isInTutorialZone,)",
+valuetype = "bool,",},

 CanLeaveCurrentLocationViaTeleport = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "canLeaveCurrentLocationViaTeleport,",},
+returns = "(bool:canLeaveCurrentLocationViaTeleport,)",
+valuetype = "bool,",},

 DoesCurrentZoneAllowScalingByLevel = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "allowsScaling,",},
+returns = "(bool:allowsScaling,)",
+valuetype = "bool,",},

 DoesCurrentZoneHaveTelvarStoneBehavior = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "telvarBehaviorEnabled,",},
+returns = "(bool:telvarBehaviorEnabled,)",
+valuetype = "bool,",},

 DoesCurrentZoneAllowBattleLevelScaling = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "allowsBattleLevelScaling,",},
+returns = "(bool:allowsBattleLevelScaling,)",
+valuetype = "bool,",},

 GetCurrentZoneLevelScalingConstraints = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,integer,)",
-valuetype = "maxScaleLevel,minScaleLevel,scaleLevelContraintType,",},
+returns = "(integer:maxScaleLevel,integer:minScaleLevel,)",
+valuetype = "integer,integer,",},

 GetCollectibleIdForZone = {type = "function",
 description = "",
 args = "(*luaindex* _zoneIndex_)",
-returns = "(integer,)",
-valuetype = "collectibleId,",},
+returns = "(integer:collectibleId,)",
+valuetype = "integer,",},

 GetZoneId = {type = "function",
 description = "",
 args = "(*luaindex* _zoneIndex_)",
-returns = "(integer,)",
-valuetype = "zoneId,",},
+returns = "(integer:zoneId,)",
+valuetype = "integer,",},

 GetZoneIndex = {type = "function",
 description = "",
 args = "(*integer* _zoneId_)",
-returns = "(luaindex,)",
-valuetype = "zoneIndex,",},
+returns = "(luaindex:zoneIndex,)",
+valuetype = "luaindex,",},

 GetCadwellProgressionLevel = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "cadwellProgressionLevel,",},
+args = "()",},

 GetNumZonesForCadwellProgressionLevel = {type = "function",
 description = "",
 args = "(*[CadwellProgressionLevel|#CadwellProgressionLevel]* _cadwellProgressionLevel_)",
-returns = "(integer,)",
-valuetype = "numZones,",},
+returns = "(integer:numZones,)",
+valuetype = "integer,",},

 GetCadwellZoneInfo = {type = "function",
 description = "",
 args = "(*[CadwellProgressionLevel|#CadwellProgressionLevel]* _cadwellProgressionLevel_, *luaindex* _zoneIndex_)",
-returns = "(luaindex,string,string,)",
-valuetype = "zoneOrder,zoneDescription,zoneName,",},
+returns = "(luaindex:zoneOrder,string:zoneDescription,string:zoneName,)",
+valuetype = "luaindex,string,string,",},

 GetNumPOIsForCadwellProgressionLevelAndZone = {type = "function",
 description = "",
 args = "(*[CadwellProgressionLevel|#CadwellProgressionLevel]* _cadwellProgressionLevel_, *luaindex* _zoneIndex_)",
-returns = "(integer,)",
-valuetype = "numPOIs,",},
+returns = "(integer:numPOIs,)",
+valuetype = "integer,",},

 GetCadwellZonePOIInfo = {type = "function",
 description = "",
 args = "(*[CadwellProgressionLevel|#CadwellProgressionLevel]* _cadwellProgressionLevel_, *luaindex* _zoneIndex_, *luaindex* _poiIndex_)",
-returns = "(bool,bool,luaindex,string,string,string,)",
-valuetype = "completed,discovered,poiOrder,poiClosingText,poiOpeningText,poiName,",},
+returns = "(bool:completed,bool:discovered,luaindex:poiOrder,string:poiClosingText,string:poiOpeningText,string:poiName,)",
+valuetype = "bool,bool,luaindex,string,string,string,",},

 GetPlayerActiveSubzoneName = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "subzoneName,",},
+returns = "(string:subzoneName,)",
+valuetype = "string,",},

 GetPlayerActiveZoneName = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "zoneName,",},
+returns = "(string:zoneName,)",
+valuetype = "string,",},

 GetPlayerLocationName = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "mapName,",},
+returns = "(string:mapName,)",
+valuetype = "string,",},

 IsActiveWorldBattleground = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isInBattleground,",},
+returns = "(bool:isInBattleground,)",
+valuetype = "bool,",},

 IsActiveWorldGroupOwnable = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isWorldGroupOwnable,",},
+returns = "(bool:isWorldGroupOwnable,)",
+valuetype = "bool,",},

 CanJumpToPlayerInZone = {type = "function",
 description = "",
 args = "(*integer* _zoneId_)",
-returns = "(bool,)",
-valuetype = "result,canJump,",},
+returns = "(bool:canJump,)",
+valuetype = "bool,",},

 GetHistoricalKeepTravelNetworkLinkInfo = {type = "function",
 description = "",
 args = "(*luaindex* _linkIndex_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _bgContext_, *number* _historyPercent_)",
-returns = "(number,number,number,number,integer,integer,integer,)",
-valuetype = "endY,endX,startY,startX,restricedToAlliance,linkOwner,linkType,",},
+returns = "(number:endY,number:endX,number:startY,number:startX,integer:restricedToAlliance,integer:linkOwner,integer:linkType,)",
+valuetype = "number,number,number,number,integer,integer,integer,",},

 GetNumFastTravelNodes = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numFastTravelNodes,",},
+returns = "(integer:numFastTravelNodes,)",
+valuetype = "integer,",},

 GetFastTravelNodeInfo = {type = "function",
 description = "",
 args = "(*luaindex* _nodeIndex_)",
-returns = "(bool,bool,textureName,number,number,string,bool,)",
-valuetype = "linkedCollectibleIsLocked,isShownInCurrentMap,poiType,glowIcon,icon,normalizedY,normalizedX,name,known,",},
+returns = "(bool:linkedCollectibleIsLocked,bool:isShownInCurrentMap,textureName:icon,number:normalizedY,number:normalizedX,string:name,bool:known,)",
+valuetype = "bool,bool,textureName,number,number,string,bool,",},

 GetFastTravelNodeOutboundOnlyInfo = {type = "function",
 description = "",
 args = "(*luaindex* _nodeIndex_)",
-returns = "(integer,bool,)",
-valuetype = "errorStringId,isOutboundOnly,",},
+returns = "(integer:errorStringId,bool:isOutboundOnly,)",
+valuetype = "integer,bool,",},

 GetFastTravelNodeDrawLevelOffset = {type = "function",
 description = "",
 args = "(*luaindex* _nodeIndex_)",
-returns = "(integer,)",
-valuetype = "drawLevelOffset,",},
+returns = "(integer:drawLevelOffset,)",
+valuetype = "integer,",},

 GetFastTravelNodeLinkedCollectibleId = {type = "function",
 description = "",
 args = "(*luaindex* _nodeIndex_)",
-returns = "(integer,)",
-valuetype = "collectibleId,",},
+returns = "(integer:collectibleId,)",
+valuetype = "integer,",},

 GetFastTravelNodeHouseId = {type = "function",
 description = "",
 args = "(*luaindex* _nodeIndex_)",
-returns = "(integer,)",
-valuetype = "houseId,",},
+returns = "(integer:houseId,)",
+valuetype = "integer,",},

 HasCompletedFastTravelNodePOI = {type = "function",
 description = "",
 args = "(*luaindex* _nodeIndex_)",
-returns = "(bool,)",
-valuetype = "hasCompletedPOI,",},
+returns = "(bool:hasCompletedPOI,)",
+valuetype = "bool,",},

 FastTravelToNode = {type = "function",
 description = "",
@@ -21529,266 +21363,244 @@ args = "(*luaindex* _nodeIndex_)",},
 GetRecallCost = {type = "function",
 description = "",
 args = "(*luaindex* _nodeIndex_)",
-returns = "(integer,)",
-valuetype = "cost,",},
+returns = "(integer:cost,)",
+valuetype = "integer,",},

 GetRecallCurrency = {type = "function",
 description = "",
-args = "(*luaindex* _nodeIndex_)",
-returns = "()",
-valuetype = "currency,",},
+args = "(*luaindex* _nodeIndex_)",},

 GetNumObjectives = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "num,",},
+returns = "(integer:num,)",
+valuetype = "integer,",},

 GetObjectiveIdsForIndex = {type = "function",
 description = "",
 args = "(*luaindex* _index_)",
-returns = "(integer,integer,)",
-valuetype = "battlegroundContext,objectiveId,keepId,",},
+returns = "(integer:objectiveId,integer:keepId,)",
+valuetype = "integer,integer,",},

 DoesObjectiveExist = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "(bool,)",
-valuetype = "exists,",},
+returns = "(bool:exists,)",
+valuetype = "bool,",},

 GetObjectiveType = {type = "function",
 description = "",
-args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "()",
-valuetype = "objectiveType,",},
+args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",},

 GetObjectiveControlState = {type = "function",
 description = "",
-args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "()",
-valuetype = "controlState,",},
+args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",},

 GetObjectiveInfo = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "(string,)",
-valuetype = "objectiveState,objectiveType,objectiveName,",},
+returns = "(string:objectiveName,)",
+valuetype = "string,",},

 GetObjectivePinInfo = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "(bool,number,number,)",
-valuetype = "continuousUpdate,currentNormalizedY,currentNormalizedX,pinType,",},
+returns = "(bool:continuousUpdate,number:currentNormalizedY,number:currentNormalizedX,)",
+valuetype = "bool,number,number,",},

 GetObjectiveSpawnPinInfo = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "(number,number,)",
-valuetype = "spawnNormalizedY,spawnNormalizedX,pinType,",},
+returns = "(number:spawnNormalizedY,number:spawnNormalizedX,)",
+valuetype = "number,number,",},

 GetObjectiveAuraPinInfo = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "(number,number,number,)",
-valuetype = "blue,green,red,pinType,",},
+returns = "(number:blue,number:green,number:red,)",
+valuetype = "number,number,number,",},

 GetObjectiveReturnPinInfo = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "(bool,number,number,)",
-valuetype = "continuousUpdate,returnNormalizedY,returnNormalizedX,pinType,",},
+returns = "(bool:continuousUpdate,number:returnNormalizedY,number:returnNormalizedX,)",
+valuetype = "bool,number,number,",},

 GetObjectiveDesignation = {type = "function",
 description = "",
-args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "()",
-valuetype = "designation,",},
+args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",},

 IsBattlegroundObjective = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "(bool,)",
-valuetype = "isInBattleground,",},
+returns = "(bool:isInBattleground,)",
+valuetype = "bool,",},

 IsCarryableObjectiveCarriedByLocalPlayer = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "(bool,)",
-valuetype = "isCarried,",},
+returns = "(bool:isCarried,)",
+valuetype = "bool,",},

 IsCaptureAreaObjectiveCaptured = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "(bool,)",
-valuetype = "isCaptured,",},
+returns = "(bool:isCaptured,)",
+valuetype = "bool,",},

 GetCaptureAreaObjectiveOwner = {type = "function",
 description = "",
-args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "()",
-valuetype = "ownerAlliance,",},
+args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",},

 GetCaptureAreaObjectiveLastInfluenceState = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "(bool,)",
-valuetype = "wereInfluenceSourcesInRangeOfCaptureArea,alliance,",},
+returns = "(bool:wereInfluenceSourcesInRangeOfCaptureArea,)",
+valuetype = "bool,",},

 GetCarryableObjectiveHoldingAllianceInfo = {type = "function",
 description = "",
-args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "()",
-valuetype = "lastHoldingAlliance,holdingAlliance,",},
+args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",},

 GetCarryableObjectiveHoldingCharacterInfo = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "(integer,string,string,)",
-valuetype = "classId,displayName,rawCharacterName,",},
+returns = "(integer:classId,string:displayName,string:rawCharacterName,)",
+valuetype = "integer,string,string,",},

 GetCarryableObjectiveLastHoldingCharacterInfo = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "(integer,string,string,)",
-valuetype = "classId,displayName,rawCharacterName,",},
+returns = "(integer:classId,string:displayName,string:rawCharacterName,)",
+valuetype = "integer,string,string,",},

 GetCaptureFlagObjectiveOriginalOwningAlliance = {type = "function",
 description = "",
-args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "()",
-valuetype = "originalOwningAlliance,",},
+args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",},

 GetArtifactScrollObjectiveOriginalOwningAlliance = {type = "function",
 description = "",
-args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "()",
-valuetype = "originalOwningAlliance,",},
+args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",},

 GetKeepThatHasCapturedThisArtifactScrollObjective = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "(integer,)",
-valuetype = "capturedAtKeepId,",},
+returns = "(integer:capturedAtKeepId,)",
+valuetype = "integer,",},

 GetArtifactReturnObjectiveOwner = {type = "function",
 description = "",
-args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "()",
-valuetype = "ownerAlliance,",},
+args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",},

 GetReturnObjectiveOwner = {type = "function",
 description = "",
-args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "()",
-valuetype = "ownerAlliance,",},
+args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",},

 GetAvAArtifactScore = {type = "function",
 description = "",
 args = "(*integer* _campaignId_, *[Alliance|#Alliance]* _alliance_, *[ObjectiveType|#ObjectiveType]* _artifactType_)",
-returns = "(integer,bool,)",
-valuetype = "enemyHeld,allOwnHeld,",},
+returns = "(integer:enemyHeld,bool:allOwnHeld,)",
+valuetype = "integer,bool,",},

 GetNumArtifactScoreBonuses = {type = "function",
 description = "",
 args = "(*[Alliance|#Alliance]* _alliance_, *[ObjectiveType|#ObjectiveType]* _artifactType_)",
-returns = "(integer,)",
-valuetype = "numBonuses,",},
+returns = "(integer:numBonuses,)",
+valuetype = "integer,",},

 GetArtifactScoreBonusInfo = {type = "function",
 description = "",
 args = "(*[Alliance|#Alliance]* _alliance_, *[ObjectiveType|#ObjectiveType]* _artifactType_, *luaindex* _index_)",
-returns = "(string,textureName,string,)",
-valuetype = "description,icon,name,",},
+returns = "(string:description,textureName:icon,string:name,)",
+valuetype = "string,textureName,string,",},

 GetKeepArtifactObjectiveId = {type = "function",
 description = "",
 args = "(*integer* _keepId_)",
-returns = "(integer,)",
-valuetype = "objectiveId,",},
+returns = "(integer:objectiveId,)",
+valuetype = "integer,",},

 GetHistoricalAvAObjectivePinInfo = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_, *number* _historyPercent_)",
-returns = "(bool,number,number,)",
-valuetype = "continuousUpdate,currentNormalizedY,currentNormalizedX,pinType,",},
+returns = "(bool:continuousUpdate,number:currentNormalizedY,number:currentNormalizedX,)",
+valuetype = "bool,number,number,",},

 DoesObjectivePassCompassVisibilitySubzoneCheck = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *integer* _objectiveId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "(bool,)",
-valuetype = "doesPassVisiblityCheck,",},
+returns = "(bool:doesPassVisiblityCheck,)",
+valuetype = "bool,",},

 GetBattlegroundGameType = {type = "function",
 description = "",
-args = "(*integer* _battlegroundId_)",
-returns = "()",
-valuetype = "gameType,",},
+args = "(*integer* _battlegroundId_)",},

 GetBattlegroundName = {type = "function",
 description = "",
 args = "(*integer* _battlegroundId_)",
-returns = "(string,)",
-valuetype = "name,",},
+returns = "(string:name,)",
+valuetype = "string,",},

 GetBattlegroundDescription = {type = "function",
 description = "",
 args = "(*integer* _battlegroundId_)",
-returns = "(string,)",
-valuetype = "description,",},
+returns = "(string:description,)",
+valuetype = "string,",},

 GetBattlegroundInfoTexture = {type = "function",
 description = "",
 args = "(*integer* _battlegroundId_)",
-returns = "(textureName,)",
-valuetype = "path,",},
+returns = "(textureName:path,)",
+valuetype = "textureName,",},

 GetScoreToWinBattleground = {type = "function",
 description = "",
 args = "(*integer* _battlegroundId_)",
-returns = "(integer,)",
-valuetype = "result,",},
+returns = "(integer:result,)",
+valuetype = "integer,",},

 GetBattlegroundNearingVictoryPercent = {type = "function",
 description = "",
 args = "(*integer* _battlegroundId_)",
-returns = "(number,)",
-valuetype = "nearingVictoryPercent,",},
+returns = "(number:nearingVictoryPercent,)",
+valuetype = "number,",},

 GetCurrentBattlegroundId = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "battlegroundId,",},
+returns = "(integer:battlegroundId,)",
+valuetype = "integer,",},

 GetBattlegroundNumUsedMedals = {type = "function",
 description = "",
 args = "(*integer* _battlegroundId_)",
-returns = "(integer,)",
-valuetype = "numMedals,",},
+returns = "(integer:numMedals,)",
+valuetype = "integer,",},

 GetBattlegroundMedalIdByIndex = {type = "function",
 description = "",
 args = "(*integer* _battlegroundId_, *luaindex* _medalIndex_)",
-returns = "(integer,)",
-valuetype = "medalId,",},
+returns = "(integer:medalId,)",
+valuetype = "integer,",},

 GetMedalInfo = {type = "function",
 description = "",
 args = "(*integer* _medalId_)",
-returns = "(integer,string,textureName,string,)",
-valuetype = "scoreReward,condition,iconTexture,name,",},
+returns = "(integer:scoreReward,string:condition,textureName:iconTexture,string:name,)",
+valuetype = "integer,string,textureName,string,",},

 GetMedalName = {type = "function",
 description = "",
 args = "(*integer* _medalId_)",
-returns = "(string,)",
-valuetype = "name,",},
+returns = "(string:name,)",
+valuetype = "string,",},

 GetMedalScoreReward = {type = "function",
 description = "",
 args = "(*integer* _medalId_)",
-returns = "(integer,)",
-valuetype = "scoreReward,",},
+returns = "(integer:scoreReward,)",
+valuetype = "integer,",},

 LeaveBattleground = {type = "function",
 description = "",
@@ -21800,207 +21612,197 @@ args = "()",},

 GetNextBattlegroundLeaderboardType = {type = "function",
 description = "",
-args = "(*[BattlegroundLeaderboardType|#BattlegroundLeaderboardType]:nilable* _lastBattlegroundLeaderboardType_)",
-returns = "()",
-valuetype = "nextBattlegroundLeaderboardType,",},
+args = "(*[BattlegroundLeaderboardType|#BattlegroundLeaderboardType]:nilable* _lastBattlegroundLeaderboardType_)",},

 GetNumBattlegroundLeaderboardEntries = {type = "function",
 description = "",
 args = "(*[BattlegroundLeaderboardType|#BattlegroundLeaderboardType]* _battlegroundLeaderboardType_)",
-returns = "(integer,)",
-valuetype = "numLeaderboardEntries,",},
+returns = "(integer:numLeaderboardEntries,)",
+valuetype = "integer,",},

 GetBattlegroundLeaderboardEntryInfo = {type = "function",
 description = "",
 args = "(*[BattlegroundLeaderboardType|#BattlegroundLeaderboardType]* _battlegroundLeaderboardType_, *luaindex* _entryIndex_)",
-returns = "(integer,string,string,integer,)",
-valuetype = "score,characterName,displayName,rank,",},
+returns = "(integer:score,string:characterName,string:displayName,integer:rank,)",
+valuetype = "integer,string,string,integer,",},

 GetBattlegroundLeaderboardLocalPlayerInfo = {type = "function",
 description = "",
 args = "(*[BattlegroundLeaderboardType|#BattlegroundLeaderboardType]* _lastBattlegroundLeaderboardType_)",
-returns = "(integer,integer,)",
-valuetype = "currentScore,currentRank,",},
+returns = "(integer:currentScore,integer:currentRank,)",
+valuetype = "integer,integer,",},

 GetBattlegroundLeaderboardsSchedule = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,integer,)",
-valuetype = "secondsUntilNextStart,secondsUntilEnd,",},
+returns = "(integer:secondsUntilNextStart,integer:secondsUntilEnd,)",
+valuetype = "integer,integer,",},

 GetNumScoreboardEntries = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numItems,",},
+returns = "(integer:numItems,)",
+valuetype = "integer,",},

 GetScoreboardEntryInfo = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(bool,string,string,)",
-valuetype = "isLocalPlayer,alliance,displayName,characterName,",},
+returns = "(bool:isLocalPlayer,string:displayName,string:characterName,)",
+valuetype = "bool,string,string,",},

 GetScoreboardEntryBattlegroundAlliance = {type = "function",
 description = "",
-args = "(*luaindex* _slotIndex_)",
-returns = "()",
-valuetype = "alliance,",},
+args = "(*luaindex* _slotIndex_)",},

 GetScoreboardEntryClassId = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(integer,)",
-valuetype = "classId,",},
+returns = "(integer:classId,)",
+valuetype = "integer,",},

 GetScoreboardEntryScoreByType = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_, *[ScoreTrackerEntryType|#ScoreTrackerEntryType]* _scoreType_)",
-returns = "(integer,)",
-valuetype = "score,",},
+returns = "(integer:score,)",
+valuetype = "integer,",},

 GetNextScoreboardEntryMedalId = {type = "function",
 description = "",
-args = "(*luaindex* _slotIndex_, *integer:nilable* _lastMedalId_)",
-returns = "()",
-valuetype = "nextMedalId,",},
+args = "(*luaindex* _slotIndex_, *integer:nilable* _lastMedalId_)",},

 GetScoreboardEntryNumEarnedMedalsById = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_, *integer* _medalId_)",
-returns = "(integer,)",
-valuetype = "count,",},
+returns = "(integer:count,)",
+valuetype = "integer,",},

 GetScoringTeam = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "result,",},
+returns = "(integer:result,)",
+valuetype = "integer,",},

 GetCurrentBattlegroundScore = {type = "function",
 description = "",
 args = "(*[BattlegroundAlliance|#BattlegroundAlliance]* _alliance_)",
-returns = "(integer,)",
-valuetype = "score,",},
+returns = "(integer:score,)",
+valuetype = "integer,",},

 GetCurrentBattlegroundState = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "result,",},
+args = "()",},

 IsCurrentBattlegroundStateTimed = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isTimed,",},
+returns = "(bool:isTimed,)",
+valuetype = "bool,",},

 GetCurrentBattlegroundStateTimeRemaining = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "timeRemaining,",},
+returns = "(integer:timeRemaining,)",
+valuetype = "integer,",},

 GetScoreboardPlayerEntryIndex = {type = "function",
 description = "",
 args = "()",
-returns = "(luaindex,)",
-valuetype = "playerIndex,",},
+returns = "(luaindex:playerIndex,)",
+valuetype = "luaindex,",},

 IsInCampaign = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "inCampaign,",},
+returns = "(bool:inCampaign,)",
+valuetype = "bool,",},

 DoesCampaignHaveEmperor = {type = "function",
 description = "",
 args = "(*integer* _campaignId_)",
-returns = "(bool,)",
-valuetype = "hasEmperor,",},
+returns = "(bool:hasEmperor,)",
+valuetype = "bool,",},

 GetCampaignEmperorInfo = {type = "function",
 description = "",
 args = "(*integer* _campaignId_)",
-returns = "(string,string,integer,)",
-valuetype = "emperorDisplayName,emperorCharacterName,emperorAlliance,",},
+returns = "(string:emperorDisplayName,string:emperorCharacterName,integer:emperorAlliance,)",
+valuetype = "string,string,integer,",},

 GetCampaignEmperorReignDuration = {type = "function",
 description = "",
 args = "(*integer* _campaignId_)",
-returns = "(integer,)",
-valuetype = "durationInSeconds,",},
+returns = "(integer:durationInSeconds,)",
+valuetype = "integer,",},

 GetCampaignAbdicationStatus = {type = "function",
 description = "",
 args = "(*integer* _campaignId_)",
-returns = "(string,string,integer,)",
-valuetype = "abdicatedDisplayName,abdicatedCharacterName,abdicatedAlliance,",},
+returns = "(string:abdicatedDisplayName,string:abdicatedCharacterName,integer:abdicatedAlliance,)",
+valuetype = "string,string,integer,",},

 GetEmperorAllianceBonusInfo = {type = "function",
 description = "",
 args = "(*integer* _campaignId_, *[Alliance|#Alliance]* _alliance_)",
-returns = "(string,textureName,string,)",
-valuetype = "description,icon,name,",},
+returns = "(string:description,textureName:icon,string:name,)",
+valuetype = "string,textureName,string,",},

 GetCampaignReassignCooldown = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "cooldownSeconds,",},
+returns = "(integer:cooldownSeconds,)",
+valuetype = "integer,",},

 GetCampaignGuestCooldown = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "cooldownSeconds,",},
+returns = "(integer:cooldownSeconds,)",
+valuetype = "integer,",},

 GetCampaignReassignCost = {type = "function",
 description = "",
 args = "(*[CampaignReassignmentRequestType|#CampaignReassignmentRequestType]* _reassignType_)",
-returns = "(integer,)",
-valuetype = "cost,",},
+returns = "(integer:cost,)",
+valuetype = "integer,",},

 GetCurrentCampaignId = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "currentCampaignId,",},
+returns = "(integer:currentCampaignId,)",
+valuetype = "integer,",},

 GetAssignedCampaignId = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "assignedCampaignId,",},
+returns = "(integer:assignedCampaignId,)",
+valuetype = "integer,",},

 GetGuestCampaignId = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "campaignId,",},
+returns = "(integer:campaignId,)",
+valuetype = "integer,",},

 GetNumFreeAnytimeCampaignReassigns = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "reassignCount,",},
+returns = "(integer:reassignCount,)",
+valuetype = "integer,",},

 GetNumFreeEndCampaignReassigns = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "reassignCount,",},
+returns = "(integer:reassignCount,)",
+valuetype = "integer,",},

 GetPreferredCampaign = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "preferredCampaign,",},
+returns = "(integer:preferredCampaign,)",
+valuetype = "integer,",},

 GetCampaignPreference = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "campaignPreference,",},
+args = "()",},

 SetCampaignPreference = {type = "function",
 description = "",
@@ -22013,20 +21815,20 @@ args = "(*integer* _campaignId_, *[CampaignReassignmentRequestType|#CampaignReas
 GetCampaignUnassignCooldown = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "cooldownSeconds,",},
+returns = "(integer:cooldownSeconds,)",
+valuetype = "integer,",},

 GetCampaignUnassignCost = {type = "function",
 description = "",
 args = "(*[CampaignUnassignRequestType|#CampaignUnassignRequestType]* _campaignUnassignType_)",
-returns = "(integer,)",
-valuetype = "cost,",},
+returns = "(integer:cost,)",
+valuetype = "integer,",},

 GetNumFreeAnytimeCampaignUnassigns = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "unassignCount,",},
+returns = "(integer:unassignCount,)",
+valuetype = "integer,",},

 UnassignCampaignForPlayer = {type = "function",
 description = "",
@@ -22039,8 +21841,8 @@ args = "()",},
 GetCampaignSequenceId = {type = "function",
 description = "",
 args = "(*integer* _campaignId_)",
-returns = "(integer,)",
-valuetype = "sequenceId,",},
+returns = "(integer:sequenceId,)",
+valuetype = "integer,",},

 QueryCampaignLeaderboardData = {type = "function",
 description = "",
@@ -22049,182 +21851,176 @@ args = "()",},
 GetLeaderboardCampaignSequenceId = {type = "function",
 description = "",
 args = "(*integer* _campaignId_)",
-returns = "(integer,)",
-valuetype = "campaignSequenceId,",},
+returns = "(integer:campaignSequenceId,)",
+valuetype = "integer,",},

 GetCampaignLeaderboardMaxRank = {type = "function",
 description = "",
 args = "(*integer* _campaignId_)",
-returns = "(integer,)",
-valuetype = "maxRank,",},
+returns = "(integer:maxRank,)",
+valuetype = "integer,",},

 GetNumCampaignLeaderboardEntries = {type = "function",
 description = "",
 args = "(*integer* _campaignId_)",
-returns = "(integer,)",
-valuetype = "entryCount,",},
+returns = "(integer:entryCount,)",
+valuetype = "integer,",},

 GetNumCampaignAllianceLeaderboardEntries = {type = "function",
 description = "",
 args = "(*integer* _campaignId_, *integer* _allianceId_)",
-returns = "(integer,)",
-valuetype = "entryCount,",},
+returns = "(integer:entryCount,)",
+valuetype = "integer,",},

 GetCampaignLeaderboardEntryInfo = {type = "function",
 description = "",
 args = "(*integer* _campaignId_, *luaindex* _entryIndex_)",
-returns = "(string,integer,integer,integer,string,integer,bool,)",
-valuetype = "displayName,allianceId,classId,alliancePoints,charName,ranking,isPlayer,",},
+returns = "(string:displayName,integer:allianceId,integer:classId,integer:alliancePoints,string:charName,integer:ranking,bool:isPlayer,)",
+valuetype = "string,integer,integer,integer,string,integer,bool,",},

 GetCampaignAllianceLeaderboardEntryInfo = {type = "function",
 description = "",
 args = "(*integer* _campaignId_, *integer* _allianceId_, *luaindex* _entryIndex_)",
-returns = "(string,integer,integer,string,integer,bool,)",
-valuetype = "displayName,classId,alliancePoints,charName,ranking,isPlayer,",},
+returns = "(string:displayName,integer:classId,integer:alliancePoints,string:charName,integer:ranking,bool:isPlayer,)",
+valuetype = "string,integer,integer,string,integer,bool,",},

 GetPlayerCampaignRewardTierInfo = {type = "function",
 description = "",
 args = "(*integer* _campaignId_)",
-returns = "(integer,integer,integer,)",
-valuetype = "nextTierTotal,nextTierProgress,earnedTier,",},
+returns = "(integer:nextTierTotal,integer:nextTierProgress,integer:earnedTier,)",
+valuetype = "integer,integer,integer,",},

 GetNumSelectionCampaigns = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "campaignCount,",},
+returns = "(integer:campaignCount,)",
+valuetype = "integer,",},

 GetSelectionCampaignAllianceScore = {type = "function",
 description = "",
 args = "(*luaindex* _campaignIndex_, *integer* _alliance_)",
-returns = "(integer,)",
-valuetype = "score,",},
+returns = "(integer:score,)",
+valuetype = "integer,",},

 GetSelectionCampaignId = {type = "function",
 description = "",
 args = "(*luaindex* _campaignIndex_)",
-returns = "(integer,)",
-valuetype = "campaignId,",},
+returns = "(integer:campaignId,)",
+valuetype = "integer,",},

 GetSelectionCampaignTimes = {type = "function",
 description = "",
 args = "(*luaindex* _campaignIndex_)",
-returns = "(integer,integer,)",
-valuetype = "secondsUntilCampaignEnd,secondsUntilCampaignStart,",},
+returns = "(integer:secondsUntilCampaignEnd,integer:secondsUntilCampaignStart,)",
+valuetype = "integer,integer,",},

 GetSelectionCampaignUnderdogLeaderAlliance = {type = "function",
 description = "",
 args = "(*luaindex* _campaignIndex_)",
-returns = "(integer,)",
-valuetype = "alliance,",},
+returns = "(integer:alliance,)",
+valuetype = "integer,",},

 GetNumSelectionCampaignFriends = {type = "function",
 description = "",
 args = "(*luaindex* _campaignIndex_)",
-returns = "(integer,)",
-valuetype = "numFriends,",},
+returns = "(integer:numFriends,)",
+valuetype = "integer,",},

 GetNumSelectionCampaignGuildMembers = {type = "function",
 description = "",
 args = "(*luaindex* _campaignIndex_)",
-returns = "(integer,)",
-valuetype = "numGuilds,",},
+returns = "(integer:numGuilds,)",
+valuetype = "integer,",},

 GetNumSelectionCampaignGroupMembers = {type = "function",
 description = "",
 args = "(*luaindex* _campaignIndex_)",
-returns = "(integer,)",
-valuetype = "numGroupmates,",},
+returns = "(integer:numGroupmates,)",
+valuetype = "integer,",},

 GetSelectionCampaignPopulationData = {type = "function",
 description = "",
-args = "(*luaindex* _campaignIndex_, *integer* _alliance_)",
-returns = "()",
-valuetype = "currentPopulationEstimate,",},
+args = "(*luaindex* _campaignIndex_, *integer* _alliance_)",},

 GetSelectionCampaignQueueWaitTime = {type = "function",
 description = "",
 args = "(*luaindex* _campaignIndex_)",
-returns = "(integer,)",
-valuetype = "queueWaitTimeSeconds,",},
+returns = "(integer:queueWaitTimeSeconds,)",
+valuetype = "integer,",},

 DoesPlayerMeetCampaignRequirements = {type = "function",
 description = "",
 args = "(*integer* _campaignId_)",
-returns = "(bool,)",
-valuetype = "meetsJoiningRequirements,",},
+returns = "(bool:meetsJoiningRequirements,)",
+valuetype = "bool,",},

 GetCampaignRulesetId = {type = "function",
 description = "",
 args = "(*integer* _campaignId_)",
-returns = "(integer,)",
-valuetype = "rulesetId,",},
+returns = "(integer:rulesetId,)",
+valuetype = "integer,",},

 GetCampaignRulesetName = {type = "function",
 description = "",
 args = "(*integer* _campaignId_)",
-returns = "(string,)",
-valuetype = "name,",},
+returns = "(string:name,)",
+valuetype = "string,",},

 GetCampaignRulesetType = {type = "function",
 description = "",
-args = "(*integer* _rulesetId_)",
-returns = "()",
-valuetype = "rulesetType,",},
+args = "(*integer* _rulesetId_)",},

 GetCampaignRulesetDescription = {type = "function",
 description = "",
 args = "(*integer* _rulesetId_)",
-returns = "(string,)",
-valuetype = "description,",},
+returns = "(string:description,)",
+valuetype = "string,",},

 GetNumCampaignSocialConnections = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "connectionCount,",},
+returns = "(integer:connectionCount,)",
+valuetype = "integer,",},

 GetCurrentCampaignLoyaltyStreak = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "currentLoyaltyStreak,",},
+returns = "(integer:currentLoyaltyStreak,)",
+valuetype = "integer,",},

 GetCampaignRulesetNumImperialKeeps = {type = "function",
 description = "",
 args = "(*integer* _rulesetId_, *[Alliance|#Alliance]* _alliance_)",
-returns = "(integer,)",
-valuetype = "numKeeps,",},
+returns = "(integer:numKeeps,)",
+valuetype = "integer,",},

 GetCampaignRulesetImperialKeepId = {type = "function",
 description = "",
 args = "(*integer* _rulesetId_, *[Alliance|#Alliance]* _alliance_, *luaindex* _index_)",
-returns = "(integer,)",
-valuetype = "keepId,",},
+returns = "(integer:keepId,)",
+valuetype = "integer,",},

 GetCampaignRulesetImperialAccessRule = {type = "function",
 description = "",
-args = "(*integer* _rulesetId_)",
-returns = "()",
-valuetype = "accessRuleType,",},
+args = "(*integer* _rulesetId_)",},

 GetCampaignRulsetMinEmperorAlliancePoints = {type = "function",
 description = "",
 args = "(*integer* _rulesetId_, *[Alliance|#Alliance]* _alliance_)",
-returns = "(integer,)",
-valuetype = "minPoints,",},
+returns = "(integer:minPoints,)",
+valuetype = "integer,",},

 GetCampaignRulesetDurationInSeconds = {type = "function",
 description = "",
 args = "(*integer* _rulesetId_)",
-returns = "(integer,)",
-valuetype = "duration,",},
+returns = "(integer:duration,)",
+valuetype = "integer,",},

 DoesCurrentCampaignRulesetAllowChampionPoints = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isNoChampionPointsCampaign,",},
+returns = "(bool:isNoChampionPointsCampaign,)",
+valuetype = "bool,",},

 RegisterForAssignedCampaignData = {type = "function",
 description = "",
@@ -22237,62 +22033,62 @@ args = "()",},
 ResetCampaignHistoryWindow = {type = "function",
 description = "",
 args = "(*[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_, *number* _currentHistoryPercent_)",
-returns = "(bool,)",
-valuetype = "requiresRebuild,",},
+returns = "(bool:requiresRebuild,)",
+valuetype = "bool,",},

 GetCampaignHistoryWindow = {type = "function",
 description = "",
 args = "(*[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "(integer,integer,)",
-valuetype = "windowEndSecsAgo,windowStartSecsAgo,",},
+returns = "(integer:windowEndSecsAgo,integer:windowStartSecsAgo,)",
+valuetype = "integer,integer,",},

 DoesHistoryRequireMapRebuild = {type = "function",
 description = "",
 args = "(*[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_, *number* _oldHistoryPercent_, *number* _newHistoryPercent_)",
-returns = "(bool,)",
-valuetype = "needsRebuild,",},
+returns = "(bool:needsRebuild,)",
+valuetype = "bool,",},

 DoesAllianceHaveImperialCityAccess = {type = "function",
 description = "",
 args = "(*integer* _campaignId_, *[Alliance|#Alliance]* _alliance_)",
-returns = "(bool,)",
-valuetype = "hasAccess,",},
+returns = "(bool:hasAccess,)",
+valuetype = "bool,",},

 IsUnderpopBonusEnabled = {type = "function",
 description = "",
 args = "(*integer* _campaignId_, *[Alliance|#Alliance]* _alliance_)",
-returns = "(bool,)",
-valuetype = "isBonusEnabled,",},
+returns = "(bool:isBonusEnabled,)",
+valuetype = "bool,",},

 IsLocalBattlegroundContext = {type = "function",
 description = "",
 args = "(*integer* _battlegroundContext_)",
-returns = "(bool,)",
-valuetype = "isLocal,",},
+returns = "(bool:isLocal,)",
+valuetype = "bool,",},

 IsAssignedBattlegroundContext = {type = "function",
 description = "",
 args = "(*integer* _battlegroundContext_)",
-returns = "(bool,)",
-valuetype = "isAssigned,",},
+returns = "(bool:isAssigned,)",
+valuetype = "bool,",},

 DoBattlegroundContextsIntersect = {type = "function",
 description = "",
 args = "(*integer* _context1_, *integer* _context2_)",
-returns = "(bool,)",
-valuetype = "intersects,",},
+returns = "(bool:intersects,)",
+valuetype = "bool,",},

 GetNumKillLocations = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numLocations,",},
+returns = "(integer:numLocations,)",
+valuetype = "integer,",},

 GetKillLocationPinInfo = {type = "function",
 description = "",
 args = "(*luaindex* _index_)",
-returns = "(number,number,integer,)",
-valuetype = "normalizedY,normalizedX,pinType,",},
+returns = "(number:normalizedY,number:normalizedX,integer:pinType,)",
+valuetype = "number,number,integer,",},

 QueueForCampaign = {type = "function",
 description = "",
@@ -22305,44 +22101,42 @@ args = "(*integer* _campaignId_, *bool* _queueAsGroup_)",},
 GetNumCampaignQueueEntries = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "entryCount,",},
+returns = "(integer:entryCount,)",
+valuetype = "integer,",},

 IsQueuedForCampaign = {type = "function",
 description = "",
 args = "(*integer* _campaignId_, *bool* _queueAsGroup_)",
-returns = "(bool,)",
-valuetype = "isQueued,",},
+returns = "(bool:isQueued,)",
+valuetype = "bool,",},

 GetCampaignQueueEntry = {type = "function",
 description = "",
 args = "(*luaindex* _entryIndex_)",
-returns = "(bool,integer,)",
-valuetype = "queueAsGroup,campaignId,",},
+returns = "(bool:queueAsGroup,integer:campaignId,)",
+valuetype = "bool,integer,",},

 GetSecondsInCampaignQueue = {type = "function",
 description = "",
 args = "(*integer* _campaignId_, *bool* _queueAsGroup_)",
-returns = "(integer,)",
-valuetype = "timeInQueueInSeconds,",},
+returns = "(integer:timeInQueueInSeconds,)",
+valuetype = "integer,",},

 GetCampaignQueuePosition = {type = "function",
 description = "",
 args = "(*integer* _campaignId_, *bool* _queueAsGroup_)",
-returns = "(integer,)",
-valuetype = "queuePosition,",},
+returns = "(integer:queuePosition,)",
+valuetype = "integer,",},

 GetCampaignQueueRemainingConfirmationSeconds = {type = "function",
 description = "",
 args = "(*integer* _campaignId_, *bool* _queueAsGroup_)",
-returns = "(integer,)",
-valuetype = "confirmationTimeRemainingInSeconds,",},
+returns = "(integer:confirmationTimeRemainingInSeconds,)",
+valuetype = "integer,",},

 GetCampaignQueueState = {type = "function",
 description = "",
-args = "(*integer* _campaignId_, *bool* _queueAsGroup_)",
-returns = "()",
-valuetype = "currentState,",},
+args = "(*integer* _campaignId_, *bool* _queueAsGroup_)",},

 ConfirmCampaignEntry = {type = "function",
 description = "",
@@ -22351,92 +22145,90 @@ args = "(*integer* _campaignId_, *bool* _queueAsGroup_, *bool* _accept_)",},
 GetCampaignQueueConfirmationDuration = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numSeconds,",},
+returns = "(integer:numSeconds,)",
+valuetype = "integer,",},

 GetStoreEntryInfo = {type = "function",
 description = "",
 args = "(*luaindex* _entryIndex_)",
-returns = "(integer,integer,integer,integer,bool,integer,bool,bool,integer,integer,integer,string,textureName,)",
-valuetype = "entryType,currencyQuantity2,currencyType2,currencyQuantity1,currencyType1,questNameColor,quality,meetsRequirementsToUse,meetsRequirementsToBuy,sellPrice,price,stack,name,icon,",},
+returns = "(integer:currencyQuantity2,integer:currencyType2,integer:currencyQuantity1,integer:currencyType1,bool:questNameColor,integer:quality,bool:meetsRequirementsToUse,bool:meetsRequirementsToBuy,integer:sellPrice,integer:price,integer:stack,string:name,textureName:icon,)",
+valuetype = "integer,integer,integer,integer,bool,integer,bool,bool,integer,integer,integer,string,textureName,",},

 GetStoreEntryBuyRequirementErrorId = {type = "function",
 description = "",
 args = "(*luaindex* _entryIndex_)",
-returns = "(integer,)",
-valuetype = "errorId,",},
+returns = "(integer:errorId,)",
+valuetype = "integer,",},

 GetStoreCollectibleInfo = {type = "function",
 description = "",
 args = "(*luaindex* _entryIndex_)",
-returns = "(bool,integer,)",
-valuetype = "locked,collectibleId,",},
+returns = "(bool:locked,integer:collectibleId,)",
+valuetype = "bool,integer,",},

 GetStoreEntryHouseTemplateId = {type = "function",
 description = "",
 args = "(*luaindex* _entryIndex_)",
-returns = "(integer,)",
-valuetype = "houseTemplateId,",},
+returns = "(integer:houseTemplateId,)",
+valuetype = "integer,",},

 GetStoreEntryQuestItemId = {type = "function",
 description = "",
 args = "(*luaindex* _entryIndex_)",
-returns = "(integer,)",
-valuetype = "questItemId,",},
+returns = "(integer:questItemId,)",
+valuetype = "integer,",},

 GetNumStoreItems = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numItems,",},
+returns = "(integer:numItems,)",
+valuetype = "integer,",},

 GetNumBuybackItems = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numBuybackItems,",},
+returns = "(integer:numBuybackItems,)",
+valuetype = "integer,",},

 GetStoreCurrencyTypes = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,bool,bool,bool,)",
-valuetype = "usesWritVouchers,usesTelvarStones,usesAlliancePoints,usesMoney,",},
+returns = "(bool:usesWritVouchers,bool:usesTelvarStones,bool:usesAlliancePoints,bool:usesMoney,)",
+valuetype = "bool,bool,bool,bool,",},

 GetStoreItemLink = {type = "function",
 description = "",
 args = "(*luaindex* _entryIndex_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 GetStoreEntryTypeInfo = {type = "function",
 description = "",
-args = "(*luaindex* _entryIndex_)",
-returns = "()",
-valuetype = "itemFilterType,",},
+args = "(*luaindex* _entryIndex_)",},

 GetStoreEntryStatValue = {type = "function",
 description = "",
 args = "(*luaindex* _entryIndex_)",
-returns = "(integer,)",
-valuetype = "statValue,",},
+returns = "(integer:statValue,)",
+valuetype = "integer,",},

 GetStoreEntryMaxBuyable = {type = "function",
 description = "",
 args = "(*luaindex* _entryIndex_)",
-returns = "(integer,)",
-valuetype = "quantity,",},
+returns = "(integer:quantity,)",
+valuetype = "integer,",},

 GetBuybackItemInfo = {type = "function",
 description = "",
 args = "(*luaindex* _entryIndex_)",
-returns = "(bool,integer,integer,integer,string,textureName,)",
-valuetype = "meetsRequirementsToEquip,quality,price,stack,name,icon,",},
+returns = "(bool:meetsRequirementsToEquip,integer:quality,integer:price,integer:stack,string:name,textureName:icon,)",
+valuetype = "bool,integer,integer,integer,string,textureName,",},

 GetBuybackItemLink = {type = "function",
 description = "",
 args = "(*luaindex* _entryIndex_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 BuyStoreItem = {type = "function",
 description = "",
@@ -22473,14 +22265,14 @@ args = "(*[Bag|#Bag]* _bagId_, *integer* _slotIndex_, *integer* _quantity_)",},
 IsStoreEmpty = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isEmpty,",},
+returns = "(bool:isEmpty,)",
+valuetype = "bool,",},

 CanStoreRepair = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "canRepair,",},
+returns = "(bool:canRepair,)",
+valuetype = "bool,",},

 LootAll = {type = "function",
 description = "",
@@ -22489,14 +22281,12 @@ args = "(*bool* _ignoreStolenItems_)",},
 GetLootItemLink = {type = "function",
 description = "",
 args = "(*integer* _lootId_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 GetLootItemType = {type = "function",
 description = "",
-args = "(*integer* _lootId_)",
-returns = "()",
-valuetype = "itemType,",},
+args = "(*integer* _lootId_)",},

 LootItemById = {type = "function",
 description = "",
@@ -22517,152 +22307,150 @@ args = "()",},
 IsLooting = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isLooting,",},
+returns = "(bool:isLooting,)",
+valuetype = "bool,",},

 GetLootTargetInfo = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,string,string,)",
-valuetype = "isOwned,actionName,targetType,name,",},
+returns = "(bool:isOwned,string:actionName,string:name,)",
+valuetype = "bool,string,string,",},

 GetLootItemInfo = {type = "function",
 description = "",
 args = "(*luaindex* _lootIndex_)",
-returns = "(bool,bool,integer,integer,integer,textureName,string,integer,)",
-valuetype = "itemType,stolen,isQuest,value,quality,count,icon,name,lootId,",},
+returns = "(bool:stolen,bool:isQuest,integer:value,integer:quality,integer:count,textureName:icon,string:name,integer:lootId,)",
+valuetype = "bool,bool,integer,integer,integer,textureName,string,integer,",},

 GetLootCurrency = {type = "function",
 description = "",
 args = "(*[CurrencyType|#CurrencyType]* _type_)",
-returns = "(integer,integer,)",
-valuetype = "ownedCurrency,unownedCurrency,",},
+returns = "(integer:ownedCurrency,integer:unownedCurrency,)",
+valuetype = "integer,integer,",},

 GetLootMoney = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,integer,)",
-valuetype = "ownedMoney,unownedMoney,",},
+returns = "(integer:ownedMoney,integer:unownedMoney,)",
+valuetype = "integer,integer,",},

 GetLootQuestItemId = {type = "function",
 description = "",
 args = "(*integer* _lootId_)",
-returns = "(integer,)",
-valuetype = "questItemId,",},
+returns = "(integer:questItemId,)",
+valuetype = "integer,",},

 GetKeepType = {type = "function",
 description = "",
 args = "(*integer* _keepId_)",
-returns = "(integer,)",
-valuetype = "keepType,",},
+returns = "(integer:keepType,)",
+valuetype = "integer,",},

 GetNumKeeps = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numKeeps,",},
+returns = "(integer:numKeeps,)",
+valuetype = "integer,",},

 GetAvAKeepScore = {type = "function",
 description = "",
 args = "(*integer* _campaignId_, *integer* _alliance_)",
-returns = "(integer,integer,integer,bool,)",
-valuetype = "totalNativeKeepsInThisAlliancesArea,numNativeKeepsThisAllianceHolds,numEnemyKeepsThisAllianceHolds,isAllianceHoldingAllNativeKeeps,",},
+returns = "(integer:totalNativeKeepsInThisAlliancesArea,integer:numNativeKeepsThisAllianceHolds,integer:numEnemyKeepsThisAllianceHolds,bool:isAllianceHoldingAllNativeKeeps,)",
+valuetype = "integer,integer,integer,bool,",},

 GetAvAKeepsHeld = {type = "function",
 description = "",
 args = "(*integer* _campaignId_, *integer* _alliance_)",
-returns = "(integer,)",
-valuetype = "keepsHeld,",},
+returns = "(integer:keepsHeld,)",
+valuetype = "integer,",},

 GetNumKeepScoreBonuses = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numBonuses,",},
+returns = "(integer:numBonuses,)",
+valuetype = "integer,",},

 GetKeepScoreBonusInfo = {type = "function",
 description = "",
 args = "(*luaindex* _index_)",
-returns = "(string,textureName,string,)",
-valuetype = "description,icon,name,",},
+returns = "(string:description,textureName:icon,string:name,)",
+valuetype = "string,textureName,string,",},

 GetKeepPinInfo = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "(number,number,integer,)",
-valuetype = "normalizedY,normalizedX,pinType,",},
+returns = "(number:normalizedY,number:normalizedX,integer:pinType,)",
+valuetype = "number,number,integer,",},

 GetKeepName = {type = "function",
 description = "",
 args = "(*integer* _keepId_)",
-returns = "(string,)",
-valuetype = "keepName,",},
+returns = "(string:keepName,)",
+valuetype = "string,",},

 GetKeepAlliance = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "(integer,)",
-valuetype = "alliance,",},
+returns = "(integer:alliance,)",
+valuetype = "integer,",},

 GetResourceKeepForKeep = {type = "function",
 description = "",
 args = "(*integer* _parentKeepId_, *[KeepResourceType|#KeepResourceType]* _resourceType_)",
-returns = "(integer,)",
-valuetype = "keepId,",},
+returns = "(integer:keepId,)",
+valuetype = "integer,",},

 GetKeepResourceLevel = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_, *[KeepResourceType|#KeepResourceType]* _resourceType_)",
-returns = "(integer,)",
-valuetype = "resourceLevel,",},
+returns = "(integer:resourceLevel,)",
+valuetype = "integer,",},

 GetKeepResourceType = {type = "function",
 description = "",
-args = "(*integer* _keepId_)",
-returns = "()",
-valuetype = "resourceType,",},
+args = "(*integer* _keepId_)",},

 GetKeepResourceInfo = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_, *[KeepResourceType|#KeepResourceType]* _resourceType_, *integer* _level_)",
-returns = "(integer,integer,integer,)",
-valuetype = "upkeepPerMinute,amountForNextLevel,currentAmount,",},
+returns = "(integer:upkeepPerMinute,integer:amountForNextLevel,integer:currentAmount,)",
+valuetype = "integer,integer,integer,",},

 GetKeepUpgradeInfo = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_, *[KeepUpgradePath|#KeepUpgradePath]* _upgradePath_, *integer* _level_)",
-returns = "(integer,integer,integer,)",
-valuetype = "upkeepPerMinute,amountForNextLevel,currentAmount,",},
+returns = "(integer:upkeepPerMinute,integer:amountForNextLevel,integer:currentAmount,)",
+valuetype = "integer,integer,integer,",},

 GetKeepProductionLevel = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "(integer,)",
-valuetype = "productionLevel,",},
+returns = "(integer:productionLevel,)",
+valuetype = "integer,",},

 GetKeepDefensiveLevel = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "(integer,)",
-valuetype = "defensiveLevel,",},
+returns = "(integer:defensiveLevel,)",
+valuetype = "integer,",},

 GetSecondsUntilKeepClaimAvailable = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "(integer,)",
-valuetype = "secondsUntilAvailable,",},
+returns = "(integer:secondsUntilAvailable,)",
+valuetype = "integer,",},

 GetGuildClaimInteractionKeepId = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "keepId,",},
+returns = "(integer:keepId,)",
+valuetype = "integer,",},

 GetGuildReleaseInteractionKeepId = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "keepId,",},
+returns = "(integer:keepId,)",
+valuetype = "integer,",},

 CancelKeepGuildClaimInteraction = {type = "function",
 description = "",
@@ -22675,110 +22463,108 @@ args = "()",},
 GetHistoricalKeepUnderAttack = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_, *number* _historyPercent_)",
-returns = "(bool,)",
-valuetype = "underAttack,",},
+returns = "(bool:underAttack,)",
+valuetype = "bool,",},

 GetHistoricalKeepPinInfo = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_, *number* _historyPercent_)",
-returns = "(number,number,integer,)",
-valuetype = "normalizedY,normalizedX,pinType,",},
+returns = "(number:normalizedY,number:normalizedX,integer:pinType,)",
+valuetype = "number,number,integer,",},

 GetHistoricalKeepAlliance = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_, *number* _historyPercent_)",
-returns = "(integer,)",
-valuetype = "alliance,",},
+returns = "(integer:alliance,)",
+valuetype = "integer,",},

 GetInteractionKeepId = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "keepId,",},
+returns = "(integer:keepId,)",
+valuetype = "integer,",},

 GetKeepUnderAttack = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "(bool,)",
-valuetype = "underAttack,",},
+returns = "(bool:underAttack,)",
+valuetype = "bool,",},

 GetKeepUpgradeRate = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_, *[KeepUpgradeLine|#KeepUpgradeLine]* _upgradeLine_)",
-returns = "(integer,)",
-valuetype = "rate,",},
+returns = "(integer:rate,)",
+valuetype = "integer,",},

 GetClaimedKeepGuildName = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "(string,)",
-valuetype = "guildName,",},
+returns = "(string:guildName,)",
+valuetype = "string,",},

 GetMaxKeepSieges = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "(integer,)",
-valuetype = "maxSiege,",},
+returns = "(integer:maxSiege,)",
+valuetype = "integer,",},

 GetMaxKeepNPCs = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "(integer,)",
-valuetype = "maxNPC,",},
+returns = "(integer:maxNPC,)",
+valuetype = "integer,",},

 GetNumFriendlyKeepNPCs = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "(integer,)",
-valuetype = "numFriendlyNPC,",},
+returns = "(integer:numFriendlyNPC,)",
+valuetype = "integer,",},

 GetNumSieges = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_, *integer* _alliance_)",
-returns = "(integer,)",
-valuetype = "numSieges,",},
+returns = "(integer:numSieges,)",
+valuetype = "integer,",},

 GetKeepKeysByIndex = {type = "function",
 description = "",
 args = "(*luaindex* _index_)",
-returns = "(integer,integer,)",
-valuetype = "battlegroundContext,keepId,",},
+returns = "(integer:battlegroundContext,integer:keepId,)",
+valuetype = "integer,integer,",},

 IsKeepTypeClaimable = {type = "function",
 description = "",
 args = "(*[KeepType|#KeepType]* _keepType_)",
-returns = "(bool,)",
-valuetype = "isClaimable,",},
+returns = "(bool:isClaimable,)",
+valuetype = "bool,",},

 GetDistrictOwnershipTelVarBonusPercent = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "(integer,)",
-valuetype = "districtOwnershipTelVarBonusPercent,",},
+returns = "(integer:districtOwnershipTelVarBonusPercent,)",
+valuetype = "integer,",},

 DoesKeepPassCompassVisibilitySubzoneCheck = {type = "function",
 description = "",
 args = "(*integer* _keepId_, *[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "(bool,)",
-valuetype = "doesPassVisibilityCheck,",},
+returns = "(bool:doesPassVisibilityCheck,)",
+valuetype = "bool,",},

 GetNumTitles = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "titleCount,",},
+returns = "(integer:titleCount,)",
+valuetype = "integer,",},

 GetTitle = {type = "function",
 description = "",
 args = "(*luaindex* _titleIndex_)",
-returns = "(string,)",
-valuetype = "titleString,",},
+returns = "(string:titleString,)",
+valuetype = "string,",},

 GetCurrentTitleIndex = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "titleIndex,",},
+args = "()",},

 SelectTitle = {type = "function",
 description = "",
@@ -22795,20 +22581,20 @@ args = "()",},
 IsResurrectPending = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "resurrectPending,",},
+returns = "(bool:resurrectPending,)",
+valuetype = "bool,",},

 GetPendingResurrectInfo = {type = "function",
 description = "",
 args = "()",
-returns = "(string,integer,string,)",
-valuetype = "casterDisplayName,timeLeft,casterName,",},
+returns = "(string:casterDisplayName,integer:timeLeft,string:casterName,)",
+valuetype = "string,integer,string,",},

 GetDeathInfo = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,integer,bool,bool,bool,bool,bool,bool,bool,bool,bool,integer,integer,integer,)",
-valuetype = "cyclicRespawnQueueTimeLeft,cyclicRespawnQueueDuration,isImperialCityLocked,isRaidDeath,freeRevive,soulGemAvailable,isReleaseOnly,isBattleGroundDeath,isAVADeath,encounterIsInProgress,isPenaltyTooHighToRevive,corpseSummonTime,timeUntilAutoRelease,timeUntilRevive,",},
+returns = "(integer:cyclicRespawnQueueTimeLeft,integer:cyclicRespawnQueueDuration,bool:isImperialCityLocked,bool:isRaidDeath,bool:freeRevive,bool:soulGemAvailable,bool:isReleaseOnly,bool:isBattleGroundDeath,bool:isAVADeath,bool:encounterIsInProgress,bool:isPenaltyTooHighToRevive,integer:corpseSummonTime,integer:timeUntilAutoRelease,integer:timeUntilRevive,)",
+valuetype = "integer,integer,bool,bool,bool,bool,bool,bool,bool,bool,bool,integer,integer,integer,",},

 Revive = {type = "function",
 description = "",
@@ -22825,8 +22611,8 @@ args = "()",},
 IsQueuedForCyclicRespawn = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "queuedForRespawn,",},
+returns = "(bool:queuedForRespawn,)",
+valuetype = "bool,",},

 RespawnAtKeep = {type = "function",
 description = "",
@@ -22835,8 +22621,8 @@ args = "(*integer* _keepId_)",},
 IsDuelingDeath = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "duelingDeath,",},
+returns = "(bool:duelingDeath,)",
+valuetype = "bool,",},

 RespawnAtForwardCamp = {type = "function",
 description = "",
@@ -22845,56 +22631,56 @@ args = "(*luaindex* _index_)",},
 GetNumForwardCamps = {type = "function",
 description = "",
 args = "(*[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "(integer,)",
-valuetype = "num,",},
+returns = "(integer:num,)",
+valuetype = "integer,",},

 GetForwardCampPinInfo = {type = "function",
 description = "",
 args = "(*[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_, *luaindex* _index_)",
-returns = "(bool,number,number,number,integer,)",
-valuetype = "useable,normalizedRadius,normalizedY,normalizedX,pinType,",},
+returns = "(bool:useable,number:normalizedRadius,number:normalizedY,number:normalizedX,integer:pinType,)",
+valuetype = "bool,number,number,number,integer,",},

 IsForwardCampGuildOwned = {type = "function",
 description = "",
 args = "(*[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_, *luaindex* _index_)",
-returns = "(bool,)",
-valuetype = "isGuildOwned,",},
+returns = "(bool:isGuildOwned,)",
+valuetype = "bool,",},

 GetForwardCampOwnerName = {type = "function",
 description = "",
 args = "(*[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_, *luaindex* _index_)",
-returns = "(string,)",
-valuetype = "guildName,",},
+returns = "(string:guildName,)",
+valuetype = "string,",},

 GetNextForwardCampRespawnTime = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "nextForwardCampRespawnTime,",},
+returns = "(integer:nextForwardCampRespawnTime,)",
+valuetype = "integer,",},

 GetNumBattleStandards = {type = "function",
 description = "",
 args = "(*[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_)",
-returns = "(integer,)",
-valuetype = "num,",},
+returns = "(integer:num,)",
+valuetype = "integer,",},

 GetBattleStandardPinInfo = {type = "function",
 description = "",
 args = "(*[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_, *luaindex* _index_)",
-returns = "(number,number,integer,)",
-valuetype = "normalizedY,normalizedX,pinType,",},
+returns = "(number:normalizedY,number:normalizedX,integer:pinType,)",
+valuetype = "number,number,integer,",},

 GetBattleStandardGuildName = {type = "function",
 description = "",
 args = "(*[BattlegroundQueryContextType|#BattlegroundQueryContextType]* _battlegroundContext_, *luaindex* _index_)",
-returns = "(string,)",
-valuetype = "guildName,",},
+returns = "(string:guildName,)",
+valuetype = "string,",},

 GetDuelInfo = {type = "function",
 description = "",
 args = "()",
-returns = "(string,string,)",
-valuetype = "partnerDisplayName,partnerCharacterName,duelState,",},
+returns = "(string:partnerDisplayName,string:partnerCharacterName,)",
+valuetype = "string,string,",},

 ChallengeTargetToDuel = {type = "function",
 description = "",
@@ -22911,8 +22697,8 @@ args = "()",},
 IsNearDuelBoundary = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isNearBoundary,",},
+returns = "(bool:isNearBoundary,)",
+valuetype = "bool,",},

 TradeInvite = {type = "function",
 description = "",
@@ -22933,8 +22719,8 @@ args = "()",},
 GetTradeInviteInfo = {type = "function",
 description = "",
 args = "()",
-returns = "(string,integer,string,)",
-valuetype = "displayName,millisecondsSinceRequest,characterName,",},
+returns = "(string:displayName,integer:millisecondsSinceRequest,string:characterName,)",
+valuetype = "string,integer,string,",},

 TradeSetMoney = {type = "function",
 description = "",
@@ -22967,56 +22753,54 @@ args = "(*luaindex* _tradeIndex_)",},
 GetTradeItemInfo = {type = "function",
 description = "",
 args = "(*[TradeParticipant|#TradeParticipant]* _who_, *luaindex* _tradeIndex_)",
-returns = "(bool,integer,string,integer,integer,textureName,string,)",
-valuetype = "itemStyle,equipType,meetsUsageRequirement,sellPrice,creatorName,quality,stack,icon,name,",},
+returns = "(bool:meetsUsageRequirement,integer:sellPrice,string:creatorName,integer:quality,integer:stack,textureName:icon,string:name,)",
+valuetype = "bool,integer,string,integer,integer,textureName,string,",},

 IsTradeItemBoPAndTradeable = {type = "function",
 description = "",
 args = "(*[TradeParticipant|#TradeParticipant]* _who_, *luaindex* _tradeIndex_)",
-returns = "(bool,)",
-valuetype = "isBoPAndTradeable,",},
+returns = "(bool:isBoPAndTradeable,)",
+valuetype = "bool,",},

 GetTradeItemBoPTimeRemainingSeconds = {type = "function",
 description = "",
 args = "(*[TradeParticipant|#TradeParticipant]* _who_, *luaindex* _tradeIndex_)",
-returns = "(integer,)",
-valuetype = "timeRemainingS,",},
+returns = "(integer:timeRemainingS,)",
+valuetype = "integer,",},

 GetTradeItemBoPTradeableDisplayNamesString = {type = "function",
 description = "",
 args = "(*[TradeParticipant|#TradeParticipant]* _who_, *luaindex* _tradeIndex_)",
-returns = "(string,)",
-valuetype = "namesString,",},
+returns = "(string:namesString,)",
+valuetype = "string,",},

 GetTradeItemBagAndSlot = {type = "function",
 description = "",
-args = "(*[TradeParticipant|#TradeParticipant]* _who_, *luaindex* _tradeIndex_)",
-returns = "()",
-valuetype = "slotIndex,bagId,",},
+args = "(*[TradeParticipant|#TradeParticipant]* _who_, *luaindex* _tradeIndex_)",},

 GetTradeItemLink = {type = "function",
 description = "",
 args = "(*[TradeParticipant|#TradeParticipant]* _who_, *luaindex* _tradeIndex_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 GetTradeMoneyOffer = {type = "function",
 description = "",
 args = "(*[TradeParticipant|#TradeParticipant]* _who_)",
-returns = "(integer,)",
-valuetype = "moneyOffer,",},
+returns = "(integer:moneyOffer,)",
+valuetype = "integer,",},

 StartMapPinAnimation = {type = "function",
 description = "",
 args = "(*object* _animationTimeline_, *[MapPinAnimationTarget|#MapPinAnimationTarget]* _animationTarget_, *[ControlType|#ControlType]:nilable* _limitToMapType_, *[MapDisplayPinType|#MapDisplayPinType]* _pinType_, *integer* _param1_, *integer* _param2_, *integer* _param3_, *integer* _playOffset_, *bool* _ignoreBreadcrumbs_)",
-returns = "(bool,)",
-valuetype = "played,",},
+returns = "(bool:played,)",
+valuetype = "bool,",},

 IsPlayerInsidePinArea = {type = "function",
 description = "",
 args = "(*[MapDisplayPinType|#MapDisplayPinType]* _pinType_, *integer* _param1_, *integer* _param2_, *integer* _param3_)",
-returns = "(bool,)",
-valuetype = "isPlayerInside,",},
+returns = "(bool:isPlayerInside,)",
+valuetype = "bool,",},

 RemoveMapPinsByType = {type = "function",
 description = "",
@@ -23028,15 +22812,11 @@ args = "(*[MapDisplayPinType|#MapDisplayPinType]* _startType_, *[MapDisplayPinTy

 AssistedQuestPinForTracked = {type = "function",
 description = "",
-args = "(*[MapDisplayPinType|#MapDisplayPinType]* _trackedPinType_)",
-returns = "()",
-valuetype = "assistedPinType,",},
+args = "(*[MapDisplayPinType|#MapDisplayPinType]* _trackedPinType_)",},

 TrackedQuestPinForAssisted = {type = "function",
 description = "",
-args = "(*[MapDisplayPinType|#MapDisplayPinType]* _assistedPinType_)",
-returns = "()",
-valuetype = "trackedPinType,",},
+args = "(*[MapDisplayPinType|#MapDisplayPinType]* _assistedPinType_)",},

 SetPinTint = {type = "function",
 description = "",
@@ -23045,68 +22825,64 @@ args = "(*[MapDisplayPinType|#MapDisplayPinType]* _pinType_, *number* _red_, *nu
 GetAvailableSkillPoints = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numPoints,",},
+returns = "(integer:numPoints,)",
+valuetype = "integer,",},

 GetNumSkyShards = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numShards,",},
+returns = "(integer:numShards,)",
+valuetype = "integer,",},

 GetNumSkillTypes = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numSkillTypes,",},
+returns = "(integer:numSkillTypes,)",
+valuetype = "integer,",},

 GetNumSkillLines = {type = "function",
 description = "",
 args = "(*[SkillType|#SkillType]* _skillType_)",
-returns = "(integer,)",
-valuetype = "numSkillLines,",},
+returns = "(integer:numSkillLines,)",
+valuetype = "integer,",},

 GetSkillLineXPInfo = {type = "function",
 description = "",
 args = "(*[SkillType|#SkillType]* _skillType_, *luaindex* _skillIndex_)",
-returns = "(integer,integer,integer,)",
-valuetype = "currentXP,nextRankXP,lastRankXP,",},
+returns = "(integer:currentXP,integer:nextRankXP,integer:lastRankXP,)",
+valuetype = "integer,integer,integer,",},

 GetSkillLineRankXPExtents = {type = "function",
 description = "",
-args = "(*[SkillType|#SkillType]* _skillType_, *luaindex* _skillIndex_, *luaindex* _rank_)",
-returns = "()",
-valuetype = "nextRankStartXP,startXP,",},
+args = "(*[SkillType|#SkillType]* _skillType_, *luaindex* _skillIndex_, *luaindex* _rank_)",},

 GetNumSkillAbilities = {type = "function",
 description = "",
 args = "(*[SkillType|#SkillType]* _skillType_, *luaindex* _skillIndex_)",
-returns = "(integer,)",
-valuetype = "numAbilities,",},
+returns = "(integer:numAbilities,)",
+valuetype = "integer,",},

 GetSkillAbilityInfo = {type = "function",
 description = "",
 args = "(*[SkillType|#SkillType]* _skillType_, *luaindex* _skillIndex_, *luaindex* _abilityIndex_)",
-returns = "(bool,bool,bool,luaindex,textureName,string,)",
-valuetype = "progressionIndex,purchased,ultimate,passive,earnedRank,texture,name,",},
+returns = "(bool:purchased,bool:ultimate,bool:passive,luaindex:earnedRank,textureName:texture,string:name,)",
+valuetype = "bool,bool,bool,luaindex,textureName,string,",},

 GetSkillAbilityId = {type = "function",
 description = "",
 args = "(*[SkillType|#SkillType]* _skillType_, *luaindex* _skillIndex_, *luaindex* _abilityIndex_, *bool* _showUpgrade_)",
-returns = "(integer,)",
-valuetype = "abilityId,",},
+returns = "(integer:abilityId,)",
+valuetype = "integer,",},

 GetSkillAbilityUpgradeInfo = {type = "function",
 description = "",
-args = "(*[SkillType|#SkillType]* _skillType_, *luaindex* _skillIndex_, *luaindex* _abilityIndex_)",
-returns = "()",
-valuetype = "maxUpgradeLevel,currentUpgradeLevel,",},
+args = "(*[SkillType|#SkillType]* _skillType_, *luaindex* _skillIndex_, *luaindex* _abilityIndex_)",},

 GetSkillAbilityNextUpgradeInfo = {type = "function",
 description = "",
 args = "(*[SkillType|#SkillType]* _skillType_, *luaindex* _skillIndex_, *luaindex* _abilityIndex_)",
-returns = "(textureName,string,)",
-valuetype = "earnedRank,texture,name,",},
+returns = "(textureName:texture,string:name,)",
+valuetype = "textureName,string,",},

 PutPointIntoSkillAbility = {type = "function",
 description = "",
@@ -23115,56 +22891,54 @@ args = "(*[SkillType|#SkillType]* _skillType_, *luaindex* _skillIndex_, *luainde
 GetSkillAbilityIndicesFromProgressionIndex = {type = "function",
 description = "",
 args = "(*luaindex* _progressionIndex_)",
-returns = "(luaindex,luaindex,)",
-valuetype = "abilityIndex,skillIndex,skillType,",},
+returns = "(luaindex:abilityIndex,luaindex:skillIndex,)",
+valuetype = "luaindex,luaindex,",},

 IsWerewolfSkillLine = {type = "function",
 description = "",
 args = "(*[SkillType|#SkillType]* _skillType_, *luaindex* _skillLineIndex_)",
-returns = "(bool,)",
-valuetype = "isWerewolfSkillLine,",},
+returns = "(bool:isWerewolfSkillLine,)",
+valuetype = "bool,",},

 IsLocalMailboxFull = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isFull,",},
+returns = "(bool:isFull,)",
+valuetype = "bool,",},

 GetNumMailItems = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numMail,",},
+returns = "(integer:numMail,)",
+valuetype = "integer,",},

 GetNextMailId = {type = "function",
 description = "",
-args = "(*id64:nilable* _lastMailId_)",
-returns = "()",
-valuetype = "nextMailId,",},
+args = "(*id64:nilable* _lastMailId_)",},

 GetMailItemInfo = {type = "function",
 description = "",
 args = "(*id64* _mailId_)",
-returns = "(integer,integer,integer,integer,integer,bool,bool,bool,bool,textureName,string,string,string,)",
-valuetype = "secsSinceReceived,expiresInDays,codAmount,attachedMoney,numAttachments,returned,fromCustomerService,fromSystem,unread,icon,subject,senderCharacterName,senderDisplayName,",},
+returns = "(integer:secsSinceReceived,integer:expiresInDays,integer:codAmount,integer:attachedMoney,integer:numAttachments,bool:returned,bool:fromCustomerService,bool:fromSystem,bool:unread,textureName:icon,string:subject,string:senderCharacterName,string:senderDisplayName,)",
+valuetype = "integer,integer,integer,integer,integer,bool,bool,bool,bool,textureName,string,string,string,",},

 GetMailSender = {type = "function",
 description = "",
 args = "(*id64* _mailId_)",
-returns = "(string,string,)",
-valuetype = "senderCharacterName,senderDisplayName,",},
+returns = "(string:senderCharacterName,string:senderDisplayName,)",
+valuetype = "string,string,",},

 GetMailAttachmentInfo = {type = "function",
 description = "",
 args = "(*id64* _mailId_)",
-returns = "(integer,integer,integer,)",
-valuetype = "codAmount,attachedMoney,numAttachments,",},
+returns = "(integer:codAmount,integer:attachedMoney,integer:numAttachments,)",
+valuetype = "integer,integer,integer,",},

 GetMailFlags = {type = "function",
 description = "",
 args = "(*id64* _mailId_)",
-returns = "(bool,bool,bool,bool,)",
-valuetype = "fromCustomerService,fromSystem,returned,unread,",},
+returns = "(bool:fromCustomerService,bool:fromSystem,bool:returned,bool:unread,)",
+valuetype = "bool,bool,bool,bool,",},

 SendMail = {type = "function",
 description = "",
@@ -23173,8 +22947,8 @@ args = "(*string* _to_, *string* _subject_, *string* _body_)",},
 GetQueuedMailPostage = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "postage,",},
+returns = "(integer:postage,)",
+valuetype = "integer,",},

 ClearQueuedMail = {type = "function",
 description = "",
@@ -23186,9 +22960,7 @@ args = "()",},

 RequestReadMail = {type = "function",
 description = "",
-args = "(*id64* _mailId_)",
-returns = "()",
-valuetype = "result,",},
+args = "(*id64* _mailId_)",},

 DeleteMail = {type = "function",
 description = "",
@@ -23197,8 +22969,8 @@ args = "(*id64* _mailId_, *bool* _forceDelete_)",},
 IsMailReturnable = {type = "function",
 description = "",
 args = "(*id64* _mailId_)",
-returns = "(bool,)",
-valuetype = "isReturnable,",},
+returns = "(bool:isReturnable,)",
+valuetype = "bool,",},

 ReturnMail = {type = "function",
 description = "",
@@ -23207,26 +22979,26 @@ args = "(*id64* _mailId_)",},
 ReadMail = {type = "function",
 description = "",
 args = "(*id64* _mailId_)",
-returns = "(string,)",
-valuetype = "body,",},
+returns = "(string:body,)",
+valuetype = "string,",},

 HasUnreadMail = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "unread,",},
+returns = "(bool:unread,)",
+valuetype = "bool,",},

 GetNumUnreadMail = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numUnread,",},
+returns = "(integer:numUnread,)",
+valuetype = "integer,",},

 CanQueueItemAttachment = {type = "function",
 description = "",
 args = "(*[Bag|#Bag]* _bagId_, *integer* _slotIndex_, *luaindex* _attachmentSlot_)",
-returns = "(bool,)",
-valuetype = "canAttach,",},
+returns = "(bool:canAttach,)",
+valuetype = "bool,",},

 RemoveQueuedItemAttachment = {type = "function",
 description = "",
@@ -23239,8 +23011,8 @@ args = "(*integer* _amount_)",},
 GetQueuedMoneyAttachment = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "amount,",},
+returns = "(integer:amount,)",
+valuetype = "integer,",},

 QueueCOD = {type = "function",
 description = "",
@@ -23249,32 +23021,32 @@ args = "(*integer* _amount_)",},
 GetQueuedCOD = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "amount,",},
+returns = "(integer:amount,)",
+valuetype = "integer,",},

 GetMailQueuedAttachmentLink = {type = "function",
 description = "",
 args = "(*luaindex* _attachmentSlot_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 GetQueuedItemAttachmentInfo = {type = "function",
 description = "",
 args = "(*luaindex* _attachmentSlot_)",
-returns = "(integer,textureName,integer,integer,)",
-valuetype = "stack,icon,slotIndex,bagId,",},
+returns = "(integer:stack,textureName:icon,integer:slotIndex,integer:bagId,)",
+valuetype = "integer,textureName,integer,integer,",},

 GetAttachedItemLink = {type = "function",
 description = "",
 args = "(*id64* _mailId_, *luaindex* _attachIndex_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 GetAttachedItemInfo = {type = "function",
 description = "",
 args = "(*id64* _mailId_, *luaindex* _attachIndex_)",
-returns = "(integer,integer,integer,bool,integer,string,integer,textureName,)",
-valuetype = "quality,itemStyle,equipType,meetsUsageRequirement,sellPrice,creatorName,stack,icon,",},
+returns = "(integer:quality,integer:itemStyle,integer:equipType,bool:meetsUsageRequirement,integer:sellPrice,string:creatorName,integer:stack,textureName:icon,)",
+valuetype = "integer,integer,integer,bool,integer,string,integer,textureName,",},

 TakeMailAttachedItems = {type = "function",
 description = "",
@@ -23291,248 +23063,244 @@ args = "()",},
 IsReadMailInfoReady = {type = "function",
 description = "",
 args = "(*id64* _mailId_)",
-returns = "(bool,)",
-valuetype = "isReady,",},
+returns = "(bool:isReady,)",
+valuetype = "bool,",},

 GetNumAchievementCategories = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numCategories,",},
+returns = "(integer:numCategories,)",
+valuetype = "integer,",},

 GetAchievementCategoryInfo = {type = "function",
 description = "",
 args = "(*luaindex* _topLevelIndex_)",
-returns = "(bool,integer,integer,integer,integer,string,)",
-valuetype = "hidesPoints,totalPoints,earnedPoints,numAchievements,numSubCatgories,name,",},
+returns = "(bool:hidesPoints,integer:totalPoints,integer:earnedPoints,integer:numAchievements,integer:numSubCatgories,string:name,)",
+valuetype = "bool,integer,integer,integer,integer,string,",},

 GetAchievementSubCategoryInfo = {type = "function",
 description = "",
 args = "(*luaindex* _topLevelIndex_, *luaindex* _subCategoryIndex_)",
-returns = "(bool,integer,integer,integer,string,)",
-valuetype = "hidesPoints,totalPoints,earnedPoints,numAchievements,name,",},
+returns = "(bool:hidesPoints,integer:totalPoints,integer:earnedPoints,integer:numAchievements,string:name,)",
+valuetype = "bool,integer,integer,integer,string,",},

 GetAchievementCategoryKeyboardIcons = {type = "function",
 description = "",
 args = "(*luaindex* _categoryIndex_)",
-returns = "(textureName,textureName,textureName,)",
-valuetype = "mouseoverIcon,pressedIcon,normalIcon,",},
+returns = "(textureName:mouseoverIcon,textureName:pressedIcon,textureName:normalIcon,)",
+valuetype = "textureName,textureName,textureName,",},

 GetAchievementCategoryGamepadIcon = {type = "function",
 description = "",
 args = "(*luaindex* _categoryIndex_)",
-returns = "(textureName,)",
-valuetype = "gamepadIcon,",},
+returns = "(textureName:gamepadIcon,)",
+valuetype = "textureName,",},

 GetEarnedAchievementPoints = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "points,",},
+returns = "(integer:points,)",
+valuetype = "integer,",},

 GetTotalAchievementPoints = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "points,",},
+returns = "(integer:points,)",
+valuetype = "integer,",},

 GetAchievementId = {type = "function",
 description = "",
 args = "(*luaindex* _topLevelIndex_, *luaindex:nilable* _categoryIndex_, *luaindex* _achievementIndex_)",
-returns = "(integer,)",
-valuetype = "achievementId,",},
+returns = "(integer:achievementId,)",
+valuetype = "integer,",},

 GetAchievementInfo = {type = "function",
 description = "",
 args = "(*integer* _achievementId_)",
-returns = "(string,string,bool,textureName,integer,string,string,)",
-valuetype = "time,date,completed,icon,points,description,name,",},
+returns = "(string:time,string:date,bool:completed,textureName:icon,integer:points,string:description,string:name,)",
+valuetype = "string,string,bool,textureName,integer,string,string,",},

 IsAchievementComplete = {type = "function",
 description = "",
 args = "(*integer* _achievementId_)",
-returns = "(bool,)",
-valuetype = "completed,",},
+returns = "(bool:completed,)",
+valuetype = "bool,",},

 GetAchievementNumRewards = {type = "function",
 description = "",
 args = "(*integer* _achievementId_)",
-returns = "(integer,)",
-valuetype = "numRewards,",},
+returns = "(integer:numRewards,)",
+valuetype = "integer,",},

 GetAchievementItemLink = {type = "function",
 description = "",
 args = "(*integer* _achievementId_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 GetAchievementNumCriteria = {type = "function",
 description = "",
 args = "(*integer* _achievementId_)",
-returns = "(integer,)",
-valuetype = "numCriteria,",},
+returns = "(integer:numCriteria,)",
+valuetype = "integer,",},

 GetAchievementCriterion = {type = "function",
 description = "",
 args = "(*integer* _achievementId_, *luaindex* _criterionIndex_)",
-returns = "(integer,integer,string,)",
-valuetype = "numRequired,numCompleted,description,",},
+returns = "(integer:numRequired,integer:numCompleted,string:description,)",
+valuetype = "integer,integer,string,",},

 GetRecentlyCompletedAchievements = {type = "function",
 description = "",
 args = "(*integer* _numAchievementsToGet_)",
-returns = "(integer,)",
-valuetype = "achievementId,",},
+returns = "(integer:achievementId,)",
+valuetype = "integer,",},

 GetCategoryInfoFromAchievementId = {type = "function",
 description = "",
 args = "(*integer* _achievementId_)",
-returns = "(integer,)",
-valuetype = "offsetFromParent,achievementIndex,categoryIndex,topLevelIndex,",},
+returns = "(integer:offsetFromParent,)",
+valuetype = "integer,",},

 GetFirstAchievementInLine = {type = "function",
 description = "",
 args = "(*integer* _achievementId_)",
-returns = "(integer,)",
-valuetype = "firstAchievementId,",},
+returns = "(integer:firstAchievementId,)",
+valuetype = "integer,",},

 GetNextAchievementInLine = {type = "function",
 description = "",
 args = "(*integer* _achievementId_)",
-returns = "(integer,)",
-valuetype = "nextAchievementId,",},
+returns = "(integer:nextAchievementId,)",
+valuetype = "integer,",},

 GetPreviousAchievementInLine = {type = "function",
 description = "",
 args = "(*integer* _achievementId_)",
-returns = "(integer,)",
-valuetype = "previousAchievementId,",},
+returns = "(integer:previousAchievementId,)",
+valuetype = "integer,",},

 GetAchievementLink = {type = "function",
 description = "",
 args = "(*integer* _achievementId_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 GetAchievementIdFromLink = {type = "function",
 description = "",
 args = "(*string* _link_)",
-returns = "(integer,)",
-valuetype = "achievementId,",},
+returns = "(integer:achievementId,)",
+valuetype = "integer,",},

 GetAchievementNameFromLink = {type = "function",
 description = "",
 args = "(*string* _link_)",
-returns = "(string,)",
-valuetype = "name,",},
+returns = "(string:name,)",
+valuetype = "string,",},

 GetAchievementProgressFromLinkData = {type = "function",
 description = "",
 args = "(*integer* _achievementId_, *string* _progress_)",
-returns = "(integer,)",
-valuetype = "numCompleted,",},
+returns = "(integer:numCompleted,)",
+valuetype = "integer,",},

 GetAchievementRewardPoints = {type = "function",
 description = "",
 args = "(*integer* _achievementId_)",
-returns = "(integer,)",
-valuetype = "points,",},
+returns = "(integer:points,)",
+valuetype = "integer,",},

 GetAchievementRewardItem = {type = "function",
 description = "",
 args = "(*integer* _achievementId_)",
-returns = "(integer,string,string,bool,)",
-valuetype = "quality,iconTextureName,itemName,hasRewardOfType,",},
+returns = "(integer:quality,string:iconTextureName,string:itemName,bool:hasRewardOfType,)",
+valuetype = "integer,string,string,bool,",},

 GetAchievementRewardTitle = {type = "function",
 description = "",
 args = "(*integer* _achievementId_)",
-returns = "(string,bool,)",
-valuetype = "titleName,hasRewardOfType,",},
+returns = "(string:titleName,bool:hasRewardOfType,)",
+valuetype = "string,bool,",},

 GetAchievementRewardDye = {type = "function",
 description = "",
 args = "(*integer* _achievementId_)",
-returns = "(integer,bool,)",
-valuetype = "dyeId,hasRewardOfType,",},
+returns = "(integer:dyeId,bool:hasRewardOfType,)",
+valuetype = "integer,bool,",},

 GetAchievementRewardCollectible = {type = "function",
 description = "",
 args = "(*integer* _achievementId_)",
-returns = "(integer,bool,)",
-valuetype = "collectibleId,hasRewardOfType,",},
+returns = "(integer:collectibleId,bool:hasRewardOfType,)",
+valuetype = "integer,bool,",},

 GetNumExperiencePointsInLevel = {type = "function",
 description = "",
-args = "(*integer* _level_)",
-returns = "()",
-valuetype = "numXP,",},
+args = "(*integer* _level_)",},

 GetEnlightenedMultiplier = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "multiplier,",},
+returns = "(number:multiplier,)",
+valuetype = "number,",},

 GetEnlightenedPool = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "poolAmount,",},
+returns = "(integer:poolAmount,)",
+valuetype = "integer,",},

 IsEnlightenedAvailableForAccount = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "availableForAccount,",},
+returns = "(bool:availableForAccount,)",
+valuetype = "bool,",},

 IsEnlightenedAvailableForCharacter = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "availableForCharacter,",},
+returns = "(bool:availableForCharacter,)",
+valuetype = "bool,",},

 GetNumChampionXPInChampionPoint = {type = "function",
 description = "",
-args = "(*integer* _championPointsEarned_)",
-returns = "()",
-valuetype = "maxExp,",},
+args = "(*integer* _championPointsEarned_)",},

 GetMaxSpendableChampionPointsInAttribute = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "maxSpendableChampionPointsInAttribute,",},
+returns = "(integer:maxSpendableChampionPointsInAttribute,)",
+valuetype = "integer,",},

 GetMaxLevel = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "maxLevel,",},
+returns = "(integer:maxLevel,)",
+valuetype = "integer,",},

 GetChampionPointsPlayerProgressionCap = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "maxRank,",},
+returns = "(integer:maxRank,)",
+valuetype = "integer,",},

 GetAbilityProgressionAbilityId = {type = "function",
 description = "",
 args = "(*luaindex* _progressionIndex_, *integer* _morph_, *integer* _rank_)",
-returns = "(integer,)",
-valuetype = "abilityId,",},
+returns = "(integer:abilityId,)",
+valuetype = "integer,",},

 GetLatestAbilityRespecNote = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "note,",},
+returns = "(string:note,)",
+valuetype = "string,",},

 GetLatestAttributeRespecNote = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "note,",},
+returns = "(string:note,)",
+valuetype = "string,",},

 PurchaseAttributes = {type = "function",
 description = "",
@@ -23541,38 +23309,38 @@ args = "(*integer* _health_, *integer* _magicka_, *integer* _stamina_)",},
 GetAttributeSpentPoints = {type = "function",
 description = "",
 args = "(*integer* _attributeType_)",
-returns = "(integer,)",
-valuetype = "points,",},
+returns = "(integer:points,)",
+valuetype = "integer,",},

 GetAttributeUnspentPoints = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "points,",},
+returns = "(integer:points,)",
+valuetype = "integer,",},

 GetNumScriptedEventInvites = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "eventCount,",},
+returns = "(integer:eventCount,)",
+valuetype = "integer,",},

 GetScriptedEventInviteIdFromIndex = {type = "function",
 description = "",
 args = "(*luaindex* _eventIndex_)",
-returns = "(integer,)",
-valuetype = "eventId,",},
+returns = "(integer:eventId,)",
+valuetype = "integer,",},

 GetScriptedEventInviteInfo = {type = "function",
 description = "",
 args = "(*integer* _eventId_)",
-returns = "(integer,string,string,string,bool,)",
-valuetype = "timeRemainingMS,questName,inviterName,eventName,isValid,",},
+returns = "(integer:timeRemainingMS,string:questName,string:inviterName,string:eventName,bool:isValid,)",
+valuetype = "integer,string,string,string,bool,",},

 GetScriptedEventInviteTimeRemainingMS = {type = "function",
 description = "",
 args = "(*integer* _eventId_)",
-returns = "(integer,)",
-valuetype = "timeRemainingMS,",},
+returns = "(integer:timeRemainingMS,)",
+valuetype = "integer,",},

 AcceptWorldEventInvite = {type = "function",
 description = "",
@@ -23589,80 +23357,72 @@ args = "(*string* _questName_)",},
 GetNumLoreCategories = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numTopCategories,",},
+returns = "(integer:numTopCategories,)",
+valuetype = "integer,",},

 GetLoreCategoryInfo = {type = "function",
 description = "",
 args = "(*luaindex* _categoryIndex_)",
-returns = "(integer,integer,string,)",
-valuetype = "categoryId,numCollections,name,",},
+returns = "(integer:categoryId,integer:numCollections,string:name,)",
+valuetype = "integer,integer,string,",},

 GetLoreCollectionInfo = {type = "function",
 description = "",
 args = "(*luaindex* _categoryIndex_, *luaindex* _collectionIndex_)",
-returns = "(integer,textureName,bool,integer,integer,string,string,)",
-valuetype = "collectionId,gamepadIcon,hidden,totalBooks,numKnownBooks,description,name,",},
+returns = "(integer:collectionId,textureName:gamepadIcon,bool:hidden,integer:totalBooks,integer:numKnownBooks,string:description,string:name,)",
+valuetype = "integer,textureName,bool,integer,integer,string,string,",},

 GetLoreBookInfo = {type = "function",
 description = "",
 args = "(*luaindex* _categoryIndex_, *luaindex* _collectionIndex_, *luaindex* _bookIndex_)",
-returns = "(integer,bool,textureName,string,)",
-valuetype = "bookId,known,icon,title,",},
+returns = "(integer:bookId,bool:known,textureName:icon,string:title,)",
+valuetype = "integer,bool,textureName,string,",},

 ReadLoreBook = {type = "function",
 description = "",
 args = "(*luaindex* _categoryIndex_, *luaindex* _collectionIndex_, *luaindex* _bookIndex_)",
-returns = "(bool,string,)",
-valuetype = "showTitle,medium,body,",},
+returns = "(bool:showTitle,string:body,)",
+valuetype = "bool,string,",},

 GetLoreBookLink = {type = "function",
 description = "",
 args = "(*luaindex* _categoryIndex_, *luaindex* _collectionIndex_, *luaindex* _bookIndex_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 GetLoreBookTitleFromLink = {type = "function",
 description = "",
 args = "(*string* _link_)",
-returns = "(string,)",
-valuetype = "title,",},
+returns = "(string:title,)",
+valuetype = "string,",},

 GetLoreBookCategoryIndexFromCategoryId = {type = "function",
 description = "",
-args = "(*integer* _categoryId_)",
-returns = "()",
-valuetype = "categoryIndex,",},
+args = "(*integer* _categoryId_)",},

 GetLoreBookCollectionIndicesFromCollectionId = {type = "function",
 description = "",
-args = "(*integer* _collectionId_)",
-returns = "()",
-valuetype = "collectionIndex,categoryIndex,",},
+args = "(*integer* _collectionId_)",},

 GetLoreBookIndicesFromBookId = {type = "function",
 description = "",
-args = "(*integer* _bookId_)",
-returns = "()",
-valuetype = "bookIndex,collectionIndex,categoryIndex,",},
+args = "(*integer* _bookId_)",},

 GetGameCameraNonInteractableName = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "name,",},
+args = "()",},

 IsInteracting = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "name,",},
+returns = "(bool:name,)",
+valuetype = "bool,",},

 GetPledgeOfMaraOfferInfo = {type = "function",
 description = "",
 args = "()",
-returns = "(string,bool,integer,string,)",
-valuetype = "targetDisplayName,isSender,millisecondsSinceRequest,targetCharacterName,",},
+returns = "(string:targetDisplayName,bool:isSender,integer:millisecondsSinceRequest,string:targetCharacterName,)",
+valuetype = "string,bool,integer,string,",},

 SendPledgeOfMaraResponse = {type = "function",
 description = "",
@@ -23671,8 +23431,8 @@ args = "(*[PledgeOfMaraResponse|#PledgeOfMaraResponse]* _response_)",},
 GetRingOfMaraExperienceBonus = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "bonusPercentage,",},
+returns = "(number:bonusPercentage,)",
+valuetype = "number,",},

 ReportFeedback = {type = "function",
 description = "",
@@ -23681,38 +23441,38 @@ args = "(*[CustomerServiceSubmitFeedbackImpacts|#CustomerServiceSubmitFeedbackIm
 GetHelpCategoryInfo = {type = "function",
 description = "",
 args = "(*luaindex* _helpCategoryIndex_)",
-returns = "(textureName,textureName,textureName,textureName,string,string,)",
-valuetype = "gamepadIcon,overIcon,downIcon,upIcon,description,name,",},
+returns = "(textureName:gamepadIcon,textureName:overIcon,textureName:downIcon,textureName:upIcon,string:description,string:name,)",
+valuetype = "textureName,textureName,textureName,textureName,string,string,",},

 GetNumHelpCategories = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numHelpCategories,",},
+returns = "(integer:numHelpCategories,)",
+valuetype = "integer,",},

 GetNumHelpEntriesWithinCategory = {type = "function",
 description = "",
 args = "(*luaindex* _helpCategoryIndex_)",
-returns = "(integer,)",
-valuetype = "numHelpEntries,",},
+returns = "(integer:numHelpEntries,)",
+valuetype = "integer,",},

 GetHelpInfo = {type = "function",
 description = "",
 args = "(*luaindex* _helpCategoryIndex_, *luaindex* _helpIndex_)",
-returns = "(string,string,string,string,string,)",
-valuetype = "showOptions,descriptionGamepad2,descriptionGamepad,image,description2,description,name,",},
+returns = "(string:descriptionGamepad2,string:descriptionGamepad,string:description2,string:description,string:name,)",
+valuetype = "string,string,string,string,string,",},

 GetHelpSearchResults = {type = "function",
 description = "",
 args = "()",
-returns = "(luaindex,luaindex,)",
-valuetype = "helpIndex,helpCategoryIndex,",},
+returns = "(luaindex:helpIndex,luaindex:helpCategoryIndex,)",
+valuetype = "luaindex,luaindex,",},

 SubmitCustomerServiceTicket = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "success,",},
+returns = "(bool:success,)",
+valuetype = "bool,",},

 ResetCustomerServiceTicket = {type = "function",
 description = "",
@@ -23753,38 +23513,38 @@ args = "(*string* _searchString_)",},
 GetHelpOverviewIntroParagraph = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "paragraph,",},
+returns = "(string:paragraph,)",
+valuetype = "string,",},

 GetNumHelpOverviewQuestionAnswers = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "length,",},
+returns = "(integer:length,)",
+valuetype = "integer,",},

 GetHelpOverviewQuestionAnswerPair = {type = "function",
 description = "",
 args = "(*luaindex* _index_)",
-returns = "(string,string,)",
-valuetype = "answer,question,",},
+returns = "(string:answer,string:question,)",
+valuetype = "string,string,",},

 IsKeyboardHelpOption = {type = "function",
 description = "",
 args = "(*[HelpShowOptions|#HelpShowOptions]* _showOption_)",
-returns = "(bool,)",
-valuetype = "isKeyboardOption,",},
+returns = "(bool:isKeyboardOption,)",
+valuetype = "bool,",},

 IsGamepadHelpOption = {type = "function",
 description = "",
 args = "(*[HelpShowOptions|#HelpShowOptions]* _showOption_)",
-returns = "(bool,)",
-valuetype = "isGamepadOption,",},
+returns = "(bool:isGamepadOption,)",
+valuetype = "bool,",},

 IsSubmitFeedbackSupported = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isSupported,",},
+returns = "(bool:isSupported,)",
+valuetype = "bool,",},

 StopSettingChamber = {type = "function",
 description = "",
@@ -23793,8 +23553,8 @@ args = "()",},
 GetSettingChamberStress = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "stress,",},
+returns = "(number:stress,)",
+valuetype = "number,",},

 AttemptForceLock = {type = "function",
 description = "",
@@ -23803,134 +23563,126 @@ args = "()",},
 GetLockpickingTimeLeft = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "timeLeftMs,",},
+returns = "(integer:timeLeftMs,)",
+valuetype = "integer,",},

 GetChanceToForceLock = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "chance,",},
+returns = "(integer:chance,)",
+valuetype = "integer,",},

 GetNumLockpicksLeft = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "picksLeft,",},
+returns = "(integer:picksLeft,)",
+valuetype = "integer,",},

 GetLockQuality = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "lockQuality,",},
+returns = "(integer:lockQuality,)",
+valuetype = "integer,",},

 GetChamberState = {type = "function",
 description = "",
 args = "(*luaindex* _chamberIndex_)",
-returns = "(number,integer,)",
-valuetype = "chamberProgress,chamberState,",},
+returns = "(number:chamberProgress,integer:chamberState,)",
+valuetype = "number,integer,",},

 IsChamberSolved = {type = "function",
 description = "",
 args = "(*luaindex* _chamberIndex_)",
-returns = "(bool,)",
-valuetype = "solved,",},
+returns = "(bool:solved,)",
+valuetype = "bool,",},

 StartSettingChamber = {type = "function",
 description = "",
 args = "(*luaindex* _chamberIndex_)",
-returns = "(bool,)",
-valuetype = "succesfullyStarted,",},
+returns = "(bool:succesfullyStarted,)",
+valuetype = "bool,",},

 GetCraftingInteractionType = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "currentCraftingInteraction,",},
+args = "()",},

 IsPerformingCraftProcess = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isCrafting,",},
+returns = "(bool:isCrafting,)",
+valuetype = "bool,",},

 GetLastCraftingResultTotalInspiration = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "totalInspiration,",},
+returns = "(integer:totalInspiration,)",
+valuetype = "integer,",},

 GetNumLastCraftingResultLearnedTranslations = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numLearnedTranslations,",},
+returns = "(integer:numLearnedTranslations,)",
+valuetype = "integer,",},

 GetLastCraftingResultLearnedTranslationInfo = {type = "function",
 description = "",
 args = "(*luaindex* _resultIndex_)",
-returns = "(integer,integer,integer,bool,integer,textureName,string,string,)",
-valuetype = "quality,itemStyle,equipType,meetsUsageRequirement,sellPrice,icon,itemName,translationName,",},
+returns = "(integer:quality,integer:itemStyle,integer:equipType,bool:meetsUsageRequirement,integer:sellPrice,textureName:icon,string:itemName,string:translationName,)",
+valuetype = "integer,integer,integer,bool,integer,textureName,string,string,",},

 GetNumLastCraftingResultLearnedTraits = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numLearnedTraits,",},
+returns = "(integer:numLearnedTraits,)",
+valuetype = "integer,",},

 GetLastCraftingResultLearnedTraitInfo = {type = "function",
 description = "",
 args = "(*luaindex* _resultIndex_)",
-returns = "(integer,integer,integer,bool,integer,textureName,string,string,)",
-valuetype = "quality,itemStyle,equipType,meetsUsageRequirement,sellPrice,icon,itemName,traitName,",},
+returns = "(integer:quality,integer:itemStyle,integer:equipType,bool:meetsUsageRequirement,integer:sellPrice,textureName:icon,string:itemName,string:traitName,)",
+valuetype = "integer,integer,integer,bool,integer,textureName,string,string,",},

 GetNumLastCraftingResultItemsAndPenalty = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,integer,)",
-valuetype = "penaltyApplied,numItems,",},
+returns = "(bool:penaltyApplied,integer:numItems,)",
+valuetype = "bool,integer,",},

 GetLastCraftingResultItemInfo = {type = "function",
 description = "",
 args = "(*luaindex* _resultIndex_)",
-returns = "(integer,integer,integer,integer,bool,integer,integer,textureName,string,)",
-valuetype = "itemInstanceId,soundCategory,quality,itemStyle,itemType,equipType,meetsUsageRequirement,sellPrice,stack,icon,name,",},
+returns = "(integer:itemInstanceId,integer:quality,integer:itemStyle,integer:equipType,bool:meetsUsageRequirement,integer:sellPrice,integer:stack,textureName:icon,string:name,)",
+valuetype = "integer,integer,integer,integer,bool,integer,integer,textureName,string,",},

 GetLastCraftingResultItemLink = {type = "function",
 description = "",
 args = "(*luaindex* _resultIndex_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 GetTradeskillLevelPassiveAbilityId = {type = "function",
 description = "",
 args = "(*[TradeskillType|#TradeskillType]* _tradeskillType_)",
-returns = "(integer,)",
-valuetype = "levelPassiveAbilityId,",},
+returns = "(integer:levelPassiveAbilityId,)",
+valuetype = "integer,",},

 GetTradeskillRecipeCraftingSystem = {type = "function",
 description = "",
-args = "(*[TradeskillType|#TradeskillType]* _tradeskillType_)",
-returns = "()",
-valuetype = "recipeCraftingSystem,",},
+args = "(*[TradeskillType|#TradeskillType]* _tradeskillType_)",},

 GetNonCombatBonusLevelTypeForTradeskillType = {type = "function",
 description = "",
-args = "(*[TradeskillType|#TradeskillType]* _tradeskillType_)",
-returns = "()",
-valuetype = "nonCombatBonusType,",},
+args = "(*[TradeskillType|#TradeskillType]* _tradeskillType_)",},

 GetTradeskillTypeForNonCombatBonusLevelType = {type = "function",
 description = "",
-args = "(*[NonCombatBonusType|#NonCombatBonusType]* _nonCombatBonusType_)",
-returns = "()",
-valuetype = "tradeskillType,",},
+args = "(*[NonCombatBonusType|#NonCombatBonusType]* _nonCombatBonusType_)",},

 GetCostToCraftAlchemyItem = {type = "function",
 description = "",
 args = "(*integer* _solventBagId_, *integer* _solventSlotIndex_)",
-returns = "(integer,)",
-valuetype = "cost,",},
+returns = "(integer:cost,)",
+valuetype = "integer,",},

 CraftAlchemyItem = {type = "function",
 description = "",
@@ -23939,98 +23691,96 @@ args = "(*integer* _solventBagId_, *integer* _solventSlotIndex_, *integer* _reag
 GetAlchemyResultingItemInfo = {type = "function",
 description = "",
 args = "(*integer* _solventBagId_, *integer* _solventSlotIndex_, *integer* _reagent1BagId_, *integer* _reagent1SlotIndex_, *integer* _reagent2BagId_, *integer* _reagent2SlotIndex_, *integer:nilable* _reagent3BagId_, *integer:nilable* _reagent3SlotIndex_)",
-returns = "(integer,integer,integer,bool,integer,integer,textureName,string,)",
-valuetype = "quality,itemStyle,equipType,meetsUsageRequirement,sellPrice,stack,icon,name,",},
+returns = "(integer:quality,integer:itemStyle,integer:equipType,bool:meetsUsageRequirement,integer:sellPrice,integer:stack,textureName:icon,string:name,)",
+valuetype = "integer,integer,integer,bool,integer,integer,textureName,string,",},

 GetAlchemyResultingItemLink = {type = "function",
 description = "",
 args = "(*integer* _solventBagId_, *integer* _solventSlotIndex_, *integer* _reagent1BagId_, *integer* _reagent1SlotIndex_, *integer* _reagent2BagId_, *integer* _reagent2SlotIndex_, *integer:nilable* _reagent3BagId_, *integer:nilable* _reagent3SlotIndex_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 GetAlchemyResultInspiration = {type = "function",
 description = "",
 args = "(*integer* _solventBagId_, *integer* _solventSlotIndex_, *integer* _reagent1BagId_, *integer* _reagent1SlotIndex_, *integer* _reagent2BagId_, *integer* _reagent2SlotIndex_, *integer:nilable* _reagent3BagId_, *integer:nilable* _reagent3SlotIndex_)",
-returns = "(integer,)",
-valuetype = "inspiration,",},
+returns = "(integer:inspiration,)",
+valuetype = "integer,",},

 GetAlchemyItemTraits = {type = "function",
 description = "",
-args = "(*integer* _reagentBagId_, *integer* _reagentSlotIndex_)",
-returns = "()",
-valuetype = "conflictIcon,cancellingTrait,matchIcon,icon,trait,",},
+args = "(*integer* _reagentBagId_, *integer* _reagentSlotIndex_)",},

 IsAlchemySolvent = {type = "function",
 description = "",
 args = "(*[ItemType|#ItemType]* _itemType_)",
-returns = "(bool,)",
-valuetype = "isAlchemySolvent,",},
+returns = "(bool:isAlchemySolvent,)",
+valuetype = "bool,",},

 GetNumRecipeLists = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numRecipeLists,",},
+returns = "(integer:numRecipeLists,)",
+valuetype = "integer,",},

 GetRecipeListInfo = {type = "function",
 description = "",
 args = "(*luaindex* _recipeListIndex_)",
-returns = "(string,textureName,textureName,textureName,textureName,integer,string,)",
-valuetype = "createSound,disabledIcon,overIcon,downIcon,upIcon,numRecipes,name,",},
+returns = "(string:createSound,textureName:disabledIcon,textureName:overIcon,textureName:downIcon,textureName:upIcon,integer:numRecipes,string:name,)",
+valuetype = "string,textureName,textureName,textureName,textureName,integer,string,",},

 GetMaxRecipeIngredients = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "maxIngredients,",},
+returns = "(integer:maxIngredients,)",
+valuetype = "integer,",},

 GetRecipeInfo = {type = "function",
 description = "",
 args = "(*luaindex* _recipeListIndex_, *luaindex* _recipeIndex_)",
-returns = "(integer,integer,integer,string,bool,)",
-valuetype = "requiredCraftingStationType,specialIngredientType,qualityReq,provisionerLevelReq,numIngredients,name,known,",},
+returns = "(integer:qualityReq,integer:provisionerLevelReq,integer:numIngredients,string:name,bool:known,)",
+valuetype = "integer,integer,integer,string,bool,",},

 GetRecipeIngredientItemInfo = {type = "function",
 description = "",
 args = "(*luaindex* _recipeListIndex_, *luaindex* _recipeIndex_, *luaindex* _ingredientIndex_)",
-returns = "(integer,integer,integer,textureName,string,)",
-valuetype = "quality,sellPrice,requiredQuantity,icon,name,",},
+returns = "(integer:quality,integer:sellPrice,integer:requiredQuantity,textureName:icon,string:name,)",
+valuetype = "integer,integer,integer,textureName,string,",},

 GetRecipeIngredientItemLink = {type = "function",
 description = "",
 args = "(*luaindex* _recipeListIndex_, *luaindex* _recipeIndex_, *luaindex* _ingredientIndex_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 GetNumRecipeTradeskillRequirements = {type = "function",
 description = "",
 args = "(*luaindex* _recipeListIndex_, *luaindex* _recipeIndex_)",
-returns = "(integer,)",
-valuetype = "numTradeskillRequirements,",},
+returns = "(integer:numTradeskillRequirements,)",
+valuetype = "integer,",},

 GetRecipeTradeskillRequirement = {type = "function",
 description = "",
 args = "(*luaindex* _recipeListIndex_, *luaindex* _recipeIndex_, *luaindex* _tradeskillIndex_)",
-returns = "(integer,)",
-valuetype = "levelRequirement,tradeskill,",},
+returns = "(integer:levelRequirement,)",
+valuetype = "integer,",},

 GetRecipeResultItemInfo = {type = "function",
 description = "",
 args = "(*luaindex* _recipeListIndex_, *luaindex* _recipeIndex_)",
-returns = "(integer,integer,integer,textureName,string,)",
-valuetype = "quality,sellPrice,stack,icon,name,",},
+returns = "(integer:quality,integer:sellPrice,integer:stack,textureName:icon,string:name,)",
+valuetype = "integer,integer,integer,textureName,string,",},

 GetRecipeResultItemLink = {type = "function",
 description = "",
 args = "(*luaindex* _recipeListIndex_, *luaindex* _recipeIndex_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 GetCostToCraftProvisionerItem = {type = "function",
 description = "",
 args = "(*luaindex* _recipeListIndex_, *luaindex* _recipeIndex_)",
-returns = "(integer,)",
-valuetype = "cost,",},
+returns = "(integer:cost,)",
+valuetype = "integer,",},

 CraftProvisionerItem = {type = "function",
 description = "",
@@ -24039,14 +23789,14 @@ args = "(*luaindex* _recipeListIndex_, *luaindex* _recipeIndex_)",},
 GetCurrentRecipeIngredientCount = {type = "function",
 description = "",
 args = "(*luaindex* _recipeListIndex_, *luaindex* _recipeIndex_, *luaindex* _ingredientIndex_)",
-returns = "(integer,)",
-valuetype = "count,",},
+returns = "(integer:count,)",
+valuetype = "integer,",},

 GetCostToCraftEnchantingItem = {type = "function",
 description = "",
 args = "(*integer* _potencyRuneBagId_, *integer* _potencyRuneSlotIndex_, *integer* _essenceRuneBagId_, *integer* _essenceRuneSlotIndex_, *integer* _aspectRuneBagId_, *integer* _aspectRuneSlotIndex_)",
-returns = "(integer,)",
-valuetype = "cost,",},
+returns = "(integer:cost,)",
+valuetype = "integer,",},

 CraftEnchantingItem = {type = "function",
 description = "",
@@ -24059,38 +23809,36 @@ args = "(*integer* _bagId_, *integer* _slotIndex_)",},
 GetEnchantingResultingItemInfo = {type = "function",
 description = "",
 args = "(*integer* _potencyRuneBagId_, *integer* _potencyRuneSlotIndex_, *integer* _essenceRuneBagId_, *integer* _essenceRuneSlotIndex_, *integer* _aspectRuneBagId_, *integer* _aspectRuneSlotIndex_)",
-returns = "(integer,bool,integer,integer,textureName,string,)",
-valuetype = "quality,meetsUsageRequirement,sellPrice,stack,icon,name,",},
+returns = "(integer:quality,bool:meetsUsageRequirement,integer:sellPrice,integer:stack,textureName:icon,string:name,)",
+valuetype = "integer,bool,integer,integer,textureName,string,",},

 GetEnchantingResultingItemLink = {type = "function",
 description = "",
 args = "(*integer* _potencyRuneBagId_, *integer* _potencyRuneSlotIndex_, *integer* _essenceRuneBagId_, *integer* _essenceRuneSlotIndex_, *integer* _aspectRuneBagId_, *integer* _aspectRuneSlotIndex_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 GetRunestoneTranslatedName = {type = "function",
 description = "",
-args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "()",
-valuetype = "name,",},
+args = "(*integer* _bagId_, *integer* _slotIndex_)",},

 GetRunestoneSoundInfo = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(integer,string,)",
-valuetype = "soundLength,soundName,",},
+returns = "(integer:soundLength,string:soundName,)",
+valuetype = "integer,string,",},

 GetEnchantedItemResultingItemLink = {type = "function",
 description = "",
 args = "(*integer* _itemBagId_, *integer* _itemSlotIndex_, *integer* _enchantmentBagId_, *integer* _enchantmentSlotIndex_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 GetCostToCraftSmithingItem = {type = "function",
 description = "",
 args = "(*luaindex* _patternIndex_, *luaindex* _materialIndex_, *integer* _materialQuantity_, *luaindex* _styleIndex_, *luaindex* _traitIndex_)",
-returns = "(integer,)",
-valuetype = "cost,",},
+returns = "(integer:cost,)",
+valuetype = "integer,",},

 CraftSmithingItem = {type = "function",
 description = "",
@@ -24099,182 +23847,178 @@ args = "(*luaindex* _patternIndex_, *luaindex* _materialIndex_, *integer* _mater
 GetSmithingPatternResultLink = {type = "function",
 description = "",
 args = "(*luaindex* _patternIndex_, *luaindex* _materialIndex_, *integer* _materialQuantity_, *luaindex* _styleIndex_, *luaindex* _traitIndex_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 CanSmithingWeaponPatternsBeCraftedHere = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "canBeCrafted,",},
+returns = "(bool:canBeCrafted,)",
+valuetype = "bool,",},

 CanSmithingApparelPatternsBeCraftedHere = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "canBeCrafted,",},
+returns = "(bool:canBeCrafted,)",
+valuetype = "bool,",},

 CanSmithingSetPatternsBeCraftedHere = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "canBeCrafted,",},
+returns = "(bool:canBeCrafted,)",
+valuetype = "bool,",},

 GetNumSmithingPatterns = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "smithingPatterns,",},
+returns = "(integer:smithingPatterns,)",
+valuetype = "integer,",},

 GetSmithingPatternInfo = {type = "function",
 description = "",
 args = "(*luaindex* _patternIndex_, *luaindex:nilable* _materialIndexOverride_, *integer:nilable* _materialQuanityOverride_, *[ItemStyle|#ItemStyle]:nilable* _styleOverride_, *[ItemTraitType|#ItemTraitType]:nilable* _traitTypeOverride_)",
-returns = "(integer,integer,integer,textureName,string,string,)",
-valuetype = "resultItemFilterType,numTraitsKnown,numTraitsRequired,numMaterials,icon,baseName,patternName,",},
+returns = "(integer:numTraitsKnown,integer:numTraitsRequired,integer:numMaterials,textureName:icon,string:baseName,string:patternName,)",
+valuetype = "integer,integer,integer,textureName,string,string,",},

 GetSmithingPatternMaterialItemInfo = {type = "function",
 description = "",
 args = "(*luaindex* _patternIndex_, *luaindex* _materialIndex_)",
-returns = "(integer,integer,integer,integer,integer,bool,integer,integer,textureName,string,)",
-valuetype = "skillRequirement,itemInstanceId,quality,itemStyle,equipType,meetsUsageRequirement,sellPrice,stack,icon,itemName,",},
+returns = "(integer:skillRequirement,integer:itemInstanceId,integer:quality,integer:itemStyle,integer:equipType,bool:meetsUsageRequirement,integer:sellPrice,integer:stack,textureName:icon,string:itemName,)",
+valuetype = "integer,integer,integer,integer,integer,bool,integer,integer,textureName,string,",},

 GetSmithingPatternNextMaterialQuantity = {type = "function",
 description = "",
 args = "(*luaindex* _patternIndex_, *luaindex* _materialIndex_, *integer* _startingPoint_, *integer* _step_)",
-returns = "(integer,)",
-valuetype = "value,",},
+returns = "(integer:value,)",
+valuetype = "integer,",},

 GetSmithingPatternMaterialItemLink = {type = "function",
 description = "",
 args = "(*luaindex* _patternIndex_, *luaindex* _materialIndex_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 GetSmithingPatternArmorType = {type = "function",
 description = "",
-args = "(*luaindex* _patternIndex_)",
-returns = "()",
-valuetype = "armorType,",},
+args = "(*luaindex* _patternIndex_)",},

 GetCurrentSmithingMaterialItemCount = {type = "function",
 description = "",
 args = "(*luaindex* _patternIndex_, *luaindex* _materialIndex_)",
-returns = "(integer,)",
-valuetype = "count,",},
+returns = "(integer:count,)",
+valuetype = "integer,",},

 GetNumSmithingStyleItems = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numStyleItems,",},
+returns = "(integer:numStyleItems,)",
+valuetype = "integer,",},

 GetSmithingStyleItemInfo = {type = "function",
 description = "",
 args = "(*luaindex* _styleItemIndex_)",
-returns = "(bool,integer,integer,bool,integer,textureName,string,)",
-valuetype = "alwaysHideIfLocked,quality,itemStyle,meetsUsageRequirement,sellPrice,icon,itemName,",},
+returns = "(bool:alwaysHideIfLocked,integer:quality,integer:itemStyle,bool:meetsUsageRequirement,integer:sellPrice,textureName:icon,string:itemName,)",
+valuetype = "bool,integer,integer,bool,integer,textureName,string,",},

 GetSmithingStyleItemLink = {type = "function",
 description = "",
 args = "(*luaindex* _styleItemIndex_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 GetCurrentSmithingStyleItemCount = {type = "function",
 description = "",
 args = "(*luaindex* _styleItemIndex_)",
-returns = "(integer,)",
-valuetype = "count,",},
+returns = "(integer:count,)",
+valuetype = "integer,",},

 IsSmithingStyleKnown = {type = "function",
 description = "",
 args = "(*luaindex* _styleItemIndex_, *luaindex* _patternIndex_)",
-returns = "(bool,)",
-valuetype = "known,",},
+returns = "(bool:known,)",
+valuetype = "bool,",},

 GetFirstKnownStyleIndex = {type = "function",
 description = "",
 args = "(*luaindex* _patternIndex_)",
-returns = "(luaindex,)",
-valuetype = "styleItemIndex,",},
+returns = "(luaindex:styleItemIndex,)",
+valuetype = "luaindex,",},

 CanSmithingStyleBeUsedOnPattern = {type = "function",
 description = "",
 args = "(*luaindex* _styleIndex_, *luaindex* _patternIndex_, *luaindex* _materialIndex_, *integer* _materialQuantity_)",
-returns = "(integer,integer,bool,)",
-valuetype = "championPointsRequirement,levelRequirement,canBeUsed,",},
+returns = "(integer:championPointsRequirement,integer:levelRequirement,bool:canBeUsed,)",
+valuetype = "integer,integer,bool,",},

 GetNumSmithingTraitItems = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numTraitItems,",},
+returns = "(integer:numTraitItems,)",
+valuetype = "integer,",},

 GetSmithingTraitItemInfo = {type = "function",
 description = "",
 args = "(*luaindex* _traitItemIndex_)",
-returns = "(integer,integer,bool,integer,textureName,string,)",
-valuetype = "quality,itemStyle,meetsUsageRequirement,sellPrice,icon,itemName,traitType,",},
+returns = "(integer:quality,integer:itemStyle,bool:meetsUsageRequirement,integer:sellPrice,textureName:icon,string:itemName,)",
+valuetype = "integer,integer,bool,integer,textureName,string,",},

 GetSmithingTraitItemLink = {type = "function",
 description = "",
 args = "(*luaindex* _traitItemIndex_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 GetCurrentSmithingTraitItemCount = {type = "function",
 description = "",
 args = "(*luaindex* _traitItemIndex_)",
-returns = "(integer,)",
-valuetype = "count,",},
+returns = "(integer:count,)",
+valuetype = "integer,",},

 IsSmithingTraitItemValidForPattern = {type = "function",
 description = "",
 args = "(*luaindex* _patternIndex_, *luaindex* _traitItemIndex_)",
-returns = "(bool,)",
-valuetype = "valid,",},
+returns = "(bool:valid,)",
+valuetype = "bool,",},

 IsSmithingTraitKnownForResult = {type = "function",
 description = "",
 args = "(*luaindex* _patternIndex_, *luaindex* _materialIndex_, *integer* _materialQuantity_, *luaindex* _styleIndex_, *luaindex* _traitIndex_)",
-returns = "(bool,)",
-valuetype = "known,",},
+returns = "(bool:known,)",
+valuetype = "bool,",},

 GetNumSmithingResearchLines = {type = "function",
 description = "",
 args = "(*[TradeskillType|#TradeskillType]* _craftingSkillType_)",
-returns = "(integer,)",
-valuetype = "numLines,",},
+returns = "(integer:numLines,)",
+valuetype = "integer,",},

 GetMaxSimultaneousSmithingResearch = {type = "function",
 description = "",
 args = "(*[TradeskillType|#TradeskillType]* _craftingSkillType_)",
-returns = "(integer,)",
-valuetype = "maxSimultaneousResearch,",},
+returns = "(integer:maxSimultaneousResearch,)",
+valuetype = "integer,",},

 GetSmithingResearchLineInfo = {type = "function",
 description = "",
 args = "(*[TradeskillType|#TradeskillType]* _craftingSkillType_, *luaindex* _researchLineIndex_)",
-returns = "(integer,integer,textureName,string,)",
-valuetype = "timeRequiredForNextResearchSecs,numTraits,icon,name,",},
+returns = "(integer:timeRequiredForNextResearchSecs,integer:numTraits,textureName:icon,string:name,)",
+valuetype = "integer,integer,textureName,string,",},

 GetSmithingResearchLineTraitInfo = {type = "function",
 description = "",
 args = "(*[TradeskillType|#TradeskillType]* _craftingSkillType_, *luaindex* _researchLineIndex_, *luaindex* _traitIndex_)",
-returns = "(bool,string,)",
-valuetype = "known,traitDescription,traitType,",},
+returns = "(bool:known,string:traitDescription,)",
+valuetype = "bool,string,",},

 GetSmithingResearchLineTraitTimes = {type = "function",
 description = "",
-args = "(*[TradeskillType|#TradeskillType]* _craftingSkillType_, *luaindex* _researchLineIndex_, *luaindex* _traitIndex_)",
-returns = "()",
-valuetype = "timeRemainingSecs,duration,",},
+args = "(*[TradeskillType|#TradeskillType]* _craftingSkillType_, *luaindex* _researchLineIndex_, *luaindex* _traitIndex_)",},

 CanItemBeSmithingTraitResearched = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_, *[TradeskillType|#TradeskillType]* _craftingSkillType_, *luaindex* _researchLineIndex_, *luaindex* _traitIndex_)",
-returns = "(bool,)",
-valuetype = "canBeResearched,",},
+returns = "(bool:canBeResearched,)",
+valuetype = "bool,",},

 ResearchSmithingTrait = {type = "function",
 description = "",
@@ -24283,26 +24027,26 @@ args = "(*integer* _bagId_, *integer* _slotIndex_)",},
 CanItemBeSmithingExtractedOrRefined = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_, *[TradeskillType|#TradeskillType]* _craftingSkillType_)",
-returns = "(bool,)",
-valuetype = "canItemBeExtractedOrRefined,",},
+returns = "(bool:canItemBeExtractedOrRefined,)",
+valuetype = "bool,",},

 GetRequiredSmithingRefinementStackSize = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "requiredStackSize,",},
+returns = "(integer:requiredStackSize,)",
+valuetype = "integer,",},

 GetSmithingRefinementMinRawMaterial = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "minRawMaterial,",},
+returns = "(integer:minRawMaterial,)",
+valuetype = "integer,",},

 GetSmithingRefinementMaxRawMaterial = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "maxRawMaterial,",},
+returns = "(integer:maxRawMaterial,)",
+valuetype = "integer,",},

 ExtractOrRefineSmithingItem = {type = "function",
 description = "",
@@ -24311,44 +24055,44 @@ args = "(*integer* _bagId_, *integer* _slotIndex_)",},
 CanItemBeSmithingImproved = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_, *[TradeskillType|#TradeskillType]* _craftingSkillType_)",
-returns = "(bool,)",
-valuetype = "canBeImproved,",},
+returns = "(bool:canBeImproved,)",
+valuetype = "bool,",},

 GetSmithingImprovementChance = {type = "function",
 description = "",
 args = "(*integer* _itemToImproveBagId_, *integer* _itemToImproveSlotIndex_, *integer* _numBoostersToUse_, *[TradeskillType|#TradeskillType]* _craftingSkillType_)",
-returns = "(number,)",
-valuetype = "chance,",},
+returns = "(number:chance,)",
+valuetype = "number,",},

 GetNumSmithingImprovementItems = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numImprovementItems,",},
+returns = "(integer:numImprovementItems,)",
+valuetype = "integer,",},

 GetSmithingImprovementItemInfo = {type = "function",
 description = "",
 args = "(*[TradeskillType|#TradeskillType]* _craftingSkillType_, *luaindex* _improvementItemIndex_)",
-returns = "(integer,integer,integer,bool,integer,integer,textureName,string,)",
-valuetype = "quality,itemStyle,equipType,meetsUsageRequirement,sellPrice,currentStack,icon,itemName,",},
+returns = "(integer:quality,integer:itemStyle,integer:equipType,bool:meetsUsageRequirement,integer:sellPrice,integer:currentStack,textureName:icon,string:itemName,)",
+valuetype = "integer,integer,integer,bool,integer,integer,textureName,string,",},

 GetSmithingImprovementItemLink = {type = "function",
 description = "",
 args = "(*[TradeskillType|#TradeskillType]* _craftingSkillType_, *luaindex* _improvementItemIndex_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 GetSmithingImprovedItemInfo = {type = "function",
 description = "",
 args = "(*integer* _itemToImproveBagId_, *integer* _itemToImproveSlotIndex_, *[TradeskillType|#TradeskillType]* _craftingSkillType_)",
-returns = "(integer,integer,integer,bool,integer,textureName,string,)",
-valuetype = "quality,itemStyle,equipType,meetsUsageRequirement,sellPrice,icon,itemName,",},
+returns = "(integer:quality,integer:itemStyle,integer:equipType,bool:meetsUsageRequirement,integer:sellPrice,textureName:icon,string:itemName,)",
+valuetype = "integer,integer,integer,bool,integer,textureName,string,",},

 GetSmithingImprovedItemLink = {type = "function",
 description = "",
 args = "(*integer* _itemToImproveBagId_, *integer* _itemToImproveSlotIndex_, *[TradeskillType|#TradeskillType]* _craftingSkillType_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 ImproveSmithingItem = {type = "function",
 description = "",
@@ -24357,38 +24101,34 @@ args = "(*integer* _itemToImproveBagId_, *integer* _itemToImproveSlotIndex_, *in
 GetNonCombatBonus = {type = "function",
 description = "",
 args = "(*[NonCombatBonusType|#NonCombatBonusType]* _nonCombatBonus_)",
-returns = "(integer,)",
-valuetype = "bonusValue,",},
+returns = "(integer:bonusValue,)",
+valuetype = "integer,",},

 GetNumEmotes = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numEmotes,",},
+returns = "(integer:numEmotes,)",
+valuetype = "integer,",},

 GetEmoteIndex = {type = "function",
 description = "",
-args = "(*integer* _emoteId_)",
-returns = "()",
-valuetype = "emoteIndex,",},
+args = "(*integer* _emoteId_)",},

 GetEmoteInfo = {type = "function",
 description = "",
 args = "(*luaindex* _emoteIndex_)",
-returns = "(bool,string,integer,string,)",
-valuetype = "showInGamepadUI,displayName,emoteId,category,slashName,",},
+returns = "(bool:showInGamepadUI,string:displayName,integer:emoteId,string:slashName,)",
+valuetype = "bool,string,integer,string,",},

 GetEmoteCollectibleId = {type = "function",
 description = "",
-args = "(*luaindex* _emoteIndex_)",
-returns = "()",
-valuetype = "collectibleId,",},
+args = "(*luaindex* _emoteIndex_)",},

 GetEmoteSlashNameByIndex = {type = "function",
 description = "",
 args = "(*luaindex* _emoteIndex_)",
-returns = "(string,)",
-valuetype = "slashName,",},
+returns = "(string:slashName,)",
+valuetype = "string,",},

 PlayEmoteByIndex = {type = "function",
 description = "",
@@ -24397,116 +24137,112 @@ args = "(*luaindex* _emoteIndex_)",},
 GetActivityInfo = {type = "function",
 description = "",
 args = "(*integer* _activityId_)",
-returns = "(integer,string,integer,integer,integer,integer,integer,string,)",
-valuetype = "sortOrder,description,minGroupSize,groupType,championPointsMax,championPointsMin,levelMax,levelMin,name,",},
+returns = "(integer:sortOrder,string:description,integer:minGroupSize,integer:championPointsMax,integer:championPointsMin,integer:levelMax,integer:levelMin,string:name,)",
+valuetype = "integer,string,integer,integer,integer,integer,integer,string,",},

 GetActivityName = {type = "function",
 description = "",
 args = "(*integer* _activityId_)",
-returns = "(string,)",
-valuetype = "name,",},
+returns = "(string:name,)",
+valuetype = "string,",},

 GetActivityType = {type = "function",
 description = "",
-args = "(*integer* _activityId_)",
-returns = "()",
-valuetype = "activity,",},
+args = "(*integer* _activityId_)",},

 GetActivityKeyboardDescriptionTextures = {type = "function",
 description = "",
 args = "(*integer* _activityId_)",
-returns = "(textureName,textureName,)",
-valuetype = "descriptionTextureLargeKeyboard,descriptionTextureSmallKeyboard,",},
+returns = "(textureName:descriptionTextureLargeKeyboard,textureName:descriptionTextureSmallKeyboard,)",
+valuetype = "textureName,textureName,",},

 GetActivityGamepadDescriptionTexture = {type = "function",
 description = "",
 args = "(*integer* _activityId_)",
-returns = "(textureName,)",
-valuetype = "descriptionTextureGamepad,",},
+returns = "(textureName:descriptionTextureGamepad,)",
+valuetype = "textureName,",},

 GetActivityDisplayLevels = {type = "function",
 description = "",
 args = "(*integer* _activityId_)",
-returns = "(integer,integer,integer,integer,)",
-valuetype = "displayChampionPointsMax,displayChampionPointsMin,displayLevelMax,displayLevelMin,",},
+returns = "(integer:displayChampionPointsMax,integer:displayChampionPointsMin,integer:displayLevelMax,integer:displayLevelMin,)",
+valuetype = "integer,integer,integer,integer,",},

 GetActivityGroupType = {type = "function",
 description = "",
-args = "(*integer* _activityId_)",
-returns = "()",
-valuetype = "groupTypeAllowed,",},
+args = "(*integer* _activityId_)",},

 GetActivityBattlegroundId = {type = "function",
 description = "",
 args = "(*integer* _activityId_)",
-returns = "(integer,)",
-valuetype = "battlegroundId,",},
+returns = "(integer:battlegroundId,)",
+valuetype = "integer,",},

 GetNumActivitySetActivities = {type = "function",
 description = "",
 args = "(*integer* _activitySetId_)",
-returns = "(integer,)",
-valuetype = "count,",},
+returns = "(integer:count,)",
+valuetype = "integer,",},

 GetActivitySetActivityIdByIndex = {type = "function",
 description = "",
 args = "(*integer* _activitySetId_, *luaindex* _index_)",
-returns = "(integer,)",
-valuetype = "activityId,",},
+returns = "(integer:activityId,)",
+valuetype = "integer,",},

 GetActivitySetInfo = {type = "function",
 description = "",
 args = "(*integer* _activitySetId_)",
-returns = "(integer,string,string,)",
-valuetype = "sortOrder,description,name,",},
+returns = "(integer:sortOrder,string:description,string:name,)",
+valuetype = "integer,string,string,",},

 GetActivitySetIcon = {type = "function",
 description = "",
 args = "(*integer* _activitySetId_)",
-returns = "(textureName,)",
-valuetype = "icon,",},
+returns = "(textureName:icon,)",
+valuetype = "textureName,",},

 GetActivitySetKeyboardDescriptionTextures = {type = "function",
 description = "",
 args = "(*integer* _activitySetId_)",
-returns = "(textureName,textureName,)",
-valuetype = "descriptionTextureLargeKeyboard,descriptionTextureSmallKeyboard,",},
+returns = "(textureName:descriptionTextureLargeKeyboard,textureName:descriptionTextureSmallKeyboard,)",
+valuetype = "textureName,textureName,",},

 GetActivitySetGamepadDescriptionTexture = {type = "function",
 description = "",
 args = "(*integer* _activitySetId_)",
-returns = "(textureName,)",
-valuetype = "descriptionTextureGamepad,",},
+returns = "(textureName:descriptionTextureGamepad,)",
+valuetype = "textureName,",},

 GetNumActivitiesByType = {type = "function",
 description = "",
 args = "(*[LFGActivity|#LFGActivity]* _activity_)",
-returns = "(integer,)",
-valuetype = "count,",},
+returns = "(integer:count,)",
+valuetype = "integer,",},

 GetActivityIdByTypeAndIndex = {type = "function",
 description = "",
 args = "(*[LFGActivity|#LFGActivity]* _activity_, *luaindex* _index_)",
-returns = "(integer,)",
-valuetype = "activityId,",},
+returns = "(integer:activityId,)",
+valuetype = "integer,",},

 GetActivityTypeAndIndex = {type = "function",
 description = "",
 args = "(*integer* _activityId_)",
-returns = "(luaindex,)",
-valuetype = "index,activity,",},
+returns = "(luaindex:index,)",
+valuetype = "luaindex,",},

 DoesPlayerMeetActivityLevelRequirements = {type = "function",
 description = "",
 args = "(*integer* _activityId_)",
-returns = "(bool,)",
-valuetype = "meetsLevelRequirements,",},
+returns = "(bool:meetsLevelRequirements,)",
+valuetype = "bool,",},

 DoesGroupMeetActivityLevelRequirements = {type = "function",
 description = "",
 args = "(*integer* _activityId_)",
-returns = "(bool,)",
-valuetype = "meetsLevelRequirements,",},
+returns = "(bool:meetsLevelRequirements,)",
+valuetype = "bool,",},

 UpdatePlayerRole = {type = "function",
 description = "",
@@ -24515,32 +24251,32 @@ args = "(*[LFGRole|#LFGRole]* _role_, *bool* _selected_)",},
 GetPlayerRoles = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,bool,bool,)",
-valuetype = "isTank,isHeal,isDPS,",},
+returns = "(bool:isTank,bool:isHeal,bool:isDPS,)",
+valuetype = "bool,bool,bool,",},

 DoesLFGActivityHasAllOption = {type = "function",
 description = "",
 args = "(*[LFGActivity|#LFGActivity]* _activity_)",
-returns = "(bool,)",
-valuetype = "hasAllOption,",},
+returns = "(bool:hasAllOption,)",
+valuetype = "bool,",},

 GetLFGActivityRewardData = {type = "function",
 description = "",
 args = "(*[LFGActivity|#LFGActivity]* _activity_)",
-returns = "(integer,)",
-valuetype = "xpReward,itemRewardType,",},
+returns = "(integer:xpReward,)",
+valuetype = "integer,",},

 IsEligibleForDailyActivityReward = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isEligible,",},
+returns = "(bool:isEligible,)",
+valuetype = "bool,",},

 GetLFGCooldownTimeRemainingSeconds = {type = "function",
 description = "",
 args = "(*[LFGCooldownType|#LFGCooldownType]* _cooldownType_)",
-returns = "(integer,)",
-valuetype = "timeRemainingSeconds,",},
+returns = "(integer:timeRemainingSeconds,)",
+valuetype = "integer,",},

 AddActivityFinderRandomSearchEntry = {type = "function",
 description = "",
@@ -24560,15 +24296,13 @@ args = "()",},

 StartGroupFinderSearch = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "result,",},
+args = "()",},

 CanSendLFMRequest = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "canSendLFMRequest,",},
+returns = "(bool:canSendLFMRequest,)",
+valuetype = "bool,",},

 SendLFMRequest = {type = "function",
 description = "",
@@ -24577,14 +24311,14 @@ args = "()",},
 GetNumActivityRequests = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numRequests,",},
+returns = "(integer:numRequests,)",
+valuetype = "integer,",},

 GetActivityRequestIds = {type = "function",
 description = "",
 args = "(*luaindex* _requestIndex_)",
-returns = "(integer,integer,)",
-valuetype = "activitySetId,activityId,",},
+returns = "(integer:activitySetId,integer:activityId,)",
+valuetype = "integer,integer,",},

 CancelGroupSearches = {type = "function",
 description = "",
@@ -24592,39 +24326,35 @@ args = "()",},

 GetActivityFinderStatus = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "status,",},
+args = "()",},

 IsCurrentlySearchingForGroup = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isSearching,",},
+returns = "(bool:isSearching,)",
+valuetype = "bool,",},

 GetRequiredActivityCollectibleId = {type = "function",
 description = "",
 args = "(*integer* _activityId_)",
-returns = "(integer,)",
-valuetype = "collectibleId,",},
+returns = "(integer:collectibleId,)",
+valuetype = "integer,",},

 GetLFGSearchTimes = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,integer,)",
-valuetype = "estimatedCompletionTimeMs,startTimeMs,",},
+returns = "(integer:estimatedCompletionTimeMs,integer:startTimeMs,)",
+valuetype = "integer,integer,",},

 HasActivityFindReplacementNotification = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "hasfindReplacementNotification,",},
+returns = "(bool:hasfindReplacementNotification,)",
+valuetype = "bool,",},

 GetActivityFindReplacementNotificationInfo = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "activityId,",},
+args = "()",},

 AcceptActivityFindReplacementNotification = {type = "function",
 description = "",
@@ -24637,44 +24367,42 @@ args = "()",},
 GetGroupSizeFromLFGGroupType = {type = "function",
 description = "",
 args = "(*[LFGGroupType|#LFGGroupType]* _groupType_)",
-returns = "(integer,)",
-valuetype = "size,",},
+returns = "(integer:size,)",
+valuetype = "integer,",},

 GetNumActivitySetsByType = {type = "function",
 description = "",
 args = "(*[LFGActivity|#LFGActivity]* _activity_)",
-returns = "(integer,)",
-valuetype = "count,",},
+returns = "(integer:count,)",
+valuetype = "integer,",},

 GetActivitySetIdByTypeAndIndex = {type = "function",
 description = "",
 args = "(*[LFGActivity|#LFGActivity]* _activity_, *luaindex* _index_)",
-returns = "(integer,)",
-valuetype = "activitySetId,",},
+returns = "(integer:activitySetId,)",
+valuetype = "integer,",},

 HasLFGReadyCheckNotification = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "hasReadyCheckNotification,",},
+returns = "(bool:hasReadyCheckNotification,)",
+valuetype = "bool,",},

 HasAcceptedLFGReadyCheck = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "hasAcceptedReadyCheck,",},
+returns = "(bool:hasAcceptedReadyCheck,)",
+valuetype = "bool,",},

 GetLFGReadyCheckNotificationInfo = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "timeRemainingSeconds,playerRole,activityType,",},
+returns = "(integer:timeRemainingSeconds,)",
+valuetype = "integer,",},

 GetLFGReadyCheckActivityType = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "activityType,",},
+args = "()",},

 AcceptLFGReadyCheckNotification = {type = "function",
 description = "",
@@ -24687,32 +24415,32 @@ args = "()",},
 GetLFGReadyCheckCounts = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,integer,integer,integer,integer,integer,)",
-valuetype = "dpsPending,dpsAccepted,healersPending,healersAccepted,tanksPending,tanksAccepted,",},
+returns = "(integer:dpsPending,integer:dpsAccepted,integer:healersPending,integer:healersAccepted,integer:tanksPending,integer:tanksAccepted,)",
+valuetype = "integer,integer,integer,integer,integer,integer,",},

 GetActivityAverageRoleTime = {type = "function",
 description = "",
 args = "(*integer* _activityId_, *[LFGRole|#LFGRole]* _role_)",
-returns = "(integer,bool,)",
-valuetype = "timeSeconds,hasData,",},
+returns = "(integer:timeSeconds,bool:hasData,)",
+valuetype = "integer,bool,",},

 GetCurrentLFGActivityId = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "activityId,",},
+returns = "(integer:activityId,)",
+valuetype = "integer,",},

 GetNumFishingLures = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numLures,",},
+returns = "(integer:numLures,)",
+valuetype = "integer,",},

 GetFishingLureInfo = {type = "function",
 description = "",
 args = "(*luaindex* _lureIndex_)",
-returns = "(integer,integer,textureName,string,)",
-valuetype = "quality,sellPrice,stack,icon,name,",},
+returns = "(integer:sellPrice,integer:stack,textureName:icon,string:name,)",
+valuetype = "integer,integer,textureName,string,",},

 SetFishingLure = {type = "function",
 description = "",
@@ -24720,21 +24448,19 @@ args = "(*luaindex* _lureIndex_)",},

 GetFishingLure = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "lureIndex,",},
+args = "()",},

 GetNumViewableTreasureMaps = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numViewableMaps,",},
+returns = "(integer:numViewableMaps,)",
+valuetype = "integer,",},

 GetTreasureMapInfo = {type = "function",
 description = "",
 args = "(*luaindex* _treasureMapIndex_)",
-returns = "(textureName,string,)",
-valuetype = "imagePath,name,",},
+returns = "(textureName:imagePath,string:name,)",
+valuetype = "textureName,string,",},

 SetFloatingMarkerInfo = {type = "function",
 description = "",
@@ -24747,14 +24473,14 @@ args = "(*number* _alpha_)",},
 GetAgentChatRequestInfo = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,bool,)",
-valuetype = "millisecondsSinceRequest,isChatRequested,",},
+returns = "(integer:millisecondsSinceRequest,bool:isChatRequested,)",
+valuetype = "integer,bool,",},

 IsAgentChatActive = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isActive,",},
+returns = "(bool:isActive,)",
+valuetype = "bool,",},

 AcceptAgentChat = {type = "function",
 description = "",
@@ -24767,218 +24493,206 @@ args = "()",},
 GetNumKillingAttacks = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numKillingAttacks,",},
+returns = "(integer:numKillingAttacks,)",
+valuetype = "integer,",},

 GetKillingAttackInfo = {type = "function",
 description = "",
 args = "(*luaindex* _index_)",
-returns = "(integer,integer,bool,textureName,integer,string,)",
-valuetype = "durationMS,castTimeAgoMS,wasKillingBlow,attackIcon,attackDamage,attackName,",},
+returns = "(integer:durationMS,integer:castTimeAgoMS,bool:wasKillingBlow,textureName:attackIcon,integer:attackDamage,string:attackName,)",
+valuetype = "integer,integer,bool,textureName,integer,string,",},

 DoesKillingAttackHaveAttacker = {type = "function",
 description = "",
 args = "(*luaindex* _index_)",
-returns = "(bool,)",
-valuetype = "hasAttacker,",},
+returns = "(bool:hasAttacker,)",
+valuetype = "bool,",},

 GetKillingAttackerInfo = {type = "function",
 description = "",
 args = "(*luaindex* _index_)",
-returns = "(string,string,bool,bool,integer,integer,integer,string,)",
-valuetype = "attackerDisplayName,minionName,alliance,isBoss,isPlayer,attackerAvARank,attackerLevel,attackerChampionPoints,attackerRawName,",},
+returns = "(string:attackerDisplayName,string:minionName,bool:isBoss,bool:isPlayer,integer:attackerAvARank,integer:attackerLevel,integer:attackerChampionPoints,string:attackerRawName,)",
+valuetype = "string,string,bool,bool,integer,integer,integer,string,",},

 GetKillingAttackerBattlegroundAlliance = {type = "function",
 description = "",
-args = "(*luaindex* _index_)",
-returns = "()",
-valuetype = "battlegroundAlliance,",},
+args = "(*luaindex* _index_)",},

 GetNumDeathRecapHints = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numHints,",},
+returns = "(integer:numHints,)",
+valuetype = "integer,",},

 GetDeathRecapHintInfo = {type = "function",
 description = "",
 args = "(*luaindex* _index_)",
-returns = "(string,)",
-valuetype = "importance,text,",},
+returns = "(string:text,)",
+valuetype = "string,",},

 GetNumTelvarStonesLost = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "telvarStonesLost,",},
+returns = "(integer:telvarStonesLost,)",
+valuetype = "integer,",},

 GetNumDyeableEquipSlots = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numDyeableEquipSlots,",},
+returns = "(integer:numDyeableEquipSlots,)",
+valuetype = "integer,",},

 GetNumDyeableCollectibleCategories = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numDyeableCollectibleCategories,",},
+returns = "(integer:numDyeableCollectibleCategories,)",
+valuetype = "integer,",},

 GetDyeableEquipSlot = {type = "function",
 description = "",
-args = "(*luaindex* _dyeableEquipSlotIndex_)",
-returns = "()",
-valuetype = "dyeableSlot,",},
+args = "(*luaindex* _dyeableEquipSlotIndex_)",},

 GetDyeableCollectibleCategory = {type = "function",
 description = "",
-args = "(*luaindex* _dyeableCollectibleCategoryIndex_)",
-returns = "()",
-valuetype = "dyeableSlot,",},
+args = "(*luaindex* _dyeableCollectibleCategoryIndex_)",},

 GetDyeableEquipSlotGamepadOrder = {type = "function",
 description = "",
 args = "(*luaindex* _dyeableEquipSlotIndex_)",
-returns = "(luaindex,)",
-valuetype = "gamepadOrder,",},
+returns = "(luaindex:gamepadOrder,)",
+valuetype = "luaindex,",},

 GetDyeableCollectibleCategoryGamepadOrder = {type = "function",
 description = "",
 args = "(*luaindex* _dyeableCollectibleCategoryIndex_)",
-returns = "(luaindex,)",
-valuetype = "gamepadOrder,",},
+returns = "(luaindex:gamepadOrder,)",
+valuetype = "luaindex,",},

 GetEquipSlotFromDyeableSlot = {type = "function",
 description = "",
-args = "(*[DyeableSlot|#DyeableSlot]* _dyeableSlot_)",
-returns = "()",
-valuetype = "equipSlot,",},
+args = "(*[DyeableSlot|#DyeableSlot]* _dyeableSlot_)",},

 GetCollectibleCategoryFromDyeableSlot = {type = "function",
 description = "",
-args = "(*[DyeableSlot|#DyeableSlot]* _dyeableSlot_)",
-returns = "()",
-valuetype = "collectibleCategory,",},
+args = "(*[DyeableSlot|#DyeableSlot]* _dyeableSlot_)",},

 IsJusticeEnabled = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isJusticeEnabled,",},
+returns = "(bool:isJusticeEnabled,)",
+valuetype = "bool,",},

 IsJusticeEnabledForZone = {type = "function",
 description = "",
 args = "(*luaindex* _aZoneIndex_)",
-returns = "(bool,)",
-valuetype = "isBountyEnabled,",},
+returns = "(bool:isBountyEnabled,)",
+valuetype = "bool,",},

 IsKillOnSight = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isKillOnSight,",},
+returns = "(bool:isKillOnSight,)",
+valuetype = "bool,",},

 GetInfamy = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "infamy,",},
+returns = "(integer:infamy,)",
+valuetype = "integer,",},

 GetBounty = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "bounty,",},
+returns = "(integer:bounty,)",
+valuetype = "integer,",},

 GetPlayerInfamyData = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,integer,)",
-valuetype = "bounty,heat,",},
+returns = "(integer:bounty,integer:heat,)",
+valuetype = "integer,integer,",},

 GetReducedBountyPayoffAmount = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "payoffAmount,",},
+returns = "(integer:payoffAmount,)",
+valuetype = "integer,",},

 GetFullBountyPayoffAmount = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "payoffAmount,",},
+returns = "(integer:payoffAmount,)",
+valuetype = "integer,",},

 GetInfamyLevel = {type = "function",
 description = "",
-args = "(*integer* _infamyAmount_)",
-returns = "()",
-valuetype = "infamyLevel,",},
+args = "(*integer* _infamyAmount_)",},

 GetInfamyMeterSize = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "meterSize,",},
+returns = "(integer:meterSize,)",
+valuetype = "integer,",},

 GetFenceSellTransactionInfo = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,integer,integer,)",
-valuetype = "resetTimeSeconds,sellsUsed,totalSells,",},
+returns = "(integer:resetTimeSeconds,integer:sellsUsed,integer:totalSells,)",
+valuetype = "integer,integer,integer,",},

 GetFenceLaunderTransactionInfo = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,integer,integer,)",
-valuetype = "resetTimeSeconds,laundersUsed,totalLaunders,",},
+returns = "(integer:resetTimeSeconds,integer:laundersUsed,integer:totalLaunders,)",
+valuetype = "integer,integer,integer,",},

 GetSecondsUntilArrestTimeout = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "secondsUntilArrestTimeout,",},
+returns = "(integer:secondsUntilArrestTimeout,)",
+valuetype = "integer,",},

 IsTrespassing = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isTrespassing,",},
+returns = "(bool:isTrespassing,)",
+valuetype = "bool,",},

 GetTimeToClemencyResetInSeconds = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "timeRemaining,",},
+returns = "(integer:timeRemaining,)",
+valuetype = "integer,",},

 GetTimeToShadowyConnectionsResetInSeconds = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "timeRemaining,",},
+returns = "(integer:timeRemaining,)",
+valuetype = "integer,",},

 IsStuckFixPending = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isStuckFixPending,",},
+returns = "(bool:isStuckFixPending,)",
+valuetype = "bool,",},

 CanUseStuck = {type = "function",
 description = "",
 args = "(*bool* _warn_)",
-returns = "(bool,)",
-valuetype = "canUseStuck,",},
+returns = "(bool:canUseStuck,)",
+valuetype = "bool,",},

 GetTimeUntilStuckAvailable = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "millisecondsUntilAvailable,",},
+returns = "(integer:millisecondsUntilAvailable,)",
+valuetype = "integer,",},

 GetStuckCooldown = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "cooldownRemainingSecs,",},
+returns = "(integer:cooldownRemainingSecs,)",
+valuetype = "integer,",},

 SendPlayerStuck = {type = "function",
 description = "",
@@ -24991,38 +24705,38 @@ args = "()",},
 IsPlayerAllowedToEditHeraldry = {type = "function",
 description = "",
 args = "(*integer* _guildIndex_)",
-returns = "(bool,)",
-valuetype = "allowed,",},
+returns = "(bool:allowed,)",
+valuetype = "bool,",},

 IsCurrentlyCustomizingHeraldry = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "currentlyCustomizing,",},
+returns = "(bool:currentlyCustomizing,)",
+valuetype = "bool,",},

 GetHeraldryCustomizationCosts = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,integer,integer,integer,integer,)",
-valuetype = "crestColorCost,crestStyleCost,backgroundSecondaryColorCost,backgroundPrimaryColorCost,backgroundStyleCost,",},
+returns = "(integer:crestColorCost,integer:crestStyleCost,integer:backgroundSecondaryColorCost,integer:backgroundPrimaryColorCost,integer:backgroundStyleCost,)",
+valuetype = "integer,integer,integer,integer,integer,",},

 IsCreatingHeraldryForFirstTime = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "creatingForFirstTime,",},
+returns = "(bool:creatingForFirstTime,)",
+valuetype = "bool,",},

 HasPendingHeraldryChanges = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "hasPendingChanges,",},
+returns = "(bool:hasPendingChanges,)",
+valuetype = "bool,",},

 GetPendingHeraldryCost = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "pendingCost,",},
+returns = "(integer:pendingCost,)",
+valuetype = "integer,",},

 RevertToSavedHeraldry = {type = "function",
 description = "",
@@ -25035,68 +24749,68 @@ args = "(*luaindex* _backgroundCategoryIndex_, *luaindex* _backgroundStyleIndex_
 GetPendingHeraldryIndices = {type = "function",
 description = "",
 args = "()",
-returns = "(luaindex,luaindex,luaindex,luaindex,luaindex,luaindex,luaindex,)",
-valuetype = "crestColorIndex,crestStyleIndex,crestCategoryIndex,backgroundSecondaryColorIndex,backgroundPrimaryColorIndex,backgroundStyleIndex,backgroundCategoryIndex,",},
+returns = "(luaindex:crestColorIndex,luaindex:crestStyleIndex,luaindex:crestCategoryIndex,luaindex:backgroundSecondaryColorIndex,luaindex:backgroundPrimaryColorIndex,luaindex:backgroundStyleIndex,luaindex:backgroundCategoryIndex,)",
+valuetype = "luaindex,luaindex,luaindex,luaindex,luaindex,luaindex,luaindex,",},

 GetNumHeraldryColors = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numColors,",},
+returns = "(integer:numColors,)",
+valuetype = "integer,",},

 GetHeraldryColorInfo = {type = "function",
 description = "",
 args = "(*luaindex* _colorIndex_)",
-returns = "(integer,number,number,number,string,)",
-valuetype = "sortKey,b,g,r,hueCategory,colorName,",},
+returns = "(integer:sortKey,number:b,number:g,number:r,string:colorName,)",
+valuetype = "integer,number,number,number,string,",},

 GetNumHeraldryBackgroundCategories = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numCategories,",},
+returns = "(integer:numCategories,)",
+valuetype = "integer,",},

 GetHeraldryBackgroundCategoryInfo = {type = "function",
 description = "",
 args = "(*luaindex* _categoryIndex_)",
-returns = "(textureName,string,)",
-valuetype = "icon,categoryName,",},
+returns = "(textureName:icon,string:categoryName,)",
+valuetype = "textureName,string,",},

 GetNumHeraldryBackgroundStyles = {type = "function",
 description = "",
 args = "(*luaindex* _categoryIndex_)",
-returns = "(integer,)",
-valuetype = "numStyles,",},
+returns = "(integer:numStyles,)",
+valuetype = "integer,",},

 GetHeraldryBackgroundStyleInfo = {type = "function",
 description = "",
 args = "(*luaindex* _categoryIndex_, *luaindex* _styleIndex_)",
-returns = "(textureName,string,)",
-valuetype = "icon,styleName,",},
+returns = "(textureName:icon,string:styleName,)",
+valuetype = "textureName,string,",},

 GetNumHeraldryCrestCategories = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numCategories,",},
+returns = "(integer:numCategories,)",
+valuetype = "integer,",},

 GetHeraldryCrestCategoryInfo = {type = "function",
 description = "",
 args = "(*luaindex* _categoryIndex_)",
-returns = "(textureName,string,)",
-valuetype = "icon,categoryName,",},
+returns = "(textureName:icon,string:categoryName,)",
+valuetype = "textureName,string,",},

 GetNumHeraldryCrestStyles = {type = "function",
 description = "",
 args = "(*luaindex* _categoryIndex_)",
-returns = "(integer,)",
-valuetype = "numStyles,",},
+returns = "(integer:numStyles,)",
+valuetype = "integer,",},

 GetHeraldryCrestStyleInfo = {type = "function",
 description = "",
 args = "(*luaindex* _categoryIndex_, *luaindex* _styleIndex_)",
-returns = "(textureName,string,)",
-valuetype = "icon,styleName,",},
+returns = "(textureName:icon,string:styleName,)",
+valuetype = "textureName,string,",},

 StartHeraldryCustomization = {type = "function",
 description = "",
@@ -25108,15 +24822,11 @@ args = "()",},

 GetHeraldryGuildBankedMoney = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "money,",},
+args = "()",},

 GetGamepadTemplate = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "gamepadTemplate,",},
+args = "()",},

 SendAllCachedSettingMessages = {type = "function",
 description = "",
@@ -25125,8 +24835,8 @@ args = "()",},
 GetVibrationInfoFromTrigger = {type = "function",
 description = "",
 args = "(*[GamepadVibrationTrigger|#GamepadVibrationTrigger]* _triggerType_)",
-returns = "(string,bool,number,number,number,number,integer,)",
-valuetype = "debugSourceInfo,foundInfo,rightTriggerMotor,leftTriggerMotor,fineMotor,coarseMotor,durationMS,",},
+returns = "(string:debugSourceInfo,bool:foundInfo,number:rightTriggerMotor,number:leftTriggerMotor,number:fineMotor,number:coarseMotor,integer:durationMS,)",
+valuetype = "string,bool,number,number,number,number,integer,",},

 SetShouldRenderWorld = {type = "function",
 description = "",
@@ -25135,80 +24845,76 @@ args = "(*bool* _shouldRenderWorld_)",},
 GetNumChampionDisciplines = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numDisciplines,",},
+returns = "(integer:numDisciplines,)",
+valuetype = "integer,",},

 GetChampionDisciplineName = {type = "function",
 description = "",
 args = "(*luaindex* _disciplineIndex_)",
-returns = "(string,)",
-valuetype = "name,",},
+returns = "(string:name,)",
+valuetype = "string,",},

 GetChampionDisciplineDescription = {type = "function",
 description = "",
 args = "(*luaindex* _disciplineIndex_)",
-returns = "(string,)",
-valuetype = "description,",},
+returns = "(string:description,)",
+valuetype = "string,",},

 GetChampionDisciplineAttribute = {type = "function",
 description = "",
-args = "(*luaindex* _disciplineIndex_)",
-returns = "()",
-valuetype = "attribute,",},
+args = "(*luaindex* _disciplineIndex_)",},

 GetNumChampionDisciplineSkills = {type = "function",
 description = "",
 args = "(*luaindex* _disciplineIndex_)",
-returns = "(integer,)",
-valuetype = "numSkills,",},
+returns = "(integer:numSkills,)",
+valuetype = "integer,",},

 GetChampionSkillPosition = {type = "function",
 description = "",
 args = "(*luaindex* _disciplineIndex_, *luaindex* _skillIndex_)",
-returns = "(number,number,)",
-valuetype = "normalizedY,normalizedX,",},
+returns = "(number:normalizedY,number:normalizedX,)",
+valuetype = "number,number,",},

 GetChampionSkillName = {type = "function",
 description = "",
 args = "(*luaindex* _disciplineIndex_, *luaindex* _skillIndex_)",
-returns = "(string,)",
-valuetype = "skillName,",},
+returns = "(string:skillName,)",
+valuetype = "string,",},

 GetMaxPossiblePointsInChampionSkill = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "maxPossiblePoints,",},
+returns = "(integer:maxPossiblePoints,)",
+valuetype = "integer,",},

 GetNumPointsSpentOnChampionSkill = {type = "function",
 description = "",
 args = "(*luaindex* _disciplineIndex_, *luaindex* _skillIndex_)",
-returns = "(integer,)",
-valuetype = "numSpentPoints,",},
+returns = "(integer:numSpentPoints,)",
+valuetype = "integer,",},

 GetNumPointsSpentInChampionDiscipline = {type = "function",
 description = "",
 args = "(*luaindex* _disciplineIndex_)",
-returns = "(integer,)",
-valuetype = "numSpentPoints,",},
+returns = "(integer:numSpentPoints,)",
+valuetype = "integer,",},

 GetChampionSkillUnlockLevel = {type = "function",
 description = "",
-args = "(*luaindex* _disciplineIndex_, *luaindex* _skillIndex_)",
-returns = "()",
-valuetype = "autoGrantLevel,",},
+args = "(*luaindex* _disciplineIndex_, *luaindex* _skillIndex_)",},

 GetNumSpentChampionPoints = {type = "function",
 description = "",
 args = "(*[Attributes|#Attributes]* _attribute_)",
-returns = "(integer,)",
-valuetype = "numSpentPoints,",},
+returns = "(integer:numSpentPoints,)",
+valuetype = "integer,",},

 GetNumUnspentChampionPoints = {type = "function",
 description = "",
 args = "(*[Attributes|#Attributes]* _attribute_)",
-returns = "(integer,)",
-valuetype = "numUnspentPoints,",},
+returns = "(integer:numUnspentPoints,)",
+valuetype = "integer,",},

 ClearPendingChampionPoints = {type = "function",
 description = "",
@@ -25217,8 +24923,8 @@ args = "()",},
 GetNumPendingChampionPoints = {type = "function",
 description = "",
 args = "(*luaindex* _disciplineIndex_, *luaindex* _skillIndex_)",
-returns = "(integer,)",
-valuetype = "numPendingPoints,",},
+returns = "(integer:numPendingPoints,)",
+valuetype = "integer,",},

 SetNumPendingChampionPoints = {type = "function",
 description = "",
@@ -25227,14 +24933,14 @@ args = "(*luaindex* _disciplineIndex_, *luaindex* _skillIndex_, *integer* _numPe
 HasAvailableChampionPointsInAttribute = {type = "function",
 description = "",
 args = "(*[Attributes|#Attributes]* _attribute_)",
-returns = "(bool,)",
-valuetype = "hasPoints,",},
+returns = "(bool:hasPoints,)",
+valuetype = "bool,",},

 WillChampionSkillBeUnlocked = {type = "function",
 description = "",
 args = "(*luaindex* _disciplineIndex_, *luaindex* _skillIndex_)",
-returns = "(bool,)",
-valuetype = "willBeUnlocked,",},
+returns = "(bool:willBeUnlocked,)",
+valuetype = "bool,",},

 SetChampionIsInRespecMode = {type = "function",
 description = "",
@@ -25243,20 +24949,20 @@ args = "(*bool* _isInRespecMode_)",},
 IsChampionInRespecMode = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isInRespecMode,",},
+returns = "(bool:isInRespecMode,)",
+valuetype = "bool,",},

 IsChampionRespecNeeded = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "needsRespec,",},
+returns = "(bool:needsRespec,)",
+valuetype = "bool,",},

 SpendPendingChampionPoints = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "requested,",},
+returns = "(bool:requested,)",
+valuetype = "bool,",},

 SetChampionMusicActive = {type = "function",
 description = "",
@@ -25265,56 +24971,54 @@ args = "(*bool* _active_)",},
 GetChampionAbilityDescription = {type = "function",
 description = "",
 args = "(*integer* _abilityId_, *integer* _numPendingPoints_)",
-returns = "(string,)",
-valuetype = "description,",},
+returns = "(string:description,)",
+valuetype = "string,",},

 GetChampionAbilityId = {type = "function",
 description = "",
 args = "(*luaindex* _disciplineIndex_, *luaindex* _skillIndex_)",
-returns = "(integer,)",
-valuetype = "abilityId,",},
+returns = "(integer:abilityId,)",
+valuetype = "integer,",},

 GetChampionRespecCost = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "cost,",},
+returns = "(integer:cost,)",
+valuetype = "integer,",},

 GetChampionPointAttributeForRank = {type = "function",
 description = "",
-args = "(*integer* _rank_)",
-returns = "()",
-valuetype = "pointAttribute,",},
+args = "(*integer* _rank_)",},

 IsChampionSystemUnlocked = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "unlocked,",},
+returns = "(bool:unlocked,)",
+valuetype = "bool,",},

 AreChampionPointsActive = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "activeReason,active,",},
+returns = "(bool:active,)",
+valuetype = "bool,",},

 GetNumDefaultQuickChats = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numQuickChats,",},
+returns = "(integer:numQuickChats,)",
+valuetype = "integer,",},

 GetDefaultQuickChatName = {type = "function",
 description = "",
 args = "(*luaindex* _index_)",
-returns = "(string,)",
-valuetype = "name,",},
+returns = "(string:name,)",
+valuetype = "string,",},

 GetDefaultQuickChatMessage = {type = "function",
 description = "",
 args = "(*luaindex* _index_)",
-returns = "(string,)",
-valuetype = "message,",},
+returns = "(string:message,)",
+valuetype = "string,",},

 PlayDefaultQuickChat = {type = "function",
 description = "",
@@ -25331,8 +25035,8 @@ args = "(*object* _timeline_, *number* _offsetY_)",},
 ZoUTF8StringLength = {type = "function",
 description = "",
 args = "(*string* _string_)",
-returns = "(integer,)",
-valuetype = "length,",},
+returns = "(integer:length,)",
+valuetype = "integer,",},

 ResetSCTDataToDefaults = {type = "function",
 description = "",
@@ -25341,8 +25045,8 @@ args = "()",},
 GetSCTKeyboardFont = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "fontStyle,fontName,",},
+returns = "(string:fontName,)",
+valuetype = "string,",},

 SetSCTKeyboardFont = {type = "function",
 description = "",
@@ -25351,8 +25055,8 @@ args = "(*string* _fontName_, *[FontStyle|#FontStyle]* _fontStyle_)",},
 GetSCTGamepadFont = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "fontStyle,fontName,",},
+returns = "(string:fontName,)",
+valuetype = "string,",},

 SetSCTGamepadFont = {type = "function",
 description = "",
@@ -25361,8 +25065,8 @@ args = "(*string* _fontName_, *[FontStyle|#FontStyle]* _fontStyle_)",},
 GetSCTEventVisualInfoId = {type = "function",
 description = "",
 args = "(*[SCTEventType|#SCTEventType]* _eventType_)",
-returns = "(integer,)",
-valuetype = "SCTEventVisualInfoId,",},
+returns = "(integer:SCTEventVisualInfoId,)",
+valuetype = "integer,",},

 SetSCTEventVisualInfo = {type = "function",
 description = "",
@@ -25371,20 +25075,20 @@ args = "(*[SCTEventType|#SCTEventType]* _eventType_, *integer* _SCTEventVisualIn
 GetNumSCTSlots = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numSlots,",},
+returns = "(integer:numSlots,)",
+valuetype = "integer,",},

 CreateNewSCTSlot = {type = "function",
 description = "",
 args = "()",
-returns = "(luaindex,)",
-valuetype = "slotIndex,",},
+returns = "(luaindex:slotIndex,)",
+valuetype = "luaindex,",},

 GetSCTSlotPosition = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(number,number,number,number,)",
-valuetype = "cameraOffsetUp,cameraOffsetRight,UIOffsetY,UIOffsetX,anchorPoint,SCTAnchorType,",},
+returns = "(number:cameraOffsetUp,number:cameraOffsetRight,number:UIOffsetY,number:UIOffsetX,)",
+valuetype = "number,number,number,number,",},

 SetSCTSlotPosition = {type = "function",
 description = "",
@@ -25393,8 +25097,8 @@ args = "(*luaindex* _slotIndex_, *[SCTUnitAnchorType|#SCTUnitAnchorType]* _SCTAn
 GetSCTSlotZoomedInPosition = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(number,number,number,)",
-valuetype = "zoomedInUIOffsetY,zoomedInUIOffsetX,zoomedInCameraDistanceThreshold,",},
+returns = "(number:zoomedInUIOffsetY,number:zoomedInUIOffsetX,number:zoomedInCameraDistanceThreshold,)",
+valuetype = "number,number,number,",},

 SetSCTSlotZoomedInPosition = {type = "function",
 description = "",
@@ -25403,8 +25107,8 @@ args = "(*luaindex* _slotIndex_, *number* _zoomedInCameraDistanceThreshold_, *nu
 GetSCTSlotClamping = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(number,number,)",
-valuetype = "bottomEdgeUIOffsetBuffer,topEdgeUIOffsetBuffer,",},
+returns = "(number:bottomEdgeUIOffsetBuffer,number:topEdgeUIOffsetBuffer,)",
+valuetype = "number,number,",},

 SetSCTSlotClamping = {type = "function",
 description = "",
@@ -25413,8 +25117,8 @@ args = "(*luaindex* _slotIndex_, *number* _topEdgeUIOffsetBuffer_, *number* _bot
 GetSCTSlotAnimationTimeline = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(string,)",
-valuetype = "animationTimelineName,",},
+returns = "(string:animationTimelineName,)",
+valuetype = "string,",},

 SetSCTSlotAnimationTimeline = {type = "function",
 description = "",
@@ -25423,8 +25127,8 @@ args = "(*luaindex* _slotIndex_, *string* _animationTimelineName_)",},
 GetSCTSlotAnimationMinimumSpacing = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(integer,)",
-valuetype = "minSpacingMS,",},
+returns = "(integer:minSpacingMS,)",
+valuetype = "integer,",},

 SetSCTSlotAnimationMinimumSpacing = {type = "function",
 description = "",
@@ -25433,8 +25137,8 @@ args = "(*luaindex* _slotIndex_, *integer* _minSpacingMS_)",},
 IsSCTSlotEventTypeShown = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_, *[SCTEventType|#SCTEventType]* _eventType_)",
-returns = "(bool,)",
-valuetype = "isShown,",},
+returns = "(bool:isShown,)",
+valuetype = "bool,",},

 SetSCTSlotEventTypeShown = {type = "function",
 description = "",
@@ -25443,8 +25147,8 @@ args = "(*luaindex* _slotIndex_, *[SCTEventType|#SCTEventType]* _eventType_, *bo
 DoesSCTSlotAllowTargetType = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_, *[SCTUnitType|#SCTUnitType]* _targetType_)",
-returns = "(bool,)",
-valuetype = "allowed,",},
+returns = "(bool:allowed,)",
+valuetype = "bool,",},

 AddSCTSlotAllowedTargetType = {type = "function",
 description = "",
@@ -25457,8 +25161,8 @@ args = "(*luaindex* _slotIndex_)",},
 DoesSCTSlotExcludeTargetType = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_, *[SCTUnitType|#SCTUnitType]* _targetType_)",
-returns = "(bool,)",
-valuetype = "allowed,",},
+returns = "(bool:allowed,)",
+valuetype = "bool,",},

 AddSCTSlotExcludedTargetType = {type = "function",
 description = "",
@@ -25471,8 +25175,8 @@ args = "(*luaindex* _slotIndex_)",},
 DoesSCTSlotAllowSourceType = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_, *[SCTUnitType|#SCTUnitType]* _targetType_)",
-returns = "(bool,)",
-valuetype = "allowed,",},
+returns = "(bool:allowed,)",
+valuetype = "bool,",},

 AddSCTSlotAllowedSourceType = {type = "function",
 description = "",
@@ -25485,8 +25189,8 @@ args = "(*luaindex* _slotIndex_)",},
 DoesSCTSlotExcludeSourceType = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_, *[SCTUnitType|#SCTUnitType]* _targetType_)",
-returns = "(bool,)",
-valuetype = "allowed,",},
+returns = "(bool:allowed,)",
+valuetype = "bool,",},

 AddSCTSlotExcludedSourceType = {type = "function",
 description = "",
@@ -25499,8 +25203,8 @@ args = "(*luaindex* _slotIndex_)",},
 GetSCTSlotTargetReputationTypes = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(bool,bool,bool,)",
-valuetype = "showForEnemy,showForNeutral,showForFriendly,",},
+returns = "(bool:showForEnemy,bool:showForNeutral,bool:showForFriendly,)",
+valuetype = "bool,bool,bool,",},

 SetSCTSlotTargetReputationTypes = {type = "function",
 description = "",
@@ -25509,8 +25213,8 @@ args = "(*luaindex* _slotIndex_, *bool* _showForFriendly_, *bool* _showForNeutra
 GetSCTSlotSourceReputationTypes = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(bool,bool,bool,)",
-valuetype = "showForEnemy,showForNeutral,showForFriendly,",},
+returns = "(bool:showForEnemy,bool:showForNeutral,bool:showForFriendly,)",
+valuetype = "bool,bool,bool,",},

 SetSCTSlotSourceReputationTypes = {type = "function",
 description = "",
@@ -25519,8 +25223,8 @@ args = "(*luaindex* _slotIndex_, *bool* _showForFriendly_, *bool* _showForNeutra
 GetSCTSlotEventControlScales = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(number,number,)",
-valuetype = "critScale,defaultScale,",},
+returns = "(number:critScale,number:defaultScale,)",
+valuetype = "number,number,",},

 SetSCTSlotEventControlScales = {type = "function",
 description = "",
@@ -25529,8 +25233,8 @@ args = "(*luaindex* _slotIndex_, *number* _defaultScale_, *number* _critScale_)"
 GetSCTSlotKeyboardCloudId = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(integer,)",
-valuetype = "SCTCloudId,",},
+returns = "(integer:SCTCloudId,)",
+valuetype = "integer,",},

 SetSCTSlotKeyboardCloud = {type = "function",
 description = "",
@@ -25539,8 +25243,8 @@ args = "(*luaindex* _slotIndex_, *integer* _SCTCloudId_)",},
 GetSCTSlotGamepadCloudId = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_)",
-returns = "(integer,)",
-valuetype = "SCTCloudId,",},
+returns = "(integer:SCTCloudId,)",
+valuetype = "integer,",},

 SetSCTSlotGamepadCloud = {type = "function",
 description = "",
@@ -25549,14 +25253,14 @@ args = "(*luaindex* _slotIndex_, *integer* _SCTCloudId_)",},
 CreateNewSCTEventVisualInfo = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "SCTEventVisualInfoId,",},
+returns = "(integer:SCTEventVisualInfoId,)",
+valuetype = "integer,",},

 GetSCTSlotEventVisualInfo = {type = "function",
 description = "",
 args = "(*luaindex* _slotIndex_, *[SCTEventType|#SCTEventType]* _eventType_)",
-returns = "(integer,)",
-valuetype = "SCTEventVisualInfoId,",},
+returns = "(integer:SCTEventVisualInfoId,)",
+valuetype = "integer,",},

 SetSCTSlotEventVisualInfo = {type = "function",
 description = "",
@@ -25565,8 +25269,8 @@ args = "(*luaindex* _slotIndex_, *[SCTEventType|#SCTEventType]* _eventType_, *in
 GetSCTEventVisualInfoTextFormat = {type = "function",
 description = "",
 args = "(*integer* _SCTEventVisualInfoId_, *[SCTEventTextType|#SCTEventTextType]* _textType_)",
-returns = "(bool,string,)",
-valuetype = "enabled,format,",},
+returns = "(bool:enabled,string:format,)",
+valuetype = "bool,string,",},

 SetSCTEventVisualInfoTextFormat = {type = "function",
 description = "",
@@ -25575,8 +25279,8 @@ args = "(*integer* _SCTEventVisualInfoId_, *[SCTEventTextType|#SCTEventTextType]
 GetSCTEventVisualInfoTextFontSizes = {type = "function",
 description = "",
 args = "(*integer* _SCTEventVisualInfoId_, *[SCTEventTextType|#SCTEventTextType]* _textType_)",
-returns = "(bool,integer,integer,)",
-valuetype = "enabled,gamepadFontSize,keyboardFontSize,",},
+returns = "(bool:enabled,integer:gamepadFontSize,integer:keyboardFontSize,)",
+valuetype = "bool,integer,integer,",},

 SetSCTEventVisualInfoTextFontSizes = {type = "function",
 description = "",
@@ -25585,8 +25289,8 @@ args = "(*integer* _SCTEventVisualInfoId_, *[SCTEventTextType|#SCTEventTextType]
 GetSCTEventVisualInfoTextColor = {type = "function",
 description = "",
 args = "(*integer* _SCTEventVisualInfoId_, *[SCTEventTextType|#SCTEventTextType]* _textType_)",
-returns = "(bool,number,number,number,)",
-valuetype = "enabled,b,g,r,",},
+returns = "(bool:enabled,number:b,number:g,number:r,)",
+valuetype = "bool,number,number,number,",},

 SetSCTEventVisualInfoTextColor = {type = "function",
 description = "",
@@ -25595,8 +25299,8 @@ args = "(*integer* _SCTEventVisualInfoId_, *[SCTEventTextType|#SCTEventTextType]
 GetSCTEventVisualInfoHideWhenValueIsZero = {type = "function",
 description = "",
 args = "(*integer* _SCTEventVisualInfoId_)",
-returns = "(bool,bool,)",
-valuetype = "enabled,hideWhenValueIsZero,",},
+returns = "(bool:enabled,bool:hideWhenValueIsZero,)",
+valuetype = "bool,bool,",},

 SetSCTEventVisualInfoHideWhenValueIsZero = {type = "function",
 description = "",
@@ -25605,8 +25309,8 @@ args = "(*integer* _SCTEventVisualInfoId_, *bool* _hideWhenValueIsZero_)",},
 CreateNewSCTCloud = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "SCTCloudId,",},
+returns = "(integer:SCTCloudId,)",
+valuetype = "integer,",},

 GetNumSCTCloudOffsets = {type = "function",
 description = "",
@@ -25627,8 +25331,8 @@ args = "(*integer* _SCTCloudId_)",},
 GetSCTCloudAnimationOverlapPercent = {type = "function",
 description = "",
 args = "(*integer* _SCTCloudId_)",
-returns = "(number,)",
-valuetype = "animationOverlapPercent,",},
+returns = "(number:animationOverlapPercent,)",
+valuetype = "number,",},

 SetSCTCloudAnimationOverlapPercent = {type = "function",
 description = "",
@@ -25681,14 +25385,12 @@ args = "(*integer* _particleEffectId_)",},
 GetActiveUserEmailAddress = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "emailAddress,",},
+returns = "(string:emailAddress,)",
+valuetype = "string,",},

 GetCurrentZoneDungeonDifficulty = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "isVeteranDifficulty,",},
+args = "()",},

 CopyHousePermissions = {type = "function",
 description = "",
@@ -25697,32 +25399,32 @@ args = "(*integer* _sourceHouseId_, *integer* _destinationHouseId_)",},
 GetNumHousingPermissions = {type = "function",
 description = "",
 args = "(*integer* _houseId_, *[HousePermissionUserGroup|#HousePermissionUserGroup]* _permissionCategory_)",
-returns = "(integer,)",
-valuetype = "numPermissions,",},
+returns = "(integer:numPermissions,)",
+valuetype = "integer,",},

 DoesHousingUserGroupHaveAccess = {type = "function",
 description = "",
 args = "(*integer* _houseId_, *[HousePermissionUserGroup|#HousePermissionUserGroup]* _permissionCategory_, *luaindex* _index_)",
-returns = "(bool,)",
-valuetype = "hasAccess,",},
+returns = "(bool:hasAccess,)",
+valuetype = "bool,",},

 IsHousingPermissionEnabled = {type = "function",
 description = "",
 args = "(*integer* _houseId_, *[HousePermissionUserGroup|#HousePermissionUserGroup]* _permissionCategory_, *luaindex* _index_, *[HousePermissionSetting|#HousePermissionSetting]* _setting_)",
-returns = "(bool,)",
-valuetype = "isPermissionEnabled,",},
+returns = "(bool:isPermissionEnabled,)",
+valuetype = "bool,",},

 IsHousingPermissionMarkedForDelete = {type = "function",
 description = "",
 args = "(*integer* _houseId_, *[HousePermissionUserGroup|#HousePermissionUserGroup]* _permissionCategory_, *luaindex* _index_)",
-returns = "(bool,)",
-valuetype = "isMarkedForDelete,",},
+returns = "(bool:isMarkedForDelete,)",
+valuetype = "bool,",},

 GetHousingUserGroupDisplayName = {type = "function",
 description = "",
 args = "(*integer* _houseId_, *[HousePermissionUserGroup|#HousePermissionUserGroup]* _permissionCategory_, *luaindex* _index_)",
-returns = "(string,)",
-valuetype = "displayName,",},
+returns = "(string:displayName,)",
+valuetype = "string,",},

 SetHousingPermissionPreset = {type = "function",
 description = "",
@@ -25738,9 +25440,7 @@ args = "(*integer* _houseId_, *[HousePermissionUserGroup|#HousePermissionUserGro

 GetHousingPermissionPresetType = {type = "function",
 description = "",
-args = "(*integer* _houseId_, *[HousePermissionUserGroup|#HousePermissionUserGroup]* _permissionCategory_, *luaindex* _index_)",
-returns = "()",
-valuetype = "preset,",},
+args = "(*integer* _houseId_, *[HousePermissionUserGroup|#HousePermissionUserGroup]* _permissionCategory_, *luaindex* _index_)",},

 SetHousingPrimaryHouse = {type = "function",
 description = "",
@@ -25749,110 +25449,108 @@ args = "(*integer* _houseId_)",},
 GetHousingPrimaryHouse = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "houseId,",},
+returns = "(integer:houseId,)",
+valuetype = "integer,",},

 GetCurrentZoneHouseId = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "houseId,",},
+returns = "(integer:houseId,)",
+valuetype = "integer,",},

 GetCurrentHousePopulationCap = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "popCap,",},
+returns = "(integer:popCap,)",
+valuetype = "integer,",},

 GetCollectibleIdForHouse = {type = "function",
 description = "",
 args = "(*integer* _houseId_)",
-returns = "(integer,)",
-valuetype = "collectibleId,",},
+returns = "(integer:collectibleId,)",
+valuetype = "integer,",},

 GetNumFurnitureCategories = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numCategories,",},
+returns = "(integer:numCategories,)",
+valuetype = "integer,",},

 GetFurnitureCategoryId = {type = "function",
 description = "",
 args = "(*luaindex* _categoryIndex_)",
-returns = "(integer,)",
-valuetype = "categoryId,",},
+returns = "(integer:categoryId,)",
+valuetype = "integer,",},

 GetNumFurnitureSubcategories = {type = "function",
 description = "",
 args = "(*luaindex* _categoryIndex_)",
-returns = "(integer,)",
-valuetype = "numSubcategories,",},
+returns = "(integer:numSubcategories,)",
+valuetype = "integer,",},

 GetFurnitureSubcategoryId = {type = "function",
 description = "",
 args = "(*luaindex* _categoryIndex_, *luaindex* _subcategoryIndex_)",
-returns = "(integer,)",
-valuetype = "subcategoryId,",},
+returns = "(integer:subcategoryId,)",
+valuetype = "integer,",},

 GetFurnitureCategoryInfo = {type = "function",
 description = "",
 args = "(*integer* _furnitureCategoryId_)",
-returns = "(bool,string,)",
-valuetype = "availableInTradingHouse,parentCategoryId,displayName,",},
+returns = "(bool:availableInTradingHouse,string:displayName,)",
+valuetype = "bool,string,",},

 GetFurnitureCategoryKeyboardIcons = {type = "function",
 description = "",
 args = "(*integer* _furnitureCategoryId_)",
-returns = "(textureName,textureName,textureName,)",
-valuetype = "mouseoverIcon,pressedIcon,normalIcon,",},
+returns = "(textureName:mouseoverIcon,textureName:pressedIcon,textureName:normalIcon,)",
+valuetype = "textureName,textureName,textureName,",},

 GetFurnitureCategoryGamepadIcon = {type = "function",
 description = "",
 args = "(*integer* _furnitureCategoryId_)",
-returns = "(textureName,)",
-valuetype = "gamepadIcon,",},
+returns = "(textureName:gamepadIcon,)",
+valuetype = "textureName,",},

 GetHouseZoneId = {type = "function",
 description = "",
 args = "(*integer* _houseId_)",
-returns = "(integer,)",
-valuetype = "zoneId,",},
+returns = "(integer:zoneId,)",
+valuetype = "integer,",},

 GetHouseFoundInZoneId = {type = "function",
 description = "",
 args = "(*integer* _houseId_)",
-returns = "(integer,)",
-valuetype = "zoneId,",},
+returns = "(integer:zoneId,)",
+valuetype = "integer,",},

 GetHouseCategoryType = {type = "function",
 description = "",
-args = "(*integer* _houseId_)",
-returns = "()",
-valuetype = "houseType,",},
+args = "(*integer* _houseId_)",},

 GetHousePreviewBackgroundImage = {type = "function",
 description = "",
 args = "(*integer* _houseId_)",
-returns = "(textureName,)",
-valuetype = "previewBackgroundFileIndex,",},
+returns = "(textureName:previewBackgroundFileIndex,)",
+valuetype = "textureName,",},

 GetNumHouseTemplatesForHouse = {type = "function",
 description = "",
 args = "(*integer* _houseId_)",
-returns = "(integer,)",
-valuetype = "numHouseTemplates,",},
+returns = "(integer:numHouseTemplates,)",
+valuetype = "integer,",},

 GetHouseTemplateIdByIndexForHouse = {type = "function",
 description = "",
 args = "(*integer* _houseId_, *luaindex* _houseTemplateIndex_)",
-returns = "(integer,)",
-valuetype = "houseTemplateId,",},
+returns = "(integer:houseTemplateId,)",
+valuetype = "integer,",},

 IsPrimaryHouse = {type = "function",
 description = "",
 args = "(*integer* _houseId_)",
-returns = "(bool,)",
-valuetype = "isPrimaryHouse,",},
+returns = "(bool:isPrimaryHouse,)",
+valuetype = "bool,",},

 HousingEditorToggleSurfaceDragMode = {type = "function",
 description = "",
@@ -25861,98 +25559,78 @@ args = "()",},
 HousingEditorIsSurfaceDragModeEnabled = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "enabled,",},
+returns = "(bool:enabled,)",
+valuetype = "bool,",},

 HousingEditorRequestSelectedPlacement = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "result,",},
+args = "()",},

 HousingEditorRequestItemPlacement = {type = "function",
 description = "",
-args = "(*[Bag|#Bag]* _bagId_, *integer* _slotIndex_, *integer* _worldX_, *integer* _worldY_, *integer* _worldZ_, *number* _pitchRadians_, *number* _yawRadians_, *number* _rollRadians_)",
-returns = "()",
-valuetype = "result,",},
+args = "(*[Bag|#Bag]* _bagId_, *integer* _slotIndex_, *integer* _worldX_, *integer* _worldY_, *integer* _worldZ_, *number* _pitchRadians_, *number* _yawRadians_, *number* _rollRadians_)",},

 HousingEditorRequestCollectiblePlacement = {type = "function",
 description = "",
-args = "(*integer* _collectibleId_, *integer* _worldX_, *integer* _worldY_, *integer* _worldZ_, *number* _pitchRadians_, *number* _yawRadians_, *number* _rollRadians_)",
-returns = "()",
-valuetype = "result,",},
+args = "(*integer* _collectibleId_, *integer* _worldX_, *integer* _worldY_, *integer* _worldZ_, *number* _pitchRadians_, *number* _yawRadians_, *number* _rollRadians_)",},

 HousingEditorRequestChangePositionAndOrientation = {type = "function",
 description = "",
-args = "(*id64* _furnitureId_, *integer* _worldX_, *integer* _worldY_, *integer* _worldZ_, *number* _pitchRadians_, *number* _yawRadians_, *number* _rollRadians_)",
-returns = "()",
-valuetype = "result,",},
+args = "(*id64* _furnitureId_, *integer* _worldX_, *integer* _worldY_, *integer* _worldZ_, *number* _pitchRadians_, *number* _yawRadians_, *number* _rollRadians_)",},

 HousingEditorRequestChangePosition = {type = "function",
 description = "",
-args = "(*id64* _furnitureId_, *integer* _worldX_, *integer* _worldY_, *integer* _worldZ_)",
-returns = "()",
-valuetype = "result,",},
+args = "(*id64* _furnitureId_, *integer* _worldX_, *integer* _worldY_, *integer* _worldZ_)",},

 HousingEditorRequestChangeOrientation = {type = "function",
 description = "",
-args = "(*id64* _furnitureId_, *number* _pitchRadians_, *number* _yawRadians_, *number* _rollRadians_)",
-returns = "()",
-valuetype = "result,",},
+args = "(*id64* _furnitureId_, *number* _pitchRadians_, *number* _yawRadians_, *number* _rollRadians_)",},

 HousingEditorGetFurnitureWorldPosition = {type = "function",
 description = "",
 args = "(*id64* _furnitureId_)",
-returns = "(integer,integer,integer,)",
-valuetype = "worldZ,worldY,worldX,",},
+returns = "(integer:worldZ,integer:worldY,integer:worldX,)",
+valuetype = "integer,integer,integer,",},

 HousingEditorGetFurnitureWorldBounds = {type = "function",
 description = "",
 args = "(*id64* _furnitureId_)",
-returns = "(integer,integer,integer,integer,integer,integer,)",
-valuetype = "maxWorldZ,maxWorldY,maxWorldX,minWorldZ,minWorldY,minWorldX,",},
+returns = "(integer:maxWorldZ,integer:maxWorldY,integer:maxWorldX,integer:minWorldZ,integer:minWorldY,integer:minWorldX,)",
+valuetype = "integer,integer,integer,integer,integer,integer,",},

 HousingEditorGetFurnitureLocalBounds = {type = "function",
 description = "",
 args = "(*id64* _furnitureId_)",
-returns = "(number,number,number,number,number,number,)",
-valuetype = "maxLocalZ,maxLocalY,maxLocalX,minLocalZ,minLocalY,minLocalX,",},
+returns = "(number:maxLocalZ,number:maxLocalY,number:maxLocalX,number:minLocalZ,number:minLocalY,number:minLocalX,)",
+valuetype = "number,number,number,number,number,number,",},

 HousingEditorGetFurnitureOrientation = {type = "function",
 description = "",
 args = "(*id64* _furnitureId_)",
-returns = "(number,number,number,)",
-valuetype = "rollRadians,yawRadians,pitchRadians,",},
+returns = "(number:rollRadians,number:yawRadians,number:pitchRadians,)",
+valuetype = "number,number,number,",},

 HousingEditorRequestRemoveSelectedFurniture = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "result,",},
+args = "()",},

 HousingEditorRequestRemoveFurniture = {type = "function",
 description = "",
-args = "(*id64* _furnitureId_)",
-returns = "()",
-valuetype = "result,",},
+args = "(*id64* _furnitureId_)",},

 HousingEditorGetSelectedFurnitureId = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "furnitureId,",},
+args = "()",},

 HousingEditorGetSelectedFurnitureStackCount = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "stackCount,",},
+returns = "(integer:stackCount,)",
+valuetype = "integer,",},

 HousingEditorSelectFurnitureById = {type = "function",
 description = "",
-args = "(*id64* _furnitureId_)",
-returns = "()",
-valuetype = "result,",},
+args = "(*id64* _furnitureId_)",},

 HousingEditorRotateFurniture = {type = "function",
 description = "",
@@ -25969,20 +25647,20 @@ args = "()",},
 HousingEditorCreateItemFurnitureForPlacement = {type = "function",
 description = "",
 args = "(*[Bag|#Bag]* _bagId_, *integer* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "success,",},
+returns = "(bool:success,)",
+valuetype = "bool,",},

 HousingEditorCreateCollectibleFurnitureForPlacement = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_)",
-returns = "(bool,)",
-valuetype = "success,",},
+returns = "(bool:success,)",
+valuetype = "bool,",},

 HousingEditorCreateFurnitureForPlacementFromMarketProduct = {type = "function",
 description = "",
 args = "(*integer* _marketProductId_)",
-returns = "(bool,)",
-valuetype = "success,",},
+returns = "(bool:success,)",
+valuetype = "bool,",},

 HousingEditorEndCurrentPreview = {type = "function",
 description = "",
@@ -25990,57 +25668,45 @@ args = "()",},

 HousingEditorSelectTargettedFurniture = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "result,",},
+args = "()",},

 HousingEditorCanSelectTargettedFurniture = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "hasTarget,",},
+returns = "(bool:hasTarget,)",
+valuetype = "bool,",},

 HousingEditorRequestModeChange = {type = "function",
 description = "",
-args = "(*[HousingEditorMode|#HousingEditorMode]* _mode_)",
-returns = "()",
-valuetype = "result,",},
+args = "(*[HousingEditorMode|#HousingEditorMode]* _mode_)",},

 GetHousingEditorMode = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "mode,",},
+args = "()",},

 GetHousingVisitorRole = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "role,",},
+args = "()",},

 GetNextPlacedHousingFurnitureId = {type = "function",
 description = "",
-args = "(*id64:nilable* _lastFurnitureId_)",
-returns = "()",
-valuetype = "nextFurnitureId,",},
+args = "(*id64:nilable* _lastFurnitureId_)",},

 GetPlacedHousingFurnitureInfo = {type = "function",
 description = "",
 args = "(*id64* _furnitureId_)",
-returns = "(integer,textureName,string,)",
-valuetype = "furnitureDataId,icon,itemName,",},
+returns = "(integer:furnitureDataId,textureName:icon,string:itemName,)",
+valuetype = "integer,textureName,string,",},

 GetPlacedHousingFurnitureQuality = {type = "function",
 description = "",
-args = "(*id64* _furnitureId_)",
-returns = "()",
-valuetype = "quality,",},
+args = "(*id64* _furnitureId_)",},

 HousingEditorCanPlaceCollectible = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_)",
-returns = "(bool,)",
-valuetype = "success,",},
+returns = "(bool:success,)",
+valuetype = "bool,",},

 HousingEditorJumpToSafeLocation = {type = "function",
 description = "",
@@ -26049,8 +25715,8 @@ args = "()",},
 GetHousingEditorConstants = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,number,number,)",
-valuetype = "numTicksPerSecondForRotationChange,rotationStepSizeRadians,pushSpeedPerSecond,",},
+returns = "(integer:numTicksPerSecondForRotationChange,number:rotationStepSizeRadians,number:pushSpeedPerSecond,)",
+valuetype = "integer,number,number,",},

 HousingEditorApplyTemplate = {type = "function",
 description = "",
@@ -26059,8 +25725,8 @@ args = "(*integer* _houseTemplateId_)",},
 GetCurrentHousePreviewTemplateId = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "houseTemplateId,",},
+returns = "(integer:houseTemplateId,)",
+valuetype = "integer,",},

 HousingEditorPreviewTemplate = {type = "function",
 description = "",
@@ -26073,68 +25739,68 @@ args = "()",},
 GetHouseFurnishingPlacementLimit = {type = "function",
 description = "",
 args = "(*integer* _houseId_, *[HousingFurnishingLimitType|#HousingFurnishingLimitType]* _limitType_)",
-returns = "(integer,)",
-valuetype = "furnishingPlacementLimit,",},
+returns = "(integer:furnishingPlacementLimit,)",
+valuetype = "integer,",},

 GetNumHouseFurnishingsPlaced = {type = "function",
 description = "",
 args = "(*[HousingFurnishingLimitType|#HousingFurnishingLimitType]* _limitType_)",
-returns = "(integer,)",
-valuetype = "numFurnishingsPlaced,",},
+returns = "(integer:numFurnishingsPlaced,)",
+valuetype = "integer,",},

 IsOwnerOfCurrentHouse = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isOwner,",},
+returns = "(bool:isOwner,)",
+valuetype = "bool,",},

 HasAnyEditingPermissionsForCurrentHouse = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "canEdit,",},
+returns = "(bool:canEdit,)",
+valuetype = "bool,",},

 HasPermissionSettingForCurrentHouse = {type = "function",
 description = "",
 args = "(*[HousePermissionSetting|#HousePermissionSetting]* _setting_)",
-returns = "(bool,)",
-valuetype = "hasSetting,",},
+returns = "(bool:hasSetting,)",
+valuetype = "bool,",},

 GetPlacedFurnitureLink = {type = "function",
 description = "",
 args = "(*id64* _placedFurnitureId_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,string,)",
-valuetype = "collectibleLink,itemLink,",},
+returns = "(string:collectibleLink,string:itemLink,)",
+valuetype = "string,string,",},

 GetCurrentHousePopulation = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "population,",},
+returns = "(integer:population,)",
+valuetype = "integer,",},

 GetFurnitureIdFromCollectibleId = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_)",
-returns = "(id64,)",
-valuetype = "furnitureId,",},
+returns = "(id64:furnitureId,)",
+valuetype = "id64,",},

 GetCollectibleIdFromFurnitureId = {type = "function",
 description = "",
 args = "(*id64* _furnitureId_)",
-returns = "(integer,)",
-valuetype = "collectibleId,",},
+returns = "(integer:collectibleId,)",
+valuetype = "integer,",},

 GetItemUniqueIdFromFurnitureId = {type = "function",
 description = "",
 args = "(*id64* _furnitureId_)",
-returns = "(id64,)",
-valuetype = "itemUniqueId,",},
+returns = "(id64:itemUniqueId,)",
+valuetype = "id64,",},

 GetFurnitureIdFromItemUniqueId = {type = "function",
 description = "",
 args = "(*id64* _itemUniqueId_)",
-returns = "(id64,)",
-valuetype = "furnitureId,",},
+returns = "(id64:furnitureId,)",
+valuetype = "id64,",},

 SetNameplateKeyboardFont = {type = "function",
 description = "",
@@ -26143,8 +25809,8 @@ args = "(*string* _fontName_, *[FontStyle|#FontStyle]* _fontStyle_)",},
 GetNameplateKeyboardFont = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "fontStyle,fontName,",},
+returns = "(string:fontName,)",
+valuetype = "string,",},

 SetNameplateGamepadFont = {type = "function",
 description = "",
@@ -26153,38 +25819,36 @@ args = "(*string* _fontName_, *[FontStyle|#FontStyle]* _fontStyle_)",},
 GetNameplateGamepadFont = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "fontStyle,fontName,",},
+returns = "(string:fontName,)",
+valuetype = "string,",},

 GetNextActiveArtificialEffectId = {type = "function",
 description = "",
-args = "(*integer:nilable* _lastActiveEffectId_)",
-returns = "()",
-valuetype = "nextActiveEffectId,",},
+args = "(*integer:nilable* _lastActiveEffectId_)",},

 GetArtificialEffectInfo = {type = "function",
 description = "",
 args = "(*integer* _artificialEffectId_)",
-returns = "(number,number,integer,textureName,string,)",
-valuetype = "timeEndingS,timeStartedS,sortOrder,effectType,icon,displayName,",},
+returns = "(number:timeEndingS,number:timeStartedS,integer:sortOrder,textureName:icon,string:displayName,)",
+valuetype = "number,number,integer,textureName,string,",},

 GetArtificialEffectTooltipText = {type = "function",
 description = "",
 args = "(*integer* _artificialEffectId_)",
-returns = "(string,)",
-valuetype = "tooltipText,",},
+returns = "(string:tooltipText,)",
+valuetype = "string,",},

 IsCutsceneActive = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isCutsceneActive,",},
+returns = "(bool:isCutsceneActive,)",
+valuetype = "bool,",},

 GetActiveCutsceneVideoPath = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "videoPath,",},
+returns = "(string:videoPath,)",
+valuetype = "string,",},

 RequestEndCutscene = {type = "function",
 description = "",
@@ -26193,8 +25857,8 @@ args = "()",},
 HasEsoPlusSubscriptionNotification = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "hasSubscriptionNotification,",},
+returns = "(bool:hasSubscriptionNotification,)",
+valuetype = "bool,",},

 ClearEsoPlusSubscriptionNotification = {type = "function",
 description = "",
@@ -26203,56 +25867,54 @@ args = "()",},
 GetUnitLevel = {type = "function",
 description = "",
 args = "(*string* _unitTag_)",
-returns = "(integer,)",
-valuetype = "level,",},
+returns = "(integer:level,)",
+valuetype = "integer,",},

 GetLinkType = {type = "function",
 description = "",
-args = "(*string* _itemLink_)",
-returns = "()",
-valuetype = "linkType,",},
+args = "(*string* _itemLink_)",},

 IsGuildBankOpen = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isGuildBankOpen,",},
+returns = "(bool:isGuildBankOpen,)",
+valuetype = "bool,",},

 GetCurrentMoney = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "money,",},
+returns = "(integer:money,)",
+valuetype = "integer,",},

 GetAlliancePoints = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "alliancePoints,",},
+returns = "(integer:alliancePoints,)",
+valuetype = "integer,",},

 GetCarriedCurrencyAmount = {type = "function",
 description = "",
 args = "(*[CurrencyType|#CurrencyType]* _type_)",
-returns = "(integer,)",
-valuetype = "currencyAmount,",},
+returns = "(integer:currencyAmount,)",
+valuetype = "integer,",},

 GetMaxCarriedCurrencyAmount = {type = "function",
 description = "",
 args = "(*[CurrencyType|#CurrencyType]* _type_)",
-returns = "(integer,)",
-valuetype = "currencyAmount,",},
+returns = "(integer:currencyAmount,)",
+valuetype = "integer,",},

 GetBankedMoney = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "money,",},
+returns = "(integer:money,)",
+valuetype = "integer,",},

 GetBankedCurrencyAmount = {type = "function",
 description = "",
 args = "(*[CurrencyType|#CurrencyType]* _type_)",
-returns = "(integer,)",
-valuetype = "currencyAmount,",},
+returns = "(integer:currencyAmount,)",
+valuetype = "integer,",},

 DepositCurrencyIntoBank = {type = "function",
 description = "",
@@ -26265,14 +25927,14 @@ args = "(*[CurrencyType|#CurrencyType]* _type_, *integer* _currencyAmount_)",},
 GetMaxBankWithdrawal = {type = "function",
 description = "",
 args = "(*[CurrencyType|#CurrencyType]* _type_)",
-returns = "(integer,)",
-valuetype = "maxWithdrawal,",},
+returns = "(integer:maxWithdrawal,)",
+valuetype = "integer,",},

 GetMaxBankDeposit = {type = "function",
 description = "",
 args = "(*[CurrencyType|#CurrencyType]* _type_)",
-returns = "(integer,)",
-valuetype = "maxDeposit,",},
+returns = "(integer:maxDeposit,)",
+valuetype = "integer,",},

 DepositMoneyIntoBank = {type = "function",
 description = "",
@@ -26285,8 +25947,8 @@ args = "(*integer* _money_)",},
 GetBankedTelvarStones = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "telvarStones,",},
+returns = "(integer:telvarStones,)",
+valuetype = "integer,",},

 DepositTelvarStonesIntoBank = {type = "function",
 description = "",
@@ -26299,20 +25961,20 @@ args = "(*integer* _telvarStones_)",},
 GetMaxBankCurrencyAmount = {type = "function",
 description = "",
 args = "(*[CurrencyType|#CurrencyType]* _type_)",
-returns = "(integer,)",
-valuetype = "currencyAmount,",},
+returns = "(integer:currencyAmount,)",
+valuetype = "integer,",},

 GetGuildBankedMoney = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "money,",},
+returns = "(integer:money,)",
+valuetype = "integer,",},

 GetGuildBankedCurrencyAmount = {type = "function",
 description = "",
 args = "(*[CurrencyType|#CurrencyType]* _type_)",
-returns = "(integer,)",
-valuetype = "currencyAmount,",},
+returns = "(integer:currencyAmount,)",
+valuetype = "integer,",},

 DepositMoneyIntoGuildBank = {type = "function",
 description = "",
@@ -26333,44 +25995,44 @@ args = "(*[CurrencyType|#CurrencyType]* _type_, *integer* _currencyAmount_)",},
 GetMaxGuildBankWithdrawal = {type = "function",
 description = "",
 args = "(*[CurrencyType|#CurrencyType]* _type_)",
-returns = "(integer,)",
-valuetype = "maxWithdrawal,",},
+returns = "(integer:maxWithdrawal,)",
+valuetype = "integer,",},

 GetMaxGuildBankDeposit = {type = "function",
 description = "",
 args = "(*[CurrencyType|#CurrencyType]* _type_)",
-returns = "(integer,)",
-valuetype = "maxDeposit,",},
+returns = "(integer:maxDeposit,)",
+valuetype = "integer,",},

 GetMaxGuildBankCurrencyAmount = {type = "function",
 description = "",
 args = "(*[CurrencyType|#CurrencyType]* _type_)",
-returns = "(integer,)",
-valuetype = "currencyAmount,",},
+returns = "(integer:currencyAmount,)",
+valuetype = "integer,",},

 GetTelvarStoneBankingFee = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "bankingFee,",},
+returns = "(integer:bankingFee,)",
+valuetype = "integer,",},

 GetTelvarStoneMinimumDeposit = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "minDeposit,",},
+returns = "(integer:minDeposit,)",
+valuetype = "integer,",},

 GetTelvarStonePercentLossOnPvpDeath = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "percentLoss,",},
+returns = "(number:percentLoss,)",
+valuetype = "number,",},

 GetTelvarStonePercentLossOnNonPvpDeath = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "percentLoss,",},
+returns = "(number:percentLoss,)",
+valuetype = "number,",},

 UseItem = {type = "function",
 description = "",
@@ -26379,8 +26041,8 @@ args = "(*integer* _bagId_, *integer* _slotIndex_)",},
 CanInteractWithItem = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "canInteract,",},
+returns = "(bool:canInteract,)",
+valuetype = "bool,",},

 UnequipItem = {type = "function",
 description = "",
@@ -26393,14 +26055,14 @@ args = "(*[Bag|#Bag]* _bagId_, *integer* _slotIndex_)",},
 GetNextBankUpgradePrice = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "cost,",},
+returns = "(integer:cost,)",
+valuetype = "integer,",},

 GetNextBackpackUpgradePrice = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "cost,",},
+returns = "(integer:cost,)",
+valuetype = "integer,",},

 BuyBankSpace = {type = "function",
 description = "",
@@ -26417,86 +26079,82 @@ args = "()",},
 GetBagUseableSize = {type = "function",
 description = "",
 args = "(*[Bag|#Bag]* _bagId_)",
-returns = "(integer,)",
-valuetype = "bagSlots,",},
+returns = "(integer:bagSlots,)",
+valuetype = "integer,",},

 GetBagSize = {type = "function",
 description = "",
 args = "(*[Bag|#Bag]* _bagId_)",
-returns = "(integer,)",
-valuetype = "bagSlots,",},
+returns = "(integer:bagSlots,)",
+valuetype = "integer,",},

 IsArmorEffectivenessReduced = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "effectivenessReduced,",},
+returns = "(bool:effectivenessReduced,)",
+valuetype = "bool,",},

 GetNumBagUsedSlots = {type = "function",
 description = "",
 args = "(*[Bag|#Bag]* _bagId_)",
-returns = "(integer,)",
-valuetype = "usedSlots,",},
+returns = "(integer:usedSlots,)",
+valuetype = "integer,",},

 GetNumBagFreeSlots = {type = "function",
 description = "",
 args = "(*[Bag|#Bag]* _bagId_)",
-returns = "(integer,)",
-valuetype = "freeSlots,",},
+returns = "(integer:freeSlots,)",
+valuetype = "integer,",},

 FindFirstEmptySlotInBag = {type = "function",
 description = "",
-args = "(*[Bag|#Bag]* _bagId_)",
-returns = "()",
-valuetype = "slotIndex,",},
+args = "(*[Bag|#Bag]* _bagId_)",},

 GetItemFilterTypeInfo = {type = "function",
 description = "",
-args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "()",
-valuetype = "itemFilterType,",},
+args = "(*integer* _bagId_, *integer* _slotIndex_)",},

 GetItemCooldownInfo = {type = "function",
 description = "",
 args = "(*[Bag|#Bag]* _bagId_, *integer* _slotIndex_)",
-returns = "(integer,integer,)",
-valuetype = "duration,remain,",},
+returns = "(integer:duration,integer:remain,)",
+valuetype = "integer,integer,",},

 GetItemStatValue = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(integer,)",
-valuetype = "statValue,",},
+returns = "(integer:statValue,)",
+valuetype = "integer,",},

 GetItemSoundCategory = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(integer,)",
-valuetype = "itemSoundCategory,",},
+returns = "(integer:itemSoundCategory,)",
+valuetype = "integer,",},

 IsItemBound = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "isBound,",},
+returns = "(bool:isBound,)",
+valuetype = "bool,",},

 IsItemEnchantable = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "enchantable,",},
+returns = "(bool:enchantable,)",
+valuetype = "bool,",},

 IsItemEnchantment = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "enchantment,",},
+returns = "(bool:enchantment,)",
+valuetype = "bool,",},

 CanItemTakeEnchantment = {type = "function",
 description = "",
 args = "(*integer* _itemToEnchantBagId_, *integer* _itemToEnchantSlotIndex_, *integer* _enchantmentToUseBagId_, *integer* _enchantmentToUseSlotIndex_)",
-returns = "(bool,)",
-valuetype = "canEnchant,",},
+returns = "(bool:canEnchant,)",
+valuetype = "bool,",},

 EnchantItem = {type = "function",
 description = "",
@@ -26505,8 +26163,8 @@ args = "(*integer* _itemToEnchantBagId_, *integer* _itemToEnchantSlotIndex_, *in
 CanConvertItemStyle = {type = "function",
 description = "",
 args = "(*integer* _itemToBagId_, *integer* _itemToSlotIndex_, *[ItemStyle|#ItemStyle]* _newStyle_)",
-returns = "(bool,)",
-valuetype = "canConvert,",},
+returns = "(bool:canConvert,)",
+valuetype = "bool,",},

 ConvertItemStyle = {type = "function",
 description = "",
@@ -26515,14 +26173,14 @@ args = "(*integer* _itemToBagId_, *integer* _itemToSlotIndex_, *[ItemStyle|#Item
 IsItemChargeable = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "rechargeable,",},
+returns = "(bool:rechargeable,)",
+valuetype = "bool,",},

 GetAmountSoulGemWouldChargeItem = {type = "function",
 description = "",
 args = "(*integer* _itemToChargeBagId_, *integer* _itemToChargeSlotIndex_, *integer* _soulGemToConsumeBagId_, *integer* _soulGemToConsumeSlotIndex_)",
-returns = "(integer,)",
-valuetype = "chargeAmount,",},
+returns = "(integer:chargeAmount,)",
+valuetype = "integer,",},

 ChargeItemWithSoulGem = {type = "function",
 description = "",
@@ -26531,68 +26189,68 @@ args = "(*integer* _itemToChargeBagId_, *integer* _itemToChargeSlotIndex_, *inte
 IsItemSoulGem = {type = "function",
 description = "",
 args = "(*[SoulGemType|#SoulGemType]* _soulGemType_, *integer* _bagId_, *integer* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "isSoulGem,",},
+returns = "(bool:isSoulGem,)",
+valuetype = "bool,",},

 GetChargeInfoForItem = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(integer,integer,)",
-valuetype = "maxCharges,charges,",},
+returns = "(integer:maxCharges,integer:charges,)",
+valuetype = "integer,integer,",},

 DoesItemHaveDurability = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "hasDurability,",},
+returns = "(bool:hasDurability,)",
+valuetype = "bool,",},

 GetItemCondition = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(integer,)",
-valuetype = "condition,",},
+returns = "(integer:condition,)",
+valuetype = "integer,",},

 GetItemRepairCost = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(integer,)",
-valuetype = "repairCost,",},
+returns = "(integer:repairCost,)",
+valuetype = "integer,",},

 GetRepairAllCost = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "repairCost,",},
+returns = "(integer:repairCost,)",
+valuetype = "integer,",},

 GetItemLaunderPrice = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(integer,)",
-valuetype = "launderCost,",},
+returns = "(integer:launderCost,)",
+valuetype = "integer,",},

 IsItemRepairKit = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "isRepairKit,",},
+returns = "(bool:isRepairKit,)",
+valuetype = "bool,",},

 IsItemNonCrownRepairKit = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "isNonCrownRepairKit,",},
+returns = "(bool:isNonCrownRepairKit,)",
+valuetype = "bool,",},

 GetRepairKitTier = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(integer,)",
-valuetype = "tier,",},
+returns = "(integer:tier,)",
+valuetype = "integer,",},

 GetAmountRepairKitWouldRepairItem = {type = "function",
 description = "",
 args = "(*integer* _itemToRepairBagId_, *integer* _itemToRepairSlotIndex_, *integer* _repairKitToConsumeBagId_, *integer* _repairKitToConsumeSlotIndex_)",
-returns = "(integer,)",
-valuetype = "amountRepaired,",},
+returns = "(integer:amountRepaired,)",
+valuetype = "integer,",},

 RepairItemWithRepairKit = {type = "function",
 description = "",
@@ -26601,176 +26259,160 @@ args = "(*integer* _itemToRepairBagId_, *integer* _itemToRepairSlotIndex_, *inte
 HasActivatableSwapWeaponsEquipped = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "canSwapWeaponSets,",},
+returns = "(bool:canSwapWeaponSets,)",
+valuetype = "bool,",},

 GetActiveWeaponPairInfo = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "locked,activeWeaponPair,",},
+returns = "(bool:locked,)",
+valuetype = "bool,",},

 GetItemLevel = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(integer,)",
-valuetype = "level,",},
+returns = "(integer:level,)",
+valuetype = "integer,",},

 GetItemRequiredLevel = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(integer,)",
-valuetype = "requiredLevel,",},
+returns = "(integer:requiredLevel,)",
+valuetype = "integer,",},

 GetItemRequiredChampionPoints = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(integer,)",
-valuetype = "requiredChampionPoints,",},
+returns = "(integer:requiredChampionPoints,)",
+valuetype = "integer,",},

 GetItemTrait = {type = "function",
 description = "",
-args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "()",
-valuetype = "trait,",},
+args = "(*integer* _bagId_, *integer* _slotIndex_)",},

 GetItemCreatorName = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(string,)",
-valuetype = "creatorName,",},
+returns = "(string:creatorName,)",
+valuetype = "string,",},

 GetItemInfo = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(integer,integer,integer,bool,bool,integer,integer,textureName,)",
-valuetype = "quality,itemStyle,equipType,locked,meetsUsageRequirement,sellPrice,stack,icon,",},
+returns = "(integer:quality,integer:itemStyle,integer:equipType,bool:locked,bool:meetsUsageRequirement,integer:sellPrice,integer:stack,textureName:icon,)",
+valuetype = "integer,integer,integer,bool,bool,integer,integer,textureName,",},

 GetItemId = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(integer,)",
-valuetype = "itemId,",},
+returns = "(integer:itemId,)",
+valuetype = "integer,",},

 GetItemSellValueWithBonuses = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(integer,)",
-valuetype = "sellPrice,",},
+returns = "(integer:sellPrice,)",
+valuetype = "integer,",},

 GetItemCraftingInfo = {type = "function",
 description = "",
-args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "()",
-valuetype = "extraInfo3,extraInfo2,extraInfo1,itemType,usedInCraftingType,",},
+args = "(*integer* _bagId_, *integer* _slotIndex_)",},

 GetItemType = {type = "function",
 description = "",
-args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "()",
-valuetype = "specializedItemType,itemType,",},
+args = "(*integer* _bagId_, *integer* _slotIndex_)",},

 GetItemArmorType = {type = "function",
 description = "",
-args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "()",
-valuetype = "armorType,",},
+args = "(*integer* _bagId_, *integer* _slotIndex_)",},

 GetItemWeaponType = {type = "function",
 description = "",
-args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "()",
-valuetype = "weaponType,",},
+args = "(*integer* _bagId_, *integer* _slotIndex_)",},

 GetItemUniqueId = {type = "function",
 description = "",
-args = "(*integer* _bagId1_, *integer* _slotIndex1_)",
-returns = "()",
-valuetype = "id,",},
+args = "(*integer* _bagId1_, *integer* _slotIndex1_)",},

 GetSoulGemItemInfo = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(integer,)",
-valuetype = "soulGemType,tier,",},
+returns = "(integer:tier,)",
+valuetype = "integer,",},

 GetSoulGemInfo = {type = "function",
 description = "",
 args = "(*[SoulGemType|#SoulGemType]* _soulGemType_, *integer* _targetLevel_, *bool* _onlyInInventory_)",
-returns = "(integer,textureName,string,)",
-valuetype = "quality,stackCount,icon,name,",},
+returns = "(integer:stackCount,textureName:icon,string:name,)",
+valuetype = "integer,textureName,string,",},

 GetNextGuildBankSlotId = {type = "function",
 description = "",
-args = "(*integer:nilable* _lastSlotId_)",
-returns = "()",
-valuetype = "nextSlotId,",},
+args = "(*integer:nilable* _lastSlotId_)",},

 GetNextVirtualBagSlotId = {type = "function",
 description = "",
-args = "(*integer:nilable* _lastSlotId_)",
-returns = "()",
-valuetype = "nextSlotId,",},
+args = "(*integer:nilable* _lastSlotId_)",},

 CanItemBeVirtual = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "canBeVirtualItem,",},
+returns = "(bool:canBeVirtualItem,)",
+valuetype = "bool,",},

 IsItemPlaceableFurniture = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "isPlaceable,",},
+returns = "(bool:isPlaceable,)",
+valuetype = "bool,",},

 GetItemFurnitureDataId = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(integer,)",
-valuetype = "furnitureDataId,",},
+returns = "(integer:furnitureDataId,)",
+valuetype = "integer,",},

 IsDisplayNameInItemBoPAccountTable = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_, *string* _displayName_)",
-returns = "(bool,)",
-valuetype = "isInTable,",},
+returns = "(bool:isInTable,)",
+valuetype = "bool,",},

 IsItemBoPAndTradeable = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "isBoPAndTradeable,",},
+returns = "(bool:isBoPAndTradeable,)",
+valuetype = "bool,",},

 GetItemBoPTimeRemainingSeconds = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(integer,)",
-valuetype = "timeRemainingS,",},
+returns = "(integer:timeRemainingS,)",
+valuetype = "integer,",},

 GetItemBoPTradeableDisplayNamesString = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(string,)",
-valuetype = "namesString,",},
+returns = "(string:namesString,)",
+valuetype = "string,",},

 GetItemBoPTradeableNumEligibleNames = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(integer,)",
-valuetype = "numNames,",},
+returns = "(integer:numNames,)",
+valuetype = "integer,",},

 GetItemBoPTradeableEligibleNameByIndex = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_, *luaindex* _nameIndex_)",
-returns = "(string,)",
-valuetype = "name,",},
+returns = "(string:name,)",
+valuetype = "string,",},

 HasCraftBagAccess = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "hasAccess,",},
+returns = "(bool:hasAccess,)",
+valuetype = "bool,",},

 SelectGuildBank = {type = "function",
 description = "",
@@ -26787,8 +26429,8 @@ args = "(*integer* _slotId_)",},
 HasAnyJunk = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *bool* _excludeStolenItems_)",
-returns = "(bool,)",
-valuetype = "hasJunk,",},
+returns = "(bool:hasJunk,)",
+valuetype = "bool,",},

 DestroyAllJunk = {type = "function",
 description = "",
@@ -26797,8 +26439,8 @@ args = "()",},
 CanAnyItemsBeStoredInCraftBag = {type = "function",
 description = "",
 args = "(*integer* _bagId_)",
-returns = "(bool,)",
-valuetype = "canBeStoredInCraftBag,",},
+returns = "(bool:canBeStoredInCraftBag,)",
+valuetype = "bool,",},

 StowAllVirtualItems = {type = "function",
 description = "",
@@ -26807,26 +26449,26 @@ args = "()",},
 DoesBagHaveSpaceFor = {type = "function",
 description = "",
 args = "(*[Bag|#Bag]* _destinationBagId_, *[Bag|#Bag]* _sourceBagId_, *integer* _sourceSlot_)",
-returns = "(bool,)",
-valuetype = "hasSpace,",},
+returns = "(bool:hasSpace,)",
+valuetype = "bool,",},

 DoesBagHaveSpaceForItemLink = {type = "function",
 description = "",
 args = "(*[Bag|#Bag]* _destinationBagId_, *string* _itemLink_)",
-returns = "(bool,)",
-valuetype = "hasSpace,",},
+returns = "(bool:hasSpace,)",
+valuetype = "bool,",},

 CanItemBePlayerLocked = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "canBePlayerLocked,",},
+returns = "(bool:canBePlayerLocked,)",
+valuetype = "bool,",},

 IsItemPlayerLocked = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "playerLocked,",},
+returns = "(bool:playerLocked,)",
+valuetype = "bool,",},

 SetItemIsPlayerLocked = {type = "function",
 description = "",
@@ -26835,14 +26477,14 @@ args = "(*integer* _bagId_, *integer* _slotIndex_, *bool* _playerLocked_)",},
 CanItemBeMarkedAsJunk = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "canBeMarkedAsJunk,",},
+returns = "(bool:canBeMarkedAsJunk,)",
+valuetype = "bool,",},

 IsItemJunk = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "junk,",},
+returns = "(bool:junk,)",
+valuetype = "bool,",},

 SetItemIsJunk = {type = "function",
 description = "",
@@ -26851,482 +26493,446 @@ args = "(*integer* _bagId_, *integer* _slotIndex_, *bool* _junk_)",},
 IsItemDyeable = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "dyeable,",},
+returns = "(bool:dyeable,)",
+valuetype = "bool,",},

 AreItemDyeChannelsDyeable = {type = "function",
 description = "",
 args = "(*[Bag|#Bag]* _bagId_, *integer* _slotIndex_)",
-returns = "(bool,bool,bool,)",
-valuetype = "accent,secondary,primary,",},
+returns = "(bool:accent,bool:secondary,bool:primary,)",
+valuetype = "bool,bool,bool,",},

 HasItemInSlot = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "hasItemInSlot,",},
+returns = "(bool:hasItemInSlot,)",
+valuetype = "bool,",},

 GetItemLinkName = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(string,)",
-valuetype = "itemName,",},
+returns = "(string:itemName,)",
+valuetype = "string,",},

 GetItemLinkItemType = {type = "function",
 description = "",
-args = "(*string* _itemLink_)",
-returns = "()",
-valuetype = "specializedItemType,itemType,",},
+args = "(*string* _itemLink_)",},

 GetItemLinkItemUseType = {type = "function",
 description = "",
-args = "(*string* _itemLink_)",
-returns = "()",
-valuetype = "onUseType,",},
+args = "(*string* _itemLink_)",},

 GetItemLinkArmorType = {type = "function",
 description = "",
-args = "(*string* _itemLink_)",
-returns = "()",
-valuetype = "armorType,",},
+args = "(*string* _itemLink_)",},

 GetItemLinkWeaponType = {type = "function",
 description = "",
-args = "(*string* _itemLink_)",
-returns = "()",
-valuetype = "weaponType,",},
+args = "(*string* _itemLink_)",},

 GetItemLinkWeaponPower = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(integer,)",
-valuetype = "weaponPower,",},
+returns = "(integer:weaponPower,)",
+valuetype = "integer,",},

 GetItemLinkArmorRating = {type = "function",
 description = "",
 args = "(*string* _itemLink_, *bool* _considerCondition_)",
-returns = "(integer,)",
-valuetype = "armorRating,",},
+returns = "(integer:armorRating,)",
+valuetype = "integer,",},

 GetItemLinkRequiredLevel = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(integer,)",
-valuetype = "requiredLevel,",},
+returns = "(integer:requiredLevel,)",
+valuetype = "integer,",},

 GetItemLinkRequiredChampionPoints = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(integer,)",
-valuetype = "requiredChampionPoints,",},
+returns = "(integer:requiredChampionPoints,)",
+valuetype = "integer,",},

 GetItemLinkValue = {type = "function",
 description = "",
 args = "(*string* _itemLink_, *bool* _considerCondition_)",
-returns = "(integer,)",
-valuetype = "value,",},
+returns = "(integer:value,)",
+valuetype = "integer,",},

 GetItemLinkCondition = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(integer,)",
-valuetype = "conditionPercent,",},
+returns = "(integer:conditionPercent,)",
+valuetype = "integer,",},

 DoesItemLinkHaveArmorDecay = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(bool,)",
-valuetype = "hasArmorDecay,",},
+returns = "(bool:hasArmorDecay,)",
+valuetype = "bool,",},

 GetItemLinkMaxEnchantCharges = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(integer,)",
-valuetype = "maxCharges,",},
+returns = "(integer:maxCharges,)",
+valuetype = "integer,",},

 GetItemLinkNumEnchantCharges = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(integer,)",
-valuetype = "numCharges,",},
+returns = "(integer:numCharges,)",
+valuetype = "integer,",},

 DoesItemLinkHaveEnchantCharges = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(bool,)",
-valuetype = "hasCharges,",},
+returns = "(bool:hasCharges,)",
+valuetype = "bool,",},

 GetItemLinkEnchantInfo = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(string,string,bool,)",
-valuetype = "enchantDescription,enchantHeader,hasCharges,",},
+returns = "(string:enchantDescription,string:enchantHeader,bool:hasCharges,)",
+valuetype = "string,string,bool,",},

 IsItemAffectedByPairedPoison = {type = "function",
 description = "",
 args = "(*[EquipSlot|#EquipSlot]* _equipSlot_)",
-returns = "(bool,)",
-valuetype = "hasPairedPoison,",},
+returns = "(bool:hasPairedPoison,)",
+valuetype = "bool,",},

 GetItemPairedPoisonInfo = {type = "function",
 description = "",
 args = "(*[EquipSlot|#EquipSlot]* _equipSlot_)",
-returns = "(string,string,integer,bool,)",
-valuetype = "poisonItemLink,poisonHeader,poisonCount,hasPoison,",},
+returns = "(string:poisonItemLink,string:poisonHeader,integer:poisonCount,bool:hasPoison,)",
+valuetype = "string,string,integer,bool,",},

 GetItemLinkOnUseAbilityInfo = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(integer,bool,integer,integer,bool,integer,string,string,bool,)",
-valuetype = "remainingCooldown,isChampionPoints,maxLevel,minLevel,hasScaling,cooldown,abilityDescription,abilityHeader,hasAbility,",},
+returns = "(integer:remainingCooldown,bool:isChampionPoints,integer:maxLevel,integer:minLevel,bool:hasScaling,integer:cooldown,string:abilityDescription,string:abilityHeader,bool:hasAbility,)",
+valuetype = "integer,bool,integer,integer,bool,integer,string,string,bool,",},

 GetItemLinkTraitOnUseAbilityInfo = {type = "function",
 description = "",
 args = "(*string* _itemLink_, *luaindex* _index_)",
-returns = "(bool,integer,integer,bool,integer,string,bool,)",
-valuetype = "isChampionPoints,maxLevel,minLevel,hasScaling,cooldown,abilityDescription,hasAbility,",},
+returns = "(bool:isChampionPoints,integer:maxLevel,integer:minLevel,bool:hasScaling,integer:cooldown,string:abilityDescription,bool:hasAbility,)",
+valuetype = "bool,integer,integer,bool,integer,string,bool,",},

 GetItemLinkTraitInfo = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(string,string,integer,string,)",
-valuetype = "traitSubtypeDescription,traitSubtypeName,traitSubtype,traitDescription,traitType,",},
+returns = "(string:traitSubtypeDescription,string:traitSubtypeName,integer:traitSubtype,string:traitDescription,)",
+valuetype = "string,string,integer,string,",},

 GetItemLinkSetInfo = {type = "function",
 description = "",
 args = "(*string* _itemLink_, *bool* _equipped_)",
-returns = "(integer,integer,integer,string,bool,)",
-valuetype = "maxEquipped,numEquipped,numBonuses,setName,hasSet,",},
+returns = "(integer:maxEquipped,integer:numEquipped,integer:numBonuses,string:setName,bool:hasSet,)",
+valuetype = "integer,integer,integer,string,bool,",},

 GetItemLinkSetBonusInfo = {type = "function",
 description = "",
 args = "(*string* _itemLink_, *bool* _equipped_, *luaindex* _index_)",
-returns = "(string,integer,)",
-valuetype = "bonusDescription,numRequired,",},
+returns = "(string:bonusDescription,integer:numRequired,)",
+valuetype = "string,integer,",},

 GetItemLinkFlavorText = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(string,)",
-valuetype = "flavorText,",},
+returns = "(string:flavorText,)",
+valuetype = "string,",},

 IsItemLinkCrafted = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(bool,)",
-valuetype = "isCrafted,",},
+returns = "(bool:isCrafted,)",
+valuetype = "bool,",},

 IsItemLinkVendorTrash = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(bool,)",
-valuetype = "isVendorTrash,",},
+returns = "(bool:isVendorTrash,)",
+valuetype = "bool,",},

 GetItemLinkSiegeMaxHP = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(integer,)",
-valuetype = "maxHP,",},
+returns = "(integer:maxHP,)",
+valuetype = "integer,",},

 GetItemLinkQuality = {type = "function",
 description = "",
-args = "(*string* _itemLink_)",
-returns = "()",
-valuetype = "quality,",},
+args = "(*string* _itemLink_)",},

 GetItemLinkSiegeType = {type = "function",
 description = "",
-args = "(*string* _itemLink_)",
-returns = "()",
-valuetype = "siegeType,",},
+args = "(*string* _itemLink_)",},

 IsItemLinkUnique = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(bool,)",
-valuetype = "isUnique,",},
+returns = "(bool:isUnique,)",
+valuetype = "bool,",},

 IsItemLinkUniqueEquipped = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(bool,)",
-valuetype = "isUniqueEquipped,",},
+returns = "(bool:isUniqueEquipped,)",
+valuetype = "bool,",},

 GetItemLinkEquipType = {type = "function",
 description = "",
-args = "(*string* _itemLink_)",
-returns = "()",
-valuetype = "equipType,",},
+args = "(*string* _itemLink_)",},

 IsItemLinkConsumable = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(bool,)",
-valuetype = "isConsumable,",},
+returns = "(bool:isConsumable,)",
+valuetype = "bool,",},

 GetItemLinkCraftingSkillType = {type = "function",
 description = "",
-args = "(*string* _itemLink_)",
-returns = "()",
-valuetype = "tradeskillType,",},
+args = "(*string* _itemLink_)",},

 IsItemLinkEnchantingRune = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(bool,)",
-valuetype = "isEnchantingRune,",},
+returns = "(bool:isEnchantingRune,)",
+valuetype = "bool,",},

 GetItemLinkEnchantingRuneName = {type = "function",
 description = "",
-args = "(*string* _itemLink_)",
-returns = "()",
-valuetype = "name,known,",},
+args = "(*string* _itemLink_)",},

 GetItemLinkEnchantingRuneClassification = {type = "function",
 description = "",
-args = "(*string* _itemLink_)",
-returns = "()",
-valuetype = "runeClassification,",},
+args = "(*string* _itemLink_)",},

 GetItemLinkRequiredCraftingSkillRank = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(integer,)",
-valuetype = "requiredRank,",},
+returns = "(integer:requiredRank,)",
+valuetype = "integer,",},

 IsItemLinkBound = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(bool,)",
-valuetype = "isBound,",},
+returns = "(bool:isBound,)",
+valuetype = "bool,",},

 GetItemLinkBindType = {type = "function",
 description = "",
-args = "(*string* _itemLink_)",
-returns = "()",
-valuetype = "bindType,",},
+args = "(*string* _itemLink_)",},

 GetItemLinkGlyphMinLevels = {type = "function",
 description = "",
-args = "(*string* _itemLink_)",
-returns = "()",
-valuetype = "minChampionPoints,minLevel,",},
+args = "(*string* _itemLink_)",},

 IsItemLinkPlaceableFurniture = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(bool,)",
-valuetype = "isPlaceableFurniture,",},
+returns = "(bool:isPlaceableFurniture,)",
+valuetype = "bool,",},

 IsItemLinkBook = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(bool,)",
-valuetype = "isBook,",},
+returns = "(bool:isBook,)",
+valuetype = "bool,",},

 GetItemLinkBookTitle = {type = "function",
 description = "",
-args = "(*string* _itemLink_)",
-returns = "()",
-valuetype = "bookTitle,",},
+args = "(*string* _itemLink_)",},

 IsItemLinkBookKnown = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(bool,)",
-valuetype = "isKnown,",},
+returns = "(bool:isKnown,)",
+valuetype = "bool,",},

 DoesItemLinkStartQuest = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(bool,)",
-valuetype = "startsQuest,",},
+returns = "(bool:startsQuest,)",
+valuetype = "bool,",},

 DoesItemLinkFinishQuest = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(bool,)",
-valuetype = "finishesQuest,",},
+returns = "(bool:finishesQuest,)",
+valuetype = "bool,",},

 IsItemLinkRecipeKnown = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(bool,)",
-valuetype = "isRecipeKnown,",},
+returns = "(bool:isRecipeKnown,)",
+valuetype = "bool,",},

 GetItemLinkRecipeResultItemLink = {type = "function",
 description = "",
 args = "(*string* _itemLink_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 GetItemLinkRecipeNumIngredients = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(integer,)",
-valuetype = "numIngredients,",},
+returns = "(integer:numIngredients,)",
+valuetype = "integer,",},

 GetItemLinkRecipeIngredientInfo = {type = "function",
 description = "",
 args = "(*string* _itemLink_, *luaindex* _index_)",
-returns = "(integer,integer,string,)",
-valuetype = "amountRequired,amountInInventoryAndBank,ingredientName,",},
+returns = "(integer:amountRequired,integer:amountInInventoryAndBank,string:ingredientName,)",
+valuetype = "integer,integer,string,",},

 GetItemLinkRecipeIngredientItemLink = {type = "function",
 description = "",
 args = "(*string* _itemLink_, *luaindex* _index_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 GetItemLinkRecipeNumTradeskillRequirements = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(integer,)",
-valuetype = "numTradeskillRequirements,",},
+returns = "(integer:numTradeskillRequirements,)",
+valuetype = "integer,",},

 GetItemLinkRecipeTradeskillRequirement = {type = "function",
 description = "",
 args = "(*string* _itemLink_, *luaindex* _tradeskillIndex_)",
-returns = "(integer,)",
-valuetype = "requiredLevel,tradeskill,",},
+returns = "(integer:requiredLevel,)",
+valuetype = "integer,",},

 GetItemLinkRecipeQualityRequirement = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(integer,)",
-valuetype = "qualityRequirement,",},
+returns = "(integer:qualityRequirement,)",
+valuetype = "integer,",},

 GetItemLinkRecipeCraftingSkillType = {type = "function",
 description = "",
-args = "(*string* _itemLink_)",
-returns = "()",
-valuetype = "craftingSkillType,",},
+args = "(*string* _itemLink_)",},

 GetItemLinkReagentTraitInfo = {type = "function",
 description = "",
-args = "(*string* _itemLink_, *luaindex* _index_)",
-returns = "()",
-valuetype = "name,known,",},
+args = "(*string* _itemLink_, *luaindex* _index_)",},

 GetItemLinkItemStyle = {type = "function",
 description = "",
-args = "(*string* _itemLink_)",
-returns = "()",
-valuetype = "style,",},
+args = "(*string* _itemLink_)",},

 GetItemLinkRefinedMaterialItemLink = {type = "function",
 description = "",
 args = "(*string* _itemLink_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "refinedItemLink,",},
+returns = "(string:refinedItemLink,)",
+valuetype = "string,",},

 GetItemLinkMaterialLevelDescription = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(string,)",
-valuetype = "levelsDescription,",},
+returns = "(string:levelsDescription,)",
+valuetype = "string,",},

 IsItemLinkOnlyUsableFromQuickslot = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(bool,)",
-valuetype = "onlyUsableFromQuickslot,",},
+returns = "(bool:onlyUsableFromQuickslot,)",
+valuetype = "bool,",},

 IsItemLinkStolen = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(bool,)",
-valuetype = "itemStolen,",},
+returns = "(bool:itemStolen,)",
+valuetype = "bool,",},

 IsItemLinkStackable = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(bool,)",
-valuetype = "itemStackable,",},
+returns = "(bool:itemStackable,)",
+valuetype = "bool,",},

 GetItemLinkStacks = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(integer,integer,integer,)",
-valuetype = "stackCountCraftBag,stackCountBank,stackCountBackpack,",},
+returns = "(integer:stackCountCraftBag,integer:stackCountBank,integer:stackCountBackpack,)",
+valuetype = "integer,integer,integer,",},

 CanItemLinkBeVirtual = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(bool,)",
-valuetype = "canBeVirtual,",},
+returns = "(bool:canBeVirtual,)",
+valuetype = "bool,",},

 GetItemLinkDyeIds = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(integer,integer,integer,)",
-valuetype = "accentDefId,secondaryDefId,primaryDefId,",},
+returns = "(integer:accentDefId,integer:secondaryDefId,integer:primaryDefId,)",
+valuetype = "integer,integer,integer,",},

 GetItemLinkDyeStampId = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(integer,)",
-valuetype = "dyeStampId,",},
+returns = "(integer:dyeStampId,)",
+valuetype = "integer,",},

 GetItemLinkFurnitureDataId = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(integer,)",
-valuetype = "furnitureDataId,",},
+returns = "(integer:furnitureDataId,)",
+valuetype = "integer,",},

 GetItemLinkGrantedRecipeIndices = {type = "function",
 description = "",
-args = "(*string* _itemLink_)",
-returns = "()",
-valuetype = "recipeIndex,recipeListIndex,",},
+args = "(*string* _itemLink_)",},

 ShouldHideTooltipRequiredLevel = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(bool,)",
-valuetype = "shouldHideLevel,",},
+returns = "(bool:shouldHideLevel,)",
+valuetype = "bool,",},

 GetMaxTraits = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "maxTraits,",},
+returns = "(integer:maxTraits,)",
+valuetype = "integer,",},

 IsItemStolen = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "itemStolen,",},
+returns = "(bool:itemStolen,)",
+valuetype = "bool,",},

 AreAnyItemsStolen = {type = "function",
 description = "",
 args = "(*integer* _bagId_)",
-returns = "(bool,)",
-valuetype = "anyItemsStolen,",},
+returns = "(bool:anyItemsStolen,)",
+valuetype = "bool,",},

 GetTelvarStoneMultiplierThresholdIndex = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "thresholdIndex,",},
+args = "()",},

 GetTelvarStoneThresholdAmount = {type = "function",
 description = "",
 args = "(*luaindex:nilable* _thresholdIndex_)",
-returns = "(integer,)",
-valuetype = "minimumAmount,",},
+returns = "(integer:minimumAmount,)",
+valuetype = "integer,",},

 GetTelvarStoneMultiplier = {type = "function",
 description = "",
 args = "(*luaindex:nilable* _thresholdIndex_)",
-returns = "(number,)",
-valuetype = "telvarStoneMultiplier,",},
+returns = "(number:telvarStoneMultiplier,)",
+valuetype = "number,",},

 IsMaxTelvarStoneMultiplierThreshold = {type = "function",
 description = "",
 args = "(*luaindex:nilable* _thresholdIndex_)",
-returns = "(bool,)",
-valuetype = "isAtMaxThreshold,",},
+returns = "(bool:isAtMaxThreshold,)",
+valuetype = "bool,",},

 StackBag = {type = "function",
 description = "",
@@ -27335,32 +26941,32 @@ args = "(*[Bag|#Bag]* _bag_)",},
 CompareBagItemToCurrentlyEquipped = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_, *[EquipSlot|#EquipSlot]* _equipSlot_)",
-returns = "(integer,)",
-valuetype = "statDelta,derivedStat,",},
+returns = "(integer:statDelta,)",
+valuetype = "integer,",},

 CompareItemLinkToCurrentlyEquipped = {type = "function",
 description = "",
 args = "(*string* _itemLink_, *[EquipSlot|#EquipSlot]* _equipSlot_)",
-returns = "(integer,)",
-valuetype = "statDelta,derivedStat,",},
+returns = "(integer:statDelta,)",
+valuetype = "integer,",},

 GetItemLinkNumItemTags = {type = "function",
 description = "",
 args = "(*string* _itemLink_)",
-returns = "(integer,)",
-valuetype = "numItemTags,",},
+returns = "(integer:numItemTags,)",
+valuetype = "integer,",},

 GetItemLinkItemTagInfo = {type = "function",
 description = "",
 args = "(*string* _itemLink_, *luaindex* _itemTagIndex_)",
-returns = "(string,)",
-valuetype = "itemTagCategory,itemTagDescription,",},
+returns = "(string:itemTagDescription,)",
+valuetype = "string,",},

 HasCraftBagAutoTransferNotification = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "hasTransferNotification,",},
+returns = "(bool:hasTransferNotification,)",
+valuetype = "bool,",},

 ClearCraftBagAutoTransferNotification = {type = "function",
 description = "",
@@ -27369,62 +26975,58 @@ args = "()",},
 IsActiveCombatRelatedEquipmentSlot = {type = "function",
 description = "",
 args = "(*[EquipSlot|#EquipSlot]* _equipSlot_)",
-returns = "(bool,)",
-valuetype = "isActiveCombatRelatedEquipSlot,",},
+returns = "(bool:isActiveCombatRelatedEquipSlot,)",
+valuetype = "bool,",},

 GetEquipmentBonusRating = {type = "function",
 description = "",
 args = "(*[Bag|#Bag]* _bagId_, *[EquipSlot|#EquipSlot]* _equipSlot_)",
-returns = "(number,)",
-valuetype = "equipmentBonusRating,",},
+returns = "(number:equipmentBonusRating,)",
+valuetype = "number,",},

 GetEquipmentBonusThreshold = {type = "function",
 description = "",
 args = "(*integer* _unitLevel_, *integer* _unitChampionPoints_, *integer* _index_)",
-returns = "(number,)",
-valuetype = "thresholdValue,",},
+returns = "(number:thresholdValue,)",
+valuetype = "number,",},

 GetNumCrownGemsFromItemManualGemification = {type = "function",
 description = "",
 args = "(*[Bag|#Bag]* _bagId_, *integer* _slotIndex_)",
-returns = "(integer,integer,)",
-valuetype = "gemsAwarded,itemsRequired,",},
+returns = "(integer:gemsAwarded,integer:itemsRequired,)",
+valuetype = "integer,integer,",},

 IsItemFromCrownStore = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "isFromCrownStore,",},
+returns = "(bool:isFromCrownStore,)",
+valuetype = "bool,",},

 IsItemFromCrownCrate = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "isFromCrownCrate,",},
+returns = "(bool:isFromCrownCrate,)",
+valuetype = "bool,",},

 GetNumTutorials = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numTutorials,",},
+returns = "(integer:numTutorials,)",
+valuetype = "integer,",},

 GetTutorialType = {type = "function",
 description = "",
-args = "(*luaindex* _tutorialIndex_)",
-returns = "()",
-valuetype = "tutorialType,",},
+args = "(*luaindex* _tutorialIndex_)",},

 GetTutorialInfo = {type = "function",
 description = "",
 args = "(*luaindex* _tutorialIndex_)",
-returns = "(integer,string,string,)",
-valuetype = "displayPriority,description,title,",},
+returns = "(integer:displayPriority,string:description,string:title,)",
+valuetype = "integer,string,string,",},

 GetTutorialLinkedHelpInfo = {type = "function",
 description = "",
-args = "(*luaindex* _tutorialIndex_)",
-returns = "()",
-valuetype = "helpIndex,helpCategoryIndex,",},
+args = "(*luaindex* _tutorialIndex_)",},

 TriggerTutorial = {type = "function",
 description = "",
@@ -27441,26 +27043,26 @@ args = "()",},
 HasSeenTutorial = {type = "function",
 description = "",
 args = "(*luaindex* _tutorialIndex_)",
-returns = "(bool,)",
-valuetype = "seen,",},
+returns = "(bool:seen,)",
+valuetype = "bool,",},

 CanTutorialBeSeen = {type = "function",
 description = "",
 args = "(*luaindex* _tutorialIndex_)",
-returns = "(bool,)",
-valuetype = "canBeSeen,",},
+returns = "(bool:canBeSeen,)",
+valuetype = "bool,",},

 IsTutorialActionRequired = {type = "function",
 description = "",
 args = "(*luaindex* _tutorialIndex_)",
-returns = "(bool,)",
-valuetype = "isActionRequired,",},
+returns = "(bool:isActionRequired,)",
+valuetype = "bool,",},

 GetTutorialId = {type = "function",
 description = "",
 args = "(*[TutorialTrigger|#TutorialTrigger]* _triggerType_)",
-returns = "(luaindex,)",
-valuetype = "tutorialId,",},
+returns = "(luaindex:tutorialId,)",
+valuetype = "luaindex,",},

 SetTutorialSeen = {type = "function",
 description = "",
@@ -27473,176 +27075,168 @@ args = "()",},
 GetNumCollectibleCategories = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numCategories,",},
+returns = "(integer:numCategories,)",
+valuetype = "integer,",},

 GetCollectibleCategoryInfo = {type = "function",
 description = "",
 args = "(*luaindex* _topLevelIndex_)",
-returns = "(bool,integer,integer,integer,integer,string,)",
-valuetype = "hidesLocked,totalCollectibles,unlockedCollectibles,numCollectibles,numSubCatgories,name,",},
+returns = "(bool:hidesLocked,integer:totalCollectibles,integer:unlockedCollectibles,integer:numCollectibles,integer:numSubCatgories,string:name,)",
+valuetype = "bool,integer,integer,integer,integer,string,",},

 GetCollectibleCategorySpecialization = {type = "function",
 description = "",
-args = "(*luaindex* _topLevelIndex_)",
-returns = "()",
-valuetype = "specialization,",},
+args = "(*luaindex* _topLevelIndex_)",},

 GetCollectibleCategoryKeyboardIcons = {type = "function",
 description = "",
 args = "(*luaindex* _categoryIndex_)",
-returns = "(textureName,textureName,textureName,)",
-valuetype = "mouseoverIcon,pressedIcon,normalIcon,",},
+returns = "(textureName:mouseoverIcon,textureName:pressedIcon,textureName:normalIcon,)",
+valuetype = "textureName,textureName,textureName,",},

 GetCollectibleCategoryGamepadIcon = {type = "function",
 description = "",
 args = "(*luaindex* _categoryIndex_)",
-returns = "(textureName,)",
-valuetype = "gamepadIcon,",},
+returns = "(textureName:gamepadIcon,)",
+valuetype = "textureName,",},

 GetCollectibleSubCategoryInfo = {type = "function",
 description = "",
 args = "(*luaindex* _topLevelIndex_, *luaindex* _subCategoryIndex_)",
-returns = "(integer,integer,integer,string,)",
-valuetype = "totalCollectibles,unlockedCollectibles,numCollectibles,name,",},
+returns = "(integer:totalCollectibles,integer:unlockedCollectibles,integer:numCollectibles,string:name,)",
+valuetype = "integer,integer,integer,string,",},

 GetUnlockedCollectiblesCount = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "count,",},
+returns = "(integer:count,)",
+valuetype = "integer,",},

 GetTotalCollectiblesCount = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "count,",},
+returns = "(integer:count,)",
+valuetype = "integer,",},

 GetCollectibleId = {type = "function",
 description = "",
 args = "(*luaindex* _topLevelIndex_, *luaindex:nilable* _categoryIndex_, *luaindex* _collectibleIndex_)",
-returns = "(integer,)",
-valuetype = "collectibleId,",},
+returns = "(integer:collectibleId,)",
+valuetype = "integer,",},

 GetCollectibleInfo = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_)",
-returns = "(bool,string,bool,bool,bool,textureName,textureName,string,string,)",
-valuetype = "isPlaceholder,hint,categoryType,isActive,purchasable,unlocked,lockedIcon,icon,description,name,",},
+returns = "(bool:isPlaceholder,string:hint,bool:isActive,bool:purchasable,bool:unlocked,textureName:lockedIcon,textureName:icon,string:description,string:name,)",
+valuetype = "bool,string,bool,bool,bool,textureName,textureName,string,string,",},

 GetCollectibleCategoryType = {type = "function",
 description = "",
-args = "(*integer* _collectibleId_)",
-returns = "()",
-valuetype = "categoryType,",},
+args = "(*integer* _collectibleId_)",},

 GetCollectibleKeyboardBackgroundImage = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_)",
-returns = "(textureName,)",
-valuetype = "backgroundImage,",},
+returns = "(textureName:backgroundImage,)",
+valuetype = "textureName,",},

 GetCollectibleGamepadBackgroundImage = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_)",
-returns = "(textureName,)",
-valuetype = "backgroundImage,",},
+returns = "(textureName:backgroundImage,)",
+valuetype = "textureName,",},

 GetCategoryInfoFromCollectibleId = {type = "function",
 description = "",
-args = "(*integer* _collectibleId_)",
-returns = "()",
-valuetype = "collectibleIndex,categoryIndex,topLevelIndex,",},
+args = "(*integer* _collectibleId_)",},

 GetTotalCollectiblesByCategoryType = {type = "function",
 description = "",
 args = "(*[CollectibleCategoryType|#CollectibleCategoryType]* _collectibleCategoryType_)",
-returns = "(integer,)",
-valuetype = "count,",},
+returns = "(integer:count,)",
+valuetype = "integer,",},

 GetTotalUnlockedCollectiblesByCategoryType = {type = "function",
 description = "",
 args = "(*[CollectibleCategoryType|#CollectibleCategoryType]* _collectibleCategoryType_)",
-returns = "(integer,)",
-valuetype = "count,",},
+returns = "(integer:count,)",
+valuetype = "integer,",},

 GetCollectibleIdFromType = {type = "function",
 description = "",
 args = "(*[CollectibleCategoryType|#CollectibleCategoryType]* _collectibleCategoryType_, *luaindex* _index_)",
-returns = "(integer,)",
-valuetype = "collectibleId,",},
+returns = "(integer:collectibleId,)",
+valuetype = "integer,",},

 IsCollectibleCategorySlottable = {type = "function",
 description = "",
 args = "(*[CollectibleCategoryType|#CollectibleCategoryType]* _collectibleCategoryType_)",
-returns = "(bool,)",
-valuetype = "isSlottable,",},
+returns = "(bool:isSlottable,)",
+valuetype = "bool,",},

 IsCollectibleCategoryUsable = {type = "function",
 description = "",
 args = "(*[CollectibleCategoryType|#CollectibleCategoryType]* _collectibleCategoryType_)",
-returns = "(bool,)",
-valuetype = "isUsable,",},
+returns = "(bool:isUsable,)",
+valuetype = "bool,",},

 IsCollectibleCategoryPlaceableFurniture = {type = "function",
 description = "",
 args = "(*[CollectibleCategoryType|#CollectibleCategoryType]* _collectibleCategoryType_)",
-returns = "(bool,)",
-valuetype = "isPlaceable,",},
+returns = "(bool:isPlaceable,)",
+valuetype = "bool,",},

 IsCollectibleBlocked = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_)",
-returns = "(bool,)",
-valuetype = "isBlocked,",},
+returns = "(bool:isBlocked,)",
+valuetype = "bool,",},

 IsCollectibleValidForPlayer = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_)",
-returns = "(bool,)",
-valuetype = "isValidForPlayer,",},
+returns = "(bool:isValidForPlayer,)",
+valuetype = "bool,",},

 GetCollectibleBlockReason = {type = "function",
 description = "",
-args = "(*integer* _collectibleId_)",
-returns = "()",
-valuetype = "usageBlockReason,",},
+args = "(*integer* _collectibleId_)",},

 IsCollectibleSlottable = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_)",
-returns = "(bool,)",
-valuetype = "isSlottable,",},
+returns = "(bool:isSlottable,)",
+valuetype = "bool,",},

 IsCollectibleUsable = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_)",
-returns = "(bool,)",
-valuetype = "isUsable,",},
+returns = "(bool:isUsable,)",
+valuetype = "bool,",},

 IsCollectibleRenameable = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_)",
-returns = "(bool,)",
-valuetype = "isRenameable,",},
+returns = "(bool:isRenameable,)",
+valuetype = "bool,",},

 IsCollectiblePlaceholder = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_)",
-returns = "(bool,)",
-valuetype = "isPlaceholder,",},
+returns = "(bool:isPlaceholder,)",
+valuetype = "bool,",},

 DoesESOPlusUnlockCollectible = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_)",
-returns = "(bool,)",
-valuetype = "unlockedViaSubscription,",},
+returns = "(bool:unlockedViaSubscription,)",
+valuetype = "bool,",},

 DoesCollectibleRequireEntitlement = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_)",
-returns = "(bool,)",
-valuetype = "collectibleRequiresEntitlement,",},
+returns = "(bool:collectibleRequiresEntitlement,)",
+valuetype = "bool,",},

 UseCollectible = {type = "function",
 description = "",
@@ -27651,20 +27245,16 @@ args = "(*integer* _collectibleId_)",},
 GetCollectibleLink = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 GetCollectibleCategoryTypeFromLink = {type = "function",
 description = "",
-args = "(*string* _link_)",
-returns = "()",
-valuetype = "categoryType,",},
+args = "(*string* _link_)",},

 GetCollectibleIdFromLink = {type = "function",
 description = "",
-args = "(*string* _link_)",
-returns = "()",
-valuetype = "collectibleId,",},
+args = "(*string* _link_)",},

 StartCollectibleSearch = {type = "function",
 description = "",
@@ -27673,20 +27263,20 @@ args = "(*string* _searchString_)",},
 GetNumCollectiblesSearchResults = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numSearchResults,",},
+returns = "(integer:numSearchResults,)",
+valuetype = "integer,",},

 GetCollectiblesSearchResult = {type = "function",
 description = "",
 args = "(*luaindex* _searchResultIndex_)",
-returns = "(luaindex,luaindex,)",
-valuetype = "collectibleIndex,subcategoryIndex,categoryIndex,",},
+returns = "(luaindex:collectibleIndex,luaindex:categoryIndex,)",
+valuetype = "luaindex,luaindex,",},

 IsValidCollectibleName = {type = "function",
 description = "",
 args = "(*string* _collectibleName_)",
-returns = "(integer,)",
-valuetype = "violationCode,",},
+returns = "(integer:violationCode,)",
+valuetype = "integer,",},

 RenameCollectible = {type = "function",
 description = "",
@@ -27695,20 +27285,18 @@ args = "(*integer* _collectibleId_, *string* _name_)",},
 GetCollectibleNickname = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_)",
-returns = "(string,)",
-valuetype = "name,",},
+returns = "(string:name,)",
+valuetype = "string,",},

 GetCollectibleHelpIndices = {type = "function",
 description = "",
-args = "(*integer* _collectibleId_)",
-returns = "()",
-valuetype = "helpIndex,helpCategoryIndex,",},
+args = "(*integer* _collectibleId_)",},

 IsCollectibleNew = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_)",
-returns = "(bool,)",
-valuetype = "isNew,",},
+returns = "(bool:isNew,)",
+valuetype = "bool,",},

 ClearCollectibleNewStatus = {type = "function",
 description = "",
@@ -27717,14 +27305,14 @@ args = "(*integer* _collectibleId_)",},
 GetNumCollectibleNotifications = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "count,",},
+returns = "(integer:count,)",
+valuetype = "integer,",},

 GetCollectibleNotificationInfo = {type = "function",
 description = "",
 args = "(*luaindex* _notificationIndex_)",
-returns = "(integer,integer,)",
-valuetype = "collectibleId,notificationId,",},
+returns = "(integer:collectibleId,integer:notificationId,)",
+valuetype = "integer,integer,",},

 RemoveCollectibleNotification = {type = "function",
 description = "",
@@ -27736,291 +27324,281 @@ args = "(*integer* _collectibleId_)",},

 GetCollectibleUnlockStateById = {type = "function",
 description = "",
-args = "(*integer* _collectibleId_)",
-returns = "()",
-valuetype = "unlockState,",},
+args = "(*integer* _collectibleId_)",},

 GetCollectibleName = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_)",
-returns = "(string,)",
-valuetype = "name,",},
+returns = "(string:name,)",
+valuetype = "string,",},

 IsCollectibleUnlocked = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_)",
-returns = "(bool,)",
-valuetype = "isUnlocked,",},
+returns = "(bool:isUnlocked,)",
+valuetype = "bool,",},

 IsCollectibleOwnedByDefId = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_)",
-returns = "(bool,)",
-valuetype = "owned,",},
+returns = "(bool:owned,)",
+valuetype = "bool,",},

 GetImperialCityCollectibleId = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "collectibleId,",},
+returns = "(integer:collectibleId,)",
+valuetype = "integer,",},

 GetCollectibleQuestPreviewInfo = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_)",
-returns = "(string,string,)",
-valuetype = "backgroundText,questName,",},
+returns = "(string:backgroundText,string:questName,)",
+valuetype = "string,string,",},

 GetActiveCollectibleByType = {type = "function",
 description = "",
 args = "(*[CollectibleCategoryType|#CollectibleCategoryType]* _categoryType_)",
-returns = "(integer,)",
-valuetype = "collectibleId,",},
+returns = "(integer:collectibleId,)",
+valuetype = "integer,",},

 GetCollectibleCooldownAndDuration = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_)",
-returns = "(integer,integer,)",
-valuetype = "cooldownDuration,cooldownRemaining,",},
+returns = "(integer:cooldownDuration,integer:cooldownRemaining,)",
+valuetype = "integer,integer,",},

 GetCollectiblePersonalityOverridenEmoteDisplayNames = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_)",
-returns = "(string,)",
-valuetype = "overriddenEmoteDisplayName,",},
+returns = "(string:overriddenEmoteDisplayName,)",
+valuetype = "string,",},

 GetCollectiblePersonalityOverridenEmoteSlashCommandNames = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_)",
-returns = "(string,)",
-valuetype = "overriddenEmoteSlashCommandName,",},
+returns = "(string:overriddenEmoteSlashCommandName,)",
+valuetype = "string,",},

 GetCollectibleRestrictionsByType = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_, *[CollectibleRestrictionType|#CollectibleRestrictionType]* _restrictionType_)",
-returns = "(string,bool,bool,)",
-valuetype = "allowedNamesString,passesRestrictions,hasRestrictions,",},
+returns = "(string:allowedNamesString,bool:passesRestrictions,bool:hasRestrictions,)",
+valuetype = "string,bool,bool,",},

 GetCollectibleFurnitureDataId = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_)",
-returns = "(integer,)",
-valuetype = "furnitureDataId,",},
+returns = "(integer:furnitureDataId,)",
+valuetype = "integer,",},

 GetCollectibleReferenceId = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_)",
-returns = "(integer,)",
-valuetype = "referenceId,",},
+returns = "(integer:referenceId,)",
+valuetype = "integer,",},

 GetCollectibleSortOrder = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_)",
-returns = "(integer,)",
-valuetype = "sortOrder,",},
+returns = "(integer:sortOrder,)",
+valuetype = "integer,",},

 GetCollectibleCategorySortOrder = {type = "function",
 description = "",
 args = "(*luaindex* _topLevelIndex_, *luaindex:nilable* _categoryIndex_)",
-returns = "(integer,)",
-valuetype = "sortOrder,",},
+returns = "(integer:sortOrder,)",
+valuetype = "integer,",},

 GetNumMarketProductCategories = {type = "function",
 description = "",
 args = "(*[MarketDisplayGroup|#MarketDisplayGroup]* _displayGroup_)",
-returns = "(integer,)",
-valuetype = "numCategories,",},
+returns = "(integer:numCategories,)",
+valuetype = "integer,",},

 GetMarketProductCategoryInfo = {type = "function",
 description = "",
 args = "(*[MarketDisplayGroup|#MarketDisplayGroup]* _displayGroup_, *luaindex* _topLevelIndex_)",
-returns = "(textureName,textureName,textureName,integer,integer,string,)",
-valuetype = "mouseoverIcon,pressedIcon,normalIcon,numMarketProducts,numSubCatgories,name,",},
+returns = "(textureName:mouseoverIcon,textureName:pressedIcon,textureName:normalIcon,integer:numMarketProducts,integer:numSubCatgories,string:name,)",
+valuetype = "textureName,textureName,textureName,integer,integer,string,",},

 GetMarketProductSubCategoryInfo = {type = "function",
 description = "",
 args = "(*[MarketDisplayGroup|#MarketDisplayGroup]* _displayGroup_, *luaindex* _topLevelIndex_, *luaindex* _subCategoryIndex_)",
-returns = "(bool,integer,string,)",
-valuetype = "showGemIcon,numMarketProducts,name,",},
+returns = "(bool:showGemIcon,integer:numMarketProducts,string:name,)",
+valuetype = "bool,integer,string,",},

 IsLTODisabledForMarketProductCategory = {type = "function",
 description = "",
 args = "(*[MarketDisplayGroup|#MarketDisplayGroup]* _displayGroup_, *luaindex* _topLevelIndex_, *luaindex:nilable* _categoryIndex_)",
-returns = "(bool,)",
-valuetype = "isDisabled,",},
+returns = "(bool:isDisabled,)",
+valuetype = "bool,",},

 GetMarketProductInfo = {type = "function",
 description = "",
 args = "(*integer* _marketProductId_)",
-returns = "(bool,bool,textureName,string,string,)",
-valuetype = "isFeatured,isNew,icon,description,name,",},
+returns = "(bool:isFeatured,bool:isNew,textureName:icon,string:description,string:name,)",
+valuetype = "bool,bool,textureName,string,string,",},

 GetMarketProductPricingByPresentation = {type = "function",
 description = "",
 args = "(*integer* _marketProductId_, *luaindex:nilable* _presentationIndex_)",
-returns = "(integer,integer,bool,integer,)",
-valuetype = "discountPercent,costAfterDiscount,hasDiscount,cost,currencyType,",},
+returns = "(integer:discountPercent,integer:costAfterDiscount,bool:hasDiscount,integer:cost,)",
+valuetype = "integer,integer,bool,integer,",},

 GetMarketProductPresentationIds = {type = "function",
 description = "",
 args = "(*[MarketDisplayGroup|#MarketDisplayGroup]* _displayGroup_, *luaindex* _topLevelIndex_, *luaindex:nilable* _categoryIndex_, *luaindex* _marketProductIndex_)",
-returns = "(luaindex,integer,)",
-valuetype = "presentationIndex,marketProductId,",},
+returns = "(luaindex:presentationIndex,integer:marketProductId,)",
+valuetype = "luaindex,integer,",},

 GetMarketProductIcon = {type = "function",
 description = "",
 args = "(*integer* _marketProductId_)",
-returns = "(textureName,)",
-valuetype = "icon,",},
+returns = "(textureName:icon,)",
+valuetype = "textureName,",},

 GetMarketProductNumItems = {type = "function",
 description = "",
 args = "(*integer* _marketProductId_)",
-returns = "(integer,)",
-valuetype = "numItems,",},
+returns = "(integer:numItems,)",
+valuetype = "integer,",},

 GetMarketProductInstantUnlockType = {type = "function",
 description = "",
-args = "(*integer* _marketProductId_)",
-returns = "()",
-valuetype = "instantUnlock,",},
+args = "(*integer* _marketProductId_)",},

 GetMarketProductPurchaseState = {type = "function",
 description = "",
-args = "(*integer* _marketProductId_, *bool* _getCached_)",
-returns = "()",
-valuetype = "purchaseState,",},
+args = "(*integer* _marketProductId_, *bool* _getCached_)",},

 DoesMarketProductContainDLC = {type = "function",
 description = "",
 args = "(*integer* _marketProductId_)",
-returns = "(bool,)",
-valuetype = "hasDLC,",},
+returns = "(bool:hasDLC,)",
+valuetype = "bool,",},

 GetMarketProductEligibilityErrorStringIds = {type = "function",
 description = "",
 args = "(*integer* _marketProductId_)",
-returns = "(integer,)",
-valuetype = "errorStringId,",},
+returns = "(integer:errorStringId,)",
+valuetype = "integer,",},

 GetMarketProductCompleteErrorStringId = {type = "function",
 description = "",
 args = "(*integer* _marketProductId_)",
-returns = "(integer,)",
-valuetype = "errorStringId,",},
+returns = "(integer:errorStringId,)",
+valuetype = "integer,",},

 GetMarketProductItemInfo = {type = "function",
 description = "",
 args = "(*integer* _marketProductId_)",
-returns = "(integer,integer,string,textureName,integer,)",
-valuetype = "itemCount,requiredLevel,itemQuality,name,iconFile,itemId,",},
+returns = "(integer:itemCount,integer:requiredLevel,string:name,textureName:iconFile,integer:itemId,)",
+valuetype = "integer,integer,string,textureName,integer,",},

 GetMarketProductItemLink = {type = "function",
 description = "",
 args = "(*integer* _marketProductId_, *[LinkStyle|#LinkStyle]* _linkStyle_)",
-returns = "(string,)",
-valuetype = "link,",},
+returns = "(string:link,)",
+valuetype = "string,",},

 GetMarketProductType = {type = "function",
 description = "",
-args = "(*integer* _marketProductId_)",
-returns = "()",
-valuetype = "productType,",},
+args = "(*integer* _marketProductId_)",},

 GetMarketProductDisplayName = {type = "function",
 description = "",
 args = "(*integer* _marketProductId_)",
-returns = "(string,)",
-valuetype = "displayName,",},
+returns = "(string:displayName,)",
+valuetype = "string,",},

 GetMarketProductDescription = {type = "function",
 description = "",
 args = "(*integer* _marketProductId_)",
-returns = "(string,)",
-valuetype = "description,",},
+returns = "(string:description,)",
+valuetype = "string,",},

 GetMarketProductNumChildren = {type = "function",
 description = "",
 args = "(*integer* _marketProductId_)",
-returns = "(integer,)",
-valuetype = "numChildren,",},
+returns = "(integer:numChildren,)",
+valuetype = "integer,",},

 GetMarketProductChildId = {type = "function",
 description = "",
 args = "(*integer* _marketProductId_, *luaindex* _childIndex_)",
-returns = "(integer,)",
-valuetype = "childId,",},
+returns = "(integer:childId,)",
+valuetype = "integer,",},

 GetMarketProductNumBundledProducts = {type = "function",
 description = "",
 args = "(*integer* _marketProductId_)",
-returns = "(integer,)",
-valuetype = "numBundledProducts,",},
+returns = "(integer:numBundledProducts,)",
+valuetype = "integer,",},

 GetMarketProductStackCount = {type = "function",
 description = "",
 args = "(*integer* _marketProductId_)",
-returns = "(integer,)",
-valuetype = "stackCount,",},
+returns = "(integer:stackCount,)",
+valuetype = "integer,",},

 GetMarketProductFurnitureDataId = {type = "function",
 description = "",
 args = "(*integer* _marketProductId_)",
-returns = "(integer,)",
-valuetype = "furnitureDataId,",},
+returns = "(integer:furnitureDataId,)",
+valuetype = "integer,",},

 GetMarketProductQuality = {type = "function",
 description = "",
-args = "(*integer* _marketProductId_)",
-returns = "()",
-valuetype = "itemQuality,",},
+args = "(*integer* _marketProductId_)",},

 GetMarketProductNumCollectibles = {type = "function",
 description = "",
 args = "(*integer* _marketProductId_)",
-returns = "(integer,)",
-valuetype = "numCollectibles,",},
+returns = "(integer:numCollectibles,)",
+valuetype = "integer,",},

 GetMarketProductCollectibleInfo = {type = "function",
 description = "",
 args = "(*integer* _marketProductId_)",
-returns = "(bool,bool,string,string,textureName,integer,)",
-valuetype = "isPlaceholder,owned,description,collectibleType,name,iconFile,collectibleId,",},
+returns = "(bool:isPlaceholder,bool:owned,string:description,string:name,textureName:iconFile,integer:collectibleId,)",
+valuetype = "bool,bool,string,string,textureName,integer,",},

 GetMarketProductCollectibleId = {type = "function",
 description = "",
 args = "(*integer* _marketProductId_)",
-returns = "(integer,)",
-valuetype = "collectibleId,",},
+returns = "(integer:collectibleId,)",
+valuetype = "integer,",},

 GetMarketProductBundleHidesChildProducts = {type = "function",
 description = "",
 args = "(*integer* _marketProductId_)",
-returns = "(bool,)",
-valuetype = "hidesChildProducts,",},
+returns = "(bool:hidesChildProducts,)",
+valuetype = "bool,",},

 GetMarketProductCrownCrateId = {type = "function",
 description = "",
 args = "(*integer* _marketProductId_)",
-returns = "(integer,)",
-valuetype = "crateId,",},
+returns = "(integer:crateId,)",
+valuetype = "integer,",},

 GetMarketProductHouseId = {type = "function",
 description = "",
 args = "(*integer* _marketProductId_)",
-returns = "(integer,)",
-valuetype = "houseId,",},
+returns = "(integer:houseId,)",
+valuetype = "integer,",},

 GetMarketProductHouseTemplateId = {type = "function",
 description = "",
 args = "(*integer* _marketProductId_)",
-returns = "(integer,)",
-valuetype = "houseTemplateId,",},
+returns = "(integer:houseTemplateId,)",
+valuetype = "integer,",},

 GetMarketProductTimeLeftInSeconds = {type = "function",
 description = "",
 args = "(*integer* _marketProductId_)",
-returns = "(number,)",
-valuetype = "timeLeftSeconds,",},
+returns = "(number:timeLeftSeconds,)",
+valuetype = "number,",},

 OpenMarket = {type = "function",
 description = "",
@@ -28028,21 +27606,19 @@ args = "(*[MarketDisplayGroup|#MarketDisplayGroup]* _displayGroup_)",},

 GetMarketState = {type = "function",
 description = "",
-args = "(*[MarketDisplayGroup|#MarketDisplayGroup]* _displayGroup_)",
-returns = "()",
-valuetype = "marketState,",},
+args = "(*[MarketDisplayGroup|#MarketDisplayGroup]* _displayGroup_)",},

 GetMarketProductsForItem = {type = "function",
 description = "",
 args = "(*integer* _itemId_, *bool* _onlyActiveListings_)",
-returns = "(integer,)",
-valuetype = "marketProductId,",},
+returns = "(integer:marketProductId,)",
+valuetype = "integer,",},

 GetActiveMarketProductListingsForHouseTemplate = {type = "function",
 description = "",
 args = "(*integer* _houseTemplateId_, *[MarketDisplayGroup|#MarketDisplayGroup]* _displayGroup_)",
-returns = "(luaindex,integer,)",
-valuetype = "presentationIndex,marketProductId,",},
+returns = "(luaindex:presentationIndex,integer:marketProductId,)",
+valuetype = "luaindex,integer,",},

 OnMarketClose = {type = "function",
 description = "",
@@ -28051,20 +27627,20 @@ args = "()",},
 CanPreviewMarketProduct = {type = "function",
 description = "",
 args = "(*integer* _marketProductId_)",
-returns = "(bool,)",
-valuetype = "isPreviewable,",},
+returns = "(bool:isPreviewable,)",
+valuetype = "bool,",},

 GetNumMarketProductPreviewVariations = {type = "function",
 description = "",
 args = "(*integer* _marketProductId_)",
-returns = "(integer,)",
-valuetype = "numVariations,",},
+returns = "(integer:numVariations,)",
+valuetype = "integer,",},

 GetMarketProductPreviewVariationDisplayName = {type = "function",
 description = "",
 args = "(*integer* _marketProductId_, *luaindex* _variation_)",
-returns = "(string,)",
-valuetype = "variationDisplayName,",},
+returns = "(string:variationDisplayName,)",
+valuetype = "string,",},

 PreviewMarketProduct = {type = "function",
 description = "",
@@ -28077,8 +27653,8 @@ args = "(*integer* _marketProductId_, *luaindex* _variation_)",},
 IsPreviewingMarketProduct = {type = "function",
 description = "",
 args = "(*integer* _marketProductId_)",
-returns = "(bool,)",
-valuetype = "isBeingPreviewed,",},
+returns = "(bool:isBeingPreviewed,)",
+valuetype = "bool,",},

 OnMarketPurchaseMoreCrowns = {type = "function",
 description = "",
@@ -28086,9 +27662,7 @@ args = "()",},

 GetEsoPlusSubscriptionInfoHelpIndices = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "helpIndex,helpCategoryIndex,",},
+args = "()",},

 SendCrownCrateOpenRequest = {type = "function",
 description = "",
@@ -28097,122 +27671,114 @@ args = "(*integer* _crateId_)",},
 GetNumOwnedCrownCrateTypes = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numCrownCrateTypes,",},
+returns = "(integer:numCrownCrateTypes,)",
+valuetype = "integer,",},

 GetNextOwnedCrownCrateId = {type = "function",
 description = "",
-args = "(*integer:nilable* _lastCrateId_)",
-returns = "()",
-valuetype = "nextCrateId,",},
+args = "(*integer:nilable* _lastCrateId_)",},

 GetOnSaleCrownCrateId = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "crateId,",},
+args = "()",},

 GetCrownCrateName = {type = "function",
 description = "",
 args = "(*integer* _crateId_)",
-returns = "(string,)",
-valuetype = "crateName,",},
+returns = "(string:crateName,)",
+valuetype = "string,",},

 GetCrownCrateCount = {type = "function",
 description = "",
 args = "(*integer* _crateId_)",
-returns = "(integer,)",
-valuetype = "count,",},
+returns = "(integer:count,)",
+valuetype = "integer,",},

 GetInventorySpaceRequiredToOpenCrownCrate = {type = "function",
 description = "",
 args = "(*integer* _crateId_)",
-returns = "(integer,)",
-valuetype = "inventorySpaceRequired,",},
+returns = "(integer:inventorySpaceRequired,)",
+valuetype = "integer,",},

 GetCrownCratePackNormalTexture = {type = "function",
 description = "",
 args = "(*integer* _crateId_)",
-returns = "(textureName,)",
-valuetype = "normalImage,",},
+returns = "(textureName:normalImage,)",
+valuetype = "textureName,",},

 GetCrownCrateCardTextures = {type = "function",
 description = "",
 args = "(*integer* _crateId_)",
-returns = "(textureName,textureName,textureName,textureName,)",
-valuetype = "cardFaceGlowImage,cardFaceImage,cardBackGlowImage,cardBackImage,",},
+returns = "(textureName:cardFaceGlowImage,textureName:cardFaceImage,textureName:cardBackGlowImage,textureName:cardBackImage,)",
+valuetype = "textureName,textureName,textureName,textureName,",},

 GetCurrentCrownCrateId = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "crateId,",},
+returns = "(integer:crateId,)",
+valuetype = "integer,",},

 GetNumCurrentCrownCrateTotalRewards = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numRewards,",},
+returns = "(integer:numRewards,)",
+valuetype = "integer,",},

 GetNumCurrentCrownCratePrimaryRewards = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numPrimaryRewards,",},
+returns = "(integer:numPrimaryRewards,)",
+valuetype = "integer,",},

 GetNumCurrentCrownCrateBonusRewards = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numBonusRewards,",},
+returns = "(integer:numBonusRewards,)",
+valuetype = "integer,",},

 GetCrownCrateRewardInfo = {type = "function",
 description = "",
 args = "(*luaindex* _rewardIndex_)",
-returns = "(integer,integer,bool,integer,textureName,textureName,string,string,)",
-valuetype = "stackCount,crownCrateTierId,isBonus,gemsExchanged,cardFaceFrameAccentImage,cardFaceImage,rewardTypeText,rewardName,",},
+returns = "(integer:stackCount,integer:crownCrateTierId,bool:isBonus,integer:gemsExchanged,textureName:cardFaceFrameAccentImage,textureName:cardFaceImage,string:rewardTypeText,string:rewardName,)",
+valuetype = "integer,integer,bool,integer,textureName,textureName,string,string,",},

 GetMarketProductCrownCrateRewardInfo = {type = "function",
 description = "",
 args = "(*integer* _marketProductId_)",
-returns = "(integer,textureName,textureName,string,string,)",
-valuetype = "stackCount,cardFaceFrameAccentImage,cardFaceImage,rewardTypeText,rewardName,",},
+returns = "(integer:stackCount,textureName:cardFaceFrameAccentImage,textureName:cardFaceImage,string:rewardTypeText,string:rewardName,)",
+valuetype = "integer,textureName,textureName,string,string,",},

 GetMarketProductCrownCrateTierId = {type = "function",
 description = "",
 args = "(*integer* _marketProductId_)",
-returns = "(integer,)",
-valuetype = "crownCrateTierId,",},
+returns = "(integer:crownCrateTierId,)",
+valuetype = "integer,",},

 GetCrownCrateRewardProductReferenceData = {type = "function",
 description = "",
 args = "(*luaindex* _rewardIndex_)",
-returns = "(integer,)",
-valuetype = "referenceDataId,rewardProductType,",},
+returns = "(integer:referenceDataId,)",
+valuetype = "integer,",},

 GetCrownCrateNPCBoneWorldPosition = {type = "function",
 description = "",
 args = "(*string* _boneName_)",
-returns = "(number,number,number,bool,)",
-valuetype = "positionZ,positionY,positionX,success,",},
+returns = "(number:positionZ,number:positionY,number:positionX,bool:success,)",
+valuetype = "number,number,number,bool,",},

 CreateCrownCrateSpecificParticleEffect = {type = "function",
 description = "",
-args = "(*integer* _crownCrateId_, *[CrownCrateParticleEffects|#CrownCrateParticleEffects]* _crownCrateParticleEffects_, *number* _worldX_, *number* _worldY_, *number* _worldZ_)",
-returns = "()",
-valuetype = "particleEffectId,",},
+args = "(*integer* _crownCrateId_, *[CrownCrateParticleEffects|#CrownCrateParticleEffects]* _crownCrateParticleEffects_, *number* _worldX_, *number* _worldY_, *number* _worldZ_)",},

 CreateCrownCrateTierSpecificParticleEffect = {type = "function",
 description = "",
-args = "(*integer* _crownCrateTierId_, *[CrownCrateTierParticleEffects|#CrownCrateTierParticleEffects]* _crownCrateTierParticleEffects_, *number* _worldX_, *number* _worldY_, *number* _worldZ_)",
-returns = "()",
-valuetype = "particleEffectId,",},
+args = "(*integer* _crownCrateTierId_, *[CrownCrateTierParticleEffects|#CrownCrateTierParticleEffects]* _crownCrateTierParticleEffects_, *number* _worldX_, *number* _worldY_, *number* _worldZ_)",},

 GetCrownCrateNPCCardThrowingBoneName = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "boneName,",},
+returns = "(string:boneName,)",
+valuetype = "string,",},

 SetCrownCrateNPCVisible = {type = "function",
 description = "",
@@ -28225,32 +27791,28 @@ args = "(*[CrownCrateEvent|#CrownCrateEvent]* _event_, *luaindex:nilable* _rewar
 GetCrownCrateTierQualityColor = {type = "function",
 description = "",
 args = "(*integer* _crownCrateTierId_)",
-returns = "(number,number,number,)",
-valuetype = "b,g,r,",},
+returns = "(number:b,number:g,number:r,)",
+valuetype = "number,number,number,",},

 GetCrownCrateTierReactionNPCAnimation = {type = "function",
 description = "",
-args = "(*integer* _crownCrateTierId_)",
-returns = "()",
-valuetype = "reactionEvent,",},
+args = "(*integer* _crownCrateTierId_)",},

 GetCrownCratesSystemState = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "crownCratesSystemState,",},
+args = "()",},

 CanInteractWithCrownCratesSystem = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "canInteractWithCrownCratesSystem,",},
+returns = "(bool:canInteractWithCrownCratesSystem,)",
+valuetype = "bool,",},

 IsPlayerAllowedToOpenCrownCrates = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,bool,)",
-valuetype = "errorStringId,isAllowed,",},
+returns = "(integer:errorStringId,bool:isAllowed,)",
+valuetype = "integer,bool,",},

 PlayCrownCrateTierSpecificParticleSoundAndVibration = {type = "function",
 description = "",
@@ -28271,8 +27833,8 @@ args = "(*bool* _active_)",},
 GetCrownCrateTierOrdering = {type = "function",
 description = "",
 args = "(*integer* _tierId_)",
-returns = "(integer,)",
-valuetype = "tierOrdering,",},
+returns = "(integer:tierOrdering,)",
+valuetype = "integer,",},

 GemifyItem = {type = "function",
 description = "",
@@ -28289,44 +27851,44 @@ args = "(*[DyeableSlot|#DyeableSlot]* _dyeableSlot_, *integer* _primaryDyeId_, *
 GetPendingSlotDyes = {type = "function",
 description = "",
 args = "(*[DyeableSlot|#DyeableSlot]* _dyeableSlot_)",
-returns = "(integer,integer,integer,)",
-valuetype = "accentDyeId,secondaryDyeId,primaryDyeId,",},
+returns = "(integer:accentDyeId,integer:secondaryDyeId,integer:primaryDyeId,)",
+valuetype = "integer,integer,integer,",},

 GetNumDyes = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numDyes,",},
+returns = "(integer:numDyes,)",
+valuetype = "integer,",},

 GetDyeInfo = {type = "function",
 description = "",
 args = "(*luaindex* _dyeIndex_)",
-returns = "(integer,integer,number,number,number,integer,bool,string,)",
-valuetype = "dyeId,sortKey,b,g,r,achievementId,hueCategory,rarity,known,dyeName,",},
+returns = "(integer:dyeId,integer:sortKey,number:b,number:g,number:r,integer:achievementId,bool:known,string:dyeName,)",
+valuetype = "integer,integer,number,number,number,integer,bool,string,",},

 GetDyeInfoById = {type = "function",
 description = "",
 args = "(*integer* _dyeId_)",
-returns = "(integer,number,number,number,integer,bool,string,)",
-valuetype = "sortKey,b,g,r,achievementId,hueCategory,rarity,known,dyeName,",},
+returns = "(integer:sortKey,number:b,number:g,number:r,integer:achievementId,bool:known,string:dyeName,)",
+valuetype = "integer,number,number,number,integer,bool,string,",},

 GetDyeColorsById = {type = "function",
 description = "",
 args = "(*integer* _dyeId_)",
-returns = "(number,number,number,)",
-valuetype = "b,g,r,",},
+returns = "(number:b,number:g,number:r,)",
+valuetype = "number,number,number,",},

 GetCurrentItemDyes = {type = "function",
 description = "",
 args = "(*integer* _bagId_, *integer* _slotIndex_)",
-returns = "(integer,integer,integer,)",
-valuetype = "accentDyeIndex,secondaryDyeIndex,primaryDyeIndex,",},
+returns = "(integer:accentDyeIndex,integer:secondaryDyeIndex,integer:primaryDyeIndex,)",
+valuetype = "integer,integer,integer,",},

 GetCurrentCollectibleDyes = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_)",
-returns = "(integer,integer,integer,)",
-valuetype = "accentDyeIndex,secondaryDyeIndex,primaryDyeIndex,",},
+returns = "(integer:accentDyeIndex,integer:secondaryDyeIndex,integer:primaryDyeIndex,)",
+valuetype = "integer,integer,integer,",},

 ApplyPendingDyes = {type = "function",
 description = "",
@@ -28335,14 +27897,14 @@ args = "()",},
 GetNumSavedDyeSets = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numSavedDyeSets,",},
+returns = "(integer:numSavedDyeSets,)",
+valuetype = "integer,",},

 GetSavedDyeSetDyes = {type = "function",
 description = "",
 args = "(*luaindex* _dyeSetIndex_)",
-returns = "(integer,integer,integer,)",
-valuetype = "accentDyeId,secondaryDyeId,primaryDyeId,",},
+returns = "(integer:accentDyeId,integer:secondaryDyeId,integer:primaryDyeId,)",
+valuetype = "integer,integer,integer,",},

 SetSavedDyeSetDyes = {type = "function",
 description = "",
@@ -28351,68 +27913,64 @@ args = "(*luaindex* _dyeSetIndex_, *integer* _primaryDyeId_, *integer* _secondar
 CanUseCollectibleDyeing = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "collectibleDyeingAllowed,",},
+returns = "(bool:collectibleDyeingAllowed,)",
+valuetype = "bool,",},

 IsDyeableSlotDyeable = {type = "function",
 description = "",
 args = "(*[DyeableSlot|#DyeableSlot]* _dyeableSlot_)",
-returns = "(bool,)",
-valuetype = "isDyeable,",},
+returns = "(bool:isDyeable,)",
+valuetype = "bool,",},

 IsDyeableSlotBound = {type = "function",
 description = "",
 args = "(*[DyeableSlot|#DyeableSlot]* _dyeableSlot_)",
-returns = "(bool,)",
-valuetype = "isBound,",},
+returns = "(bool:isBound,)",
+valuetype = "bool,",},

 AreDyeableSlotDyeChannelsDyeable = {type = "function",
 description = "",
 args = "(*[DyeableSlot|#DyeableSlot]* _dyeableSlot_)",
-returns = "(bool,bool,bool,)",
-valuetype = "accent,secondary,primary,",},
+returns = "(bool:accent,bool:secondary,bool:primary,)",
+valuetype = "bool,bool,bool,",},

 GetDyeableSlotDyeData = {type = "function",
 description = "",
 args = "(*[DyeableSlot|#DyeableSlot]* _dyeableSlot_)",
-returns = "(integer,)",
-valuetype = "dyeData,",},
+returns = "(integer:dyeData,)",
+valuetype = "integer,",},

 GetDyeableSlotId = {type = "function",
 description = "",
 args = "(*[DyeableSlot|#DyeableSlot]* _dyeableSlot_)",
-returns = "(integer,)",
-valuetype = "id,",},
+returns = "(integer:id,)",
+valuetype = "integer,",},

 GetDyeableSlotIcon = {type = "function",
 description = "",
 args = "(*[DyeableSlot|#DyeableSlot]* _dyeableSlot_)",
-returns = "(textureName,)",
-valuetype = "icon,",},
+returns = "(textureName:icon,)",
+valuetype = "textureName,",},

 GetDyeableSlotCurrentDyes = {type = "function",
 description = "",
 args = "(*[DyeableSlot|#DyeableSlot]* _dyeableSlot_)",
-returns = "(integer,integer,integer,)",
-valuetype = "accentDyeId,secondaryDyeId,primaryDyeId,",},
+returns = "(integer:accentDyeId,integer:secondaryDyeId,integer:primaryDyeId,)",
+valuetype = "integer,integer,integer,",},

 IsDyeIndexKnown = {type = "function",
 description = "",
 args = "(*luaindex* _dyeIndex_)",
-returns = "(bool,)",
-valuetype = "isKnown,",},
+returns = "(bool:isKnown,)",
+valuetype = "bool,",},

 CanPlayerUseCostumeDyeStamp = {type = "function",
 description = "",
-args = "(*integer* _dyeStampId_)",
-returns = "()",
-valuetype = "dyeStampUseResult,",},
+args = "(*integer* _dyeStampId_)",},

 CanPlayerUseItemDyeStamp = {type = "function",
 description = "",
-args = "(*integer* _dyeStampId_)",
-returns = "()",
-valuetype = "dyeStampUseResult,",},
+args = "(*integer* _dyeStampId_)",},

 SetupDyeStampPreview = {type = "function",
 description = "",
@@ -28421,38 +27979,38 @@ args = "(*integer* _bagId_, *integer* _slotIndex_)",},
 IsInPreviewMode = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isInPreviewMode,",},
+returns = "(bool:isInPreviewMode,)",
+valuetype = "bool,",},

 IsCharacterPreviewingAvailable = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "canPreview,",},
+returns = "(bool:canPreview,)",
+valuetype = "bool,",},

 IsCurrentlyPreviewing = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isPreviewing,",},
+returns = "(bool:isPreviewing,)",
+valuetype = "bool,",},

 IsCurrentlyPreviewingCollectibleAsFurniture = {type = "function",
 description = "",
 args = "(*integer* _collectibleId_)",
-returns = "(bool,)",
-valuetype = "isPreviewing,",},
+returns = "(bool:isPreviewing,)",
+valuetype = "bool,",},

 IsCurrentlyPreviewingInventoryItemAsFurniture = {type = "function",
 description = "",
 args = "(*[Bag|#Bag]* _bagId_, *integer* _slotIndex_)",
-returns = "(bool,)",
-valuetype = "isPreviewing,",},
+returns = "(bool:isPreviewing,)",
+valuetype = "bool,",},

 IsCurrentlyPreviewingPlacedFurniture = {type = "function",
 description = "",
 args = "(*id64* _furnitureId_)",
-returns = "(bool,)",
-valuetype = "isPreviewing,",},
+returns = "(bool:isPreviewing,)",
+valuetype = "bool,",},

 BeginPreviewMode = {type = "function",
 description = "",
@@ -28477,8 +28035,8 @@ args = "()",},
 CanSpinPreviewCharacter = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "canSpin,",},
+returns = "(bool:canSpin,)",
+valuetype = "bool,",},

 PreviewDyeStamp = {type = "function",
 description = "",
@@ -28527,8 +28085,8 @@ args = "(*bool* _showHiddenGear_)",},
 GetShowHiddenGear = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "showHiddenGear,",},
+returns = "(bool:showHiddenGear,)",
+valuetype = "bool,",},

 ForceCancelMounted = {type = "function",
 description = "",
@@ -28557,8 +28115,8 @@ args = "(*integer* _houseTemplateId_)",},
 ClearCursor = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "clearedSomething,",},
+returns = "(bool:clearedSomething,)",
+valuetype = "bool,",},

 SetCursorItemSoundsEnabled = {type = "function",
 description = "",
@@ -28567,44 +28125,40 @@ args = "(*bool* _enabled_)",},
 GetCursorContentType = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "cursorType,",},
+returns = "(integer:cursorType,)",
+valuetype = "integer,",},

 GetSkillLineInfo = {type = "function",
 description = "",
 args = "(*[SkillType|#SkillType]* _skillType_, *luaindex* _skillIndex_)",
-returns = "(bool,luaindex,string,)",
-valuetype = "discovered,rank,name,",},
+returns = "(bool:discovered,luaindex:rank,string:name,)",
+valuetype = "bool,luaindex,string,",},

 GetCraftingSkillLineIndices = {type = "function",
 description = "",
 args = "(*[TradeskillType|#TradeskillType]* _craftingSkillType_)",
-returns = "(luaindex,)",
-valuetype = "skillIndex,skillType,",},
+returns = "(luaindex:skillIndex,)",
+valuetype = "luaindex,",},

 GetCraftingSkillName = {type = "function",
 description = "",
 args = "(*[TradeskillType|#TradeskillType]* _craftingSkillType_)",
-returns = "(string,)",
-valuetype = "name,",},
+returns = "(string:name,)",
+valuetype = "string,",},

 GetFurnitureCategoryName = {type = "function",
 description = "",
 args = "(*integer* _furnitureCategoryId_)",
-returns = "(string,)",
-valuetype = "displayName,",},
+returns = "(string:displayName,)",
+valuetype = "string,",},

 GetFurnitureDataInfo = {type = "function",
 description = "",
-args = "(*integer* _furnitureDataId_)",
-returns = "()",
-valuetype = "furnitureTheme,subcategoryId,categoryId,",},
+args = "(*integer* _furnitureDataId_)",},

 GetFurnitureDataCategoryInfo = {type = "function",
 description = "",
-args = "(*integer* _furnitureDataId_)",
-returns = "()",
-valuetype = "subcategoryId,categoryId,",},
+args = "(*integer* _furnitureDataId_)",},

 SetInteractionUsingInteractCamera = {type = "function",
 description = "",
@@ -28613,8 +28167,8 @@ args = "(*bool* _enabled_)",},
 IsInteractionUsingInteractCamera = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "enabled,",},
+returns = "(bool:enabled,)",
+valuetype = "bool,",},



@@ -28627,38 +28181,38 @@ args = "(*string* _relevantFilter_)",},
 GetAddOnDependencyInfo = {type = "function",
 description = "",
 args = "(*luaindex* _addOnIndex_, *luaindex* _addOnDependencyIndex_)",
-returns = "(bool,string,)",
-valuetype = "active,name,",},
+returns = "(bool:active,string:name,)",
+valuetype = "bool,string,",},

 GetAddOnFilter = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "settingFilter,",},
+returns = "(string:settingFilter,)",
+valuetype = "string,",},

 GetAddOnInfo = {type = "function",
 description = "",
 args = "(*luaindex* _addOnIndex_)",
-returns = "(bool,bool,string,string,string,string,)",
-valuetype = "isOutOfDate,state,enabled,description,author,title,name,",},
+returns = "(bool:isOutOfDate,bool:enabled,string:description,string:author,string:title,string:name,)",
+valuetype = "bool,bool,string,string,string,string,",},

 GetAddOnNumDependencies = {type = "function",
 description = "",
 args = "(*luaindex* _addOnIndex_)",
-returns = "(integer,)",
-valuetype = "numDependencies,",},
+returns = "(integer:numDependencies,)",
+valuetype = "integer,",},

 GetLoadOutOfDateAddOns = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "loadOutOfDateAddons,",},
+returns = "(bool:loadOutOfDateAddons,)",
+valuetype = "bool,",},

 GetNumAddOns = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numAddOns,",},
+returns = "(integer:numAddOns,)",
+valuetype = "integer,",},

 RemoveAddOnFilter = {type = "function",
 description = "",
@@ -28685,14 +28239,14 @@ args = "(*bool* _loadOutOfDateAddons_)",},
 CreateTimeline = {type = "function",
 description = "",
 args = "()",
-returns = "(object,)",
-valuetype = "timeline,",},
+returns = "(object:timeline,)",
+valuetype = "object,",},

 CreateTimelineFromVirtual = {type = "function",
 description = "",
 args = "(*string* _timelineName_, *object* _animatedControl_)",
-returns = "(object,)",
-valuetype = "timeline,",},
+returns = "(object:timeline,)",
+valuetype = "object,",},



@@ -28703,38 +28257,38 @@ valuetype = "timeline,",},
 GetAnimatedControl = {type = "function",
 description = "",
 args = "()",
-returns = "(object,)",
-valuetype = "animatedControl,",},
+returns = "(object:animatedControl,)",
+valuetype = "object,",},

 GetDuration = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "durationMs,",},
+returns = "(integer:durationMs,)",
+valuetype = "integer,",},

 GetEasingFunction = {type = "function",
 description = "",
 args = "()",
-returns = "(function,)",
-valuetype = "functionRef,",},
+returns = "(function:functionRef,)",
+valuetype = "function,",},

 GetHandler = {type = "function",
 description = "",
 args = "(*string* _EventName_)",
-returns = "(function,)",
-valuetype = "FunctionRef,",},
+returns = "(function:FunctionRef,)",
+valuetype = "function,",},

 GetTimeline = {type = "function",
 description = "",
 args = "()",
-returns = "(object,)",
-valuetype = "owningTimeline,",},
+returns = "(object:owningTimeline,)",
+valuetype = "object,",},

 IsPlaying = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isPlaying,",},
+returns = "(bool:isPlaying,)",
+valuetype = "bool,",},

 SetAnimatedControl = {type = "function",
 description = "",
@@ -28757,38 +28311,38 @@ args = "(*string* _EventName_, *function* _FunctionRef_)",},
 GetEndPitch = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "endPitchRadians,",},
+returns = "(number:endPitchRadians,)",
+valuetype = "number,",},

 GetEndRoll = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "endRollRadians,",},
+returns = "(number:endRollRadians,)",
+valuetype = "number,",},

 GetEndYaw = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "endYawRadians,",},
+returns = "(number:endYawRadians,)",
+valuetype = "number,",},

 GetStartPitch = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "startPitchRadians,",},
+returns = "(number:startPitchRadians,)",
+valuetype = "number,",},

 GetStartRoll = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "startRollRadians,",},
+returns = "(number:startRollRadians,)",
+valuetype = "number,",},

 GetStartYaw = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "startYawRadians,",},
+returns = "(number:startYawRadians,)",
+valuetype = "number,",},

 SetEndPitch = {type = "function",
 description = "",
@@ -28827,62 +28381,62 @@ args = "()",},
 GetDeltaOffsetX = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "deltaX,",},
+returns = "(number:deltaX,)",
+valuetype = "number,",},

 GetDeltaOffsetY = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "deltaY,",},
+returns = "(number:deltaY,)",
+valuetype = "number,",},

 GetDeltaOffsetZ = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "deltaZ,",},
+returns = "(number:deltaZ,)",
+valuetype = "number,",},

 GetEndOffsetX = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "endX,",},
+returns = "(number:endX,)",
+valuetype = "number,",},

 GetEndOffsetY = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "endY,",},
+returns = "(number:endY,)",
+valuetype = "number,",},

 GetEndOffsetZ = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "endZ,",},
+returns = "(number:endZ,)",
+valuetype = "number,",},

 GetStartOffsetX = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "startX,",},
+returns = "(number:startX,)",
+valuetype = "number,",},

 GetStartOffsetY = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "startY,",},
+returns = "(number:startY,)",
+valuetype = "number,",},

 GetStartOffsetZ = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "startZ,",},
+returns = "(number:startZ,)",
+valuetype = "number,",},

 GetTranslateDeltas = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,number,)",
-valuetype = "deltaZ,deltaY,deltaX,",},
+returns = "(number:deltaZ,number:deltaY,number:deltaX,)",
+valuetype = "number,number,number,",},

 SetBezierControlPoint = {type = "function",
 description = "",
@@ -28937,14 +28491,14 @@ args = "(*number* _startX_, *number* _startY_, *number* _startZ_, *number* _endX
 GetEndAlpha = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "endAlpha,",},
+returns = "(number:endAlpha,)",
+valuetype = "number,",},

 GetStartAlpha = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "startAlpha,",},
+returns = "(number:startAlpha,)",
+valuetype = "number,",},

 SetAlphaValues = {type = "function",
 description = "",
@@ -28963,14 +28517,14 @@ args = "(*number* _startAlpha_)",},
 GetEndColor = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,number,number,)",
-valuetype = "endA,endB,endG,endR,",},
+returns = "(number:endA,number:endB,number:endG,number:endR,)",
+valuetype = "number,number,number,number,",},

 GetStartColor = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,number,number,)",
-valuetype = "startA,startB,startG,startR,",},
+returns = "(number:startA,number:startB,number:startG,number:startR,)",
+valuetype = "number,number,number,number,",},

 SetColorValues = {type = "function",
 description = "",
@@ -28995,14 +28549,14 @@ args = "(*function* _functionRef_)",},
 GetEndScale = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "endScale,",},
+returns = "(number:endScale,)",
+valuetype = "number,",},

 GetStartScale = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "startScale,",},
+returns = "(number:startScale,)",
+valuetype = "number,",},

 SetEndScale = {type = "function",
 description = "",
@@ -29073,26 +28627,26 @@ args = "(*number* _startWidth_)",},
 GetCellsHigh = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "aNumCellsHigh,",},
+returns = "(integer:aNumCellsHigh,)",
+valuetype = "integer,",},

 GetCellsWide = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "aNumCellsWide,",},
+returns = "(integer:aNumCellsWide,)",
+valuetype = "integer,",},

 IsMirroringAlongX = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "mirroring,",},
+returns = "(bool:mirroring,)",
+valuetype = "bool,",},

 IsMirroringAlongY = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "mirroring,",},
+returns = "(bool:mirroring,)",
+valuetype = "bool,",},

 SetCellsHigh = {type = "function",
 description = "",
@@ -29123,14 +28677,14 @@ args = "(*bool* _mirroring_)",},
 GetEndRotation = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "endRadians,",},
+returns = "(number:endRadians,)",
+valuetype = "number,",},

 GetStartRotation = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "startRadians,",},
+returns = "(number:startRadians,)",
+valuetype = "number,",},

 SetEndRotation = {type = "function",
 description = "",
@@ -29155,50 +28709,50 @@ args = "(*number* _slideDistanceU_, *number* _slideDistanceV_)",},
 GetAnchorIndex = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "anchorIndex,",},
+returns = "(integer:anchorIndex,)",
+valuetype = "integer,",},

 GetDeltaOffsetX = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "deltaX,",},
+returns = "(number:deltaX,)",
+valuetype = "number,",},

 GetDeltaOffsetY = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "deltaY,",},
+returns = "(number:deltaY,)",
+valuetype = "number,",},

 GetEndOffsetX = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "endX,",},
+returns = "(number:endX,)",
+valuetype = "number,",},

 GetEndOffsetY = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "endY,",},
+returns = "(number:endY,)",
+valuetype = "number,",},

 GetStartOffsetX = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "startX,",},
+returns = "(number:startX,)",
+valuetype = "number,",},

 GetStartOffsetY = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "startY,",},
+returns = "(number:startY,)",
+valuetype = "number,",},

 GetTranslateDeltas = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,)",
-valuetype = "deltaY,deltaX,",},
+returns = "(number:deltaY,number:deltaX,)",
+valuetype = "number,number,",},

 SetAnchorIndex = {type = "function",
 description = "",
@@ -29249,146 +28803,146 @@ args = "()",},
 GetAnimation = {type = "function",
 description = "",
 args = "(*luaindex* _animationIndex_)",
-returns = "(object,)",
-valuetype = "animation,",},
+returns = "(object:animation,)",
+valuetype = "object,",},

 GetAnimationOffset = {type = "function",
 description = "",
 args = "(*object* _animation_)",
-returns = "(integer,)",
-valuetype = "offset,",},
+returns = "(integer:offset,)",
+valuetype = "integer,",},

 GetAnimationTimeline = {type = "function",
 description = "",
 args = "(*luaindex* _timelineIndex_)",
-returns = "(object,)",
-valuetype = "timeline,",},
+returns = "(object:timeline,)",
+valuetype = "object,",},

 GetAnimationTimelineOffset = {type = "function",
 description = "",
 args = "(*object* _animation_)",
-returns = "(integer,)",
-valuetype = "offset,",},
+returns = "(integer:offset,)",
+valuetype = "integer,",},

 GetDuration = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "duration,",},
+returns = "(integer:duration,)",
+valuetype = "integer,",},

 GetFirstAnimation = {type = "function",
 description = "",
 args = "()",
-returns = "(object,)",
-valuetype = "animation,",},
+returns = "(object:animation,)",
+valuetype = "object,",},

 GetFirstAnimationTimeline = {type = "function",
 description = "",
 args = "()",
-returns = "(object,)",
-valuetype = "timeline,",},
+returns = "(object:timeline,)",
+valuetype = "object,",},

 GetFullProgress = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "progress,",},
+returns = "(number:progress,)",
+valuetype = "number,",},

 GetHandler = {type = "function",
 description = "",
 args = "(*string* _EventName_)",
-returns = "(function,)",
-valuetype = "FunctionRef,",},
+returns = "(function:FunctionRef,)",
+valuetype = "function,",},

 GetLastAnimation = {type = "function",
 description = "",
 args = "()",
-returns = "(object,)",
-valuetype = "animation,",},
+returns = "(object:animation,)",
+valuetype = "object,",},

 GetLastAnimationTimeline = {type = "function",
 description = "",
 args = "()",
-returns = "(object,)",
-valuetype = "timeline,",},
+returns = "(object:timeline,)",
+valuetype = "object,",},

 GetNumAnimationTimelines = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numTimelines,",},
+returns = "(integer:numTimelines,)",
+valuetype = "integer,",},

 GetNumAnimations = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numAnimations,",},
+returns = "(integer:numAnimations,)",
+valuetype = "integer,",},

 GetParent = {type = "function",
 description = "",
 args = "()",
-returns = "(object,)",
-valuetype = "timeline,",},
+returns = "(object:timeline,)",
+valuetype = "object,",},

 GetPlaybackLoopsRemaining = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "loopsRemaining,",},
+returns = "(integer:loopsRemaining,)",
+valuetype = "integer,",},

 GetProgress = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "progress,",},
+returns = "(number:progress,)",
+valuetype = "number,",},

 GetSkipAnimationsBehindPlayheadOnInitialPlay = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "skipAnimations,",},
+returns = "(bool:skipAnimations,)",
+valuetype = "bool,",},

 InsertAnimation = {type = "function",
 description = "",
 args = "(*integer* _animationType_, *object* _animatedControl_, *integer* _offset_)",
-returns = "(object,)",
-valuetype = "animation,",},
+returns = "(object:animation,)",
+valuetype = "object,",},

 InsertAnimationFromVirtual = {type = "function",
 description = "",
 args = "(*string* _animationVirtualName_, *object* _animatedControl_)",
-returns = "(object,)",
-valuetype = "animation,",},
+returns = "(object:animation,)",
+valuetype = "object,",},

 InsertAnimationTimeline = {type = "function",
 description = "",
 args = "(*integer* _offset_, *object* _animatedControl_)",
-returns = "(object,)",
-valuetype = "animation,",},
+returns = "(object:animation,)",
+valuetype = "object,",},

 InsertAnimationTimelineFromVirtual = {type = "function",
 description = "",
 args = "(*string* _animationVirtualName_, *object* _animatedControl_)",
-returns = "(object,)",
-valuetype = "animation,",},
+returns = "(object:animation,)",
+valuetype = "object,",},

 InsertCallback = {type = "function",
 description = "",
 args = "(*function* _functionRef_, *integer* _offset_)",
-returns = "(function,)",
-valuetype = "functionRefRet,",},
+returns = "(function:functionRefRet,)",
+valuetype = "function,",},

 IsPlaying = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isPlaying,",},
+returns = "(bool:isPlaying,)",
+valuetype = "bool,",},

 IsPlayingBackward = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "reversed,",},
+returns = "(bool:reversed,)",
+valuetype = "bool,",},

 PlayBackward = {type = "function",
 description = "",
@@ -29459,14 +29013,14 @@ args = "()",},
 GetCenterColor = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,number,number,)",
-valuetype = "a,b,g,r,",},
+returns = "(number:a,number:b,number:g,number:r,)",
+valuetype = "number,number,number,number,",},

 IsPixelRoundingEnabled = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "pixelRoundingEnabled,",},
+returns = "(bool:pixelRoundingEnabled,)",
+valuetype = "bool,",},

 SetCenterColor = {type = "function",
 description = "",
@@ -29509,20 +29063,20 @@ args = "(*integer* _buttonNum_, *bool* _enabled_)",},
 GetLabelControl = {type = "function",
 description = "",
 args = "()",
-returns = "(object,)",
-valuetype = "labelControl,",},
+returns = "(object:labelControl,)",
+valuetype = "object,",},

 GetState = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "state,",},
+returns = "(integer:state,)",
+valuetype = "integer,",},

 IsPixelRoundingEnabled = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "pixelRoundingEnabled,",},
+returns = "(bool:pixelRoundingEnabled,)",
+valuetype = "bool,",},

 SetClickSound = {type = "function",
 description = "",
@@ -29637,38 +29191,38 @@ args = "(*integer* _verticalAlign_)",},
 GetColorAsHSV = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,number,)",
-valuetype = "value,saturation,hue,",},
+returns = "(number:value,number:saturation,number:hue,)",
+valuetype = "number,number,number,",},

 GetColorAsRGB = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,number,)",
-valuetype = "blue,green,red,",},
+returns = "(number:blue,number:green,number:red,)",
+valuetype = "number,number,number,",},

 GetColorWheelTextureControl = {type = "function",
 description = "",
 args = "()",
-returns = "(object,)",
-valuetype = "textureControl,",},
+returns = "(object:textureControl,)",
+valuetype = "object,",},

 GetColorWheelThumbTextureControl = {type = "function",
 description = "",
 args = "()",
-returns = "(object,)",
-valuetype = "textureControl,",},
+returns = "(object:textureControl,)",
+valuetype = "object,",},

 GetFullValuedColorAsRGB = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,number,)",
-valuetype = "blue,green,red,",},
+returns = "(number:blue,number:green,number:red,)",
+valuetype = "number,number,number,",},

 GetValue = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "value,",},
+returns = "(number:value,)",
+valuetype = "number,",},

 SetColorAsHSV = {type = "function",
 description = "",
@@ -29691,68 +29245,66 @@ args = "(*number* _value_)",},
 GetAlphaCoefficients = {type = "function",
 description = "",
 args = "(*[MapDisplayPinType|#MapDisplayPinType]* _pinType_)",
-returns = "(number,number,number,)",
-valuetype = "constant,coefficient,leadingCoefficient,",},
+returns = "(number:constant,number:coefficient,number:leadingCoefficient,)",
+valuetype = "number,number,number,",},

 GetCenterOveredPinDescription = {type = "function",
 description = "",
 args = "(*luaindex* _centerOveredPinIndex_)",
-returns = "(string,)",
-valuetype = "description,",},
+returns = "(string:description,)",
+valuetype = "string,",},

 GetCenterOveredPinDistance = {type = "function",
 description = "",
 args = "(*luaindex* _centerOveredPinIndex_)",
-returns = "(number,)",
-valuetype = "distance,",},
+returns = "(number:distance,)",
+valuetype = "number,",},

 GetCenterOveredPinInfo = {type = "function",
 description = "",
 args = "(*luaindex* _centerOveredPinIndex_)",
-returns = "(bool,integer,number,string,)",
-valuetype = "suppressed,drawLevel,drawLayer,distance,type,description,",},
+returns = "(bool:suppressed,integer:drawLevel,number:distance,string:description,)",
+valuetype = "bool,integer,number,string,",},

 GetCenterOveredPinLayerAndLevel = {type = "function",
 description = "",
 args = "(*luaindex* _centerOveredPinIndex_)",
-returns = "(integer,)",
-valuetype = "drawLevel,drawLayer,",},
+returns = "(integer:drawLevel,)",
+valuetype = "integer,",},

 GetCenterOveredPinType = {type = "function",
 description = "",
-args = "(*luaindex* _centerOveredPinIndex_)",
-returns = "()",
-valuetype = "type,",},
+args = "(*luaindex* _centerOveredPinIndex_)",},

 GetMinVisibleAlpha = {type = "function",
 description = "",
 args = "(*[MapDisplayPinType|#MapDisplayPinType]* _pinType_)",
-returns = "(number,)",
-valuetype = "minVisibleAlpha,",},
+returns = "(number:minVisibleAlpha,)",
+valuetype = "number,",},

 GetMinVisibleScale = {type = "function",
 description = "",
 args = "(*[MapDisplayPinType|#MapDisplayPinType]* _pinType_)",
-returns = "(number,)",
-valuetype = "minVisibleScale,",},
+returns = "(number:minVisibleScale,)",
+valuetype = "number,",},

 GetNumCenterOveredPins = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numCenterOveredPins,",},
+returns = "(integer:numCenterOveredPins,)",
+valuetype = "integer,",},

 GetScaleCoefficients = {type = "function",
 description = "",
 args = "(*[MapDisplayPinType|#MapDisplayPinType]* _pinType_)",
-returns = "(number,number,number,)",
-valuetype = "constant,coefficient,leadingCoefficient,",},
+returns = "(number:constant,number:coefficient,number:leadingCoefficient,)",
+valuetype = "number,number,number,",},

 IsCenterOveredPinSuppressed = {type = "function",
 description = "",
 args = "(*luaindex* _centerOveredPinIndex_)",
-returns = "(bool,)",
-valuetype = "suppressed,",},
+returns = "(bool:suppressed,)",
+valuetype = "bool,",},

 SetAlphaCoefficients = {type = "function",
 description = "",
@@ -29783,8 +29335,8 @@ args = "(*[MapDisplayPinType|#MapDisplayPinType]* _pinType_, *number* _leadingCo
 AddFilterForEvent = {type = "function",
 description = "",
 args = "(*integer* _event_)",
-returns = "(bool,)",
-valuetype = "success,",},
+returns = "(bool:success,)",
+valuetype = "bool,",},

 ClearAnchors = {type = "function",
 description = "",
@@ -29793,26 +29345,26 @@ args = "()",},
 Convert3DLocalOrientationToWorldOrientation = {type = "function",
 description = "",
 args = "(*number* _localPitch_, *number* _localYaw_, *number* _localRoll_)",
-returns = "(number,number,number,)",
-valuetype = "worldRoll,worldYaw,worldPitch,",},
+returns = "(number:worldRoll,number:worldYaw,number:worldPitch,)",
+valuetype = "number,number,number,",},

 Convert3DLocalPositionToWorldPosition = {type = "function",
 description = "",
 args = "(*number* _localX_, *number* _localY_, *number* _localZ_)",
-returns = "(number,number,number,)",
-valuetype = "worldZ,worldY,worldX,",},
+returns = "(number:worldZ,number:worldY,number:worldX,)",
+valuetype = "number,number,number,",},

 Convert3DWorldOrientationToLocalOrientation = {type = "function",
 description = "",
 args = "(*number* _worldPitch_, *number* _worldYaw_, *number* _worldRoll_)",
-returns = "(number,number,number,)",
-valuetype = "localRoll,localYaw,localPitch,",},
+returns = "(number:localRoll,number:localYaw,number:localPitch,)",
+valuetype = "number,number,number,",},

 Convert3DWorldPositionToLocalPosition = {type = "function",
 description = "",
 args = "(*number* _worldX_, *number* _worldY_, *number* _worldZ_)",
-returns = "(number,number,number,)",
-valuetype = "localZ,localY,localX,",},
+returns = "(number:localZ,number:localY,number:localX,)",
+valuetype = "number,number,number,",},

 Create3DRenderSpace = {type = "function",
 description = "",
@@ -29821,8 +29373,8 @@ args = "()",},
 CreateControl = {type = "function",
 description = "",
 args = "(*string* _arg1_, *integer* _type_)",
-returns = "(object,)",
-valuetype = "apRet,",},
+returns = "(object:apRet,)",
+valuetype = "object,",},

 Destroy3DRenderSpace = {type = "function",
 description = "",
@@ -29831,320 +29383,318 @@ args = "()",},
 Does3DRenderSpaceUseDepthBuffer = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "usesDepthBuffer,",},
+returns = "(bool:usesDepthBuffer,)",
+valuetype = "bool,",},

 Get3DRenderSpaceForward = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,number,)",
-valuetype = "z,y,x,",},
+returns = "(number:z,number:y,number:x,)",
+valuetype = "number,number,number,",},

 Get3DRenderSpaceOrientation = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,number,)",
-valuetype = "rollRadians,yawRadians,pitchRadians,",},
+returns = "(number:rollRadians,number:yawRadians,number:pitchRadians,)",
+valuetype = "number,number,number,",},

 Get3DRenderSpaceOrigin = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,number,)",
-valuetype = "z,y,x,",},
+returns = "(number:z,number:y,number:x,)",
+valuetype = "number,number,number,",},

 Get3DRenderSpaceRight = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,number,)",
-valuetype = "z,y,x,",},
+returns = "(number:z,number:y,number:x,)",
+valuetype = "number,number,number,",},

 Get3DRenderSpaceSystem = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "system,",},
+args = "()",},

 Get3DRenderSpaceUp = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,number,)",
-valuetype = "z,y,x,",},
+returns = "(number:z,number:y,number:x,)",
+valuetype = "number,number,number,",},

 GetAlpha = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "alpha,",},
+returns = "(number:alpha,)",
+valuetype = "number,",},

 GetAnchor = {type = "function",
 description = "",
 args = "(*integer* _anchorIndex_)",
-returns = "(number,number,integer,object,integer,bool,)",
-valuetype = "anchorConstrains,offsetY,offsetX,relativePoint,relativeTo,point,isValidAnchor,",},
+returns = "(number:offsetY,number:offsetX,integer:relativePoint,object:relativeTo,integer:point,bool:isValidAnchor,)",
+valuetype = "number,number,integer,object,integer,bool,",},

 GetBottom = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "bottom,",},
+returns = "(number:bottom,)",
+valuetype = "number,",},

 GetCenter = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,)",
-valuetype = "centerY,centerX,",},
+returns = "(number:centerY,number:centerX,)",
+valuetype = "number,number,",},

 GetChild = {type = "function",
 description = "",
 args = "(*luaindex* _childIndex_)",
-returns = "(object,)",
-valuetype = "childControl,",},
+returns = "(object:childControl,)",
+valuetype = "object,",},

 GetClampedToScreen = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "clamped,",},
+returns = "(bool:clamped,)",
+valuetype = "bool,",},

 GetClampedToScreenInsets = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,number,number,)",
-valuetype = "bottom,right,top,left,",},
+returns = "(number:bottom,number:right,number:top,number:left,)",
+valuetype = "number,number,number,number,",},

 GetControlAlpha = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "alpha,",},
+returns = "(number:alpha,)",
+valuetype = "number,",},

 GetControlScale = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "scale,",},
+returns = "(number:scale,)",
+valuetype = "number,",},

 GetDesiredHeight = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "height,",},
+returns = "(number:height,)",
+valuetype = "number,",},

 GetDesiredWidth = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "width,",},
+returns = "(number:width,)",
+valuetype = "number,",},

 GetDimensionConstraints = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,number,number,)",
-valuetype = "maxHeight,maxWidth,minHeight,minWidth,",},
+returns = "(number:maxHeight,number:maxWidth,number:minHeight,number:minWidth,)",
+valuetype = "number,number,number,number,",},

 GetDimensions = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,)",
-valuetype = "height,width,",},
+returns = "(number:height,number:width,)",
+valuetype = "number,number,",},

 GetDrawLayer = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "layer,",},
+returns = "(integer:layer,)",
+valuetype = "integer,",},

 GetDrawLevel = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "level,",},
+returns = "(integer:level,)",
+valuetype = "integer,",},

 GetDrawTier = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "tier,",},
+returns = "(integer:tier,)",
+valuetype = "integer,",},

 GetExcludeFromResizeToFitExtents = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "excludes,",},
+returns = "(bool:excludes,)",
+valuetype = "bool,",},

 GetHandler = {type = "function",
 description = "",
 args = "(*string* _handlerName_)",
-returns = "(function,)",
-valuetype = "functionRef,",},
+returns = "(function:functionRef,)",
+valuetype = "function,",},

 GetHeight = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "height,",},
+returns = "(number:height,)",
+valuetype = "number,",},

 GetHitInsets = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,number,number,)",
-valuetype = "bottom,right,top,left,",},
+returns = "(number:bottom,number:right,number:top,number:left,)",
+valuetype = "number,number,number,number,",},

 GetId = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "id,",},
+returns = "(integer:id,)",
+valuetype = "integer,",},

 GetInheritsAlpha = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "inheritAlpha,",},
+returns = "(bool:inheritAlpha,)",
+valuetype = "bool,",},

 GetInheritsScale = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "inheritScale,",},
+returns = "(bool:inheritScale,)",
+valuetype = "bool,",},

 GetLeft = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "left,",},
+returns = "(number:left,)",
+valuetype = "number,",},

 GetName = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "name,",},
+returns = "(string:name,)",
+valuetype = "string,",},

 GetNamedChild = {type = "function",
 description = "",
 args = "(*string* _childName_)",
-returns = "(object,)",
-valuetype = "returnedControl,",},
+returns = "(object:returnedControl,)",
+valuetype = "object,",},

 GetNumChildren = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numChildren,",},
+returns = "(integer:numChildren,)",
+valuetype = "integer,",},

 GetOwningWindow = {type = "function",
 description = "",
 args = "()",
-returns = "(object,)",
-valuetype = "OwningTopLevelWindow,",},
+returns = "(object:OwningTopLevelWindow,)",
+valuetype = "object,",},

 GetParent = {type = "function",
 description = "",
 args = "()",
-returns = "(object,)",
-valuetype = "ret1,",},
+returns = "(object:ret1,)",
+valuetype = "object,",},

 GetResizeToFitDescendents = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "resizes,",},
+returns = "(bool:resizes,)",
+valuetype = "bool,",},

 GetResizeToFitPadding = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,)",
-valuetype = "height,width,",},
+returns = "(number:height,number:width,)",
+valuetype = "number,number,",},

 GetRight = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "right,",},
+returns = "(number:right,)",
+valuetype = "number,",},

 GetScale = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "scale,",},
+returns = "(number:scale,)",
+valuetype = "number,",},

 GetScreenRect = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,number,number,)",
-valuetype = "bottom,right,top,left,",},
+returns = "(number:bottom,number:right,number:top,number:left,)",
+valuetype = "number,number,number,number,",},

 GetTop = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "top,",},
+returns = "(number:top,)",
+valuetype = "number,",},

 GetType = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "type,",},
+returns = "(integer:type,)",
+valuetype = "integer,",},

 GetWidth = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "width,",},
+returns = "(number:width,)",
+valuetype = "number,",},

 Has3DRenderSpace = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "has3DRenderSpace,",},
+returns = "(bool:has3DRenderSpace,)",
+valuetype = "bool,",},

 IsChildOf = {type = "function",
 description = "",
 args = "(*object* _desiredParent_)",
-returns = "(bool,)",
-valuetype = "isChild,",},
+returns = "(bool:isChild,)",
+valuetype = "bool,",},

 IsControlHidden = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "hidden,",},
+returns = "(bool:hidden,)",
+valuetype = "bool,",},

 IsHandlerSet = {type = "function",
 description = "",
 args = "(*string* _handlerName_)",
-returns = "(bool,)",
-valuetype = "isSet,",},
+returns = "(bool:isSet,)",
+valuetype = "bool,",},

 IsHidden = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "hidden,",},
+returns = "(bool:hidden,)",
+valuetype = "bool,",},

 IsKeyboardEnabled = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "enabled,",},
+returns = "(bool:enabled,)",
+valuetype = "bool,",},

 IsMouseEnabled = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "enabled,",},
+returns = "(bool:enabled,)",
+valuetype = "bool,",},

 IsPointInside = {type = "function",
 description = "",
 args = "(*number* _x_, *number* _y_, *number* _leftOffset_, *number* _topOffset_, *number* _rightOffset_, *number* _bottomOffset_)",
-returns = "(bool,)",
-valuetype = "isInside,",},
+returns = "(bool:isInside,)",
+valuetype = "bool,",},

 RegisterForEvent = {type = "function",
 description = "",
 args = "(*integer* _event_, *function* _callback_)",
-returns = "(bool,)",
-valuetype = "success,",},
+returns = "(bool:success,)",
+valuetype = "bool,",},

 Set3DRenderSpaceForward = {type = "function",
 description = "",
@@ -30297,8 +29847,8 @@ args = "(*number* _width_)",},
 StartMoving = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isMoving,",},
+returns = "(bool:isMoving,)",
+valuetype = "bool,",},

 StopMovingOrResizing = {type = "function",
 description = "",
@@ -30311,28 +29861,28 @@ args = "()",},
 UnregisterForEvent = {type = "function",
 description = "",
 args = "(*integer* _event_)",
-returns = "(bool,)",
-valuetype = "success,",},
+returns = "(bool:success,)",
+valuetype = "bool,",},



 GetDuration = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "duration,",},
+returns = "(integer:duration,)",
+valuetype = "integer,",},

 GetPercentCompleteFixed = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "percentComplete,",},
+returns = "(number:percentComplete,)",
+valuetype = "number,",},

 GetTimeLeft = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "time,",},
+returns = "(integer:time,)",
+valuetype = "integer,",},

 ResetCooldown = {type = "function",
 description = "",
@@ -30425,68 +29975,68 @@ args = "()",},
 GetCopyEnabled = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "enabled,",},
+returns = "(bool:enabled,)",
+valuetype = "bool,",},

 GetCursorPosition = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "cursorPosition,",},
+returns = "(integer:cursorPosition,)",
+valuetype = "integer,",},

 GetEditEnabled = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "enabled,",},
+returns = "(bool:enabled,)",
+valuetype = "bool,",},

 GetFontHeight = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "fontHeightUIUnits,",},
+returns = "(number:fontHeightUIUnits,)",
+valuetype = "number,",},

 GetNewLineEnabled = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "enabled,",},
+returns = "(bool:enabled,)",
+valuetype = "bool,",},

 GetPasteEnabled = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "enabled,",},
+returns = "(bool:enabled,)",
+valuetype = "bool,",},

 GetScrollExtents = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numLines,",},
+returns = "(integer:numLines,)",
+valuetype = "integer,",},

 GetText = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "apRet,",},
+returns = "(string:apRet,)",
+valuetype = "string,",},

 GetTopLineIndex = {type = "function",
 description = "",
 args = "()",
-returns = "(luaindex,)",
-valuetype = "index,",},
+returns = "(luaindex:index,)",
+valuetype = "luaindex,",},

 HasFocus = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "aRet,",},
+returns = "(bool:aRet,)",
+valuetype = "bool,",},

 HasSelection = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "hasSelection,",},
+returns = "(bool:hasSelection,)",
+valuetype = "bool,",},

 InsertText = {type = "function",
 description = "",
@@ -30495,14 +30045,14 @@ args = "(*string* _aText_)",},
 IsComposingIMEText = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isComposing,",},
+returns = "(bool:isComposing,)",
+valuetype = "bool,",},

 IsMultiLine = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isMultiLine,",},
+returns = "(bool:isMultiLine,)",
+valuetype = "bool,",},

 LoseFocus = {type = "function",
 description = "",
@@ -30583,16 +30133,16 @@ args = "()",},
 WasLastChangeVirtualKeyboard = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "aRet,",},
+returns = "(bool:aRet,)",
+valuetype = "bool,",},



 GetFontInfo = {type = "function",
 description = "",
 args = "()",
-returns = "(string,integer,string,)",
-valuetype = "option,size,face,",},
+returns = "(string:option,integer:size,string:face,)",
+valuetype = "string,integer,string,",},

 SetFont = {type = "function",
 description = "",
@@ -30611,80 +30161,78 @@ args = "(*object* _toLabel_)",},
 DidLineWrap = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "didLineWrap,",},
+returns = "(bool:didLineWrap,)",
+valuetype = "bool,",},

 GetColor = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,number,number,)",
-valuetype = "a,b,g,r,",},
+returns = "(number:a,number:b,number:g,number:r,)",
+valuetype = "number,number,number,number,",},

 GetFontHeight = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "fontHeightUIUnits,",},
+returns = "(number:fontHeightUIUnits,)",
+valuetype = "number,",},

 GetHorizontalAlignment = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "align,",},
+returns = "(integer:align,)",
+valuetype = "integer,",},

 GetModifyTextType = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "modifyTextType,",},
+args = "()",},

 GetNumLines = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numLines,",},
+returns = "(integer:numLines,)",
+valuetype = "integer,",},

 GetStringWidth = {type = "function",
 description = "",
 args = "(*string* _text_)",
-returns = "(number,)",
-valuetype = "pixelWidth,",},
+returns = "(number:pixelWidth,)",
+valuetype = "number,",},

 GetStyleColor = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,number,number,)",
-valuetype = "a,b,g,r,",},
+returns = "(number:a,number:b,number:g,number:r,)",
+valuetype = "number,number,number,number,",},

 GetText = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "apRet,",},
+returns = "(string:apRet,)",
+valuetype = "string,",},

 GetTextDimensions = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,)",
-valuetype = "stringHeight,stringWidth,",},
+returns = "(number:stringHeight,number:stringWidth,)",
+valuetype = "number,number,",},

 GetTextHeight = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "stringHeight,",},
+returns = "(number:stringHeight,)",
+valuetype = "number,",},

 GetTextWidth = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "stringWidth,",},
+returns = "(number:stringWidth,)",
+valuetype = "number,",},

 GetVerticalAlignment = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "align,",},
+returns = "(integer:align,)",
+valuetype = "integer,",},

 SetColor = {type = "function",
 description = "",
@@ -30741,58 +30289,56 @@ args = "(*integer* _wrapMode_)",},
 WasTruncated = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "wasTruncated,",},
+returns = "(bool:wasTruncated,)",
+valuetype = "bool,",},



 GetBlendMode = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "blendMode,",},
+args = "()",},

 GetColor = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,number,number,)",
-valuetype = "a,b,g,r,",},
+returns = "(number:a,number:b,number:g,number:r,)",
+valuetype = "number,number,number,number,",},

 GetDesaturation = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "desaturation,",},
+returns = "(number:desaturation,)",
+valuetype = "number,",},

 GetTextureCoords = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,number,number,)",
-valuetype = "bottom,top,right,left,",},
+returns = "(number:bottom,number:top,number:right,number:left,)",
+valuetype = "number,number,number,number,",},

 GetTextureFileDimensions = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,integer,)",
-valuetype = "pixelHeight,pixelWidth,",},
+returns = "(integer:pixelHeight,integer:pixelWidth,)",
+valuetype = "integer,integer,",},

 GetTextureFileName = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "filename,",},
+returns = "(string:filename,)",
+valuetype = "string,",},

 IsPixelRoundingEnabled = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "pixelRoundingEnabled,",},
+returns = "(bool:pixelRoundingEnabled,)",
+valuetype = "bool,",},

 IsTextureLoaded = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "loaded,",},
+returns = "(bool:loaded,)",
+valuetype = "bool,",},

 SetBlendMode = {type = "function",
 description = "",
@@ -30835,8 +30381,8 @@ args = "(*integer* _vertexPoints_, *number* _red_, *number* _green_, *number* _b
 GetZoom = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "normalizedRadius,",},
+returns = "(number:normalizedRadius,)",
+valuetype = "number,",},

 SetPinFont = {type = "function",
 description = "",
@@ -30853,14 +30399,14 @@ args = "(*number* _normalizedRadius_)",},
 GetScrollExtents = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,)",
-valuetype = "vertical,horizontal,",},
+returns = "(number:vertical,number:horizontal,)",
+valuetype = "number,number,",},

 GetScrollOffsets = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,)",
-valuetype = "vertical,horizontal,",},
+returns = "(number:vertical,number:horizontal,)",
+valuetype = "number,number,",},

 RestoreToExtents = {type = "function",
 description = "",
@@ -30887,50 +30433,50 @@ args = "(*number* _offset_)",},
 DoesAllowDraggingFromThumb = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "allow,",},
+returns = "(bool:allow,)",
+valuetype = "bool,",},

 GetEnabled = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isEnabled,",},
+returns = "(bool:isEnabled,)",
+valuetype = "bool,",},

 GetMinMax = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,)",
-valuetype = "max,min,",},
+returns = "(number:max,number:min,)",
+valuetype = "number,number,",},

 GetOrientation = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "orientation,",},
+returns = "(integer:orientation,)",
+valuetype = "integer,",},

 GetThumbTextureControl = {type = "function",
 description = "",
 args = "()",
-returns = "(object,)",
-valuetype = "textureControl,",},
+returns = "(object:textureControl,)",
+valuetype = "object,",},

 GetValue = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "value,",},
+returns = "(number:value,)",
+valuetype = "number,",},

 GetValueStep = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "step,",},
+returns = "(number:step,)",
+valuetype = "number,",},

 IsThumbFlushWithExtents = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "flush,",},
+returns = "(bool:flush,)",
+valuetype = "bool,",},

 SetAllowDraggingFromThumb = {type = "function",
 description = "",
@@ -31005,14 +30551,14 @@ args = "(*bool* _enabled_)",},
 GetMinMax = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,)",
-valuetype = "max,min,",},
+returns = "(number:max,number:min,)",
+valuetype = "number,number,",},

 GetValue = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "value,",},
+returns = "(number:value,)",
+valuetype = "number,",},

 SetBarAlignment = {type = "function",
 description = "",
@@ -31095,50 +30641,50 @@ args = "()",},
 GetDrawLastEntryIfOutOfRoom = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "drawLastIfOutOfRoom,",},
+returns = "(bool:drawLastIfOutOfRoom,)",
+valuetype = "bool,",},

 GetLineFade = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,)",
-valuetype = "timeItTakesLineToFade,timeBeforeLineBeginsToFade,",},
+returns = "(number:timeItTakesLineToFade,number:timeBeforeLineBeginsToFade,)",
+valuetype = "number,number,",},

 GetLinkEnabled = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "linkEnabed,",},
+returns = "(bool:linkEnabed,)",
+valuetype = "bool,",},

 GetMaxHistoryLines = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numLines,",},
+returns = "(integer:numLines,)",
+valuetype = "integer,",},

 GetNumHistoryLines = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numLines,",},
+returns = "(integer:numLines,)",
+valuetype = "integer,",},

 GetNumVisibleLines = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "numLines,",},
+returns = "(integer:numLines,)",
+valuetype = "integer,",},

 GetScrollPosition = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "scrollPosition,",},
+returns = "(integer:scrollPosition,)",
+valuetype = "integer,",},

 IsSplittingLongMessages = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isSplitting,",},
+returns = "(bool:isSplitting,)",
+valuetype = "bool,",},

 MoveScrollPosition = {type = "function",
 description = "",
@@ -31204,75 +30750,73 @@ args = "()",},

 GetBlendMode = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "blendMode,",},
+args = "()",},

 GetColor = {type = "function",
 description = "",
 args = "(*luaindex* _surfaceIndex_)",
-returns = "(number,number,number,number,)",
-valuetype = "a,b,g,r,",},
+returns = "(number:a,number:b,number:g,number:r,)",
+valuetype = "number,number,number,number,",},

 GetDesaturation = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "desaturation,",},
+returns = "(number:desaturation,)",
+valuetype = "number,",},

 GetInsets = {type = "function",
 description = "",
 args = "(*luaindex* _surfaceIndex_)",
-returns = "(number,number,number,number,)",
-valuetype = "bottom,top,right,left,",},
+returns = "(number:bottom,number:top,number:right,number:left,)",
+valuetype = "number,number,number,number,",},

 GetNumSurfaces = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,)",
-valuetype = "surfaces,",},
+returns = "(integer:surfaces,)",
+valuetype = "integer,",},

 GetSurfaceAlpha = {type = "function",
 description = "",
 args = "(*luaindex* _surfaceIndex_)",
-returns = "(number,)",
-valuetype = "a,",},
+returns = "(number:a,)",
+valuetype = "number,",},

 GetTextureCoords = {type = "function",
 description = "",
 args = "(*luaindex* _surfaceIndex_)",
-returns = "(number,number,number,number,)",
-valuetype = "bottom,top,right,left,",},
+returns = "(number:bottom,number:top,number:right,number:left,)",
+valuetype = "number,number,number,number,",},

 GetTextureFileDimensions = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,integer,)",
-valuetype = "pixelHeight,pixelWidth,",},
+returns = "(integer:pixelHeight,integer:pixelWidth,)",
+valuetype = "integer,integer,",},

 GetTextureFileName = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "filename,",},
+returns = "(string:filename,)",
+valuetype = "string,",},

 IsPixelRoundingEnabled = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "pixelRoundingEnabled,",},
+returns = "(bool:pixelRoundingEnabled,)",
+valuetype = "bool,",},

 IsSurfaceHidden = {type = "function",
 description = "",
 args = "(*luaindex* _surfaceIndex_)",
-returns = "(bool,)",
-valuetype = "hidden,",},
+returns = "(bool:hidden,)",
+valuetype = "bool,",},

 IsTextureLoaded = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "loaded,",},
+returns = "(bool:loaded,)",
+valuetype = "bool,",},

 RemoveSurface = {type = "function",
 description = "",
@@ -31323,80 +30867,76 @@ args = "(*[ReleaseReferenceOptions|#ReleaseReferenceOptions]* _releaseOption_)",
 Get3DLocalDimensions = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,)",
-valuetype = "height,width,",},
+returns = "(number:height,number:width,)",
+valuetype = "number,number,",},

 GetAddressMode = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "addressMode,",},
+args = "()",},

 GetBlendMode = {type = "function",
 description = "",
-args = "()",
-returns = "()",
-valuetype = "blendMode,",},
+args = "()",},

 GetColor = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,number,number,)",
-valuetype = "a,b,g,r,",},
+returns = "(number:a,number:b,number:g,number:r,)",
+valuetype = "number,number,number,number,",},

 GetDesaturation = {type = "function",
 description = "",
 args = "()",
-returns = "(number,)",
-valuetype = "desaturation,",},
+returns = "(number:desaturation,)",
+valuetype = "number,",},

 GetResizeToFitFile = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "resizesToFitFile,",},
+returns = "(bool:resizesToFitFile,)",
+valuetype = "bool,",},

 GetTextureCoords = {type = "function",
 description = "",
 args = "()",
-returns = "(number,number,number,number,)",
-valuetype = "bottom,top,right,left,",},
+returns = "(number:bottom,number:top,number:right,number:left,)",
+valuetype = "number,number,number,number,",},

 GetTextureFileDimensions = {type = "function",
 description = "",
 args = "()",
-returns = "(integer,integer,)",
-valuetype = "pixelHeight,pixelWidth,",},
+returns = "(integer:pixelHeight,integer:pixelWidth,)",
+valuetype = "integer,integer,",},

 GetTextureFileName = {type = "function",
 description = "",
 args = "()",
-returns = "(string,)",
-valuetype = "filename,",},
+returns = "(string:filename,)",
+valuetype = "string,",},

 GetVertexUV = {type = "function",
 description = "",
 args = "(*[VERTEX_POINTS|#VERTEX_POINTS]* _vertex_)",
-returns = "(number,number,)",
-valuetype = "v,u,",},
+returns = "(number:v,number:u,)",
+valuetype = "number,number,",},

 Is3DQuadFacingCamera = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isFacing,",},
+returns = "(bool:isFacing,)",
+valuetype = "bool,",},

 IsPixelRoundingEnabled = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "pixelRoundingEnabled,",},
+returns = "(bool:pixelRoundingEnabled,)",
+valuetype = "bool,",},

 IsTextureLoaded = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "loaded,",},
+returns = "(bool:loaded,)",
+valuetype = "bool,",},

 Set3DLocalDimensions = {type = "function",
 description = "",
@@ -31511,8 +31051,8 @@ args = "()",},
 GetOwner = {type = "function",
 description = "",
 args = "()",
-returns = "(object,)",
-valuetype = "owner,",},
+returns = "(object:owner,)",
+valuetype = "object,",},

 HideComparativeTooltips = {type = "function",
 description = "",
@@ -31739,8 +31279,8 @@ args = "()",},
 AllowBringToTop = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "allow,",},
+returns = "(bool:allow,)",
+valuetype = "bool,",},

 BringWindowToTop = {type = "function",
 description = "",
@@ -31767,62 +31307,62 @@ args = "(*object* _control_, *string* _virtualName_)",},
 CompareControlVisualOrder = {type = "function",
 description = "",
 args = "(*object* _controlA_, *object* _controlB_)",
-returns = "(integer,)",
-valuetype = "order,",},
+returns = "(integer:order,)",
+valuetype = "integer,",},

 CreateControl = {type = "function",
 description = "",
 args = "(*string* _arg1_, *object* _parent_, *integer* _type_)",
-returns = "(object,)",
-valuetype = "apRet,",},
+returns = "(object:apRet,)",
+valuetype = "object,",},

 CreateControlFromVirtual = {type = "function",
 description = "",
 args = "(*string* _controlName_, *object* _parent_, *string* _virtualName_, *string* _optionalSuffix_)",
-returns = "(object,)",
-valuetype = "apRet,",},
+returns = "(object:apRet,)",
+valuetype = "object,",},

 CreateTopLevelWindow = {type = "function",
 description = "",
 args = "(*string* _arg1_)",
-returns = "(object,)",
-valuetype = "apRet,",},
+returns = "(object:apRet,)",
+valuetype = "object,",},

 GetControlByName = {type = "function",
 description = "",
 args = "(*string* _name_, *string* _suffix_)",
-returns = "(object,)",
-valuetype = "ret,",},
+returns = "(object:ret,)",
+valuetype = "object,",},

 GetFocusControl = {type = "function",
 description = "",
 args = "()",
-returns = "(object,)",
-valuetype = "focusControl,",},
+returns = "(object:focusControl,)",
+valuetype = "object,",},

 GetMouseOverControl = {type = "function",
 description = "",
 args = "()",
-returns = "(object,)",
-valuetype = "mouseOverControl,",},
+returns = "(object:mouseOverControl,)",
+valuetype = "object,",},

 IsHandlingHardwareEvent = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isHandlingHardwareEvent,",},
+returns = "(bool:isHandlingHardwareEvent,)",
+valuetype = "bool,",},

 IsMouseOverWorld = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "isMouseOverWorld,",},
+returns = "(bool:isMouseOverWorld,)",
+valuetype = "bool,",},

 IsSecureRenderModeEnabled = {type = "function",
 description = "",
 args = "()",
-returns = "(bool,)",
-valuetype = "secureRenderModeEnabled,",},
+returns = "(bool:secureRenderModeEnabled,)",
+valuetype = "bool,",},

 SetFocusByName = {type = "function",
 description = "",
diff --git a/apimaker2.lua b/apimaker2.lua
index f9aa5c8..60bab88 100644
--- a/apimaker2.lua
+++ b/apimaker2.lua
@@ -29,10 +29,10 @@ for line in esouidoc:lines() do
     if line:find("%*%*") then
         local returntypestring = ""
         local valuetypestring = ""
-        for returntype in line:gmatch("%*([%a%d]+)%*") do
-            returntypestring = returntype .. "," .. returntypestring
+        for returntype, returntype2 in line:gmatch("%*([%a%d]+)%* _([%a%d]+)_") do
+            returntypestring = returntype .. ":" .. returntype2 .."," .. returntypestring
         end
-        for valuetype in line:gmatch("_([%a%d]+)_") do
+        for valuetype in line:gmatch("%*([%a%d]+)%*") do
             valuetypestring = valuetype .. "," .. valuetypestring
         end
         if returntypestring and valuetypestring ~="" then