diff --git a/Adventures in Lestoria/AdventuresInLestoria.cpp b/Adventures in Lestoria/AdventuresInLestoria.cpp index 3a0034a5..8041c96f 100644 --- a/Adventures in Lestoria/AdventuresInLestoria.cpp +++ b/Adventures in Lestoria/AdventuresInLestoria.cpp @@ -126,6 +126,7 @@ InputGroup AiL::KEY_SCROLLLEFT; InputGroup AiL::KEY_SCROLLRIGHT; InputGroup AiL::KEY_SCROLLHORZ; InputGroup AiL::KEY_SCROLLVERT; +InputGroup AiL::KEY_SCROLLVERT_R; InputGroup AiL::KEY_SCROLL; InputGroup AiL::KEY_SHOULDER; InputGroup AiL::KEY_CHANGE_LOADOUT; @@ -2536,6 +2537,7 @@ void AiL::InitializeDefaultKeybinds(){ KEY_SCROLLDOWN.AddKeybind({ANALOG,static_cast(GPAxes::RY)}); KEY_SCROLLVERT.AddKeybind({ANALOG,static_cast(GPAxes::LY)}); KEY_SCROLLVERT.AddKeybind({ANALOG,static_cast(GPAxes::RY)}); + KEY_SCROLLVERT_R.AddKeybind({ANALOG,static_cast(GPAxes::RY)}); KEY_SCROLLHORZ.AddKeybind({ANALOG,static_cast(GPAxes::LX)}); KEY_SCROLLHORZ.AddKeybind({ANALOG,static_cast(GPAxes::RX)}); KEY_SCROLL.AddKeybind({KEY,ARROWS}); diff --git a/Adventures in Lestoria/AdventuresInLestoria.h b/Adventures in Lestoria/AdventuresInLestoria.h index 3a640370..3f6361fd 100644 --- a/Adventures in Lestoria/AdventuresInLestoria.h +++ b/Adventures in Lestoria/AdventuresInLestoria.h @@ -99,6 +99,7 @@ public: static InputGroup KEY_SCROLLRIGHT; static InputGroup KEY_SCROLLHORZ; static InputGroup KEY_SCROLLVERT; + static InputGroup KEY_SCROLLVERT_R; static InputGroup KEY_SCROLL; static InputGroup KEY_SHOULDER; static InputGroup KEY_CHANGE_LOADOUT; diff --git a/Adventures in Lestoria/Key.cpp b/Adventures in Lestoria/Key.cpp index 1a492955..0449fa6b 100644 --- a/Adventures in Lestoria/Key.cpp +++ b/Adventures in Lestoria/Key.cpp @@ -312,7 +312,7 @@ void InputGroup::DrawInput(const std::variant>buttonImgs; - if(type!=CONTROLLER){ + if(type!=CONTROLLER&&type!=MOUSE){ for(const Input&input:keyOrder){ if(input.GetType()==MOUSE){ if(input.HasIcon()){ @@ -383,9 +383,9 @@ void InputGroup::DrawInput(const std::variantview.DrawShadowStringPropDecal(pos+offset,displayText,{255,255,255,alpha},{0,0,0,alpha}); } + + game->view.DrawShadowStringPropDecal(pos+offset,displayText,{255,255,255,alpha},{0,0,0,alpha}); } void InputGroup::DrawInput(const std::variantrenderer,const vf2d pos,const std::string_view displayText,const uint8_t alpha)const{ diff --git a/Adventures in Lestoria/MenuType.h b/Adventures in Lestoria/MenuType.h index b0e4eff3..614cf266 100644 --- a/Adventures in Lestoria/MenuType.h +++ b/Adventures in Lestoria/MenuType.h @@ -41,12 +41,12 @@ enum MenuType{ /////////////////////////////////////////////////////////// /*DO NOT REMOVE!!*/ENUM_START,/////////////////////////////// /////////////////////////////////////////////////////////// - // 27% Controller Compatibility. (100 total items, 4 items per menu * 25 menus) + // 28% Controller Compatibility. (100 total items, 4 items per menu * 25 menus) INVENTORY_CONSUMABLES, //100% Controller Compatibility CLASS_INFO, //100% Controller Compatibility CLASS_SELECTION, //100% Controller Compatibility MAIN_MENU, //100% Controller Compatibility - OVERWORLD_LEVEL_SELECT, //75% Controller Compatibility - Scrolling for keyboard? + OVERWORLD_LEVEL_SELECT, //100% Controller Compatibility - Scrolling for keyboard? ITEM_LOADOUT, //0% Controller Compatibility LEVEL_COMPLETE, //0% Controller Compatibility OVERWORLD_MENU, //0% Controller Compatibility diff --git a/Adventures in Lestoria/OverworldMapLevelWindow.cpp b/Adventures in Lestoria/OverworldMapLevelWindow.cpp index 3c30e4a1..538b0876 100644 --- a/Adventures in Lestoria/OverworldMapLevelWindow.cpp +++ b/Adventures in Lestoria/OverworldMapLevelWindow.cpp @@ -74,7 +74,16 @@ void Menu::InitializeOverworldMapLevelWindow(){ {{game->KEY_CHANGE_LOADOUT},{"Change Loadout",[](MenuType type){ Component(type,"Change Loadout Button")->Click(); }}}, - {{game->KEY_SCROLLVERT,Analog},{"Scroll Encounters",[](MenuType type){ + {{game->KEY_SHOULDER,Pressed},{"Scroll Encounters",[](MenuType type){ + Component(type,"Spawns List")->Scroll(-1.0f); + }}}, + {{game->KEY_FASTSCROLLUP,Held,InputEngageGroup::NOT_VISIBLE},{"Scroll Encounters",[](MenuType type){ + Component(type,"Spawns List")->Scroll(-1.0f); + }}}, + {{game->KEY_FASTSCROLLDOWN,Held,InputEngageGroup::NOT_VISIBLE},{"Scroll Encounters",[](MenuType type){ + Component(type,"Spawns List")->Scroll(1.0f); + }}}, + {{game->KEY_SCROLLVERT_R,Analog},{"Scroll Encounters",[](MenuType type){ Component(type,"Spawns List")->Scroll(game->KEY_SCROLLVERT.Analog()); }}}, {{game->KEY_SCROLLUP,Held},{"",[](MenuType type){ diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index f578518d..bd8bf68f 100644 --- a/Adventures in Lestoria/Version.h +++ b/Adventures in Lestoria/Version.h @@ -39,7 +39,7 @@ All rights reserved. #define VERSION_MAJOR 0 #define VERSION_MINOR 3 #define VERSION_PATCH 0 -#define VERSION_BUILD 6988 +#define VERSION_BUILD 6993 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/Adventures in Lestoria/assets/config/Interface.txt b/Adventures in Lestoria/assets/config/Interface.txt index df4b8aa8..fc36e3f4 100644 --- a/Adventures in Lestoria/assets/config/Interface.txt +++ b/Adventures in Lestoria/assets/config/Interface.txt @@ -5,6 +5,9 @@ Interface # How long to wait for subsequent scrolling through menu items. ScrollDelay = 0.2s + + # Scroll speed for ScrollableWindowComponents in pixels/sec + AnalogScrollSpeed = 220 # The size of each side of the 9-patch menu sprite. 9PatchSize = 24,24 diff --git a/Adventures in Lestoria/assets/themes/lmb.png b/Adventures in Lestoria/assets/themes/lmb.png index 3c34eab2..e2894bb5 100644 Binary files a/Adventures in Lestoria/assets/themes/lmb.png and b/Adventures in Lestoria/assets/themes/lmb.png differ diff --git a/Adventures in Lestoria/assets/themes/mmb.png b/Adventures in Lestoria/assets/themes/mmb.png index b8afb434..ec7cae05 100644 Binary files a/Adventures in Lestoria/assets/themes/mmb.png and b/Adventures in Lestoria/assets/themes/mmb.png differ diff --git a/Adventures in Lestoria/assets/themes/rmb.png b/Adventures in Lestoria/assets/themes/rmb.png index 72873418..fc695402 100644 Binary files a/Adventures in Lestoria/assets/themes/rmb.png and b/Adventures in Lestoria/assets/themes/rmb.png differ diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index 356955e0..4c3e8fcb 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ