diff --git a/Adventures in Lestoria/AdventuresInLestoria.cpp b/Adventures in Lestoria/AdventuresInLestoria.cpp index 92d3bfc2..14b88d93 100644 --- a/Adventures in Lestoria/AdventuresInLestoria.cpp +++ b/Adventures in Lestoria/AdventuresInLestoria.cpp @@ -139,6 +139,7 @@ InputGroup AiL::KEY_SCROLLVERT_R; InputGroup AiL::KEY_SCROLLVERT_L; InputGroup AiL::KEY_SCROLL; InputGroup AiL::KEY_SHOULDER; +InputGroup AiL::KEY_SHOULDER2; InputGroup AiL::KEY_CHANGE_LOADOUT; InputGroup AiL::KEY_MOUSE_RIGHT; @@ -2991,7 +2992,7 @@ void AiL::InitializeDefaultKeybinds(){ KEY_SHOULDER.AddKeybind({KEY,SHOULDER}); KEY_SHOULDER.AddKeybind({CONTROLLER,static_cast(GPButtons::SHOULDER)}); 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_UP}); diff --git a/Adventures in Lestoria/AdventuresInLestoria.h b/Adventures in Lestoria/AdventuresInLestoria.h index b07ecbf9..64f896e2 100644 --- a/Adventures in Lestoria/AdventuresInLestoria.h +++ b/Adventures in Lestoria/AdventuresInLestoria.h @@ -110,6 +110,7 @@ public: static InputGroup KEY_SCROLLVERT_L; static InputGroup KEY_SCROLL; static InputGroup KEY_SHOULDER; + static InputGroup KEY_SHOULDER2; static InputGroup KEY_CHANGE_LOADOUT; static InputGroup KEY_ENTER; diff --git a/Adventures in Lestoria/BlacksmithCraftingWindow.cpp b/Adventures in Lestoria/BlacksmithCraftingWindow.cpp index d941c9db..d491d382 100644 --- a/Adventures in Lestoria/BlacksmithCraftingWindow.cpp +++ b/Adventures in Lestoria/BlacksmithCraftingWindow.cpp @@ -271,6 +271,7 @@ void Menu::InitializeBlacksmithCraftingWindow(){ Component(type,"Weapon Tab")->Click(); } }}}, + {{game->KEY_SHOULDER2,Pressed},{"Scroll Up/Down",[](MenuType type){}}}, {{game->KEY_SHOULDER,Pressed},{"Scroll Up/Down",[](MenuType type){}}}, } ,{ //Button Navigation Rules diff --git a/Adventures in Lestoria/BuyItemWindow.cpp b/Adventures in Lestoria/BuyItemWindow.cpp index 2d2b55b9..31204ad3 100644 --- a/Adventures in Lestoria/BuyItemWindow.cpp +++ b/Adventures in Lestoria/BuyItemWindow.cpp @@ -134,6 +134,7 @@ void Menu::InitializeBuyItemWindow(){ },[](MenuType type){ Component(type,"Purchase Button")->Click(); }}}, + {{game->KEY_SHOULDER2,Pressed},{"Qty Up/Down",[](MenuType type){}}}, {{game->KEY_SHOULDER,Pressed},{"Qty Up/Down",[](MenuType type){}}}, {{game->KEY_FASTSCROLLDOWN,PressedDAS},{"",[](MenuType type){ Component(type,"Increase buy amount Button")->Click(); diff --git a/Adventures in Lestoria/CharacterMenuWindow.cpp b/Adventures in Lestoria/CharacterMenuWindow.cpp index 597d9375..4c5ca8d6 100644 --- a/Adventures in Lestoria/CharacterMenuWindow.cpp +++ b/Adventures in Lestoria/CharacterMenuWindow.cpp @@ -384,6 +384,7 @@ void Menu::InitializeCharacterMenuWindow(){ returnData=std::format("Equip Slot {}",CharacterMenuWindow::slotNames[0]); }, { //Button Key + {{game->KEY_SHOULDER2,Pressed},{"Scroll",[](MenuType type){}}}, {{game->KEY_SHOULDER,Pressed},{"Scroll",[](MenuType type){}}}, {{game->KEY_SCROLL,Analog},{"Scroll",[](MenuType type){}}}, {{game->KEY_MOUSE_RIGHT,Pressed},{[](MenuFuncData data){ diff --git a/Adventures in Lestoria/ConsumableCraftItemWindow.cpp b/Adventures in Lestoria/ConsumableCraftItemWindow.cpp index 67d60890..40111c7d 100644 --- a/Adventures in Lestoria/ConsumableCraftItemWindow.cpp +++ b/Adventures in Lestoria/ConsumableCraftItemWindow.cpp @@ -139,6 +139,7 @@ void Menu::InitializeConsumableCraftItemWindow(){ },[](MenuType type){ Component(type,"Craft Button")->Click(); }}}, + {{game->KEY_SHOULDER2,Pressed},{"Qty Up/Down",[](MenuType type){}}}, {{game->KEY_SHOULDER,Pressed},{"Qty Up/Down",[](MenuType type){}}}, {{game->KEY_FASTSCROLLDOWN,PressedDAS},{"",[](MenuType type){ Component(type,"Increase Craft amount Button")->Click(); diff --git a/Adventures in Lestoria/ConsumableCraftingWindow.cpp b/Adventures in Lestoria/ConsumableCraftingWindow.cpp index 3fa666c8..d5807e19 100644 --- a/Adventures in Lestoria/ConsumableCraftingWindow.cpp +++ b/Adventures in Lestoria/ConsumableCraftingWindow.cpp @@ -153,6 +153,7 @@ void Menu::InitializeConsumableCraftingWindow(){ } }, { //Button Key + {{game->KEY_SHOULDER2,Pressed},{"Scroll Up/Down",[](MenuType type){}}}, {{game->KEY_SHOULDER,Pressed},{"Scroll Up/Down",[](MenuType type){}}}, {{game->KEY_FASTSCROLLDOWN,PressedDAS},{"",[&](MenuType type){ if(!Menu::menus[type]->GetSelection().expired()&& diff --git a/Adventures in Lestoria/CreditsWindow.cpp b/Adventures in Lestoria/CreditsWindow.cpp index 3037a965..791660f6 100644 --- a/Adventures in Lestoria/CreditsWindow.cpp +++ b/Adventures in Lestoria/CreditsWindow.cpp @@ -67,6 +67,7 @@ void Menu::InitializeCreditsWindow(){ {{game->KEY_SCROLLDOWN,Held},{"",[](MenuType type){ Component(type,"Display Text Scroll Window")->Scroll(-1.f); }}}, + {{game->KEY_SHOULDER2,Pressed},{"Scroll",[](MenuType type){}}}, {{game->KEY_SHOULDER,Pressed},{"Scroll",[](MenuType type){ Component(type,"Display Text Scroll Window")->Scroll(-1.0f); }}}, diff --git a/Adventures in Lestoria/InventoryWindow.cpp b/Adventures in Lestoria/InventoryWindow.cpp index f3566a19..dc2ea05a 100644 --- a/Adventures in Lestoria/InventoryWindow.cpp +++ b/Adventures in Lestoria/InventoryWindow.cpp @@ -174,6 +174,7 @@ void Menu::InitializeInventoryWindow(){ {game->KEY_BACK,{"Back",[](MenuType type){ Menu::CloseMenu(); }}}, + {{game->KEY_SHOULDER2,Pressed},{"Scroll Up/Down",[](MenuType type){}}}, {{game->KEY_SHOULDER,Pressed},{"Scroll Up/Down",[](MenuType type){}}}, {{game->KEY_FACEUP,Pressed},{"Change Category",[&](MenuType type){ auto categories=GetSortedCategories(); diff --git a/Adventures in Lestoria/LevelCompleteWindow.cpp b/Adventures in Lestoria/LevelCompleteWindow.cpp index 06551cc7..c76a2fe8 100644 --- a/Adventures in Lestoria/LevelCompleteWindow.cpp +++ b/Adventures in Lestoria/LevelCompleteWindow.cpp @@ -111,6 +111,19 @@ void Menu::InitializeLevelCompleteWindow(){ } }, { //Button Key + {{game->KEY_SHOULDER2,Pressed},{[](MenuFuncData data){ + auto monsterLoot=Component(data.menu.GetType(),"Monster Loot Window"); + auto stageLoot=Component(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){ auto monsterLoot=Component(data.menu.GetType(),"Monster Loot Window"); auto stageLoot=Component(data.menu.GetType(),"Stage Loot Window"); diff --git a/Adventures in Lestoria/LoadGameWindow.cpp b/Adventures in Lestoria/LoadGameWindow.cpp index ef59ebb0..8bd11efc 100644 --- a/Adventures in Lestoria/LoadGameWindow.cpp +++ b/Adventures in Lestoria/LoadGameWindow.cpp @@ -139,6 +139,7 @@ void Menu::InitializeLoadGameWindow(){ #endif {{game->KEY_CONFIRM},{"Load",[](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_FASTSCROLLDOWN,PressedDAS,InputEngageGroup::NOT_VISIBLE},{"Scroll",[](MenuType type){ auto gameFilesList=Component(type,"Game Files List"); diff --git a/Adventures in Lestoria/MerchantWindow.cpp b/Adventures in Lestoria/MerchantWindow.cpp index 5cce7b26..fbf25337 100644 --- a/Adventures in Lestoria/MerchantWindow.cpp +++ b/Adventures in Lestoria/MerchantWindow.cpp @@ -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_FACEUP,Pressed},{[](MenuFuncData data){ if(Component(MERCHANT,"Buy Tab")->selected){ diff --git a/Adventures in Lestoria/OverworldMapLevelWindow.cpp b/Adventures in Lestoria/OverworldMapLevelWindow.cpp index 6c55517d..90eaf567 100644 --- a/Adventures in Lestoria/OverworldMapLevelWindow.cpp +++ b/Adventures in Lestoria/OverworldMapLevelWindow.cpp @@ -89,9 +89,8 @@ void Menu::InitializeOverworldMapLevelWindow(){ Component(type,"Enter Button")->Click(); } }}}, - {{game->KEY_SHOULDER,Pressed},{"Scroll Encounters",[](MenuType type){ - Component(type,"Spawns List")->Scroll(-1.0f); - }}}, + {{game->KEY_SHOULDER2,Pressed},{"Scroll Encounters",[](MenuType type){}}}, + {{game->KEY_SHOULDER,Pressed},{"Scroll Encounters",[](MenuType type){}}}, {{game->KEY_FASTSCROLLUP,Held,InputEngageGroup::NOT_VISIBLE},{"Scroll Encounters",[](MenuType type){ Component(type,"Spawns List")->Scroll(-1.0f); }}}, diff --git a/Adventures in Lestoria/SellItemWindow.cpp b/Adventures in Lestoria/SellItemWindow.cpp index 6ec824e5..56e230f6 100644 --- a/Adventures in Lestoria/SellItemWindow.cpp +++ b/Adventures in Lestoria/SellItemWindow.cpp @@ -136,6 +136,7 @@ void Menu::InitializeSellItemWindow(){ },[](MenuType type){ Component(type,"Sell Button")->Click(); }}}, + {{game->KEY_SHOULDER2,Pressed},{"Qty Up/Down",[](MenuType type){}}}, {{game->KEY_SHOULDER,Pressed},{"Qty Up/Down",[](MenuType type){}}}, {{game->KEY_FASTSCROLLDOWN,PressedDAS},{"",[](MenuType type){ Component(type,"Increase sell amount Button")->Click(); diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 7f1adbf3..a368c0f4 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 0 #define VERSION_PATCH 0 -#define VERSION_BUILD 8348 +#define VERSION_BUILD 8351 #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 f336f87b..f2979209 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ