diff --git a/include/dusk/settings.h b/include/dusk/settings.h index 326f7f321c..6961efb387 100644 --- a/include/dusk/settings.h +++ b/include/dusk/settings.h @@ -266,6 +266,7 @@ struct UserSettings { ConfigVar fastSpinner; ConfigVar armorRupeeDrain; ConfigVar invincibleEnemies; + ConfigVar easyQuickSpin; // Technical ConfigVar restoreWiiGlitches; diff --git a/src/d/actor/d_a_alink_cut.inc b/src/d/actor/d_a_alink_cut.inc index ba3c0ba89e..8be20f53ad 100644 --- a/src/d/actor/d_a_alink_cut.inc +++ b/src/d/actor/d_a_alink_cut.inc @@ -165,6 +165,12 @@ BOOL daAlink_c::checkCutTypeNoBlur() const { } bool daAlink_c::checkCutTurnInput() const { + #if TARGET_PC + if (mDoCPd_c::getHoldR(PAD_1) && dusk::getSettings().game.easyQuickSpin) { + return true; + } + #endif + return 0xF800 < abs(field_0x3180); } diff --git a/src/dusk/settings.cpp b/src/dusk/settings.cpp index e2a2169485..24fd6cbc22 100644 --- a/src/dusk/settings.cpp +++ b/src/dusk/settings.cpp @@ -139,6 +139,7 @@ UserSettings g_userSettings = { .fastSpinner {"game.fastSpinner", false}, .armorRupeeDrain {"game.armorRupeeDrain", MagicArmorMode::NORMAL}, .invincibleEnemies {"game.invincibleEnemies", false}, + .easyQuickSpin {"game.easyQuickSpin", false}, // Technical .restoreWiiGlitches {"game.restoreWiiGlitches", false}, @@ -315,6 +316,8 @@ void registerSettings() { Register(g_userSettings.game.superClawshot); Register(g_userSettings.game.alwaysGreatspin); Register(g_userSettings.game.invincibleEnemies); + Register(g_userSettings.game.easyQuickSpin); + Register(g_userSettings.game.enableFrameInterpolation); Register(g_userSettings.game.enableGyroAim); Register(g_userSettings.game.enableGyroRollgoal); diff --git a/src/dusk/ui/settings.cpp b/src/dusk/ui/settings.cpp index bcd0d3cfe4..1b06b782f0 100644 --- a/src/dusk/ui/settings.cpp +++ b/src/dusk/ui/settings.cpp @@ -1375,8 +1375,12 @@ SettingsWindow::SettingsWindow(bool prelaunch) : mPrelaunch(prelaunch) { "Item drops such as rupees and hearts will never disappear after they drop."); leftPane.add_section("Abilities"); + addCheat( "Moon Jump (R+A)", getSettings().game.moonJump, "Hold R and A to rise into the air."); + addCheat( + "Easy Quick Spin (R+B)", getSettings().game.easyQuickSpin, "Hold R to always do a Quick Spin when attacking with B."); + addCheat("Super Clawshot", getSettings().game.superClawshot, "Extends Clawshot behavior beyond the normal game rules."); addCheat("Always Greatspin", getSettings().game.alwaysGreatspin,