Add Shoulder2 button hack to get the other controller button scroll up/down pair to appear in input helpers. Release Build 8351.

mac-build
sigonasr2 8 months ago
parent f18cba0b97
commit 41228265b2
  1. 3
      Adventures in Lestoria/AdventuresInLestoria.cpp
  2. 1
      Adventures in Lestoria/AdventuresInLestoria.h
  3. 1
      Adventures in Lestoria/BlacksmithCraftingWindow.cpp
  4. 1
      Adventures in Lestoria/BuyItemWindow.cpp
  5. 1
      Adventures in Lestoria/CharacterMenuWindow.cpp
  6. 1
      Adventures in Lestoria/ConsumableCraftItemWindow.cpp
  7. 1
      Adventures in Lestoria/ConsumableCraftingWindow.cpp
  8. 1
      Adventures in Lestoria/CreditsWindow.cpp
  9. 1
      Adventures in Lestoria/InventoryWindow.cpp
  10. 13
      Adventures in Lestoria/LevelCompleteWindow.cpp
  11. 1
      Adventures in Lestoria/LoadGameWindow.cpp
  12. 1
      Adventures in Lestoria/MerchantWindow.cpp
  13. 5
      Adventures in Lestoria/OverworldMapLevelWindow.cpp
  14. 1
      Adventures in Lestoria/SellItemWindow.cpp
  15. 2
      Adventures in Lestoria/Version.h
  16. BIN
      x64/Release/Adventures in Lestoria.exe

@ -139,6 +139,7 @@ InputGroup AiL::KEY_SCROLLVERT_R;
InputGroup AiL::KEY_SCROLLVERT_L; InputGroup AiL::KEY_SCROLLVERT_L;
InputGroup AiL::KEY_SCROLL; InputGroup AiL::KEY_SCROLL;
InputGroup AiL::KEY_SHOULDER; InputGroup AiL::KEY_SHOULDER;
InputGroup AiL::KEY_SHOULDER2;
InputGroup AiL::KEY_CHANGE_LOADOUT; InputGroup AiL::KEY_CHANGE_LOADOUT;
InputGroup AiL::KEY_MOUSE_RIGHT; InputGroup AiL::KEY_MOUSE_RIGHT;
@ -2991,7 +2992,7 @@ void AiL::InitializeDefaultKeybinds(){
KEY_SHOULDER.AddKeybind({KEY,SHOULDER}); KEY_SHOULDER.AddKeybind({KEY,SHOULDER});
KEY_SHOULDER.AddKeybind({CONTROLLER,static_cast<int>(GPButtons::SHOULDER)}); KEY_SHOULDER.AddKeybind({CONTROLLER,static_cast<int>(GPButtons::SHOULDER)});
KEY_SHOULDER.AddKeybind({STEAM,Steam::FAST_SCROLL_UP}); KEY_SHOULDER.AddKeybind({STEAM,Steam::FAST_SCROLL_UP});
KEY_SHOULDER.AddKeybind({STEAM,Steam::FAST_SCROLL_DOWN}); KEY_SHOULDER2.AddKeybind({STEAM,Steam::FAST_SCROLL_DOWN});
KEY_FACEDOWN.AddKeybind({STEAM,Steam::FAST_SCROLL_DOWN}); KEY_FACEDOWN.AddKeybind({STEAM,Steam::FAST_SCROLL_DOWN});
KEY_FACEDOWN.AddKeybind({STEAM,Steam::FAST_SCROLL_UP}); KEY_FACEDOWN.AddKeybind({STEAM,Steam::FAST_SCROLL_UP});

@ -110,6 +110,7 @@ public:
static InputGroup KEY_SCROLLVERT_L; static InputGroup KEY_SCROLLVERT_L;
static InputGroup KEY_SCROLL; static InputGroup KEY_SCROLL;
static InputGroup KEY_SHOULDER; static InputGroup KEY_SHOULDER;
static InputGroup KEY_SHOULDER2;
static InputGroup KEY_CHANGE_LOADOUT; static InputGroup KEY_CHANGE_LOADOUT;
static InputGroup KEY_ENTER; static InputGroup KEY_ENTER;

@ -271,6 +271,7 @@ void Menu::InitializeBlacksmithCraftingWindow(){
Component<MenuComponent>(type,"Weapon Tab")->Click(); Component<MenuComponent>(type,"Weapon Tab")->Click();
} }
}}}, }}},
{{game->KEY_SHOULDER2,Pressed},{"Scroll Up/Down",[](MenuType type){}}},
{{game->KEY_SHOULDER,Pressed},{"Scroll Up/Down",[](MenuType type){}}}, {{game->KEY_SHOULDER,Pressed},{"Scroll Up/Down",[](MenuType type){}}},
} }
,{ //Button Navigation Rules ,{ //Button Navigation Rules

@ -134,6 +134,7 @@ void Menu::InitializeBuyItemWindow(){
},[](MenuType type){ },[](MenuType type){
Component<MenuComponent>(type,"Purchase Button")->Click(); Component<MenuComponent>(type,"Purchase Button")->Click();
}}}, }}},
{{game->KEY_SHOULDER2,Pressed},{"Qty Up/Down",[](MenuType type){}}},
{{game->KEY_SHOULDER,Pressed},{"Qty Up/Down",[](MenuType type){}}}, {{game->KEY_SHOULDER,Pressed},{"Qty Up/Down",[](MenuType type){}}},
{{game->KEY_FASTSCROLLDOWN,PressedDAS},{"",[](MenuType type){ {{game->KEY_FASTSCROLLDOWN,PressedDAS},{"",[](MenuType type){
Component<MenuComponent>(type,"Increase buy amount Button")->Click(); Component<MenuComponent>(type,"Increase buy amount Button")->Click();

@ -384,6 +384,7 @@ void Menu::InitializeCharacterMenuWindow(){
returnData=std::format("Equip Slot {}",CharacterMenuWindow::slotNames[0]); returnData=std::format("Equip Slot {}",CharacterMenuWindow::slotNames[0]);
}, },
{ //Button Key { //Button Key
{{game->KEY_SHOULDER2,Pressed},{"Scroll",[](MenuType type){}}},
{{game->KEY_SHOULDER,Pressed},{"Scroll",[](MenuType type){}}}, {{game->KEY_SHOULDER,Pressed},{"Scroll",[](MenuType type){}}},
{{game->KEY_SCROLL,Analog},{"Scroll",[](MenuType type){}}}, {{game->KEY_SCROLL,Analog},{"Scroll",[](MenuType type){}}},
{{game->KEY_MOUSE_RIGHT,Pressed},{[](MenuFuncData data){ {{game->KEY_MOUSE_RIGHT,Pressed},{[](MenuFuncData data){

@ -139,6 +139,7 @@ void Menu::InitializeConsumableCraftItemWindow(){
},[](MenuType type){ },[](MenuType type){
Component<MenuComponent>(type,"Craft Button")->Click(); Component<MenuComponent>(type,"Craft Button")->Click();
}}}, }}},
{{game->KEY_SHOULDER2,Pressed},{"Qty Up/Down",[](MenuType type){}}},
{{game->KEY_SHOULDER,Pressed},{"Qty Up/Down",[](MenuType type){}}}, {{game->KEY_SHOULDER,Pressed},{"Qty Up/Down",[](MenuType type){}}},
{{game->KEY_FASTSCROLLDOWN,PressedDAS},{"",[](MenuType type){ {{game->KEY_FASTSCROLLDOWN,PressedDAS},{"",[](MenuType type){
Component<MenuComponent>(type,"Increase Craft amount Button")->Click(); Component<MenuComponent>(type,"Increase Craft amount Button")->Click();

@ -153,6 +153,7 @@ void Menu::InitializeConsumableCraftingWindow(){
} }
}, },
{ //Button Key { //Button Key
{{game->KEY_SHOULDER2,Pressed},{"Scroll Up/Down",[](MenuType type){}}},
{{game->KEY_SHOULDER,Pressed},{"Scroll Up/Down",[](MenuType type){}}}, {{game->KEY_SHOULDER,Pressed},{"Scroll Up/Down",[](MenuType type){}}},
{{game->KEY_FASTSCROLLDOWN,PressedDAS},{"",[&](MenuType type){ {{game->KEY_FASTSCROLLDOWN,PressedDAS},{"",[&](MenuType type){
if(!Menu::menus[type]->GetSelection().expired()&& if(!Menu::menus[type]->GetSelection().expired()&&

@ -67,6 +67,7 @@ void Menu::InitializeCreditsWindow(){
{{game->KEY_SCROLLDOWN,Held},{"",[](MenuType type){ {{game->KEY_SCROLLDOWN,Held},{"",[](MenuType type){
Component<ScrollableWindowComponent>(type,"Display Text Scroll Window")->Scroll(-1.f); Component<ScrollableWindowComponent>(type,"Display Text Scroll Window")->Scroll(-1.f);
}}}, }}},
{{game->KEY_SHOULDER2,Pressed},{"Scroll",[](MenuType type){}}},
{{game->KEY_SHOULDER,Pressed},{"Scroll",[](MenuType type){ {{game->KEY_SHOULDER,Pressed},{"Scroll",[](MenuType type){
Component<ScrollableWindowComponent>(type,"Display Text Scroll Window")->Scroll(-1.0f); Component<ScrollableWindowComponent>(type,"Display Text Scroll Window")->Scroll(-1.0f);
}}}, }}},

@ -174,6 +174,7 @@ void Menu::InitializeInventoryWindow(){
{game->KEY_BACK,{"Back",[](MenuType type){ {game->KEY_BACK,{"Back",[](MenuType type){
Menu::CloseMenu(); Menu::CloseMenu();
}}}, }}},
{{game->KEY_SHOULDER2,Pressed},{"Scroll Up/Down",[](MenuType type){}}},
{{game->KEY_SHOULDER,Pressed},{"Scroll Up/Down",[](MenuType type){}}}, {{game->KEY_SHOULDER,Pressed},{"Scroll Up/Down",[](MenuType type){}}},
{{game->KEY_FACEUP,Pressed},{"Change Category",[&](MenuType type){ {{game->KEY_FACEUP,Pressed},{"Change Category",[&](MenuType type){
auto categories=GetSortedCategories(); auto categories=GetSortedCategories();

@ -111,6 +111,19 @@ void Menu::InitializeLevelCompleteWindow(){
} }
}, },
{ //Button Key { //Button Key
{{game->KEY_SHOULDER2,Pressed},{[](MenuFuncData data){
auto monsterLoot=Component<InventoryScrollableWindowComponent>(data.menu.GetType(),"Monster Loot Window");
auto stageLoot=Component<InventoryScrollableWindowComponent>(data.menu.GetType(),"Stage Loot Window");
if(!data.parentComponent.expired()){
if(data.parentComponent.lock()->GetName()=="Monster Loot Window"&&monsterLoot->GetComponents().size()>0){
return "Stage Loot";
}else
if(monsterLoot->GetComponents().size()>0){
return "Monster Loot";
}
}
return "";
},[](MenuType type){}}},
{{game->KEY_SHOULDER,Pressed},{[](MenuFuncData data){ {{game->KEY_SHOULDER,Pressed},{[](MenuFuncData data){
auto monsterLoot=Component<InventoryScrollableWindowComponent>(data.menu.GetType(),"Monster Loot Window"); auto monsterLoot=Component<InventoryScrollableWindowComponent>(data.menu.GetType(),"Monster Loot Window");
auto stageLoot=Component<InventoryScrollableWindowComponent>(data.menu.GetType(),"Stage Loot Window"); auto stageLoot=Component<InventoryScrollableWindowComponent>(data.menu.GetType(),"Stage Loot Window");

@ -139,6 +139,7 @@ void Menu::InitializeLoadGameWindow(){
#endif #endif
{{game->KEY_CONFIRM},{"Load",[](MenuType type){}}}, {{game->KEY_CONFIRM},{"Load",[](MenuType type){}}},
{{game->KEY_SCROLLVERT,Analog},{"Scroll",[](MenuType type){}}}, {{game->KEY_SCROLLVERT,Analog},{"Scroll",[](MenuType type){}}},
{{game->KEY_SHOULDER2,Pressed},{"Scroll",[](MenuType type){}}},
{{game->KEY_SHOULDER,Pressed},{"Scroll",[](MenuType type){}}}, {{game->KEY_SHOULDER,Pressed},{"Scroll",[](MenuType type){}}},
{{game->KEY_FASTSCROLLDOWN,PressedDAS,InputEngageGroup::NOT_VISIBLE},{"Scroll",[](MenuType type){ {{game->KEY_FASTSCROLLDOWN,PressedDAS,InputEngageGroup::NOT_VISIBLE},{"Scroll",[](MenuType type){
auto gameFilesList=Component<ScrollableWindowComponent>(type,"Game Files List"); auto gameFilesList=Component<ScrollableWindowComponent>(type,"Game Files List");

@ -325,6 +325,7 @@ void Menu::InitializeMerchantWindow(){
} }
} }
}}}, }}},
{{game->KEY_SHOULDER2,Pressed},{"Scroll Up/Down",[](MenuType type){}}},
{{game->KEY_SHOULDER,Pressed},{"Scroll Up/Down",[](MenuType type){}}}, {{game->KEY_SHOULDER,Pressed},{"Scroll Up/Down",[](MenuType type){}}},
{{game->KEY_FACEUP,Pressed},{[](MenuFuncData data){ {{game->KEY_FACEUP,Pressed},{[](MenuFuncData data){
if(Component<MenuComponent>(MERCHANT,"Buy Tab")->selected){ if(Component<MenuComponent>(MERCHANT,"Buy Tab")->selected){

@ -89,9 +89,8 @@ void Menu::InitializeOverworldMapLevelWindow(){
Component<MenuComponent>(type,"Enter Button")->Click(); Component<MenuComponent>(type,"Enter Button")->Click();
} }
}}}, }}},
{{game->KEY_SHOULDER,Pressed},{"Scroll Encounters",[](MenuType type){ {{game->KEY_SHOULDER2,Pressed},{"Scroll Encounters",[](MenuType type){}}},
Component<EncountersSpawnListScrollableWindowComponent>(type,"Spawns List")->Scroll(-1.0f); {{game->KEY_SHOULDER,Pressed},{"Scroll Encounters",[](MenuType type){}}},
}}},
{{game->KEY_FASTSCROLLUP,Held,InputEngageGroup::NOT_VISIBLE},{"Scroll Encounters",[](MenuType type){ {{game->KEY_FASTSCROLLUP,Held,InputEngageGroup::NOT_VISIBLE},{"Scroll Encounters",[](MenuType type){
Component<EncountersSpawnListScrollableWindowComponent>(type,"Spawns List")->Scroll(-1.0f); Component<EncountersSpawnListScrollableWindowComponent>(type,"Spawns List")->Scroll(-1.0f);
}}}, }}},

@ -136,6 +136,7 @@ void Menu::InitializeSellItemWindow(){
},[](MenuType type){ },[](MenuType type){
Component<MenuComponent>(type,"Sell Button")->Click(); Component<MenuComponent>(type,"Sell Button")->Click();
}}}, }}},
{{game->KEY_SHOULDER2,Pressed},{"Qty Up/Down",[](MenuType type){}}},
{{game->KEY_SHOULDER,Pressed},{"Qty Up/Down",[](MenuType type){}}}, {{game->KEY_SHOULDER,Pressed},{"Qty Up/Down",[](MenuType type){}}},
{{game->KEY_FASTSCROLLDOWN,PressedDAS},{"",[](MenuType type){ {{game->KEY_FASTSCROLLDOWN,PressedDAS},{"",[](MenuType type){
Component<MenuComponent>(type,"Increase sell amount Button")->Click(); Component<MenuComponent>(type,"Increase sell amount Button")->Click();

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

Loading…
Cancel
Save