Meter bugfixes

Author: WuBoytH

fighters/dolly/src/opff.rs

@@ -841,6 +841,9 @@ unsafe fn magic_series(fighter: &mut L2CFighterCommon, boma: &mut BattleObjectMo
 
 pub extern "C" fn dolly_meter(fighter: &mut smash::lua2cpp::L2CFighterCommon) {
     unsafe {
+        if !sv_information::is_ready_go() && fighter.status_frame() < 1 {
+            return;
+        }
         MeterModule::update(fighter.object(), false);
         // if fighter.is_button_on(Buttons::AppealAll) {
         //     MeterModule::show(fighter.object());
@@ -873,6 +876,6 @@ pub unsafe fn dolly_frame(fighter: &mut smash::lua2cpp::L2CFighterCommon) {
 pub fn install() {
     smashline::Agent::new("dolly")
         .on_line(Main, dolly_frame_wrapper)
-        .on_line(Exec, dolly_meter)
+        .on_line(Main, dolly_meter)
         .install();
 }

fighters/ken/src/opff.rs

@@ -64,6 +64,9 @@ extern "Rust" {
 
 unsafe extern "C" fn ken_meter(fighter: &mut smash::lua2cpp::L2CFighterCommon) {
     unsafe {
+        if !sv_information::is_ready_go() && fighter.status_frame() < 1 {
+            return;
+        }
         MeterModule::update(fighter.battle_object, false);
         MeterModule::set_meter_cap(fighter.object(), 10);
         MeterModule::set_meter_per_level(fighter.object(), 30.0);
@@ -401,6 +404,6 @@ unsafe fn target_combos(boma: &mut BattleObjectModuleAccessor) {
 pub fn install() {
     smashline::Agent::new("ken")
         .on_line(Main, ken_frame_wrapper)
-        .on_line(Exec, ken_meter)
+        .on_line(Main, ken_meter)
         .install();
 }

fighters/lucario/src/opff.rs

@@ -5,6 +5,9 @@ use globals::*;
 
 pub extern "C" fn lucario_meter(fighter: &mut smash::lua2cpp::L2CFighterCommon) {
     unsafe {
+        if !sv_information::is_ready_go() && fighter.status_frame() < 1 {
+            return;
+        }
         MeterModule::update(fighter.object(), false);
         MeterModule::set_meter_cap(fighter.object(), 2);
         MeterModule::set_meter_per_level(fighter.object(), 100.0);
@@ -367,6 +370,6 @@ unsafe fn magic_series(fighter: &mut L2CFighterCommon, boma: &mut BattleObjectMo
 pub fn install() {
     smashline::Agent::new("lucario")
         .on_line(Main, lucario_frame_wrapper)
-        .on_line(Exec, lucario_meter)
+        .on_line(Main, lucario_meter)
         .install();
 }

fighters/palutena/src/opff.rs

@@ -311,6 +311,9 @@ unsafe fn power_cast(fighter: &mut L2CFighterCommon) {
 
 pub extern "C" fn palu_power_board(fighter: &mut smash::lua2cpp::L2CFighterCommon) {
     unsafe {
+        if !sv_information::is_ready_go() && fighter.status_frame() < 1 {
+            return;
+        }
         MeterModule::update(fighter.object(), false);
         MeterModule::set_meter_cap(fighter.object(), 2);
         utils::ui::UiManager::set_power_board_enable(fighter.get_int(*FIGHTER_INSTANCE_WORK_ID_INT_ENTRY_ID) as u32, true);
@@ -339,10 +342,7 @@ pub unsafe fn palutena_frame(fighter: &mut smash::lua2cpp::L2CFighterCommon) {
 }
 
 pub extern "C" fn reflection_board_callback(weapon: &mut smash::lua2cpp::L2CFighterBase) {
-    unsafe { 
-        if weapon.kind() != WEAPON_KIND_PALUTENA_REFLECTIONBOARD {
-            return
-        }
+    unsafe {
         if weapon.is_status(*WEAPON_PALUTENA_REFLECTIONBOARD_STATUS_KIND_SHOOT) {
             let owner_id = WorkModule::get_int(weapon.module_accessor, *WEAPON_INSTANCE_WORK_ID_INT_LINK_OWNER) as u32;
             let palutena = utils::util::get_battle_object_from_id(owner_id);
@@ -357,7 +357,7 @@ pub extern "C" fn reflection_board_callback(weapon: &mut smash::lua2cpp::L2CFigh
 pub fn install() {
     smashline::Agent::new("palutena")
         .on_line(Main, palutena_frame_wrapper)
-        .on_line(Exec, palu_power_board)
+        .on_line(Main, palu_power_board)
         .install();
     smashline::Agent::new("palutena_reflectionboard")
         .on_line(Main, reflection_board_callback)

fighters/pichu/src/opff.rs

@@ -163,6 +163,9 @@ unsafe fn charge_training_taunt(fighter: &mut L2CFighterCommon, boma: &mut Battl
 
 pub extern "C" fn pichu_meter(fighter: &mut smash::lua2cpp::L2CFighterCommon) {
     unsafe {
+        if !sv_information::is_ready_go() && fighter.status_frame() < 1 {
+            return;
+        }
         MeterModule::update(fighter.object(), false);
         MeterModule::set_meter_cap(fighter.object(), 2);
         MeterModule::set_meter_per_level(fighter.object(), 25.0);
@@ -216,6 +219,6 @@ pub unsafe fn pichu_frame(fighter: &mut smash::lua2cpp::L2CFighterCommon) {
 pub fn install() {
     smashline::Agent::new("pichu")
         .on_line(Main, pichu_frame_wrapper)
-        .on_line(Exec, pichu_meter)
+        .on_line(Main, pichu_meter)
         .install();
 }

fighters/robot/src/opff.rs

@@ -203,6 +203,9 @@ pub unsafe fn moveset(fighter: &mut smash::lua2cpp::L2CFighterCommon, boma: &mut
 
 unsafe extern "C" fn robot_meter(fighter: &mut smash::lua2cpp::L2CFighterCommon) {
     unsafe {
+        if !sv_information::is_ready_go() && fighter.status_frame() < 1 {
+            return;
+        }
         MeterModule::update(fighter.object(), false);
         utils::ui::UiManager::set_robot_meter_enable(fighter.get_int(*FIGHTER_INSTANCE_WORK_ID_INT_ENTRY_ID) as u32, true);
         utils::ui::UiManager::set_robot_meter_info(
@@ -229,6 +232,6 @@ pub unsafe fn robot_frame(fighter: &mut smash::lua2cpp::L2CFighterCommon) {
 pub fn install() {
     smashline::Agent::new("robot")
         .on_line(Main, robot_frame_wrapper)
-        .on_line(Exec, robot_meter)
+        .on_line(Main, robot_meter)
         .install();
 }

fighters/ryu/src/opff.rs

@@ -63,6 +63,9 @@ extern "Rust" {
 
 unsafe extern "C" fn ryu_meter(fighter: &mut smash::lua2cpp::L2CFighterCommon) {
     unsafe {
+        if !sv_information::is_ready_go() && fighter.status_frame() < 1 {
+            return;
+        }
         MeterModule::update(fighter.battle_object, false);
         utils::ui::UiManager::set_ex_meter_enable(fighter.get_int(*FIGHTER_INSTANCE_WORK_ID_INT_ENTRY_ID) as u32, true);
         utils::ui::UiManager::set_ex_meter_info(
@@ -537,6 +540,6 @@ unsafe fn hadoken_fadc_sfs_cancels(fighter: &mut L2CFighterCommon, boma: &mut Ba
 pub fn install() {
     smashline::Agent::new("ryu")
         .on_line(Main, ryu_frame_wrapper)
-        .on_line(Exec, ryu_meter)
+        .on_line(Main, ryu_meter)
         .install();
 }