Added controller compatibility to the refine result and enchant confirmation windows. Modify menu navigation behavior slightly for the three windows with accessory lists. Release Build 11665.

Adventures in Lestoria/ArtificerDisassembleWindow.cpp

@@ -175,12 +175,10 @@ void Menu::InitializeArtificerDisassembleWindow(){
 			},}},
 		{"Back",{
 			.up=[&](MenuType type,Data&returnData){
-				if(Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetSelectedChild())returnData=Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetSelectedChild().value().get().GetName();
+				returnData=Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetComponents().back().lock()->GetName();
-				else returnData=Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetComponents().back().lock()->GetName();
 			},
 			.down=[&](MenuType type,Data&returnData){
-				if(Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetSelectedChild())returnData=Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetSelectedChild().value().get().GetName();
+				returnData=Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetComponents().front().lock()->GetName();
-				else returnData=Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetComponents().front().lock()->GetName();
 			},
 			.left="Disassemble Button",
 			.right="Disassemble Button",}},

Adventures in Lestoria/ArtificerEnchantConfirmWindow.cpp

@@ -100,20 +100,18 @@ void Menu::InitializeArtificerEnchantConfirmWindow(){
 	
 	artificerEnchantConfirmWindow->SetupKeyboardNavigation(
 	[](MenuType type,Data&returnData){ //On Open
-		returnData="";
+		returnData="Take New Button";
 	},
 	{ //Button Key
 		{game->KEY_SCROLL,{"Navigate",[](MenuType type){}}},
-		{game->KEY_BACK,{"Stay",[](MenuType type){
-			
-		}}},
 		{game->KEY_CONFIRM,{"Select",[](MenuType type){}}},
 	}
 	,{ //Button Navigation Rules
-		{"Sample Button",{
+		{"Take Old Button",{
-			.up="",
+			.left="Take New Button",
-			.down="",
+			.right="Take New Button",}},
-			.left="",
+		{"Take New Button",{
-			.right="",}},
+			.left="Take Old Button",
+			.right="Take Old Button",}},
 	});
 }

Adventures in Lestoria/ArtificerEnchantWindow.cpp

@@ -210,12 +210,10 @@ void Menu::InitializeArtificerEnchantWindow(){
 			},}},
 		{"Back",{
 			.up=[&](MenuType type,Data&returnData){
-				if(Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetSelectedChild())returnData=Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetSelectedChild().value().get().GetName();
+				returnData=Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetComponents().back().lock()->GetName();
-				else returnData=Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetComponents().back().lock()->GetName();
 			},
 			.down=[&](MenuType type,Data&returnData){
-				if(Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetSelectedChild())returnData=Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetSelectedChild().value().get().GetName();
+				returnData=Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetComponents().front().lock()->GetName();
-				else returnData=Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetComponents().front().lock()->GetName();
 			},
 			.left="Fragment Enchant Button",
 			.right="Fragment Enchant Button",}},

Adventures in Lestoria/ArtificerRefineResultWindow.cpp

@@ -61,7 +61,7 @@ void Menu::InitializeArtificerRefineResultWindow(){
 	
 	artificerRefineResultWindow->SetupKeyboardNavigation(
 	[](MenuType type,Data&returnData){ //On Open
-		returnData="";
+		returnData="Continue Button";
 	},
 	{ //Button Key
 		{game->KEY_SCROLL,{"Navigate",[](MenuType type){}}},
@@ -71,10 +71,5 @@ void Menu::InitializeArtificerRefineResultWindow(){
 		{game->KEY_CONFIRM,{"Select",[](MenuType type){}}},
 	}
 	,{ //Button Navigation Rules
-		{"Sample Button",{
-			.up="",
-			.down="",
-			.left="",
-			.right="",}},
 	});
 }

Adventures in Lestoria/ArtificerRefineWindow.cpp

@@ -192,12 +192,10 @@ void Menu::InitializeArtificerRefineWindow(){
 			},}},
 		{"Back",{
 			.up=[&](MenuType type,Data&returnData){
-				if(Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetSelectedChild())returnData=Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetSelectedChild().value().get().GetName();
+				returnData=Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetComponents().back().lock()->GetName();
-				else returnData=Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetComponents().back().lock()->GetName();
 			},
 			.down=[&](MenuType type,Data&returnData){
-				if(Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetSelectedChild())returnData=Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetSelectedChild().value().get().GetName();
+				returnData=Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetComponents().front().lock()->GetName();
-				else returnData=Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetComponents().front().lock()->GetName();
 			},
 			.left="Fragment Refine Button",
 			.right="Fragment Refine Button",}},

Adventures in Lestoria/MenuType.h

@@ -71,10 +71,10 @@ enum MenuType{
     CREDITS, //100% Controller Compatibility 
     ARTIFICER, //100% Controller Compatibility 
     ARTIFICER_REFINE, //100% Controller Compatibility 
-    ARTIFICER_REFINE_RESULT,
+    ARTIFICER_REFINE_RESULT, //100% Controller Compatibility 
     ARTIFICER_DISASSEMBLE, //100% Controller Compatibility 
     ARTIFICER_ENCHANT, //100% Controller Compatibility 
-    ARTIFICER_ENCHANT_CONFIRM,
+    ARTIFICER_ENCHANT_CONFIRM, //100% Controller Compatibility 
     ///////////////////////////////////////////////////////////
     /*DO NOT REMOVE!!*/ENUM_END////////////////////////////////
     ///////////////////////////////////////////////////////////

Adventures in Lestoria/Version.h

@@ -39,7 +39,7 @@ All rights reserved.
 #define VERSION_MAJOR 1
 #define VERSION_MINOR 3
 #define VERSION_PATCH 0
-#define VERSION_BUILD 11662
+#define VERSION_BUILD 11665
 
 #define stringify(a) stringify_(a)
 #define stringify_(a) #a