Fix Overlapping Overlays

Still overlaps while the pipeline building overlay is fading out

include/dusk/settings.h

@@ -266,7 +266,6 @@ struct UserSettings {
         ConfigVar<bool> fastSpinner;
         ConfigVar<MagicArmorMode> armorRupeeDrain;
         ConfigVar<bool> invincibleEnemies;
-        ConfigVar<bool> easyQuickSpin;
 
         // Technical
         ConfigVar<bool> restoreWiiGlitches;

src/d/actor/d_a_alink_cut.inc

@@ -165,12 +165,6 @@ 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);
 }
 

src/dusk/settings.cpp

@@ -139,7 +139,6 @@ 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},
@@ -316,8 +315,6 @@ 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);

src/dusk/ui/overlay.cpp

@@ -254,6 +254,15 @@ void Overlay::update() {
             mFpsCounter->SetAttribute("open", "");
             mFpsCounter->SetAttribute("corner", kFpsCorners[idx]);
 
+            if(idx == 2 && mPipelineProgress && mPipelineProgress->GetAttribute("open")) {
+                // 12 (height of pipeline box off bottom) + height of pipeline box + 3 (padding space)
+                mFpsCounter->SetProperty(Rml::PropertyId::Bottom, Rml::Property(15 + mPipelineProgress->GetOffsetHeight(), Rml::Unit::PX));
+            }
+            else {
+                // Return fps counter to default height off the bottom
+                mFpsCounter->SetProperty(Rml::PropertyId::Bottom, Rml::Property(12, Rml::Unit::PX));
+            }
+
             const Uint64 perfFreq = SDL_GetPerformanceFrequency();
             float fps = aurora_get_fps();
 

src/dusk/ui/settings.cpp

@@ -1375,12 +1375,8 @@ 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,