sigonasr2/AdventuresInLestoria
1
1
Fork 0
Code Issues 11 Pull Requests Projects 1 Releases Wiki Activity

Implemented controller compatbility for Artificer Disassembly Menu. Release Build 11653.

Browse Source
This commit is contained in:
sigonasr2 2024-09-16 03:21:29 -05:00
parent 86e2976549
commit da5d596a37
4 changed files with 54 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Adventures in Lestoria/ArtificerDisassembleWindow.cpp
View File

@ -140,7 +140,12 @@ void Menu::InitializeArtificerDisassembleWindow(){
artificerDisassembleWindow->SetupKeyboardNavigation( artificerDisassembleWindow->SetupKeyboardNavigation(
[](MenuType type,Data&returnData){ //On Open [](MenuType type,Data&returnData){ //On Open
returnData=""; auto&items{Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetComponents()};
if(items.size()>0){
returnData=items[0];
}else{
returnData="Back";
}
}, },
{ //Button Key { //Button Key
{game->KEY_SCROLL,{"Navigate",[](MenuType type){}}}, {game->KEY_SCROLL,{"Navigate",[](MenuType type){}}},
@ -148,12 +153,51 @@ void Menu::InitializeArtificerDisassembleWindow(){
Menu::CloseMenu(); Menu::CloseMenu();
}}}, }}},
{game->KEY_CONFIRM,{"Select",[](MenuType type){}}}, {game->KEY_CONFIRM,{"Select",[](MenuType type){}}},
{{game->KEY_SHOULDER2,Pressed},{"Scroll Up/Down",[](MenuType type){}}},
{{game->KEY_SHOULDER,Pressed},{"Scroll Up/Down",[](MenuType type){}}},
{{game->KEY_FASTSCROLLUP,PressedDAS},{"Scroll",[](MenuType type){
Menu::menus[type]->GetSelection().lock()->parentComponent.lock()->DecreaseSelectionIndex(3.f);
}}},
{{game->KEY_FASTSCROLLDOWN,PressedDAS},{"Scroll",[](MenuType type){
Menu::menus[type]->GetSelection().lock()->parentComponent.lock()->IncreaseSelectionIndex(3.f);
}}},
} }
,{ //Button Navigation Rules ,{ //Button Navigation Rules
{"Sample Button",{ {"Accessory List",{
.up="", .up=[&](MenuType type,Data&returnData){
.down="", Menu::ScrollUp(type,"Accessory List",returnData,"Back");
.left="", },
.right="",}}, .down=[&](MenuType type,Data&returnData){
}); Menu::ScrollDown(type,"Accessory List",returnData,"Back");
},
.left="Back",
.right=[&](MenuType type,Data&returnData){
Menu::menus[type]->GetSelection().lock()->Click();
returnData="Disassemble Button";
},}},
{"Back",{
.up=[&](MenuType type,Data&returnData){
if(Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetSelectedChild())returnData=Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetSelectedChild().value().get().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();
else returnData=Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetComponents().front().lock()->GetName();
},
.left="Disassemble Button",
.right="Disassemble Button",}},
{"Disassemble Button",{
.up=[&](MenuType type,Data&returnData){
returnData=Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetComponents().back().lock()->GetName();
},
.down=[&](MenuType type,Data&returnData){
returnData=Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetComponents().front().lock()->GetName();
},
.left=[&](MenuType type,Data&returnData){
if(Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetSelectedChild())returnData=Component<RowInventoryScrollableWindowComponent>(type,"Accessory List")->GetSelectedChild().value().get().GetName();
else returnData="Back";
},
.right="Back",}},
}
);
} }

4
Adventures in Lestoria/MenuType.h
View File

@ -70,9 +70,9 @@ enum MenuType{
DEATH, //100% Controller Compatibility DEATH, //100% Controller Compatibility
CREDITS, //100% Controller Compatibility CREDITS, //100% Controller Compatibility
ARTIFICER, //100% Controller Compatibility ARTIFICER, //100% Controller Compatibility
ARTIFICER_REFINE, ARTIFICER_REFINE, //100% Controller Compatibility
ARTIFICER_REFINE_RESULT, ARTIFICER_REFINE_RESULT,
ARTIFICER_DISASSEMBLE, ARTIFICER_DISASSEMBLE, //100% Controller Compatibility
ARTIFICER_ENCHANT, ARTIFICER_ENCHANT,
ARTIFICER_ENCHANT_CONFIRM, ARTIFICER_ENCHANT_CONFIRM,
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////

2
Adventures in Lestoria/Version.h
View File

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

BIN
x64/Release/Adventures in Lestoria.exe
View File

Binary file not shown.