Merge pull request #2218 from jaccob101/revisit_float_hotfix

WuBoytH · web-flow · commit 869218fe5741 · 2024-01-29T03:27:20.000-05:00
Held-Float Re-Add (with delay,sry)
diff --git a/fighters/common/src/opff/floats.rs b/fighters/common/src/opff/floats.rs
@@ -91,8 +91,8 @@ pub unsafe fn extra_floats(fighter: &mut L2CFighterCommon, boma: &mut BattleObje
             }
             if WorkModule::is_flag(boma, *FIGHTER_INSTANCE_WORK_ID_FLAG_SUPERLEAF) 
             && !WorkModule::is_flag(boma, *FIGHTER_STATUS_WORK_ID_FLAG_RESERVE_FALL_SLOWLY)
-            && (!ControlModule::check_button_on(boma, *CONTROL_PAD_BUTTON_JUMP) || boma.left_stick_y() >= -0.66)
-            {
+            && (boma.left_stick_y() >= -0.66 && InputModule::get_trigger_count(fighter.battle_object, Buttons::Jump) <= 4)
+            { //disables held floats unless jump is held 5f
                 WorkModule::off_flag(boma, *FIGHTER_INSTANCE_WORK_ID_FLAG_SUPERLEAF);
             }
             // Immediately transition to fall/double jump fall when activating float

Original file line number	Diff line number	Diff line change
`@@ -91,8 +91,8 @@ pub unsafe fn extra_floats(fighter: &mut L2CFighterCommon, boma: &mut BattleObje`
`91`	`91`	`}`
`92`	`92`	`if WorkModule::is_flag(boma, *FIGHTER_INSTANCE_WORK_ID_FLAG_SUPERLEAF)`
`93`	`93`	`&& !WorkModule::is_flag(boma, *FIGHTER_STATUS_WORK_ID_FLAG_RESERVE_FALL_SLOWLY)`
`94`		`- && (!ControlModule::check_button_on(boma, *CONTROL_PAD_BUTTON_JUMP) \|\| boma.left_stick_y() >= -0.66)`
`95`		`- {`
	`94`	`+ && (boma.left_stick_y() >= -0.66 && InputModule::get_trigger_count(fighter.battle_object, Buttons::Jump) <= 4)`
	`95`	`+ { //disables held floats unless jump is held 5f`
`96`	`96`	`WorkModule::off_flag(boma, *FIGHTER_INSTANCE_WORK_ID_FLAG_SUPERLEAF);`
`97`	`97`	`}`
`98`	`98`	`// Immediately transition to fall/double jump fall when activating float`