Mirror/UltimateTrainingModpack
1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2024-11-20 00:46:34 +00:00
Code Issues Activity

Bonus Fruit thrown when charged (#372)

Browse source
This commit is contained in:
GradualSyrup 2022-06-08 00:26:04 -05:00 committed by GitHub
parent 5e1f523bb6
commit 5d94e57d70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 834 additions and 825 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/training/charge.rs
View file

@ -187,11 +187,11 @@ pub unsafe fn get_charge(
// Pac-Man Bonus Fruit
else if fighter_kind == FIGHTER_KIND_PACMAN {
let my_charge = WorkModule::get_int(module_accessor, 0x100000C1); // FIGHTER_PACMAN_INSTANCE_WORK_ID_INT_SPECIAL_N_CHARGE_RANK
let max_have = WorkModule::is_flag(
let fruit_have = WorkModule::is_flag(
module_accessor,
*FIGHTER_PACMAN_INSTANCE_WORK_ID_FLAG_SPECIAL_N_MAX_HAVE_ITEM,
*FIGHTER_PACMAN_INSTANCE_WORK_ID_FLAG_SPECIAL_N_PULL_THROW,
);
charge_state.int_x(my_charge).has_charge(max_have)
charge_state.int_x(my_charge).has_charge(fruit_have)
}
// Robin Thunder Tome Spells
else if fighter_kind == FIGHTER_KIND_REFLET {
@ -652,19 +652,28 @@ pub unsafe fn handle_charge(
}
// Pac-Man Bonus Fruit - 0 to 12
else if fighter_kind == FIGHTER_KIND_PACMAN {
let mut has_key = false;
charge.int_x.map(|charge_rank| {
WorkModule::set_int(module_accessor, charge_rank, 0x100000C1); // FIGHTER_PACMAN_INSTANCE_WORK_ID_INT_SPECIAL_N_CHARGE_RANK
if charge_rank == 12 {
EffectModule::req_common(module_accessor, Hash40::new("charge_max"), 0.0);
has_key = true;
}
});
charge.has_charge.map(|has_fruit| {
WorkModule::set_flag(
module_accessor,
has_fruit,
*FIGHTER_PACMAN_INSTANCE_WORK_ID_FLAG_SPECIAL_N_PULL_THROW,
);
if has_key {
WorkModule::set_flag(
module_accessor,
has_key,
*FIGHTER_PACMAN_INSTANCE_WORK_ID_FLAG_SPECIAL_N_MAX_HAVE_ITEM,
);
}
});
}
// Robin Thunder Tome Spells - 0 to 3