diff --git a/Adventures in Lestoria/AdventuresInLestoria.cpp b/Adventures in Lestoria/AdventuresInLestoria.cpp index 3492ec7c..597ae0ba 100644 --- a/Adventures in Lestoria/AdventuresInLestoria.cpp +++ b/Adventures in Lestoria/AdventuresInLestoria.cpp @@ -347,13 +347,7 @@ bool AiL::OnUserUpdate(float fElapsedTime){ levelTime+=fElapsedTime; SteamAPI_RunCallbacks(); if(SteamInput()){ - if(Input::ingameControlsHandle==Input::menuControlsHandle){ - //Something went wrong so try initializing again... - std::cout<<"WARNING! Steam Input system was not ready and has not set the action set control handles properly! Trying again..."<GetActionSetHandle("InGameControls"); - Input::menuControlsHandle=SteamInput()->GetActionSetHandle("MenuControls"); - } - ActivateActionSetForAllControllers(Input::menuControlsHandle); + ActivateActionSetForAllControllers(Input::ingameControlsHandle); Input::UpdateSteamInput(); } @@ -434,8 +428,6 @@ bool AiL::DownPressed(){ void AiL::HandleUserInput(float fElapsedTime){ if(!Menu::stack.empty())return; //A window being opened means there's no user input allowed. - if(SteamInput())ActivateActionSetForAllControllers(Input::ingameControlsHandle); - if(GetKey(SCROLL).bPressed)displayHud=!displayHud; bool setIdleAnimation=true; @@ -644,9 +636,6 @@ void AiL::HandleUserInput(float fElapsedTime){ } } } - - - if(SteamInput())SteamInput()->ActivateActionSet(STEAM_INPUT_HANDLE_ALL_CONTROLLERS,Input::menuControlsHandle); } void AiL::UpdateCamera(float fElapsedTime){ @@ -3791,7 +3780,6 @@ bool AiL::Steam_Init(){ if(SteamInput()!=nullptr){ SteamInput()->Init(false); Input::ingameControlsHandle=SteamInput()->GetActionSetHandle("InGameControls"); - Input::menuControlsHandle=SteamInput()->GetActionSetHandle("MenuControls"); } return true; } @@ -3800,6 +3788,6 @@ bool AiL::Steam_Init(){ void AiL::ActivateActionSetForAllControllers(InputActionSetHandle_t actionSetHandle){ for(int i=0;iActivateActionSet(Input::steamControllers[i],Input::menuControlsHandle); + SteamInput()->ActivateActionSet(Input::steamControllers[i],actionSetHandle); } } \ No newline at end of file diff --git a/Adventures in Lestoria/Key.cpp b/Adventures in Lestoria/Key.cpp index a133bd3e..a6c039e2 100644 --- a/Adventures in Lestoria/Key.cpp +++ b/Adventures in Lestoria/Key.cpp @@ -47,17 +47,17 @@ INCLUDE_GFX bool Input::usingGamepad; uint64_t Input::ingameControlsHandle{0}; -uint64_t Input::menuControlsHandle{0}; uint8_t activeSteamControllerIndex{0}; safemapInputGroup::menuNamesToInputGroups; std::vectorInputGroup::menuInputGroups; std::vectorInputGroup::gameplayInputGroups; -std::arrayInput::steamControllers; +std::arrayInput::steamControllers; +std::unordered_map>>Input::steamGameInputToOrigin; uint8_t Input::activeSteamControllerIndex; uint8_t Input::controllerCount{0}; std::vectorInput::leftStickActionSets{Steam::MOVE}; -std::vectorInput::rightStickActionSets{Steam::MANUAL_AIM,Steam::SCROLL}; +std::vectorInput::rightStickActionSets{Steam::SCROLL}; std::array>,16>Input::enumToActionName; std::unordered_mapInput::steamIconToGameIcon{ @@ -144,9 +144,8 @@ Input::Input(InputType type,int key) :type(type),key(key){} void Input::Initialize(){ - for(int i=0;i<16;i++){ + for(int i=0;iGetDigitalActionHandle(data.first.c_str()); InputDigitalActionData_t buttonData=SteamInput()->GetDigitalActionData(steamControllers[i],inputHnd); - if(!buttonData.bActive)continue; //Ignore inputs that are not active. - if(buttonData.bActive){std::cout<0){ //Setup display icons for steam controllers. + for(auto&[input,data]:enumToActionName[activeSteamControllerIndex]){ + InputDigitalActionHandle_t inputHnd=SteamInput()->GetDigitalActionHandle(data.first.c_str()); + InputDigitalActionData_t buttonData=SteamInput()->GetDigitalActionData(steamControllers[activeSteamControllerIndex],inputHnd); + //Store the origins that steam knows about inside the gameplay input arrays provided. These are pairs where the first item is the number of origins for this input and the second item is the array itself. + steamGameInputToOrigin[input].first=SteamInput()->GetDigitalActionOrigins(steamControllers[activeSteamControllerIndex],ingameControlsHandle,inputHnd,steamGameInputToOrigin[input].second.data()); + } + } } } @@ -358,6 +363,7 @@ float Input::Analog(){ float axisVal=GetAnalogStickVal(i,input,Axis::X); if(axisVal!=0.f){ usingGamepad=true; + activeSteamControllerIndex=i; return axisVal; } } @@ -367,6 +373,7 @@ float Input::Analog(){ float axisVal=GetAnalogStickVal(i,input,Axis::Y); if(axisVal!=0.f){ usingGamepad=true; + activeSteamControllerIndex=i; return axisVal; } } @@ -376,6 +383,7 @@ float Input::Analog(){ float axisVal=GetAnalogStickVal(i,input,Axis::X); if(axisVal!=0.f){ usingGamepad=true; + activeSteamControllerIndex=i; return axisVal; } } @@ -385,6 +393,7 @@ float Input::Analog(){ float axisVal=GetAnalogStickVal(i,input,Axis::Y); if(axisVal!=0.f){ usingGamepad=true; + activeSteamControllerIndex=i; return axisVal; } } @@ -410,6 +419,10 @@ float Input::Analog(){ } std::string Input::GetDisplayName()const{ + if(type==STEAM){ + return std::format("STEAM:{}",key); + } + if(!GenericKey::keyLiteral.count({type,key}))return ""; return GenericKey::keyLiteral.at({type,key}).displayName; } @@ -652,7 +665,13 @@ void InputGroup::DrawInput(const std::variantrenderer,const vf2d pos,const std::string_view displayText,const uint8_t alpha,InputType type,vf2d textScale)const{ std::optionalprimaryKey; switch(type){ - case CONTROLLER:primaryKey=GetPrimaryKey(CONTROLLER);break; + case CONTROLLER:{ + if(SteamInput()){ + primaryKey=GetPrimaryKey(STEAM); + }else{ + primaryKey=GetPrimaryKey(CONTROLLER); + } + }break; case MOUSE:primaryKey=GetPrimaryKey(MOUSE);break; default:primaryKey=GetPrimaryKey(KEY);break; } @@ -660,7 +679,7 @@ void InputGroup::DrawPrimaryInput(const std::variant>buttonImgs; - if(type!=CONTROLLER&&type!=MOUSE){ + if(type!=STEAM&&type!=CONTROLLER&&type!=MOUSE){ for(const Input&input:keyOrder){ if(input.GetType()==MOUSE){ if(input.HasExtendedIcons()){ @@ -688,10 +707,15 @@ void InputGroup::DrawPrimaryInput(const std::variantwidth*textScale.x+"Interface.InputHelperSpacing"_F; - buttonImgSize.y=std::max(buttonImgSize.y,float(primaryKey.value().GetIcon().Sprite()->height)); + float alteredIconScale=1.f; + + if(type==STEAM)alteredIconScale/=2.85f; //They are initially 32x32. + + buttonImgSize.x+=primaryKey.value().GetIcon().Sprite()->width*alteredIconScale*textScale.x+"Interface.InputHelperSpacing"_F; + buttonImgSize.y=std::max(buttonImgSize.y,float(primaryKey.value().GetIcon().Sprite()->height*alteredIconScale)); buttonImgs.push_back(primaryKey.value().GetIcon().Decal()); - }else{ + }else + { buttonImgSize.x+=game->GetTextSizeProp(primaryKey.value().GetDisplayName()).x*textScale.x+"Interface.InputHelperSpacing"_F; buttonImgSize.y=std::max(buttonImgSize.y,float(game->GetTextSizeProp(primaryKey.value().GetDisplayName()).y)+"Interface.InputHelperSpacing"_F); buttonImgs.push_back(primaryKey.value().GetDisplayName()); @@ -706,7 +730,10 @@ void InputGroup::DrawPrimaryInput(const std::variant(renderer)->DrawDecal(pos+offset-vf2d{0.f,2.f},img,textScale,{255,255,255,alpha}); + float alteredIconScale=1.f; \ + \ + if(type==STEAM)alteredIconScale/=2.85f; /*They are initially 32x32.*/ \ + std::get(renderer)->DrawDecal(pos+offset-vf2d{0.f,2.f},img,alteredIconScale*textScale,{255,255,255,alpha}); #pragma endregion if(std::holds_alternative(renderer)){ Render(AiL); @@ -775,12 +802,21 @@ void InputGroup::DrawPrimaryInput(const std::variant0; + } return GenericKey::keyLiteral.at({type,key}).iconName.length()>0; } const bool Input::HasExtendedIcons()const{ + if(type==STEAM)return false; return GenericKey::keyLiteral.at({type,key}).iconName.length()>0&&GenericKey::keyLiteral.at({type,key}).iconName2.length()>0&&GenericKey::keyLiteral.at({type,key}).iconName3.length()>0; } const Renderable&Input::GetIcon()const{ + if(type==STEAM){ + EInputActionOrigin action=Input::steamGameInputToOrigin.at(Steam::SteamInput(key)).second[0]; + return GFX.at(SteamInput()->GetGlyphPNGForActionOrigin(action,k_ESteamInputGlyphSize_Small,0)); + } return GFX.at(GenericKey::keyLiteral.at({type,key}).iconName); } const Renderable&Input::GetIcon(IconType type)const{ diff --git a/Adventures in Lestoria/Key.h b/Adventures in Lestoria/Key.h index 9ef8c72d..eb87a93d 100644 --- a/Adventures in Lestoria/Key.h +++ b/Adventures in Lestoria/Key.h @@ -66,9 +66,8 @@ enum class Axis{ namespace Steam{ enum SteamInput{ - //Gameplay Inputs MOVE, //This is the left stick analog input. Whenever we use this, we assume left stick is being used. - MANUAL_AIM, //This is the right stick analog input. Whenever we use this, we assume right stick is being used. + SCROLL, //This is the right stick analog input. Whenever we use this, we assume right stick is being used. BASIC_ATTACK, DEFENSIVE, MENU_PAUSE, @@ -79,8 +78,6 @@ namespace Steam{ ITEM_1, ITEM_2, ITEM_3, - //Menu Inputs - SCROLL, //This is the right stick analog input. Whenever we use this, we assume right stick is being used. CONFIRM, BACK, FUNCTION_1, @@ -95,6 +92,8 @@ namespace Steam{ }; }; +using NumOfOrigins=uint8_t; + //A generic class that represents any type of input. class Input{ friend class InputGroup; @@ -102,12 +101,11 @@ class Input{ friend class AiL; InputType type; int key; //This will be interpreted differently depending on input type. - static uint64_t ingameControlsHandle; - static uint64_t menuControlsHandle; static bool usingGamepad; static void SetUsingGamepad(const bool usingGamepad); - static std::array>,16>enumToActionName; + static std::array>,STEAM_INPUT_MAX_COUNT>enumToActionName; static std::unordered_mapsteamIconToGameIcon; + static std::unordered_map>>steamGameInputToOrigin; //Store the origins that steam knows about inside either the gameplay or menu input arrays provided. These are pairs where the first item is the number of origins for this input and the second item is the array itself. static void Initialize(); static void UpdateSteamInput(); static std::arraysteamControllers; @@ -139,6 +137,7 @@ public: const Renderable&GetIcon(IconType type)const; const int GetKeyCode()const; friend const bool operator==(const Input&input1,const Input&input2); + static uint64_t ingameControlsHandle; }; class InputGroup{ diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 5a03f2c3..13f5503f 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 5 #define VERSION_PATCH 1 -#define VERSION_BUILD 8298 +#define VERSION_BUILD 8324 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/Adventures in Lestoria/controller_config/controller_generic.vdf b/Adventures in Lestoria/controller_config/controller_generic.vdf index 25aa1ea1..0ee57bea 100644 --- a/Adventures in Lestoria/controller_config/controller_generic.vdf +++ b/Adventures in Lestoria/controller_config/controller_generic.vdf @@ -1,18 +1,18 @@ "controller_mappings" { "version" "3" - "revision" "38" - "title" "Generic Gamepad" - "description" "Default controller configuration" + "revision" "82" + "title" "#Title_Config" + "description" "#Description_Config" "creator" "76561198025675819" "progenitor" "" - "url" "usercloud://2895980/xbox 360playstationnintendo switch_0" + "url" "usercloud://2895980/generic gamepad_3" "export_type" "personal_cloud" - "controller_type" "controller_switch_pro" - "controller_caps" "613772287" + "controller_type" "controller_generic" + "controller_caps" "1573375" "major_revision" "0" "minor_revision" "0" - "Timestamp" "1711225148" + "Timestamp" "1711341077" "actions" { "InGameControls" @@ -20,67 +20,42 @@ "title" "#Set_Ingame" "legacy_set" "0" "StickPadGyro" - { - "Move" - { - "title" "#Gameplay_Move" - "input_mode" "joystick_move" - } - "Manual Aim" - { - "title" "#Gameplay_Aim" - "input_mode" "joystick_move" - } - } - "Button" - { - "Basic_Attack" "#Gameplay_BasicAttack" - "Defensive" "#Gameplay_Defensive" - "Menu" - { - "Pause" "#Menu_Menu" - } - "Ability_1" "#Gameplay_Ability1" - "Ability_2" "#Gameplay_Ability2" - "Ability_3" "#Gameplay_Ability3" - "Ability_4" "#Gameplay_Ability4" - "Item_1" "#Gameplay_Item1" - "Item_2" "#Gameplay_Item2" - "Item_3" "#Gameplay_Item3" - } - } - "MenuControls" - { - "title" "#Set_Menu" - "legacy_set" "0" - "StickPadGyro" { "Scroll" { - "title" "#Menu_Scroll" + "title" "#Scroll" "input_mode" "joystick_move" } } "Button" { - "Confirm" "#Menu_Confirm" - "Back" "#Menu_Back" - "Function_1" "#Menu_Function1" - "Function_2" "#Menu_Function2" + "Basic_Attack" "#BasicAttack" + "Defensive" "#Defensive" "Menu" { - "Pause" "#Menu_Menu" - } - "Up" "#Menu_Up" - "Down" "#Menu_Down" - "Left" "#Menu_Left" - "Right" "#Menu_Right" + "Pause" "#Menu" + } + "Ability_1" "#Ability1" + "Ability_2" "#Ability2" + "Ability_3" "#Ability3" + "Ability_4" "#Ability4" + "Item_1" "#Item1" + "Item_2" "#Item2" + "Item_3" "#Item3" + "Confirm" "#Confirm" + "Back" "#Back" + "Function_1" "#Function1" + "Function_2" "#Function2" + "Up" "#Up" + "Down" "#Down" + "Left" "#Left" + "Right" "#Right" "Lock" { - "Unlock_Accessory" "#Menu_Select" + "Unlock_Accessory" "#Select" } - "Fast_Scroll_Up" "#Menu_ScrollUp" - "Fast_Scroll_Down" "#Menu_ScrollDown" + "Fast_Scroll_Up" "#ScrollUp" + "Fast_Scroll_Down" "#ScrollDown" } } } @@ -91,34 +66,31 @@ { "english" { - "Title_Config" "Adventures in Lestoria Configuration" - "Description_Config" "The default controller configuration for Adventures in Lestoria." + "Title_Config" "Generic Gamepad" + "Description_Config" "Generic gamepad configuration." "Set_Ingame" "Gameplay Controls" - "Set_Menu" "Menu Controls" - "Gameplay_BasicAttack" "Basic Attack" - "Gameplay_Move" "Move" - "Gameplay_Aim" "Manual Aim" - "Gameplay_Defensive" "Defensive" - "Gameplay_Ability1" "Ability 1" - "Gameplay_Ability2" "Ability 2" - "Gameplay_Ability3" "Ability 3" - "Gameplay_Ability4" "Ability 4" - "Gameplay_Item1" "Item 1" - "Gameplay_Item2" "Item 2" - "Gameplay_Item3" "Item 3" - "Menu_Confirm" "Confirm" - "Menu_Back" "Back" - "Menu_Select" "Lock/Unlock Accessory" - "Menu_Function1" "Function 1" - "Menu_Function2" "Function 2" - "Menu_Menu" "Menu/Pause" - "Menu_Up" "Menu Up" - "Menu_Down" "Menu Down" - "Menu_Left" "Menu Left" - "Menu_Right" "Menu Right" - "Menu_Scroll" "Scroll" - "Menu_ScrollUp" "Fast Scroll Up" - "Menu_ScrollDown" "Fast Scroll Down" + "BasicAttack" "Basic Attack" + "Defensive" "Use Defensive" + "Ability1" "Use Ability 1" + "Ability2" "Use Ability 2" + "Ability3" "Use Ability 3" + "Ability4" "Use Ability 4" + "Item1" "Use Item 1" + "Item2" "Use Item 2" + "Item3" "Use Item 3" + "Confirm" "Confirm" + "Back" "Back" + "SELECT" "Lock/Unlock Accessory" + "Function1" "Menu Function 1" + "Function2" "Menu Function 2" + "Menu" "Menu/Pause" + "Up" "Up" + "Down" "Down" + "Left" "Left" + "Right" "Right" + "Scroll" "Scroll Menu/Manual Aim" + "ScrollUp" "Fast Scroll Menu Up" + "ScrollDown" "Fast Scroll Menu Down" } } "group" @@ -129,7 +101,7 @@ "description" "" "inputs" { - "button_b" + "button_a" { "activators" { @@ -137,7 +109,14 @@ { "bindings" { - "binding" "game_action InGameControls Basic_Attack, , " + "binding" "game_action InGameControls Defensive, , " + } + } + "Full_Press" + { + "bindings" + { + "binding" "game_action InGameControls Back, , " } } } @@ -145,7 +124,7 @@ { } } - "button_a" + "button_b" { "activators" { @@ -153,7 +132,14 @@ { "bindings" { - "binding" "game_action InGameControls Defensive, , " + "binding" "game_action InGameControls Basic_Attack, , " + } + } + "Full_Press" + { + "bindings" + { + "binding" "game_action InGameControls Confirm, , " } } } @@ -161,7 +147,7 @@ { } } - "button_y" + "button_x" { "activators" { @@ -169,7 +155,14 @@ { "bindings" { - "binding" "game_action InGameControls Ability_2, , " + "binding" "game_action InGameControls Ability_1, , " + } + } + "Full_Press" + { + "bindings" + { + "binding" "game_action InGameControls Function_2, , " } } } @@ -177,7 +170,7 @@ { } } - "button_x" + "button_y" { "activators" { @@ -185,7 +178,14 @@ { "bindings" { - "binding" "game_action InGameControls Ability_1, , " + "binding" "game_action InGameControls Ability_2, , " + } + } + "Full_Press" + { + "bindings" + { + "binding" "game_action InGameControls Function_1, , " } } } @@ -203,7 +203,7 @@ "description" "" "inputs" { - "click" + "edge" { "activators" { @@ -218,20 +218,11 @@ "haptic_intensity" "2" } } - } - "disabled_activators" - { - } - } - "edge" - { - "activators" - { "Full_Press" { "bindings" { - "binding" "game_action InGameControls Item_2, , " + "binding" "game_action InGameControls Fast_Scroll_Up, , " } "settings" { @@ -253,7 +244,7 @@ "description" "" "inputs" { - "click" + "edge" { "activators" { @@ -268,20 +259,11 @@ "haptic_intensity" "2" } } - } - "disabled_activators" - { - } - } - "edge" - { - "activators" - { "Full_Press" { "bindings" { - "binding" "game_action InGameControls Ability_4, , " + "binding" "game_action InGameControls Fast_Scroll_Down, , " } "settings" { @@ -303,70 +285,6 @@ "description" "" "inputs" { - "button_b" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "game_action MenuControls Confirm, , " - } - } - } - "disabled_activators" - { - } - } - "button_a" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "game_action MenuControls Back, , " - } - } - } - "disabled_activators" - { - } - } - "button_y" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "game_action MenuControls Function_1, , " - } - } - } - "disabled_activators" - { - } - } - "button_x" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "game_action MenuControls Function_2, , " - } - } - } - "disabled_activators" - { - } - } } } "group" @@ -377,46 +295,6 @@ "description" "" "inputs" { - "click" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "game_action MenuControls Fast_Scroll_Up, , " - } - "settings" - { - "haptic_intensity" "2" - } - } - } - "disabled_activators" - { - } - } - "edge" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "game_action MenuControls Fast_Scroll_Up, , " - } - "settings" - { - "haptic_intensity" "2" - } - } - } - "disabled_activators" - { - } - } } } "group" @@ -427,46 +305,6 @@ "description" "" "inputs" { - "click" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "game_action MenuControls Fast_Scroll_Down, , " - } - "settings" - { - "haptic_intensity" "2" - } - } - } - "disabled_activators" - { - } - } - "edge" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "game_action MenuControls Fast_Scroll_Down, , " - } - "settings" - { - "haptic_intensity" "2" - } - } - } - "disabled_activators" - { - } - } } } "group" @@ -510,10 +348,6 @@ { "virtual_mode" "1" } - "gameactions" - { - "MenuControls" "Scroll" - } } "group" { @@ -528,14 +362,24 @@ { "virtual_mode" "1" } - "gameactions" + } + "group" + { + "id" "15" + "mode" "joystick_move" + "name" "" + "description" "" + "inputs" + { + } + "settings" { - "InGameControls" "Move" + "virtual_mode" "1" } } "group" { - "id" "15" + "id" "16" "mode" "joystick_move" "name" "" "description" "" @@ -546,14 +390,39 @@ { "virtual_mode" "1" } - "gameactions" + } + "group" + { + "id" "18" + "mode" "dpad" + "name" "" + "description" "" + "inputs" { - "InGameControls" "Move" + } + "settings" + { + "requires_click" "0" + "haptic_intensity_override" "0" } } "group" { - "id" "16" + "id" "19" + "mode" "dpad" + "name" "" + "description" "" + "inputs" + { + } + "settings" + { + "requires_click" "0" + } + } + "group" + { + "id" "20" "mode" "joystick_move" "name" "" "description" "" @@ -566,12 +435,12 @@ } "gameactions" { - "InGameControls" "Manual Aim" + "InGameControls" "Scroll" } } "group" { - "id" "18" + "id" "21" "mode" "dpad" "name" "" "description" "" @@ -585,7 +454,7 @@ { "bindings" { - "binding" "game_action MenuControls Up, , " + "binding" "game_action InGameControls Up, , " } } } @@ -601,7 +470,7 @@ { "bindings" { - "binding" "game_action MenuControls Down, , " + "binding" "game_action InGameControls Down, , " } } } @@ -617,7 +486,7 @@ { "bindings" { - "binding" "game_action MenuControls Right, , " + "binding" "game_action InGameControls Right, , " } } } @@ -633,7 +502,7 @@ { "bindings" { - "binding" "game_action MenuControls Left, , " + "binding" "game_action InGameControls Left, , " } } } @@ -650,7 +519,25 @@ } "group" { - "id" "19" + "id" "22" + "mode" "joystick_move" + "name" "" + "description" "" + "inputs" + { + } + "settings" + { + "virtual_mode" "1" + } + "gameactions" + { + "InGameControls" "Scroll" + } + } + "group" + { + "id" "23" "mode" "dpad" "name" "" "description" "" @@ -664,7 +551,7 @@ { "bindings" { - "binding" "game_action MenuControls Up, , " + "binding" "game_action InGameControls Up, , " } } } @@ -680,7 +567,7 @@ { "bindings" { - "binding" "game_action MenuControls Down, , " + "binding" "game_action InGameControls Down, , " } } } @@ -696,7 +583,7 @@ { "bindings" { - "binding" "game_action MenuControls Right, , " + "binding" "game_action InGameControls Right, , " } } } @@ -712,7 +599,7 @@ { "bindings" { - "binding" "game_action MenuControls Left, , " + "binding" "game_action InGameControls Left, , " } } } @@ -761,20 +648,11 @@ "binding" "game_action InGameControls Item_3, , " } } - } - "disabled_activators" - { - } - } - "left_bumper" - { - "activators" - { "Full_Press" { "bindings" { - "binding" "game_action InGameControls Item_1, , " + "binding" "game_action InGameControls Lock/Unlock_Accessory, , " } } } @@ -782,23 +660,7 @@ { } } - "right_bumper" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "game_action InGameControls Ability_3, , " - } - } - } - "disabled_activators" - { - } - } - "button_capture" + "left_bumper" { "activators" { @@ -806,33 +668,14 @@ { "bindings" { - "binding" "controller_action SCREENSHOT, , " + "binding" "game_action InGameControls Item_1, , " } } - } - "disabled_activators" - { - } - } - } - } - "group" - { - "id" "4" - "mode" "switches" - "name" "" - "description" "" - "inputs" - { - "button_escape" - { - "activators" - { "Full_Press" { "bindings" { - "binding" "game_action MenuControls Menu/Pause, , " + "binding" "game_action InGameControls Fast_Scroll_Up, , " } } } @@ -840,7 +683,7 @@ { } } - "button_menu" + "right_bumper" { "activators" { @@ -848,23 +691,14 @@ { "bindings" { - "binding" "game_action MenuControls Lock/Unlock_Accessory, , " + "binding" "game_action InGameControls Ability_3, , " } } - } - "disabled_activators" - { - } - } - "left_bumper" - { - "activators" - { "Full_Press" { "bindings" { - "binding" "game_action MenuControls Fast_Scroll_Up, , " + "binding" "game_action InGameControls Fast_Scroll_Down, , " } } } @@ -872,7 +706,7 @@ { } } - "right_bumper" + "button_capture" { "activators" { @@ -880,7 +714,7 @@ { "bindings" { - "binding" "game_action MenuControls Fast_Scroll_Down, , " + "binding" "controller_action SCREENSHOT, , " } } } @@ -888,6 +722,16 @@ { } } + } + } + "group" + { + "id" "4" + "mode" "switches" + "name" "" + "description" "" + "inputs" + { "button_capture" { "activators" @@ -916,26 +760,13 @@ "1" "button_diamond active" "2" "left_trigger active" "3" "right_trigger active" - "15" "joystick active" - "16" "right_joystick active" - "14" "dpad active" - } - } - "preset" - { - "id" "1" - "name" "MenuControls" - "group_source_bindings" - { - "4" "switch active" - "5" "button_diamond active" - "6" "left_trigger active" - "7" "right_trigger active" - "12" "joystick inactive" - "19" "joystick active" - "13" "right_joystick active" - "11" "dpad inactive" - "18" "dpad active" + "15" "joystick inactive" + "23" "joystick active" + "16" "right_joystick inactive" + "22" "right_joystick active" + "14" "dpad inactive" + "20" "dpad inactive" + "21" "dpad active" } } "settings" diff --git a/Adventures in Lestoria/controller_config/controller_switch_pro.vdf b/Adventures in Lestoria/controller_config/controller_switch_pro.vdf index e92b125f..8602073d 100644 --- a/Adventures in Lestoria/controller_config/controller_switch_pro.vdf +++ b/Adventures in Lestoria/controller_config/controller_switch_pro.vdf @@ -1,18 +1,18 @@ "controller_mappings" { "version" "3" - "revision" "44" - "title" "Switch" - "description" "Default Switch controller setup." + "revision" "83" + "title" "#Title_Config" + "description" "#Description_Config" "creator" "76561198025675819" "progenitor" "" - "url" "autosave://C:\\Program Files (x86)\\Steam\\steamapps\\common\\Steam Controller Configs\\65410091\\config\\2895980\\controller_switch_pro.vdf" - "export_type" "personal_local" + "url" "usercloud://2895980/switch pro configuration_0" + "export_type" "personal_cloud" "controller_type" "controller_switch_pro" "controller_caps" "613772287" "major_revision" "0" "minor_revision" "0" - "Timestamp" "1711284115" + "Timestamp" "1711340749" "actions" { "InGameControls" @@ -20,67 +20,42 @@ "title" "#Set_Ingame" "legacy_set" "0" "StickPadGyro" - { - "Move" - { - "title" "#Gameplay_Move" - "input_mode" "joystick_move" - } - "Manual Aim" - { - "title" "#Gameplay_Aim" - "input_mode" "joystick_move" - } - } - "Button" - { - "Basic_Attack" "#Gameplay_BasicAttack" - "Defensive" "#Gameplay_Defensive" - "Menu" - { - "Pause" "#Menu_Menu" - } - "Ability_1" "#Gameplay_Ability1" - "Ability_2" "#Gameplay_Ability2" - "Ability_3" "#Gameplay_Ability3" - "Ability_4" "#Gameplay_Ability4" - "Item_1" "#Gameplay_Item1" - "Item_2" "#Gameplay_Item2" - "Item_3" "#Gameplay_Item3" - } - } - "MenuControls" - { - "title" "#Set_Menu" - "legacy_set" "0" - "StickPadGyro" { "Scroll" { - "title" "#Menu_Scroll" + "title" "#Scroll" "input_mode" "joystick_move" } } "Button" { - "Confirm" "#Menu_Confirm" - "Back" "#Menu_Back" - "Function_1" "#Menu_Function1" - "Function_2" "#Menu_Function2" + "Basic_Attack" "#BasicAttack" + "Defensive" "#Defensive" "Menu" { - "Pause" "#Menu_Menu" - } - "Up" "#Menu_Up" - "Down" "#Menu_Down" - "Left" "#Menu_Left" - "Right" "#Menu_Right" + "Pause" "#Menu" + } + "Ability_1" "#Ability1" + "Ability_2" "#Ability2" + "Ability_3" "#Ability3" + "Ability_4" "#Ability4" + "Item_1" "#Item1" + "Item_2" "#Item2" + "Item_3" "#Item3" + "Confirm" "#Confirm" + "Back" "#Back" + "Function_1" "#Function1" + "Function_2" "#Function2" + "Up" "#Up" + "Down" "#Down" + "Left" "#Left" + "Right" "#Right" "Lock" { - "Unlock_Accessory" "#Menu_Select" + "Unlock_Accessory" "#Select" } - "Fast_Scroll_Up" "#Menu_ScrollUp" - "Fast_Scroll_Down" "#Menu_ScrollDown" + "Fast_Scroll_Up" "#ScrollUp" + "Fast_Scroll_Down" "#ScrollDown" } } } @@ -91,34 +66,31 @@ { "english" { - "Title_Config" "Adventures in Lestoria Configuration" - "Description_Config" "The default controller configuration for Adventures in Lestoria." + "Title_Config" "Switch Pro" + "Description_Config" "Nintendo Switch Pro controller configuration." "Set_Ingame" "Gameplay Controls" - "Set_Menu" "Menu Controls" - "Gameplay_BasicAttack" "Basic Attack" - "Gameplay_Move" "Move" - "Gameplay_Aim" "Manual Aim" - "Gameplay_Defensive" "Defensive" - "Gameplay_Ability1" "Ability 1" - "Gameplay_Ability2" "Ability 2" - "Gameplay_Ability3" "Ability 3" - "Gameplay_Ability4" "Ability 4" - "Gameplay_Item1" "Item 1" - "Gameplay_Item2" "Item 2" - "Gameplay_Item3" "Item 3" - "Menu_Confirm" "Confirm" - "Menu_Back" "Back" - "Menu_Select" "Lock/Unlock Accessory" - "Menu_Function1" "Function 1" - "Menu_Function2" "Function 2" - "Menu_Menu" "Menu/Pause" - "Menu_Up" "Menu Up" - "Menu_Down" "Menu Down" - "Menu_Left" "Menu Left" - "Menu_Right" "Menu Right" - "Menu_Scroll" "Scroll" - "Menu_ScrollUp" "Fast Scroll Up" - "Menu_ScrollDown" "Fast Scroll Down" + "BasicAttack" "Basic Attack" + "Defensive" "Use Defensive" + "Ability1" "Use Ability 1" + "Ability2" "Use Ability 2" + "Ability3" "Use Ability 3" + "Ability4" "Use Ability 4" + "Item1" "Use Item 1" + "Item2" "Use Item 2" + "Item3" "Use Item 3" + "Confirm" "Confirm" + "Back" "Back" + "SELECT" "Lock/Unlock Accessory" + "Function1" "Menu Function 1" + "Function2" "Menu Function 2" + "Menu" "Menu/Pause" + "Up" "Up" + "Down" "Down" + "Left" "Left" + "Right" "Right" + "Scroll" "Scroll Menu/Manual Aim" + "ScrollUp" "Fast Scroll Menu Up" + "ScrollDown" "Fast Scroll Menu Down" } } "group" @@ -140,6 +112,13 @@ "binding" "game_action InGameControls Defensive, , " } } + "Full_Press" + { + "bindings" + { + "binding" "game_action InGameControls Back, , " + } + } } "disabled_activators" { @@ -156,6 +135,13 @@ "binding" "game_action InGameControls Basic_Attack, , " } } + "Full_Press" + { + "bindings" + { + "binding" "game_action InGameControls Confirm, , " + } + } } "disabled_activators" { @@ -172,6 +158,13 @@ "binding" "game_action InGameControls Ability_2, , " } } + "Full_Press" + { + "bindings" + { + "binding" "game_action InGameControls Function_1, , " + } + } } "disabled_activators" { @@ -188,6 +181,13 @@ "binding" "game_action InGameControls Ability_1, , " } } + "Full_Press" + { + "bindings" + { + "binding" "game_action InGameControls Function_2, , " + } + } } "disabled_activators" { @@ -203,7 +203,7 @@ "description" "" "inputs" { - "click" + "edge" { "activators" { @@ -218,20 +218,11 @@ "haptic_intensity" "2" } } - } - "disabled_activators" - { - } - } - "edge" - { - "activators" - { "Full_Press" { "bindings" { - "binding" "game_action InGameControls Item_2, , " + "binding" "game_action InGameControls Fast_Scroll_Up, , " } "settings" { @@ -253,7 +244,7 @@ "description" "" "inputs" { - "click" + "edge" { "activators" { @@ -268,20 +259,11 @@ "haptic_intensity" "2" } } - } - "disabled_activators" - { - } - } - "edge" - { - "activators" - { "Full_Press" { "bindings" { - "binding" "game_action InGameControls Ability_4, , " + "binding" "game_action InGameControls Fast_Scroll_Down, , " } "settings" { @@ -303,70 +285,6 @@ "description" "" "inputs" { - "button_b" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "game_action MenuControls Back, , " - } - } - } - "disabled_activators" - { - } - } - "button_a" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "game_action MenuControls Confirm, , " - } - } - } - "disabled_activators" - { - } - } - "button_y" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "game_action MenuControls Function_1, , " - } - } - } - "disabled_activators" - { - } - } - "button_x" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "game_action MenuControls Function_2, , " - } - } - } - "disabled_activators" - { - } - } } } "group" @@ -377,46 +295,6 @@ "description" "" "inputs" { - "click" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "game_action MenuControls Fast_Scroll_Up, , " - } - "settings" - { - "haptic_intensity" "2" - } - } - } - "disabled_activators" - { - } - } - "edge" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "game_action MenuControls Fast_Scroll_Up, , " - } - "settings" - { - "haptic_intensity" "2" - } - } - } - "disabled_activators" - { - } - } } } "group" @@ -427,46 +305,6 @@ "description" "" "inputs" { - "click" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "game_action MenuControls Fast_Scroll_Down, , " - } - "settings" - { - "haptic_intensity" "2" - } - } - } - "disabled_activators" - { - } - } - "edge" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "game_action MenuControls Fast_Scroll_Down, , " - } - "settings" - { - "haptic_intensity" "2" - } - } - } - "disabled_activators" - { - } - } } } "group" @@ -510,10 +348,6 @@ { "virtual_mode" "1" } - "gameactions" - { - "MenuControls" "Scroll" - } } "group" { @@ -528,14 +362,24 @@ { "virtual_mode" "1" } - "gameactions" + } + "group" + { + "id" "15" + "mode" "joystick_move" + "name" "" + "description" "" + "inputs" { - "InGameControls" "Move" + } + "settings" + { + "virtual_mode" "1" } } "group" { - "id" "15" + "id" "16" "mode" "joystick_move" "name" "" "description" "" @@ -546,14 +390,39 @@ { "virtual_mode" "1" } - "gameactions" + } + "group" + { + "id" "18" + "mode" "dpad" + "name" "" + "description" "" + "inputs" + { + } + "settings" { - "InGameControls" "Move" + "requires_click" "0" + "haptic_intensity_override" "0" } } "group" { - "id" "16" + "id" "19" + "mode" "dpad" + "name" "" + "description" "" + "inputs" + { + } + "settings" + { + "requires_click" "0" + } + } + "group" + { + "id" "20" "mode" "joystick_move" "name" "" "description" "" @@ -566,12 +435,12 @@ } "gameactions" { - "InGameControls" "Manual Aim" + "InGameControls" "Scroll" } } "group" { - "id" "18" + "id" "21" "mode" "dpad" "name" "" "description" "" @@ -585,7 +454,7 @@ { "bindings" { - "binding" "game_action MenuControls Up, , " + "binding" "game_action InGameControls Up, , " } } } @@ -601,7 +470,7 @@ { "bindings" { - "binding" "game_action MenuControls Down, , " + "binding" "game_action InGameControls Down, , " } } } @@ -617,7 +486,7 @@ { "bindings" { - "binding" "game_action MenuControls Right, , " + "binding" "game_action InGameControls Right, , " } } } @@ -633,7 +502,7 @@ { "bindings" { - "binding" "game_action MenuControls Left, , " + "binding" "game_action InGameControls Left, , " } } } @@ -650,7 +519,25 @@ } "group" { - "id" "19" + "id" "22" + "mode" "joystick_move" + "name" "" + "description" "" + "inputs" + { + } + "settings" + { + "virtual_mode" "1" + } + "gameactions" + { + "InGameControls" "Scroll" + } + } + "group" + { + "id" "23" "mode" "dpad" "name" "" "description" "" @@ -664,7 +551,7 @@ { "bindings" { - "binding" "game_action MenuControls Up, , " + "binding" "game_action InGameControls Up, , " } } } @@ -680,7 +567,7 @@ { "bindings" { - "binding" "game_action MenuControls Down, , " + "binding" "game_action InGameControls Down, , " } } } @@ -696,7 +583,7 @@ { "bindings" { - "binding" "game_action MenuControls Right, , " + "binding" "game_action InGameControls Right, , " } } } @@ -712,7 +599,7 @@ { "bindings" { - "binding" "game_action MenuControls Left, , " + "binding" "game_action InGameControls Left, , " } } } @@ -761,20 +648,11 @@ "binding" "game_action InGameControls Item_3, , " } } - } - "disabled_activators" - { - } - } - "left_bumper" - { - "activators" - { "Full_Press" { "bindings" { - "binding" "game_action InGameControls Item_1, , " + "binding" "game_action InGameControls Lock/Unlock_Accessory, , " } } } @@ -782,23 +660,7 @@ { } } - "right_bumper" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "game_action InGameControls Ability_3, , " - } - } - } - "disabled_activators" - { - } - } - "button_capture" + "left_bumper" { "activators" { @@ -806,33 +668,14 @@ { "bindings" { - "binding" "controller_action SCREENSHOT, , " + "binding" "game_action InGameControls Item_1, , " } } - } - "disabled_activators" - { - } - } - } - } - "group" - { - "id" "4" - "mode" "switches" - "name" "" - "description" "" - "inputs" - { - "button_escape" - { - "activators" - { "Full_Press" { "bindings" { - "binding" "game_action MenuControls Menu/Pause, , " + "binding" "game_action InGameControls Fast_Scroll_Up, , " } } } @@ -840,7 +683,7 @@ { } } - "button_menu" + "right_bumper" { "activators" { @@ -848,23 +691,14 @@ { "bindings" { - "binding" "game_action MenuControls Lock/Unlock_Accessory, , " + "binding" "game_action InGameControls Ability_3, , " } } - } - "disabled_activators" - { - } - } - "left_bumper" - { - "activators" - { "Full_Press" { "bindings" { - "binding" "game_action MenuControls Fast_Scroll_Up, , " + "binding" "game_action InGameControls Fast_Scroll_Down, , " } } } @@ -872,7 +706,7 @@ { } } - "right_bumper" + "button_capture" { "activators" { @@ -880,7 +714,7 @@ { "bindings" { - "binding" "game_action MenuControls Fast_Scroll_Down, , " + "binding" "controller_action SCREENSHOT, , " } } } @@ -888,6 +722,16 @@ { } } + } + } + "group" + { + "id" "4" + "mode" "switches" + "name" "" + "description" "" + "inputs" + { "button_capture" { "activators" @@ -916,26 +760,13 @@ "1" "button_diamond active" "2" "left_trigger active" "3" "right_trigger active" - "15" "joystick active" - "16" "right_joystick active" - "14" "dpad active" - } - } - "preset" - { - "id" "1" - "name" "MenuControls" - "group_source_bindings" - { - "4" "switch active" - "5" "button_diamond active" - "6" "left_trigger active" - "7" "right_trigger active" - "12" "joystick inactive" - "19" "joystick active" - "13" "right_joystick active" - "11" "dpad inactive" - "18" "dpad active" + "15" "joystick inactive" + "23" "joystick active" + "16" "right_joystick inactive" + "22" "right_joystick active" + "14" "dpad inactive" + "20" "dpad inactive" + "21" "dpad active" } } "settings" diff --git a/Adventures in Lestoria/controller_config/controller_xbox360.vdf b/Adventures in Lestoria/controller_config/controller_xbox360.vdf index 8c312fdc..35b8aba3 100644 --- a/Adventures in Lestoria/controller_config/controller_xbox360.vdf +++ b/Adventures in Lestoria/controller_config/controller_xbox360.vdf @@ -1,18 +1,18 @@ "controller_mappings" { "version" "3" - "revision" "37" - "title" "XBox/Playstation" - "description" "Default Xbox/Playstation controller setup." + "revision" "76" + "title" "#Title_Config" + "description" "#Description_Config" "creator" "76561198025675819" "progenitor" "" "url" "autosave://C:\\Program Files (x86)\\Steam\\steamapps\\common\\Steam Controller Configs\\65410091\\config\\2895980\\controller_xbox360.vdf" - "export_type" "personal_local" + "export_type" "personal_cloud" "controller_type" "controller_xbox360" "controller_caps" "1590271" "major_revision" "0" "minor_revision" "0" - "Timestamp" "1711284058" + "Timestamp" "1711340807" "actions" { "InGameControls" @@ -20,67 +20,42 @@ "title" "#Set_Ingame" "legacy_set" "0" "StickPadGyro" - { - "Move" - { - "title" "#Gameplay_Move" - "input_mode" "joystick_move" - } - "Manual Aim" - { - "title" "#Gameplay_Aim" - "input_mode" "joystick_move" - } - } - "Button" - { - "Basic_Attack" "#Gameplay_BasicAttack" - "Defensive" "#Gameplay_Defensive" - "Menu" - { - "Pause" "#Menu_Menu" - } - "Ability_1" "#Gameplay_Ability1" - "Ability_2" "#Gameplay_Ability2" - "Ability_3" "#Gameplay_Ability3" - "Ability_4" "#Gameplay_Ability4" - "Item_1" "#Gameplay_Item1" - "Item_2" "#Gameplay_Item2" - "Item_3" "#Gameplay_Item3" - } - } - "MenuControls" - { - "title" "#Set_Menu" - "legacy_set" "0" - "StickPadGyro" { "Scroll" { - "title" "#Menu_Scroll" + "title" "#Scroll" "input_mode" "joystick_move" } } "Button" { - "Confirm" "#Menu_Confirm" - "Back" "#Menu_Back" - "Function_1" "#Menu_Function1" - "Function_2" "#Menu_Function2" + "Basic_Attack" "#BasicAttack" + "Defensive" "#Defensive" "Menu" { - "Pause" "#Menu_Menu" - } - "Up" "#Menu_Up" - "Down" "#Menu_Down" - "Left" "#Menu_Left" - "Right" "#Menu_Right" + "Pause" "#Menu" + } + "Ability_1" "#Ability1" + "Ability_2" "#Ability2" + "Ability_3" "#Ability3" + "Ability_4" "#Ability4" + "Item_1" "#Item1" + "Item_2" "#Item2" + "Item_3" "#Item3" + "Confirm" "#Confirm" + "Back" "#Back" + "Function_1" "#Function1" + "Function_2" "#Function2" + "Up" "#Up" + "Down" "#Down" + "Left" "#Left" + "Right" "#Right" "Lock" { - "Unlock_Accessory" "#Menu_Select" + "Unlock_Accessory" "#Select" } - "Fast_Scroll_Up" "#Menu_ScrollUp" - "Fast_Scroll_Down" "#Menu_ScrollDown" + "Fast_Scroll_Up" "#ScrollUp" + "Fast_Scroll_Down" "#ScrollDown" } } } @@ -91,34 +66,31 @@ { "english" { - "Title_Config" "Adventures in Lestoria Configuration" - "Description_Config" "The default controller configuration for Adventures in Lestoria." + "Title_Config" "Xbox/Playstation" + "Description_Config" "Xbox/Playstation controller configuration." "Set_Ingame" "Gameplay Controls" - "Set_Menu" "Menu Controls" - "Gameplay_BasicAttack" "Basic Attack" - "Gameplay_Move" "Move" - "Gameplay_Aim" "Manual Aim" - "Gameplay_Defensive" "Defensive" - "Gameplay_Ability1" "Ability 1" - "Gameplay_Ability2" "Ability 2" - "Gameplay_Ability3" "Ability 3" - "Gameplay_Ability4" "Ability 4" - "Gameplay_Item1" "Item 1" - "Gameplay_Item2" "Item 2" - "Gameplay_Item3" "Item 3" - "Menu_Confirm" "Confirm" - "Menu_Back" "Back" - "Menu_Select" "Lock/Unlock Accessory" - "Menu_Function1" "Function 1" - "Menu_Function2" "Function 2" - "Menu_Menu" "Menu/Pause" - "Menu_Up" "Menu Up" - "Menu_Down" "Menu Down" - "Menu_Left" "Menu Left" - "Menu_Right" "Menu Right" - "Menu_Scroll" "Scroll" - "Menu_ScrollUp" "Fast Scroll Up" - "Menu_ScrollDown" "Fast Scroll Down" + "BasicAttack" "Basic Attack" + "Defensive" "Use Defensive" + "Ability1" "Use Ability 1" + "Ability2" "Use Ability 2" + "Ability3" "Use Ability 3" + "Ability4" "Use Ability 4" + "Item1" "Use Item 1" + "Item2" "Use Item 2" + "Item3" "Use Item 3" + "Confirm" "Confirm" + "Back" "Back" + "SELECT" "Lock/Unlock Accessory" + "Function1" "Menu Function 1" + "Function2" "Menu Function 2" + "Menu" "Menu/Pause" + "Up" "Up" + "Down" "Down" + "Left" "Left" + "Right" "Right" + "Scroll" "Scroll Menu/Manual Aim" + "ScrollUp" "Fast Scroll Menu Up" + "ScrollDown" "Fast Scroll Menu Down" } } "group" @@ -140,6 +112,13 @@ "binding" "game_action InGameControls Defensive, , " } } + "Full_Press" + { + "bindings" + { + "binding" "game_action InGameControls Back, , " + } + } } "disabled_activators" { @@ -156,6 +135,13 @@ "binding" "game_action InGameControls Basic_Attack, , " } } + "Full_Press" + { + "bindings" + { + "binding" "game_action InGameControls Confirm, , " + } + } } "disabled_activators" { @@ -172,6 +158,13 @@ "binding" "game_action InGameControls Ability_1, , " } } + "Full_Press" + { + "bindings" + { + "binding" "game_action InGameControls Function_2, , " + } + } } "disabled_activators" { @@ -188,6 +181,13 @@ "binding" "game_action InGameControls Ability_2, , " } } + "Full_Press" + { + "bindings" + { + "binding" "game_action InGameControls Function_1, , " + } + } } "disabled_activators" { @@ -203,7 +203,7 @@ "description" "" "inputs" { - "click" + "edge" { "activators" { @@ -218,20 +218,11 @@ "haptic_intensity" "2" } } - } - "disabled_activators" - { - } - } - "edge" - { - "activators" - { "Full_Press" { "bindings" { - "binding" "game_action InGameControls Item_2, , " + "binding" "game_action InGameControls Fast_Scroll_Up, , " } "settings" { @@ -253,7 +244,7 @@ "description" "" "inputs" { - "click" + "edge" { "activators" { @@ -268,20 +259,11 @@ "haptic_intensity" "2" } } - } - "disabled_activators" - { - } - } - "edge" - { - "activators" - { "Full_Press" { "bindings" { - "binding" "game_action InGameControls Ability_4, , " + "binding" "game_action InGameControls Fast_Scroll_Down, , " } "settings" { @@ -303,70 +285,6 @@ "description" "" "inputs" { - "button_a" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "game_action MenuControls Back, , " - } - } - } - "disabled_activators" - { - } - } - "button_b" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "game_action MenuControls Confirm, , " - } - } - } - "disabled_activators" - { - } - } - "button_x" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "game_action MenuControls Function_2, , " - } - } - } - "disabled_activators" - { - } - } - "button_y" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "game_action MenuControls Function_1, , " - } - } - } - "disabled_activators" - { - } - } } } "group" @@ -377,46 +295,6 @@ "description" "" "inputs" { - "click" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "game_action MenuControls Fast_Scroll_Up, , " - } - "settings" - { - "haptic_intensity" "2" - } - } - } - "disabled_activators" - { - } - } - "edge" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "game_action MenuControls Fast_Scroll_Up, , " - } - "settings" - { - "haptic_intensity" "2" - } - } - } - "disabled_activators" - { - } - } } } "group" @@ -427,46 +305,6 @@ "description" "" "inputs" { - "click" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "game_action MenuControls Fast_Scroll_Down, , " - } - "settings" - { - "haptic_intensity" "2" - } - } - } - "disabled_activators" - { - } - } - "edge" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "game_action MenuControls Fast_Scroll_Down, , " - } - "settings" - { - "haptic_intensity" "2" - } - } - } - "disabled_activators" - { - } - } } } "group" @@ -510,10 +348,6 @@ { "virtual_mode" "1" } - "gameactions" - { - "MenuControls" "Scroll" - } } "group" { @@ -528,14 +362,24 @@ { "virtual_mode" "1" } - "gameactions" + } + "group" + { + "id" "15" + "mode" "joystick_move" + "name" "" + "description" "" + "inputs" { - "InGameControls" "Move" + } + "settings" + { + "virtual_mode" "1" } } "group" { - "id" "15" + "id" "16" "mode" "joystick_move" "name" "" "description" "" @@ -546,14 +390,39 @@ { "virtual_mode" "1" } - "gameactions" + } + "group" + { + "id" "18" + "mode" "dpad" + "name" "" + "description" "" + "inputs" { - "InGameControls" "Move" + } + "settings" + { + "requires_click" "0" + "haptic_intensity_override" "0" } } "group" { - "id" "16" + "id" "19" + "mode" "dpad" + "name" "" + "description" "" + "inputs" + { + } + "settings" + { + "requires_click" "0" + } + } + "group" + { + "id" "20" "mode" "joystick_move" "name" "" "description" "" @@ -566,12 +435,12 @@ } "gameactions" { - "InGameControls" "Manual Aim" + "InGameControls" "Scroll" } } "group" { - "id" "17" + "id" "21" "mode" "dpad" "name" "" "description" "" @@ -585,7 +454,7 @@ { "bindings" { - "binding" "game_action MenuControls Up, , " + "binding" "game_action InGameControls Up, , " } } } @@ -601,7 +470,7 @@ { "bindings" { - "binding" "game_action MenuControls Down, , " + "binding" "game_action InGameControls Down, , " } } } @@ -617,7 +486,7 @@ { "bindings" { - "binding" "game_action MenuControls Right, , " + "binding" "game_action InGameControls Right, , " } } } @@ -633,7 +502,7 @@ { "bindings" { - "binding" "game_action MenuControls Left, , " + "binding" "game_action InGameControls Left, , " } } } @@ -650,7 +519,25 @@ } "group" { - "id" "18" + "id" "22" + "mode" "joystick_move" + "name" "" + "description" "" + "inputs" + { + } + "settings" + { + "virtual_mode" "1" + } + "gameactions" + { + "InGameControls" "Scroll" + } + } + "group" + { + "id" "23" "mode" "dpad" "name" "" "description" "" @@ -664,7 +551,7 @@ { "bindings" { - "binding" "game_action MenuControls Up, , " + "binding" "game_action InGameControls Up, , " } } } @@ -680,7 +567,7 @@ { "bindings" { - "binding" "game_action MenuControls Down, , " + "binding" "game_action InGameControls Down, , " } } } @@ -696,7 +583,7 @@ { "bindings" { - "binding" "game_action MenuControls Right, , " + "binding" "game_action InGameControls Right, , " } } } @@ -712,7 +599,7 @@ { "bindings" { - "binding" "game_action MenuControls Left, , " + "binding" "game_action InGameControls Left, , " } } } @@ -761,6 +648,13 @@ "binding" "game_action InGameControls Item_3, , " } } + "Full_Press" + { + "bindings" + { + "binding" "game_action InGameControls Lock/Unlock_Accessory, , " + } + } } "disabled_activators" { @@ -777,20 +671,11 @@ "binding" "game_action InGameControls Item_1, , " } } - } - "disabled_activators" - { - } - } - "right_bumper" - { - "activators" - { "Full_Press" { "bindings" { - "binding" "game_action InGameControls Ability_3, , " + "binding" "game_action InGameControls Fast_Scroll_Up, , " } } } @@ -798,17 +683,7 @@ { } } - } - } - "group" - { - "id" "4" - "mode" "switches" - "name" "" - "description" "" - "inputs" - { - "button_escape" + "right_bumper" { "activators" { @@ -816,23 +691,14 @@ { "bindings" { - "binding" "game_action MenuControls Menu/Pause, , " + "binding" "game_action InGameControls Ability_3, , " } } - } - "disabled_activators" - { - } - } - "button_menu" - { - "activators" - { "Full_Press" { "bindings" { - "binding" "game_action MenuControls Lock/Unlock_Accessory, , " + "binding" "game_action InGameControls Fast_Scroll_Down, , " } } } @@ -840,7 +706,7 @@ { } } - "left_bumper" + "button_capture" { "activators" { @@ -848,7 +714,7 @@ { "bindings" { - "binding" "game_action MenuControls Fast_Scroll_Up, , " + "binding" "controller_action SCREENSHOT, , " } } } @@ -856,7 +722,17 @@ { } } - "right_bumper" + } + } + "group" + { + "id" "4" + "mode" "switches" + "name" "" + "description" "" + "inputs" + { + "button_capture" { "activators" { @@ -864,7 +740,7 @@ { "bindings" { - "binding" "game_action MenuControls Fast_Scroll_Down, , " + "binding" "controller_action SCREENSHOT, , " } } } @@ -884,26 +760,13 @@ "1" "button_diamond active" "2" "left_trigger active" "3" "right_trigger active" - "15" "joystick active" - "16" "right_joystick active" - "14" "dpad active" - } - } - "preset" - { - "id" "1" - "name" "MenuControls" - "group_source_bindings" - { - "4" "switch active" - "5" "button_diamond active" - "6" "left_trigger active" - "7" "right_trigger active" - "12" "joystick inactive" - "18" "joystick active" - "13" "right_joystick active" - "11" "dpad inactive" - "17" "dpad active" + "15" "joystick inactive" + "23" "joystick active" + "16" "right_joystick inactive" + "22" "right_joystick active" + "14" "dpad inactive" + "20" "dpad inactive" + "21" "dpad active" } } "settings" diff --git a/Adventures in Lestoria/controller_config/game_actions_2895980.vdf b/Adventures in Lestoria/controller_config/game_actions_2895980.vdf index 88217473..5aba1291 100644 --- a/Adventures in Lestoria/controller_config/game_actions_2895980.vdf +++ b/Adventures in Lestoria/controller_config/game_actions_2895980.vdf @@ -6,43 +6,10 @@ { "title" "#Set_Ingame" "StickPadGyro" - { - "Move" - { - "title" "#Gameplay_Move" - "input_mode" "joystick_move" - } - "Manual Aim" - { - "title" "#Gameplay_Aim" - "input_mode" "joystick_move" - } - } - "AnalogTrigger" - { - } - "Button" - { - "Basic_Attack" "#Gameplay_BasicAttack" - "Defensive" "#Gameplay_Defensive" - "Menu/Pause" "#Menu_Menu" - "Ability_1" "#Gameplay_Ability1" - "Ability_2" "#Gameplay_Ability2" - "Ability_3" "#Gameplay_Ability3" - "Ability_4" "#Gameplay_Ability4" - "Item_1" "#Gameplay_Item1" - "Item_2" "#Gameplay_Item2" - "Item_3" "#Gameplay_Item3" - } - } - "MenuControls" - { - "title" "#Set_Menu" - "StickPadGyro" { "Scroll" { - "title" "#Menu_Scroll" + "title" "#Scroll" "input_mode" "joystick_move" } } @@ -51,18 +18,27 @@ } "Button" { - "Confirm" "#Menu_Confirm" - "Back" "#Menu_Back" - "Function_1" "#Menu_Function1" - "Function_2" "#Menu_Function2" - "Menu/Pause" "#Menu_Menu" - "Up" "#Menu_Up" - "Down" "#Menu_Down" - "Left" "#Menu_Left" - "Right" "#Menu_Right" - "Lock/Unlock_Accessory" "#Menu_Select" - "Fast_Scroll_Up" "#Menu_ScrollUp" - "Fast_Scroll_Down" "#Menu_ScrollDown" + "Basic_Attack" "#BasicAttack" + "Defensive" "#Defensive" + "Menu/Pause" "#Menu" + "Ability_1" "#Ability1" + "Ability_2" "#Ability2" + "Ability_3" "#Ability3" + "Ability_4" "#Ability4" + "Item_1" "#Item1" + "Item_2" "#Item2" + "Item_3" "#Item3" + "Confirm" "#Confirm" + "Back" "#Back" + "Function_1" "#Function1" + "Function_2" "#Function2" + "Up" "#Up" + "Down" "#Down" + "Left" "#Left" + "Right" "#Right" + "Lock/Unlock_Accessory" "#Select" + "Fast_Scroll_Up" "#ScrollUp" + "Fast_Scroll_Down" "#ScrollDown" } } } @@ -71,33 +47,30 @@ "english" { "Title_Config" "Adventures in Lestoria Configuration" - "Description_Config" "The default controller configuration for Adventures in Lestoria." + "Description_Config" "The default control set for Adventures in Lestoria." "Set_Ingame" "Gameplay Controls" - "Set_Menu" "Menu Controls" - "Gameplay_BasicAttack" "Basic Attack" - "Gameplay_Move" "Move" - "Gameplay_Aim" "Manual Aim" - "Gameplay_Defensive" "Defensive" - "Gameplay_Ability1" "Ability 1" - "Gameplay_Ability2" "Ability 2" - "Gameplay_Ability3" "Ability 3" - "Gameplay_Ability4" "Ability 4" - "Gameplay_Item1" "Item 1" - "Gameplay_Item2" "Item 2" - "Gameplay_Item3" "Item 3" - "Menu_Confirm" "Confirm" - "Menu_Back" "Back" - "Menu_Select" "Lock/Unlock Accessory" - "Menu_Function1" "Function 1" - "Menu_Function2" "Function 2" - "Menu_Menu" "Menu/Pause" - "Menu_Up" "Menu Up" - "Menu_Down" "Menu Down" - "Menu_Left" "Menu Left" - "Menu_Right" "Menu Right" - "Menu_Scroll" "Scroll" - "Menu_ScrollUp" "Fast Scroll Up" - "Menu_ScrollDown" "Fast Scroll Down" + "BasicAttack" "Basic Attack" + "Defensive" "Use Defensive" + "Ability1" "Use Ability 1" + "Ability2" "Use Ability 2" + "Ability3" "Use Ability 3" + "Ability4" "Use Ability 4" + "Item1" "Use Item 1" + "Item2" "Use Item 2" + "Item3" "Use Item 3" + "Confirm" "Confirm" + "Back" "Back" + "Select" "Lock/Unlock Accessory" + "Function1" "Menu Function 1" + "Function2" "Menu Function 2" + "Menu" "Menu/Pause" + "Up" "Up" + "Down" "Down" + "Left" "Left" + "Right" "Right" + "Scroll" "Scroll Menu/Manual Aim" + "ScrollUp" "Fast Scroll Menu Up" + "ScrollDown" "Fast Scroll Menu Down" } } "configurations" diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index 46d41f61..f31fe8a1 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ