Merge branch 'master' of https://github.com/seblindfors/ConsolePort

Author: seblindfors

ConsolePort/Locale/enUS.lua

@@ -334,6 +334,9 @@ L.DEVICE_DESC_SWITCHPRO = [[
 	Nintendo Switch Pro controller has a similar layout to the Xbox controller, but with inverted button labels.
 
 	The Pro controller has four center buttons, giving it a slight edge over a standard Xbox controller.
+
+	The Nintendo Switch 2 Pro controller cannot use its paddles or C button natively in the game.
+	With external software, such as Steam or reWASD, they can be mapped to keyboard keys, allowing use in game.
 ]];
 L.CONTROLS_GENERAL_INFO = [[
 	Select your preferred control scheme.

ConsolePort/Model/Gamepad/Nintendo/Switch.lua

@@ -152,6 +152,9 @@ local _, db = ...; db.Gamepad:AddGamepad({
 		PADBACK      = 'Switch/Back';
 		PADSYSTEM    = 'Switch/System';
 		PADSOCIAL    = 'Switch/Share';
+		PADPADDLE1   = 'All/RG';
+		PADPADDLE2   = 'All/LG';
+		PADPADDLE3   = 'Xbox/Share';
 	};
 	Layout = {-- format: delta (-1 or 1), drawLayer, x1, y1, ..., xN, yN
 		--------------------
@@ -162,6 +165,8 @@ local _, db = ...; db.Gamepad:AddGamepad({
 		--------------------
 		PADLSTICK    = {-1, 01, 0114, 0038};
 		--------------------
+		PADPADDLE2   = {-1, -1, 0090, -040, 0160, -194};
+		--------------------
 		PADDUP       = {-1, 01, 0064, 0000, 0200, -020};
 		PADDLEFT     = {-1, 01, 0086, -022, 0160, -066};
 		PADDDOWN     = {-1, 01, 0066, -042, 0160, -120};
@@ -181,5 +186,8 @@ local _, db = ...; db.Gamepad:AddGamepad({
 		--------------------
 		PADRSTICK    = {01, 01, 0054, -024, 0150, -170};
 		PADSYSTEM    = {01, 01, 0024, 0026, 0016, -050, 0130, -220};
+		--------------------
+		PADPADDLE1   = {01, -1, 0090, -040, 0160, -194};
+		PADPADDLE3   = {01, 01, 0002, -050, 0040, -100, 0120, -300};
 	};
-})
+})

ConsolePort/Utils/Const.lua

@@ -4,6 +4,7 @@
 -- return true or nil (nil for dynamic table insertions)
 CPAPI.IsClassicEraVersion = WOW_PROJECT_ID == WOW_PROJECT_CLASSIC or nil;
 CPAPI.IsClassicVersion    = WOW_PROJECT_ID == WOW_PROJECT_MISTS_CLASSIC or nil;
+CPAPI.IsWrathVersion      = WOW_PROJECT_ID == WOW_PROJECT_WRATH_CLASSIC or nil;
 CPAPI.IsRetailVersion     = WOW_PROJECT_ID == WOW_PROJECT_MAINLINE or nil;
 CPAPI.IsAnniVersion       = WOW_PROJECT_ID == WOW_PROJECT_BURNING_CRUSADE_CLASSIC or nil;
 

ConsolePort_Bar/Controller/Blizzard/Classic.lua

@@ -1,5 +1,5 @@
 -- Credit: https://github.com/Nevcairiel/Bartender4/blob/master/HideBlizzard.lua
-if not CPAPI.IsAnniVersion then return end;
+if not (CPAPI.IsAnniVersion or CPAPI.IsWrathVersion) then return end;
 local _, env = ...;
 
 local function hideEditModeFrame(frame, clearEvents)

ConsolePort_Bar/Controller/Blizzard/ClassicEra.lua

@@ -1,5 +1,5 @@
 -- Credit: https://github.com/Nevcairiel/Bartender4/blob/master/HideBlizzardClassic.lua
-if not CPAPI.IsClassicEraVersion and not CPAPI.IsClassicVersion then return end;
+if not CPAPI.IsClassicEraVersion and not CPAPI.IsClassicVersion and not CPAPI.IsWrathVersion then return end;
 local _, env = ...;
 
 local function reparent(frame)

ConsolePort_Menu/Model/Buttons.lua

@@ -2,7 +2,7 @@ local _, env = ...;
 ---------------------------------------------------------------
 local ICON = GenerateClosure(format, [[Interface\ICONS\%s]]);
 local IsRetailVersion      = CPAPI.IsRetailVersion or nil;
-local IsClassicGameVersion = CPAPI.IsClassicVersion or CPAPI.IsClassicEraVersion or CPAPI.IsAnniVersion or nil;
+local IsClassicGameVersion = CPAPI.IsClassicVersion or CPAPI.IsClassicEraVersion or CPAPI.IsAnniVersion or CPAPI.IsWrathVersion or nil;
 
 local GenerateFlatClosure = GenerateFlatClosure or function(...)
 	local closure = GenerateClosure(...)
@@ -167,10 +167,7 @@ env.Buttons = {}; _ = function(data) tinsert(env.Buttons, data) end;
 	end;
 } end;
 
----------------------------------------------------------------
---[[ Keyring ]] if CPAPI.IsClassicEraVersion or CPAPI.IsAnniVersion and KeyRingButton then _{
----------------------------------------------------------------
-	text  = KEYRING;
+	--[[ Keyring ]] if (CPAPI.IsClassicEraVersion or CPAPI.IsAnniVersion or CPAPI.IsWrathVersion) and KeyRingButton then _{
 	img   = [[Interface\ContainerFrame\KeyRing-Bag-Icon]];
 	ref   = KeyRingButton;
 } end;
@@ -207,7 +204,7 @@ env.Buttons = {}; _ = function(data) tinsert(env.Buttons, data) end;
 	img   = [[Interface\LFGFRAME\UI-LFG-PORTRAIT]];
 	ref   = LFDMicroButton or LFGMicroButton;
 	click = CPAPI.IsClassicVersion and GenerateFlatClosure(PVEFrame_ToggleFrame);
-	OnLoad = (CPAPI.IsClassicEraVersion or CPAPI.IsAnniVersion) and function(self)
+	OnLoad = (CPAPI.IsClassicEraVersion or CPAPI.IsAnniVersion or CPAPI.IsWrathVersion) and function(self)
 		self.OnLoad = nil;
 		EventUtil.ContinueOnAddOnLoaded('Blizzard_GroupFinder_VanillaStyle', function()
 			env.db:RunSafe(function()