diff --git a/Adventures in Lestoria/ArtificerDisassembleWindow.cpp b/Adventures in Lestoria/ArtificerDisassembleWindow.cpp index 72026620..1808f09e 100644 --- a/Adventures in Lestoria/ArtificerDisassembleWindow.cpp +++ b/Adventures in Lestoria/ArtificerDisassembleWindow.cpp @@ -175,12 +175,10 @@ void Menu::InitializeArtificerDisassembleWindow(){ },}}, {"Back",{ .up=[&](MenuType type,Data&returnData){ - if(Component(type,"Accessory List")->GetSelectedChild())returnData=Component(type,"Accessory List")->GetSelectedChild().value().get().GetName(); - else returnData=Component(type,"Accessory List")->GetComponents().back().lock()->GetName(); + returnData=Component(type,"Accessory List")->GetComponents().back().lock()->GetName(); }, .down=[&](MenuType type,Data&returnData){ - if(Component(type,"Accessory List")->GetSelectedChild())returnData=Component(type,"Accessory List")->GetSelectedChild().value().get().GetName(); - else returnData=Component(type,"Accessory List")->GetComponents().front().lock()->GetName(); + returnData=Component(type,"Accessory List")->GetComponents().front().lock()->GetName(); }, .left="Disassemble Button", .right="Disassemble Button",}}, diff --git a/Adventures in Lestoria/ArtificerEnchantConfirmWindow.cpp b/Adventures in Lestoria/ArtificerEnchantConfirmWindow.cpp index 7181d53f..71ca6c82 100644 --- a/Adventures in Lestoria/ArtificerEnchantConfirmWindow.cpp +++ b/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",{ - .up="", - .down="", - .left="", - .right="",}}, + {"Take Old Button",{ + .left="Take New Button", + .right="Take New Button",}}, + {"Take New Button",{ + .left="Take Old Button", + .right="Take Old Button",}}, }); } \ No newline at end of file diff --git a/Adventures in Lestoria/ArtificerEnchantWindow.cpp b/Adventures in Lestoria/ArtificerEnchantWindow.cpp index 035ca4f8..d49a9f6d 100644 --- a/Adventures in Lestoria/ArtificerEnchantWindow.cpp +++ b/Adventures in Lestoria/ArtificerEnchantWindow.cpp @@ -210,12 +210,10 @@ void Menu::InitializeArtificerEnchantWindow(){ },}}, {"Back",{ .up=[&](MenuType type,Data&returnData){ - if(Component(type,"Accessory List")->GetSelectedChild())returnData=Component(type,"Accessory List")->GetSelectedChild().value().get().GetName(); - else returnData=Component(type,"Accessory List")->GetComponents().back().lock()->GetName(); + returnData=Component(type,"Accessory List")->GetComponents().back().lock()->GetName(); }, .down=[&](MenuType type,Data&returnData){ - if(Component(type,"Accessory List")->GetSelectedChild())returnData=Component(type,"Accessory List")->GetSelectedChild().value().get().GetName(); - else returnData=Component(type,"Accessory List")->GetComponents().front().lock()->GetName(); + returnData=Component(type,"Accessory List")->GetComponents().front().lock()->GetName(); }, .left="Fragment Enchant Button", .right="Fragment Enchant Button",}}, diff --git a/Adventures in Lestoria/ArtificerRefineResultWindow.cpp b/Adventures in Lestoria/ArtificerRefineResultWindow.cpp index 6b9db456..a47c1aac 100644 --- a/Adventures in Lestoria/ArtificerRefineResultWindow.cpp +++ b/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="",}}, }); } \ No newline at end of file diff --git a/Adventures in Lestoria/ArtificerRefineWindow.cpp b/Adventures in Lestoria/ArtificerRefineWindow.cpp index c9b4ab30..94d50970 100644 --- a/Adventures in Lestoria/ArtificerRefineWindow.cpp +++ b/Adventures in Lestoria/ArtificerRefineWindow.cpp @@ -192,12 +192,10 @@ void Menu::InitializeArtificerRefineWindow(){ },}}, {"Back",{ .up=[&](MenuType type,Data&returnData){ - if(Component(type,"Accessory List")->GetSelectedChild())returnData=Component(type,"Accessory List")->GetSelectedChild().value().get().GetName(); - else returnData=Component(type,"Accessory List")->GetComponents().back().lock()->GetName(); + returnData=Component(type,"Accessory List")->GetComponents().back().lock()->GetName(); }, .down=[&](MenuType type,Data&returnData){ - if(Component(type,"Accessory List")->GetSelectedChild())returnData=Component(type,"Accessory List")->GetSelectedChild().value().get().GetName(); - else returnData=Component(type,"Accessory List")->GetComponents().front().lock()->GetName(); + returnData=Component(type,"Accessory List")->GetComponents().front().lock()->GetName(); }, .left="Fragment Refine Button", .right="Fragment Refine Button",}}, diff --git a/Adventures in Lestoria/MenuType.h b/Adventures in Lestoria/MenuType.h index 3039e044..d4e38411 100644 --- a/Adventures in Lestoria/MenuType.h +++ b/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//////////////////////////////// /////////////////////////////////////////////////////////// diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 249db8b2..62161e84 100644 --- a/Adventures in Lestoria/Version.h +++ b/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 diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index 66ff059b..d5a1013a 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ