Merge branch 'dev' into megaman-adjustments

Author: WuBoytH

fighters/common/src/opff/floats.rs

@@ -32,30 +32,25 @@ pub unsafe fn extra_floats(fighter: &mut L2CFighterCommon, boma: &mut BattleObje
     if VarModule::get_int(boma.object(), vars::common::instance::FLOAT_STYLE) == 2 {
         VarModule::set_int(boma.object(), vars::common::instance::FLOAT_DURATION, 0);
     }
-    // Activate float_pause aerial flag to prevent floats from being activated during aerials if
-    // float option isnt 1
-    if VarModule::get_int(boma.object(), vars::common::instance::FLOAT_STYLE) != 1 {
-        if status_kind != *FIGHTER_STATUS_KIND_ATTACK_AIR {
-            VarModule::set_flag(boma.object(), vars::common::instance::FLOAT_PAUSE_AERIAL, WorkModule::get_int(boma, *FIGHTER_INSTANCE_WORK_ID_INT_SUPERLEAF_FALL_SLOWLY_FRAME) == VarModule::get_int(boma.object(), vars::common::instance::FLOAT_DURATION));
-        } else if WorkModule::is_flag(boma, *FIGHTER_STATUS_WORK_ID_FLAG_RESERVE_FALL_SLOWLY) {
-            VarModule::off_flag(boma.object(), vars::common::instance::FLOAT_PAUSE_AERIAL);
-        }
-    }
 
     if situation_kind == *SITUATION_KIND_AIR
     && !boma.is_prev_status(*SITUATION_KIND_GROUND)
-    //&& !StatusModule::is_changing(boma)
     {
+        // FIGHTER_INSTANCE_WORK_ID_INT_SUPERLEAF_FALL_SLOWLY_FRAME will sometimes erroneously decrement once every 2 frames (effectively allowing for double the max float time); this overrides that
+        // With SL2 float time is no longer doubled, but forcing the flag to be on is still required?
+        if WorkModule::get_int(boma, *FIGHTER_INSTANCE_WORK_ID_INT_SUPERLEAF_FALL_SLOWLY_FRAME) > 0 
+        && WorkModule::get_int(boma, *FIGHTER_INSTANCE_WORK_ID_INT_SUPERLEAF_FALL_SLOWLY_FRAME) < VarModule::get_int(boma.object(), vars::common::instance::FLOAT_DURATION)
+        {
+            WorkModule::on_flag(boma, *FIGHTER_STATUS_WORK_ID_FLAG_RESERVE_FALL_SLOWLY);
+        }
         if WorkModule::is_flag(boma, *FIGHTER_STATUS_WORK_ID_FLAG_RESERVE_FALL_SLOWLY) {
             VarModule::on_flag(fighter.battle_object, vars::common::instance::OMNI_FLOAT);
         }
         // Prevent float from activating during aerials
         if VarModule::get_int(boma.object(), vars::common::instance::FLOAT_STYLE) != 1 && !WorkModule::is_flag(boma, *FIGHTER_STATUS_WORK_ID_FLAG_RESERVE_FALL_SLOWLY) {
             if status_kind == *FIGHTER_STATUS_KIND_ATTACK_AIR && !CancelModule::is_enable_cancel(boma) {
-                if VarModule::is_flag(boma.object(), vars::common::instance::FLOAT_PAUSE_AERIAL) {
-                    VarModule::on_flag(boma.object(), vars::common::instance::AERIAL_NO_FLOAT);
-                    WorkModule::set_int(boma, 0, *FIGHTER_INSTANCE_WORK_ID_INT_SUPERLEAF_FALL_SLOWLY_FRAME);
-                }
+                VarModule::on_flag(boma.object(), vars::common::instance::AERIAL_NO_FLOAT);
+                WorkModule::set_int(boma, 0, *FIGHTER_INSTANCE_WORK_ID_INT_SUPERLEAF_FALL_SLOWLY_FRAME);
             } else {
                 if VarModule::is_flag(boma.object(), vars::common::instance::AERIAL_NO_FLOAT) {
                     WorkModule::set_int(boma, VarModule::get_int(boma.object(), vars::common::instance::FLOAT_DURATION), *FIGHTER_INSTANCE_WORK_ID_INT_SUPERLEAF_FALL_SLOWLY_FRAME);
@@ -96,47 +91,29 @@ pub unsafe fn extra_floats(fighter: &mut L2CFighterCommon, boma: &mut BattleObje
                 }
             }
             // Immediately transition to fall/double jump fall when activating float
-            if ControlModule::check_button_on(boma, *CONTROL_PAD_BUTTON_JUMP) && boma.left_stick_y() < -0.66 && WorkModule::get_int(boma, *FIGHTER_INSTANCE_WORK_ID_INT_SUPERLEAF_FALL_SLOWLY_FRAME) > 0 {
+            if !WorkModule::is_flag(boma, *FIGHTER_STATUS_WORK_ID_FLAG_RESERVE_FALL_SLOWLY)
+            && WorkModule::get_int(boma, *FIGHTER_INSTANCE_WORK_ID_INT_SUPERLEAF_FALL_SLOWLY_FRAME) > 0
+            && ControlModule::check_button_on(boma, *CONTROL_PAD_BUTTON_JUMP) && boma.left_stick_y() < -0.66
+            {
                 if [*FIGHTER_STATUS_KIND_CLIFF_JUMP1, *FIGHTER_STATUS_KIND_CLIFF_JUMP2, *FIGHTER_STATUS_KIND_CLIFF_JUMP3, *FIGHTER_STATUS_KIND_DAMAGE_FALL, *FIGHTER_STATUS_KIND_PASS].contains(&status_kind) {
-                    VarModule::on_flag(fighter.battle_object, vars::common::instance::OMNI_FLOAT);
-                    ControlModule::reset_trigger(boma);
-                    StatusModule::change_status_request_from_script(boma, *FIGHTER_STATUS_KIND_FALL, true);
+                    StatusModule::change_status_request_from_script(boma, *FIGHTER_STATUS_KIND_FALL, false);
                 } else if status_kind == *FIGHTER_STATUS_KIND_JUMP_AERIAL {
-                    VarModule::on_flag(fighter.battle_object, vars::common::instance::OMNI_FLOAT);
-                    ControlModule::reset_trigger(boma);
-                    StatusModule::change_status_request_from_script(boma, *FIGHTER_STATUS_KIND_FALL_AERIAL, true);
-                } else if [hash40("walk_fall_l"), hash40("walk_fall_r"), hash40("run_fall_l"), hash40("run_fall_r")].contains(&MotionModule::motion_kind(boma)) {
-                    MotionModule::change_motion(boma, Hash40::new("fall"), 0.0, 1.0, false, 0.0, false, false);
+                    StatusModule::change_status_request_from_script(boma, *FIGHTER_STATUS_KIND_FALL_AERIAL, false);
                 } else if status_kind == *FIGHTER_STATUS_KIND_JUMP {
                     if StatusModule::is_changing(boma) { //peach ground-float mechanic
-                        let pos = Vector3f { x: PostureModule::pos_x(boma), y: PostureModule::pos_y(boma) + 3.5, z: PostureModule::pos_z(boma) };
+                        let pos = Vector3f { x: PostureModule::pos_x(boma), y: PostureModule::pos_y(boma) + 2.5 + motion_value, z: PostureModule::pos_z(boma) };
                         PostureModule::set_pos(boma, &pos);
                     }
-                    VarModule::on_flag(fighter.battle_object, vars::common::instance::OMNI_FLOAT);
-                    ControlModule::reset_trigger(boma);
-                    StatusModule::change_status_request_from_script(boma, *FIGHTER_STATUS_KIND_FALL, true);
+                    StatusModule::change_status_request_from_script(boma, *FIGHTER_STATUS_KIND_FALL, false);
                 }
             }
-            //else {
-            //    // "superjump" bugfix
-            //    if WorkModule::is_flag(boma, *FIGHTER_STATUS_WORK_ID_FLAG_RESERVE_FALL_SLOWLY) && status_kind == *FIGHTER_STATUS_KIND_JUMP && boma.status_frame() <= 1 {
-            //        ControlModule::reset_trigger(boma);
-            //        StatusModule::change_status_request_from_script(boma, *FIGHTER_STATUS_KIND_FALL, true);
-            //    }
-            //}
-            // FIGHTER_INSTANCE_WORK_ID_INT_SUPERLEAF_FALL_SLOWLY_FRAME will sometimes erroneously decrement once every 2 frames (effectively allowing for double the max float time); this overrides that
-            if WorkModule::get_int(boma, *FIGHTER_INSTANCE_WORK_ID_INT_SUPERLEAF_FALL_SLOWLY_FRAME) > 0 && WorkModule::get_int(boma, *FIGHTER_INSTANCE_WORK_ID_INT_SUPERLEAF_FALL_SLOWLY_FRAME) < VarModule::get_int(boma.object(), vars::common::instance::FLOAT_DURATION) {
-                if ([*FIGHTER_STATUS_KIND_JUMP, *FIGHTER_STATUS_KIND_JUMP_AERIAL, *FIGHTER_STATUS_KIND_CLIFF_JUMP1, *FIGHTER_STATUS_KIND_CLIFF_JUMP2, *FIGHTER_STATUS_KIND_CLIFF_JUMP3].contains(&status_kind) || [*FIGHTER_STATUS_KIND_FALL, *FIGHTER_STATUS_KIND_FALL_AERIAL, *FIGHTER_STATUS_KIND_ATTACK_AIR].contains(&status_kind)) && !WorkModule::is_flag(boma, *FIGHTER_STATUS_WORK_ID_FLAG_RESERVE_FALL_SLOWLY) {
-                    let fall_slowly_frame = WorkModule::get_int(boma, *FIGHTER_INSTANCE_WORK_ID_INT_SUPERLEAF_FALL_SLOWLY_FRAME);
-                    WorkModule::on_flag(boma, *FIGHTER_STATUS_WORK_ID_FLAG_RESERVE_FALL_SLOWLY);
-                    VarModule::on_flag(fighter.battle_object, vars::common::instance::OMNI_FLOAT);
-                    WorkModule::set_int(boma, fall_slowly_frame - 1, *FIGHTER_INSTANCE_WORK_ID_INT_SUPERLEAF_FALL_SLOWLY_FRAME);
-                }
+            // Run-off anim cancel
+            if [hash40("walk_fall_l"), hash40("walk_fall_r"), hash40("run_fall_l"), hash40("run_fall_r")].contains(&MotionModule::motion_kind(boma)) 
+            && WorkModule::is_flag(boma, *FIGHTER_STATUS_WORK_ID_FLAG_RESERVE_FALL_SLOWLY) {
+                MotionModule::change_motion(boma, Hash40::new("fall"), 0.0, 1.0, false, 0.0, false, false);
             }
-
             // Omnidirectional float for Dark Samus and Mewtwo
-            if WorkModule::get_int(boma, *FIGHTER_INSTANCE_WORK_ID_INT_SUPERLEAF_FALL_SLOWLY_FRAME) > 0 
-            && WorkModule::get_int(boma, *FIGHTER_INSTANCE_WORK_ID_INT_SUPERLEAF_FALL_SLOWLY_FRAME) < VarModule::get_int(boma.object(), vars::common::instance::FLOAT_DURATION) 
+            if WorkModule::is_flag(boma, *FIGHTER_STATUS_WORK_ID_FLAG_RESERVE_FALL_SLOWLY)
             && ControlModule::check_button_on(boma, *CONTROL_PAD_BUTTON_JUMP) {
                 if boma.left_stick_y() != 0.0 && VarModule::get_int(fighter.battle_object, vars::common::instance::FLOAT_TIMER) > 2 {
                     let mut motion_vec = Vector3f{x: 0.0, y: 0.0, z: 0.0};

fighters/ike/src/status.rs

@@ -40,6 +40,18 @@ extern "C" fn ike_init(fighter: &mut L2CFighterCommon) {
     }
 }
 
+unsafe extern "C" fn ike_rebirth_end(fighter: &mut L2CFighterCommon) -> L2CValue {
+    VisibilityModule::set_int64(fighter.module_accessor, hash40("sword") as i64, hash40("sword_normal") as i64);
+    if ArticleModule::is_exist(fighter.module_accessor, *FIGHTER_IKE_GENERATE_ARTICLE_SWORD) {
+        ArticleModule::remove_exist(fighter.module_accessor, *FIGHTER_IKE_GENERATE_ARTICLE_SWORD, ArticleOperationTarget(*ARTICLE_OPE_TARGET_ALL));
+    }
+    fighter.status_end_Rebirth();
+    0.into()
+}
+
 pub fn install() {
-    smashline::Agent::new("ike").on_start(ike_init).install();
+    smashline::Agent::new("ike")
+        .on_start(ike_init)
+        .status(smashline::End, *FIGHTER_STATUS_KIND_REBIRTH, ike_rebirth_end)
+        .install();
 }

fighters/koopajr/src/status.rs

@@ -34,11 +34,20 @@ extern "C" fn koopajr_init(fighter: &mut L2CFighterCommon) {
     }
 }
 
+unsafe extern "C" fn koopajr_rebirth_end(fighter: &mut L2CFighterCommon) -> L2CValue {
+    if ArticleModule::is_exist(fighter.module_accessor, *FIGHTER_KOOPAJR_GENERATE_ARTICLE_KART) {
+        ArticleModule::remove_exist(fighter.module_accessor, *FIGHTER_KOOPAJR_GENERATE_ARTICLE_KART, ArticleOperationTarget(*ARTICLE_OPE_TARGET_ALL));
+    }
+    fighter.status_end_Rebirth();
+    0.into()
+}
+
 pub fn install() {
     special_s_jump::install();
     special_hi_escape::install();
     special_hi_damage::install();
     smashline::Agent::new("koopajr")
         .on_start(koopajr_init)
+        .status(smashline::End, *FIGHTER_STATUS_KIND_REBIRTH, koopajr_rebirth_end)
         .install();
 }

fighters/lucas/src/opff.rs

@@ -450,10 +450,7 @@ pub unsafe fn lucas_frame(fighter: &mut smash::lua2cpp::L2CFighterCommon) {
 }
 
 pub extern "C" fn pkthunder_callback(weapon: &mut smash::lua2cpp::L2CFighterBase) {
-    unsafe { 
-        if weapon.kind() != WEAPON_KIND_LUCAS_PK_THUNDER {
-            return
-        }
+    unsafe {
         WorkModule::on_flag(weapon.module_accessor, *WEAPON_INSTANCE_WORK_ID_FLAG_NO_DEAD);
     }
 }

fighters/lucas/src/status.rs

@@ -221,7 +221,11 @@ pub unsafe extern "C" fn attack_air(fighter: &mut L2CFighterCommon) -> L2CValue
 
 unsafe extern "C" fn move_exec(weapon: &mut L2CFighterCommon) -> L2CValue {
     if !VarModule::is_flag(weapon.object(), vars::lucas::status::THUNDER_LOOSE) {
-        if LinkModule::get_parent_status_kind(weapon.module_accessor, *WEAPON_LINK_NO_CONSTRAINT) as i32 != *FIGHTER_LUCAS_STATUS_KIND_SPECIAL_HI_HOLD {
+        let parent_id = WorkModule::get_int(weapon.module_accessor, *WEAPON_INSTANCE_WORK_ID_INT_ACTIVATE_FOUNDER_ID);
+        let parent_object = get_battle_object_from_id(parent_id as u32);
+        if !parent_object.is_null()
+        && sv_battle_object::kind(parent_id as u32) == *FIGHTER_KIND_LUCAS
+        && StatusModule::status_kind((*parent_object).module_accessor) != *FIGHTER_LUCAS_STATUS_KIND_SPECIAL_HI_HOLD {
             VarModule::on_flag(weapon.object(), vars::lucas::status::THUNDER_LOOSE);
             MotionModule::change_motion_force_inherit_frame(weapon.module_accessor, Hash40::new("move"), 0.0, 1.0, 1.0);
             return 0.into();

fighters/mario/src/status.rs

@@ -53,11 +53,21 @@ unsafe extern "C" fn special_lw_shoot_pre(fighter: &mut L2CFighterCommon) -> L2C
     return 0.into()
 }
 
+unsafe extern "C" fn mario_rebirth_end(fighter: &mut L2CFighterCommon) -> L2CValue {
+    if ArticleModule::is_exist(fighter.module_accessor, *FIGHTER_MARIO_GENERATE_ARTICLE_CAPPY) {
+        ArticleModule::remove_exist(fighter.module_accessor, *FIGHTER_MARIO_GENERATE_ARTICLE_CAPPY, ArticleOperationTarget(*ARTICLE_OPE_TARGET_ALL));
+    }
+    EffectModule::remove_post_effect_line(fighter.module_accessor, 0x1e, true);
+    fighter.status_end_Rebirth();
+    0.into()
+}
+
 pub fn install() {
     special_n::install();
     smashline::Agent::new("mario")
         .on_start(mario_init)
         .status(Pre, *FIGHTER_STATUS_KIND_SPECIAL_LW, special_lw_pre)
         .status(Pre, *FIGHTER_MARIO_STATUS_KIND_SPECIAL_LW_SHOOT, special_lw_shoot_pre)
+        .status(smashline::End, *FIGHTER_STATUS_KIND_REBIRTH, mario_rebirth_end)
         .install();
 }

fighters/master/src/lib.rs

@@ -4,7 +4,7 @@
 
 pub mod acmd;
 
-//pub mod status;
+pub mod status;
 pub mod opff;
 
 use smash::{
@@ -40,6 +40,6 @@ use smashline::*;
 
 pub fn install() {
     acmd::install();
-    //status::install();
+    status::install();
     opff::install();
 }

fighters/master/src/status.rs

@@ -0,0 +1,16 @@
+use super::*;
+use globals::*;
+
+unsafe extern "C" fn master_rebirth_end(fighter: &mut L2CFighterCommon) -> L2CValue {
+    if ArticleModule::is_exist(fighter.module_accessor, *FIGHTER_MASTER_GENERATE_ARTICLE_SWORD) {
+        ArticleModule::remove_exist(fighter.module_accessor, *FIGHTER_MASTER_GENERATE_ARTICLE_SWORD, ArticleOperationTarget(*ARTICLE_OPE_TARGET_ALL));
+    }
+    fighter.status_end_Rebirth();
+    0.into()
+}
+
+pub fn install() {
+    smashline::Agent::new("master")
+        .status(smashline::End, *FIGHTER_STATUS_KIND_REBIRTH, master_rebirth_end)
+        .install();
+}

fighters/ness/src/opff.rs

@@ -214,10 +214,7 @@ pub unsafe fn ness_frame(fighter: &mut smash::lua2cpp::L2CFighterCommon) {
 }
 
 pub unsafe extern "C" fn pkthunder_callback(weapon: &mut smash::lua2cpp::L2CFighterBase) {
-    unsafe { 
-        if weapon.kind() != WEAPON_KIND_NESS_PK_THUNDER {
-            return
-        }
+    unsafe {
         WorkModule::on_flag(weapon.module_accessor, *WEAPON_INSTANCE_WORK_ID_FLAG_NO_DEAD);
     }
 }

fighters/ness/src/status.rs

@@ -7,7 +7,11 @@ utils::import!(common::djc::attack_air_main_status);
 
 unsafe extern "C" fn move_exec(weapon: &mut L2CFighterCommon) -> L2CValue {
     if !VarModule::is_flag(weapon.object(), vars::ness::status::THUNDER_LOOSE) {
-        if LinkModule::get_parent_status_kind(weapon.module_accessor, *WEAPON_LINK_NO_CONSTRAINT) as i32 != *FIGHTER_NESS_STATUS_KIND_SPECIAL_HI_HOLD {
+        let parent_id = WorkModule::get_int(weapon.module_accessor, *WEAPON_INSTANCE_WORK_ID_INT_ACTIVATE_FOUNDER_ID);
+        let parent_object = get_battle_object_from_id(parent_id as u32);
+        if !parent_object.is_null()
+        && sv_battle_object::kind(parent_id as u32) == *FIGHTER_KIND_NESS
+        && StatusModule::status_kind((*parent_object).module_accessor) != *FIGHTER_NESS_STATUS_KIND_SPECIAL_HI_HOLD {
             VarModule::on_flag(weapon.object(), vars::ness::status::THUNDER_LOOSE);
             MotionModule::change_motion_force_inherit_frame(weapon.module_accessor, Hash40::new("move"), 0.0, 1.0, 1.0);
             return 0.into();

fighters/palutena/src/acmd/other.rs

@@ -308,6 +308,53 @@ unsafe extern "C" fn palutena_autoaimbullet_shot_effect(agent: &mut L2CAgentBase
     }
 }
 
+unsafe extern "C" fn palutena_explosiveflame_explode_game(fighter: &mut L2CAgentBase) {
+    let lua_state = fighter.lua_state_agent;
+    let boma = fighter.boma();
+    if is_excute(fighter) {
+        ATTACK(fighter, 0, 0, Hash40::new("top"), 1.5, 160, 100, 50, 0, 4.8, 0.0, 0.0, 0.0, None, None, None, 1.0, 0.4, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_POS, false, -0.7, 0.0, 5, true, true, false, false, false, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_BOMB, *ATTACK_REGION_BOMB);
+        AttackModule::set_no_damage_fly_smoke_all(boma, true, false);
+    }
+    wait(lua_state, 4.0);
+    if is_excute(fighter) {
+        AttackModule::set_size(boma, 0, 6.0);
+    }
+    wait(lua_state, 4.0);
+    if is_excute(fighter) {
+        AttackModule::set_size(boma, 0, 7.2);
+    }
+    wait(lua_state, 4.0);
+    if is_excute(fighter) {
+        AttackModule::set_size(boma, 0, 8.4);
+    }
+    wait(lua_state, 4.0);
+    if is_excute(fighter) {
+        AttackModule::set_size(boma, 0, 9.6);
+    }
+    wait(lua_state, 4.0);
+    if is_excute(fighter) {
+        AttackModule::set_size(boma, 0, 10.8);
+    }
+    wait(lua_state, 4.0);
+    if is_excute(fighter) {
+        AttackModule::set_size(boma, 0, 12.0);
+    }
+    wait(lua_state, 4.0);
+    if is_excute(fighter) {
+        AttackModule::clear_all(boma);
+        //AREA_WIND_2ND_RAD(fighter, 0, 1, 0.02, 1000, 1, 0, 0, 29);
+        ControlModule::set_rumble(boma, Hash40::new("rbkind_explosion"), 0, false, *BATTLE_OBJECT_ID_INVALID as u32);
+    }
+    wait(lua_state, 1.0);
+    if is_excute(fighter) {
+        ATTACK(fighter, 0, 1, Hash40::new("top"), 5.5, 84, 141, 0, 60, 15.5, 0.0, 0.0, 0.0, None, None, None, 1.5, 0.4, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, -2.7, 0.0, 0, true, true, false, false, false, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_fire"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_BOMB, *ATTACK_REGION_BOMB);
+    }
+    wait(lua_state, 2.0);
+    if is_excute(fighter) {
+        AttackModule::clear_all(boma);
+    }
+}
+
 unsafe extern "C" fn escape_air_game(fighter: &mut L2CAgentBase) {
     let lua_state = fighter.lua_state_agent;
     let boma = fighter.boma();
@@ -358,6 +405,9 @@ pub fn install() {
     smashline::Agent::new("palutena_reflectionboard")
         .acmd("game_shoot", palutena_reflectionboard_shoot_game)
         .install();
+    smashline::Agent::new("palutena_explosiveflame")
+        .acmd("game_explode", palutena_explosiveflame_explode_game)
+        .install();
     // smashline::Agent::new("palutena_explosiveflame_reserve")
     //     .acmd("effect_wait", palutena_explosiveflame_reserve_wait_effect)
     //     .install();