Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions include/dusk/action_bindings.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ enum class ActionBinds {
CALL_MIDNA,
OPEN_DUSKLIGHT_MENU,
TURBO_SPEED_BUTTON,
QUICK_TRANSFORM,
SUN_SONG,
MOON_JUMP,
COUNT,
};

Expand Down
3 changes: 3 additions & 0 deletions include/dusk/settings.h
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,9 @@ struct UserSettings {
std::array<ActionBindConfigVar, 4> callMidna;
std::array<ActionBindConfigVar, 4> openDusklightMenu;
std::array<ActionBindConfigVar, 4> turboSpeedButton;
std::array<ActionBindConfigVar, 4> quickTransform;
std::array<ActionBindConfigVar, 4> sunSong;
std::array<ActionBindConfigVar, 4> moonJump;
} actionBindings;
};

Expand Down
3 changes: 3 additions & 0 deletions src/dusk/action_bindings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ ActionBindsMap& getActionBinds() {
{ActionBinds::CALL_MIDNA, {&getSettings().actionBindings.callMidna, "Call Midna"}},
{ActionBinds::OPEN_DUSKLIGHT_MENU, {&getSettings().actionBindings.openDusklightMenu, "Open Dusklight Menu"}},
{ActionBinds::TURBO_SPEED_BUTTON, {&getSettings().actionBindings.turboSpeedButton, "Turbo Speed Button"}},
{ActionBinds::QUICK_TRANSFORM, {&getSettings().actionBindings.quickTransform, "Quick Transform"}},
{ActionBinds::SUN_SONG, {&getSettings().actionBindings.sunSong, "Sun's Song"}},
{ActionBinds::MOON_JUMP, {&getSettings().actionBindings.moonJump, "Moon Jump"}},
};
return actionBinds;
}
Expand Down
30 changes: 30 additions & 0 deletions src/dusk/settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,24 @@ UserSettings g_userSettings = {
ActionBindConfigVar{"actionBindings.turboButton_port2", PAD_NATIVE_BUTTON_INVALID},
ActionBindConfigVar{"actionBindings.turboButton_port3", PAD_NATIVE_BUTTON_INVALID},
},
.quickTransform {
ActionBindConfigVar{"actionBindings.quickTransform_port0", PAD_NATIVE_BUTTON_INVALID},
ActionBindConfigVar{"actionBindings.quickTransform_port1", PAD_NATIVE_BUTTON_INVALID},
ActionBindConfigVar{"actionBindings.quickTransform_port2", PAD_NATIVE_BUTTON_INVALID},
ActionBindConfigVar{"actionBindings.quickTransform_port3", PAD_NATIVE_BUTTON_INVALID},
},
.sunSong {
ActionBindConfigVar{"actionBindings.sunSong_port0", PAD_NATIVE_BUTTON_INVALID},
ActionBindConfigVar{"actionBindings.sunSong_port1", PAD_NATIVE_BUTTON_INVALID},
ActionBindConfigVar{"actionBindings.sunSong_port2", PAD_NATIVE_BUTTON_INVALID},
ActionBindConfigVar{"actionBindings.sunSong_port3", PAD_NATIVE_BUTTON_INVALID},
},
.moonJump {
ActionBindConfigVar{"actionBindings.moonJump_port0", PAD_NATIVE_BUTTON_INVALID},
ActionBindConfigVar{"actionBindings.moonJump_port1", PAD_NATIVE_BUTTON_INVALID},
ActionBindConfigVar{"actionBindings.moonJump_port2", PAD_NATIVE_BUTTON_INVALID},
ActionBindConfigVar{"actionBindings.moonJump_port3", PAD_NATIVE_BUTTON_INVALID},
}
}
};

Expand Down Expand Up @@ -309,6 +327,18 @@ void registerSettings() {
Register(g_userSettings.actionBindings.turboSpeedButton[1]);
Register(g_userSettings.actionBindings.turboSpeedButton[2]);
Register(g_userSettings.actionBindings.turboSpeedButton[3]);
Register(g_userSettings.actionBindings.quickTransform[0]);
Register(g_userSettings.actionBindings.quickTransform[1]);
Register(g_userSettings.actionBindings.quickTransform[2]);
Register(g_userSettings.actionBindings.quickTransform[3]);
Register(g_userSettings.actionBindings.sunSong[0]);
Register(g_userSettings.actionBindings.sunSong[1]);
Register(g_userSettings.actionBindings.sunSong[2]);
Register(g_userSettings.actionBindings.sunSong[3]);
Register(g_userSettings.actionBindings.moonJump[0]);
Register(g_userSettings.actionBindings.moonJump[1]);
Register(g_userSettings.actionBindings.moonJump[2]);
Register(g_userSettings.actionBindings.moonJump[3]);
}

// Transient settings
Expand Down
4 changes: 2 additions & 2 deletions src/dusk/ui/settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1175,9 +1175,9 @@ SettingsWindow::SettingsWindow(bool prelaunch) : mPrelaunch(prelaunch) {
addOption("Show Poe Count on Map", getSettings().game.enhancedMapMenus,
"Displays collected/total number of Poe Souls for a region on the map.");
addSpeedrunDisabledOption("Sun's Song (R+X)", getSettings().game.sunsSong,
"Allows Wolf Link to howl and change the time of day.");
"Allows Wolf Link to howl and change the time of day.<br/><br/>This can also be bound to another input in Custom Action Bindings.");
addOption("Quick Transform (R+Y)", getSettings().game.enableQuickTransform,
"Transform instantly by pressing R and Y simultaneously.");
"Transform instantly by pressing R and Y simultaneously.<br/><br/>This can also be bound to another input in Custom Action Bindings.");

leftPane.add_section("Speedrunning");
config_bool_select(leftPane, rightPane, getSettings().game.speedrunMode,
Expand Down
7 changes: 4 additions & 3 deletions src/f_ap/f_ap_game.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include "tracy/Tracy.hpp"
#include <dusk/gamepad_color.h>
#include <dusk/autosave.h>
#include <dusk/action_bindings.h>
#endif

fapGm_HIO_c::fapGm_HIO_c() {
Expand Down Expand Up @@ -756,19 +757,19 @@ static void duskExecute() {
isRecording = false;
}

if (mDoCPd_c::getHoldR(PAD_1) && mDoCPd_c::getTrigX(PAD_1)) {
if (dusk::getActionBindTrig(dusk::ActionBinds::SUN_SONG, 0) || (!dusk::isActionBound(dusk::ActionBinds::SUN_SONG, 0) && mDoCPd_c::getHoldR(PAD_1) && mDoCPd_c::getTrigX(PAD_1))) {
if (const auto link = g_dComIfG_gameInfo.play.getPlayer(0)) {
dynamic_cast<daAlink_c*>(link)->handleWolfHowl();
}
}

if ((mDoCPd_c::getHold(PAD_1) & (PAD_TRIGGER_R | PAD_TRIGGER_L)) == PAD_TRIGGER_R && mDoCPd_c::getTrigY(PAD_1)) {
if (dusk::getActionBindTrig(dusk::ActionBinds::QUICK_TRANSFORM, 0) || (!dusk::isActionBound(dusk::ActionBinds::QUICK_TRANSFORM, 0) && mDoCPd_c::getHoldR(PAD_1) && mDoCPd_c::getTrigY(PAD_1))) {
if (const auto link = g_dComIfG_gameInfo.play.getPlayer(0)) {
dynamic_cast<daAlink_c*>(link)->handleQuickTransform();
}
}

if (dusk::getSettings().game.moonJump && (mDoCPd_c::getHoldR(PAD_1) && mDoCPd_c::getHoldA(PAD_1))) {
if (dusk::getActionBindTrig(dusk::ActionBinds::MOON_JUMP, 0) || (!dusk::isActionBound(dusk::ActionBinds::MOON_JUMP, 0) && mDoCPd_c::getHoldR(PAD_1) && mDoCPd_c::getTrigA(PAD_1))) {
if (const auto link = g_dComIfG_gameInfo.play.getPlayer(0)) {
link->speed.y = 56.0f;
}
Expand Down
Loading