Mirror/UltimateTrainingModpack
1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2025-02-17 14:40:31 +00:00
Code Issues Activity

Make ganon's aerial sideb untechable (#375)

Browse source
This commit is contained in:
asimon-1 2022-06-22 09:49:57 -04:00 committed by GitHub
parent 9d2f87290b
commit e42e046b87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.toml
View file

@ -15,6 +15,7 @@ bitflags = "1.2.1"
parking_lot = { version = "0.12.0", features = ["nightly"] } parking_lot = { version = "0.12.0", features = ["nightly"] }
lazy_static = "1.4.0" lazy_static = "1.4.0"
owo-colors = "2.1.0" owo-colors = "2.1.0"
once_cell = "1.12.0"
ramhorns = "0.12.0" ramhorns = "0.12.0"
paste = "1.0" paste = "1.0"
num = "0.4.0" num = "0.4.0"

2
src/common/events.rs
View file

@ -1,4 +1,4 @@
use core::lazy::OnceCell; use once_cell::sync::OnceCell;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use skyline::libc::c_void; use skyline::libc::c_void;
use skyline::nn::{account, crypto, oe, time}; use skyline::nn::{account, crypto, oe, time};

8
src/training/tech.rs
View file

@ -67,10 +67,16 @@ fn handle_grnd_tech(
} }
unsafe { unsafe {
// prev_status_kind(module_accessor, 0) gets the 1st previous status,
// which is FIGHTER_STATUS_KIND_CATCHED_AIR_END_GANON for both aerial/grounded sideb
// prev_status_kind(module_accessor, 1) gets the 2nd previous status,
// which is FIGHTER_STATUS_KIND_CATCHED_GANON for grounded sideb
// and FIGHTER_STATUS_KIND_CATCHED_AIR_GANON for aerial sideb
let second_prev_status = StatusModule::prev_status_kind(module_accessor, 1);
let can_tech = WorkModule::is_enable_transition_term( let can_tech = WorkModule::is_enable_transition_term(
module_accessor, module_accessor,
*FIGHTER_STATUS_TRANSITION_TERM_ID_PASSIVE, *FIGHTER_STATUS_TRANSITION_TERM_ID_PASSIVE,
); ) && (second_prev_status != FIGHTER_STATUS_KIND_CATCHED_AIR_FALL_GANON);
if !can_tech { if !can_tech {
return false; return false;