Skip to content

Commit 959ae1b

Browse files
SuddyNSuddyN
committed
Lucario meter 1st pass
1 parent a222090 commit 959ae1b

File tree

10 files changed

+64
-52
lines changed

10 files changed

+64
-52
lines changed

‎fighters/common/src/function_hooks/aura.rs

+6-3
Original file line numberDiff line numberDiff line change
@@ -76,18 +76,21 @@ unsafe extern "C" fn get_aura(object: *mut BattleObject) -> f32 {
7676

7777
let aura_override = VarModule::get_float(object, vars::lucario::status::AURA_OVERRIDE);
7878
if aura_override > 0.0 {
79+
// println!("aura_override: {}", aura_override);
7980
return aura_override;
8081
}
8182

8283
if VarModule::is_flag(object, vars::lucario::instance::METER_IS_BURNOUT) {
83-
return ParamModule::get_float(object, ParamType::Agent, "aura.penalty_aurapower");
84+
let penalty_aurapower = ParamModule::get_float(object, ParamType::Agent, "aura.penalty_aurapower");
85+
// println!("penalty_aurapower: {}", penalty_aurapower);
86+
return penalty_aurapower;
8487
}
8588

8689
let min_aurapower = ParamModule::get_float(object, ParamType::Agent, "aura.min_aurapower");
8790
let max_aurapower = ParamModule::get_float(object, ParamType::Agent, "aura.max_aurapower");
8891

89-
let charge = MeterModule::level(object) as f32;
90-
let max_charge = MeterModule::meter_cap(object) as f32;
92+
let charge = MeterModule::meter(object) as f32;
93+
let max_charge = MeterModule::meter_cap(object) as f32 * MeterModule::meter_per_level(object);
9194

9295
let diff = max_aurapower - min_aurapower;
9396
let aura_power = min_aurapower + (diff * charge.clamp(0.0, max_charge) / max_charge);

‎fighters/lucario/src/acmd/aerials.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,13 @@ unsafe fn lucario_attack_air_b_game(fighter: &mut L2CAgentBase) {
124124
FT_MOTION_RATE(fighter, 1.0);
125125
if is_excute(fighter) {
126126
MeterModule::watch_damage(fighter.battle_object, true);
127-
ATTACK(fighter, 0, 0, Hash40::new("top"), 13.0, 361, 100, 0, 30, 5.2, 0.0, 11.0, -14.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_aura"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_LUCARIO, *ATTACK_REGION_PUNCH);
128-
ATTACK(fighter, 1, 0, Hash40::new("top"), 12.0, 361, 100, 0, 30, 3.0, 0.0, 11.0, -9.0, Some(0.0), Some(11.0), Some(-2.0), 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_aura"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_LUCARIO, *ATTACK_REGION_PUNCH);
127+
ATTACK(fighter, 0, 0, Hash40::new("top"), 14.6, 361, 100, 0, 30, 5.2, 0.0, 11.0, -14.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_aura"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_LUCARIO, *ATTACK_REGION_PUNCH);
128+
ATTACK(fighter, 1, 0, Hash40::new("top"), 13.5, 361, 100, 0, 30, 3.0, 0.0, 11.0, -9.0, Some(0.0), Some(11.0), Some(-2.0), 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_aura"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_LUCARIO, *ATTACK_REGION_PUNCH);
129129
}
130130
wait(lua_state, 4.0);
131131
if is_excute(fighter) {
132132
AttackModule::clear(boma, 0, false);
133-
ATTACK(fighter, 1, 0, Hash40::new("top"), 9.0, 65, 77, 0, 30, 3.0, 0.0, 11.0, -9.0, Some(0.0), Some(11.0), Some(-2.0), 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_aura"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_LUCARIO, *ATTACK_REGION_PUNCH);
133+
ATTACK(fighter, 1, 0, Hash40::new("top"), 10.1, 65, 77, 0, 30, 3.0, 0.0, 11.0, -9.0, Some(0.0), Some(11.0), Some(-2.0), 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_aura"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_LUCARIO, *ATTACK_REGION_PUNCH);
134134
}
135135
frame(lua_state, 20.0);
136136
if is_excute(fighter) {
@@ -159,8 +159,8 @@ unsafe fn lucario_attack_air_hi_game(fighter: &mut L2CAgentBase) {
159159
FT_MOTION_RATE(fighter, 1.0);
160160
if is_excute(fighter) {
161161
MeterModule::watch_damage(fighter.battle_object, true);
162-
ATTACK(fighter, 0, 0, Hash40::new("top"), 11.0, 80, 80, 0, 30, 5.0, 0.0, 11.0, 2.0, Some(0.0), Some(12.0), Some(2.0), 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_aura"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_LUCARIO, *ATTACK_REGION_KICK);
163-
ATTACK(fighter, 1, 0, Hash40::new("top"), 12.0, 90, 100, 0, 40, 5.0, 0.0, 11.0, 2.0, Some(0.0), Some(20.0), Some(2.0), 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_aura"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_LUCARIO, *ATTACK_REGION_KICK);
162+
ATTACK(fighter, 0, 0, Hash40::new("top"), 12.4, 80, 80, 0, 30, 5.0, 0.0, 11.0, 2.0, Some(0.0), Some(12.0), Some(2.0), 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_aura"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_LUCARIO, *ATTACK_REGION_KICK);
163+
ATTACK(fighter, 1, 0, Hash40::new("top"), 13.5, 90, 100, 0, 40, 5.0, 0.0, 11.0, 2.0, Some(0.0), Some(20.0), Some(2.0), 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_aura"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_LUCARIO, *ATTACK_REGION_KICK);
164164
}
165165
wait(lua_state, 4.0);
166166
if is_excute(fighter) {

‎fighters/lucario/src/acmd/other.rs

-4
Original file line numberDiff line numberDiff line change
@@ -343,10 +343,6 @@ unsafe fn game_downattacku(fighter: &mut L2CAgentBase) {
343343
unsafe fn game_appealhi(fighter: &mut L2CAgentBase) {
344344
let lua_state = fighter.lua_state_agent;
345345
let boma = fighter.boma();
346-
frame(lua_state, 50.0);
347-
if is_excute(fighter) {
348-
MeterModule::add(fighter.battle_object, 0.2 * MeterModule::meter_per_level(fighter.battle_object));
349-
}
350346
}
351347

352348
pub fn install() {

‎fighters/lucario/src/acmd/smashes.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ unsafe fn lucario_attack_hi4_game(fighter: &mut L2CAgentBase) {
3838
frame(lua_state, 7.0);
3939
if is_excute(fighter) {
4040
MeterModule::watch_damage(fighter.battle_object, true);
41-
ATTACK(fighter, 0, 0, Hash40::new("bust"), 5.0, 85, 100, 100, 0, 4.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 0.25, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 3, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_aura"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_LUCARIO, *ATTACK_REGION_PUNCH);
42-
ATTACK(fighter, 1, 0, Hash40::new("armr"), 5.0, 112, 100, 100, 0, 4.5, 0.0, 0.0, 0.0, None, None, None, 1.0, 0.25, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 3, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_aura"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_LUCARIO, *ATTACK_REGION_PUNCH);
41+
ATTACK(fighter, 0, 0, Hash40::new("bust"), 5.6, 85, 100, 100, 0, 4.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 0.25, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 3, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_aura"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_LUCARIO, *ATTACK_REGION_PUNCH);
42+
ATTACK(fighter, 1, 0, Hash40::new("armr"), 5.6, 112, 100, 100, 0, 4.5, 0.0, 0.0, 0.0, None, None, None, 1.0, 0.25, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 3, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_aura"), *ATTACK_SOUND_LEVEL_M, *COLLISION_SOUND_ATTR_LUCARIO, *ATTACK_REGION_PUNCH);
4343
}
4444
frame(lua_state, 10.0);
4545
if is_excute(fighter) {
4646
SA_SET(fighter, *SITUATION_KIND_AIR);
47-
ATTACK(fighter, 0, 0, Hash40::new("bust"), 7.0, 80, 120, 0, 70, 4.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_aura"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_LUCARIO, *ATTACK_REGION_PUNCH);
48-
ATTACK(fighter, 1, 0, Hash40::new("armr"), 7.0, 80, 120, 0, 70, 5.0, 3.0, 0.0, 0.0, Some(-3.0), Some(0.0), Some(0.0), 1.0, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_aura"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_LUCARIO, *ATTACK_REGION_PUNCH);
47+
ATTACK(fighter, 0, 0, Hash40::new("bust"), 7.9, 80, 120, 0, 70, 4.0, 0.0, 0.0, 0.0, None, None, None, 1.0, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_aura"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_LUCARIO, *ATTACK_REGION_PUNCH);
48+
ATTACK(fighter, 1, 0, Hash40::new("armr"), 7.9, 80, 120, 0, 70, 5.0, 3.0, 0.0, 0.0, Some(-3.0), Some(0.0), Some(0.0), 1.0, 1.0, *ATTACK_SETOFF_KIND_OFF, *ATTACK_LR_CHECK_F, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_aura"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_LUCARIO, *ATTACK_REGION_PUNCH);
4949
}
5050
frame(lua_state, 16.0);
5151
FT_MOTION_RATE(fighter, 2.0);
@@ -136,8 +136,8 @@ unsafe fn lucario_attack_lw4_game(fighter: &mut L2CAgentBase) {
136136
FT_MOTION_RATE(fighter, 1.000);
137137
if is_excute(fighter) {
138138
MeterModule::watch_damage(fighter.battle_object, true);
139-
ATTACK(fighter, 0, 0, Hash40::new("top"), 12.0, 33, 99, 0, 30, 4.3, 0.0, 6.0, 15.0, Some(0.0), Some(6.0), Some(4.5), 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_aura"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_LUCARIO, *ATTACK_REGION_PUNCH);
140-
ATTACK(fighter, 1, 0, Hash40::new("top"), 12.0, 33, 99, 0, 30, 4.3, 0.0, 6.0, -15.0, Some(0.0), Some(6.0), Some(-4.5), 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_aura"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_LUCARIO, *ATTACK_REGION_PUNCH);
139+
ATTACK(fighter, 0, 0, Hash40::new("top"), 13.5, 33, 99, 0, 30, 4.3, 0.0, 6.0, 15.0, Some(0.0), Some(6.0), Some(4.5), 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_aura"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_LUCARIO, *ATTACK_REGION_PUNCH);
140+
ATTACK(fighter, 1, 0, Hash40::new("top"), 13.5, 33, 99, 0, 30, 4.3, 0.0, 6.0, -15.0, Some(0.0), Some(6.0), Some(-4.5), 1.0, 1.0, *ATTACK_SETOFF_KIND_ON, *ATTACK_LR_CHECK_POS, false, 0, 0.0, 0, false, false, false, false, true, *COLLISION_SITUATION_MASK_GA, *COLLISION_CATEGORY_MASK_ALL, *COLLISION_PART_MASK_ALL, false, Hash40::new("collision_attr_aura"), *ATTACK_SOUND_LEVEL_L, *COLLISION_SOUND_ATTR_LUCARIO, *ATTACK_REGION_PUNCH);
141141
}
142142
wait(lua_state, 5.0);
143143
if is_excute(fighter) {

‎fighters/lucario/src/acmd/specials.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ unsafe fn game_specialnbomb(fighter: &mut L2CAgentBase) {
355355
frame(lua_state, 37.0);
356356
if is_excute(fighter) {
357357
ArticleModule::shoot(boma, *FIGHTER_LUCARIO_GENERATE_ARTICLE_AURABALL, ArticleOperationTarget(*ARTICLE_OPE_TARGET_LAST), false);
358-
MeterModule::drain_direct(fighter.battle_object, 2.0 * MeterModule::meter_per_level(fighter.battle_object));
358+
MeterModule::drain_direct(fighter.battle_object, MeterModule::meter_per_level(fighter.battle_object));
359359
let frames = 120.max(VarModule::get_int(fighter.object(), vars::lucario::instance::METER_PAUSE_REGEN_FRAME));
360360
VarModule::set_int(fighter.object(), vars::lucario::instance::METER_PAUSE_REGEN_FRAME, frames);
361361
}
@@ -402,7 +402,7 @@ unsafe fn game_specialairnbomb(fighter: &mut L2CAgentBase) {
402402
frame(lua_state, 37.0);
403403
if is_excute(fighter) {
404404
ArticleModule::shoot(boma, *FIGHTER_LUCARIO_GENERATE_ARTICLE_AURABALL, ArticleOperationTarget(*ARTICLE_OPE_TARGET_LAST), false);
405-
MeterModule::drain_direct(fighter.battle_object, 2.0 * MeterModule::meter_per_level(fighter.battle_object));
405+
MeterModule::drain_direct(fighter.battle_object, MeterModule::meter_per_level(fighter.battle_object));
406406
let frames = 120.max(VarModule::get_int(fighter.object(), vars::lucario::instance::METER_PAUSE_REGEN_FRAME));
407407
VarModule::set_int(fighter.object(), vars::lucario::instance::METER_PAUSE_REGEN_FRAME, frames);
408408
}

‎fighters/lucario/src/opff.rs

+12-12
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ pub fn lucario_meter(fighter: &mut smash::lua2cpp::L2CFighterCommon) {
1010
return;
1111
}
1212
MeterModule::update(fighter.object(), false);
13-
MeterModule::set_meter_cap(fighter.object(), 6);
14-
MeterModule::set_meter_per_level(fighter.object(), 50.0);
13+
MeterModule::set_meter_cap(fighter.object(), 2);
14+
MeterModule::set_meter_per_level(fighter.object(), 100.0);
1515
utils::ui::UiManager::set_aura_meter_enable(fighter.get_int(*FIGHTER_INSTANCE_WORK_ID_INT_ENTRY_ID) as u32, true);
1616
utils::ui::UiManager::set_aura_meter_info(
17-
fighter.get_int(*FIGHTER_INSTANCE_WORK_ID_INT_ENTRY_ID) as u32,
18-
MeterModule::meter(fighter.object()),
17+
(fighter.get_int(*FIGHTER_INSTANCE_WORK_ID_INT_ENTRY_ID) as u32),
18+
(MeterModule::meter(fighter.object())),
1919
(MeterModule::meter_cap(fighter.object()) as f32 * MeterModule::meter_per_level(fighter.object())),
20-
MeterModule::meter_per_level(fighter.object()),
21-
VarModule::is_flag(fighter.object(), vars::lucario::instance::METER_IS_BURNOUT)
20+
(MeterModule::meter_per_level(fighter.object())),
21+
(VarModule::is_flag(fighter.object(), vars::lucario::instance::METER_IS_BURNOUT))
2222
);
2323
}
2424
}
@@ -134,7 +134,7 @@ unsafe fn sspecial(fighter: &mut L2CFighterCommon, boma: &mut BattleObjectModule
134134
&& !VarModule::is_flag(fighter.battle_object, vars::lucario::instance::METER_IS_BURNOUT) {
135135
let bonus_aurapower = ParamModule::get_float(fighter.battle_object, ParamType::Agent, "aura.bonus_aurapower");
136136
VarModule::set_float(fighter.battle_object, vars::lucario::status::AURA_OVERRIDE, bonus_aurapower);
137-
MeterModule::drain_direct(fighter.battle_object, 2.0 * MeterModule::meter_per_level(fighter.battle_object));
137+
MeterModule::drain_direct(fighter.battle_object, MeterModule::meter_per_level(fighter.battle_object));
138138
pause_meter_regen(fighter, 120);
139139
}
140140
}
@@ -154,7 +154,7 @@ unsafe fn dspecial(fighter: &mut L2CFighterCommon, boma: &mut BattleObjectModule
154154
&& !VarModule::is_flag(fighter.object(), vars::lucario::instance::METER_IS_BURNOUT) {
155155
fighter.change_status_req(*FIGHTER_STATUS_KIND_ATTACK_AIR, false);
156156
KineticModule::mul_speed(boma, &Vector3f{x: 0.5, y: 0.5, z: 0.5}, *FIGHTER_KINETIC_ENERGY_ID_STOP);
157-
MeterModule::drain_direct(fighter.object(), MeterModule::meter_per_level(fighter.object()) * 2.0);
157+
MeterModule::drain_direct(fighter.object(), MeterModule::meter_per_level(fighter.object()));
158158
pause_meter_regen(fighter, 120);
159159
}
160160
}
@@ -251,7 +251,7 @@ unsafe fn meter_module(fighter: &mut L2CFighterCommon, boma: &mut BattleObjectMo
251251
VarModule::on_flag(fighter.battle_object, vars::lucario::instance::METER_IS_BURNOUT);
252252
PLAY_SE(fighter, Hash40::new("se_common_spirits_critical_l_tail"));
253253
}
254-
} else if (meter >= meter_per_level * 2.0) { // exit burnout at 1 full bar
254+
} else if (meter >= meter_per_level) { // exit burnout at 1 half bar
255255
if VarModule::is_flag(fighter.battle_object, vars::lucario::instance::METER_IS_BURNOUT) {
256256
VarModule::off_flag(fighter.battle_object, vars::lucario::instance::METER_IS_BURNOUT);
257257
PLAY_SE(fighter, Hash40::new("se_system_favorite_on"));
@@ -327,9 +327,9 @@ unsafe fn magic_series(fighter: &mut L2CFighterCommon, boma: &mut BattleObjectMo
327327
if [
328328
*FIGHTER_STATUS_KIND_ATTACK,
329329
*FIGHTER_STATUS_KIND_ATTACK_DASH,
330-
*FIGHTER_STATUS_KIND_ATTACK_S3,
331-
*FIGHTER_STATUS_KIND_ATTACK_HI3,
332-
*FIGHTER_STATUS_KIND_ATTACK_LW3,
330+
// *FIGHTER_STATUS_KIND_ATTACK_S3,
331+
// *FIGHTER_STATUS_KIND_ATTACK_HI3,
332+
// *FIGHTER_STATUS_KIND_ATTACK_LW3,
333333
].contains(&status_kind) {
334334
if boma.is_cat_flag(Cat1::AttackS4) {
335335
StatusModule::change_status_request_from_script(boma, *FIGHTER_STATUS_KIND_ATTACK_S4_START,true);

0 commit comments

Comments
 (0)