Mirror/UltimateTrainingModpack
1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2025-01-31 22:47:25 +00:00
Code Issues Activity

fix save states staling, position under stage

Browse source
This commit is contained in:
jugeeya 2020-06-17 23:01:19 -07:00
parent 0a6a26b6b2
commit a3ea3e7332
2 changed files with 57 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/training/mod.rs
View file

@ -24,6 +24,16 @@ pub unsafe fn handle_get_param_float(
.unwrap_or_else(|| original!()(module_accessor, param_type, param_hash))
}
#[skyline::hook(replace = WorkModule::get_param_int)]
pub unsafe fn handle_get_param_int(
module_accessor: &mut app::BattleObjectModuleAccessor,
param_type: u64,
param_hash: u64,
) -> i32 {
save_states::get_param_int(module_accessor, param_type, param_hash)
.unwrap_or_else(|| original!()(module_accessor, param_type, param_hash))
}
#[skyline::hook(replace = ControlModule::get_attack_air_kind)]
pub unsafe fn handle_get_attack_air_kind(
module_accessor: &mut app::BattleObjectModuleAccessor,
@ -40,7 +50,7 @@ pub unsafe fn handle_get_command_flag_cat(
module_accessor: &mut app::BattleObjectModuleAccessor,
category: i32,
) -> i32 {
save_states::save_states(module_accessor);
save_states::save_states(module_accessor, category);
let mut flag = original!()(module_accessor, category);
@ -199,6 +209,8 @@ pub fn training_mods() {
handle_check_button_on,
handle_check_button_off,
handle_get_param_float,
// Save states
handle_get_param_int,
// Mash attack
handle_get_attack_air_kind,
// Tech options

57
src/training/save_states.rs
View file

@ -2,6 +2,7 @@ use crate::common::*;
use smash::app::{self, lua_bind::*};
use smash::lib::lua_const::*;
use smash::phx::{Hash40, Vector3f};
use smash::hash40;
#[derive(PartialEq)]
enum SaveState {
@ -28,8 +29,42 @@ static mut SAVE_STATE_PERCENT_CPU: f32 = 0.0;
static mut SAVE_STATE_LR_CPU: f32 = 1.0;
static mut SAVE_STATE_SITUATION_KIND_CPU: i32 = 0 as i32;
pub unsafe fn save_states(module_accessor: &mut app::BattleObjectModuleAccessor) {
pub unsafe fn get_param_int(
_module_accessor: &mut app::BattleObjectModuleAccessor,
param_type: u64,
param_hash: u64,
) -> Option<i32> {
if !is_training_mode() {
return None;
}
if param_type == hash40("common") {
if param_hash == hash40("dead_rebirth_wait_frame") {
return Some(1);
}
if param_hash == hash40("rebirth_move_frame") {
return Some(0);
}
if param_hash == hash40("rebirth_wait_frame") {
return Some(0);
}
if param_hash == hash40("rebirth_invincible_frame") {
return Some(0);
}
if param_hash == hash40("rebirth_invincible_add_frame") {
return Some(0);
}
}
None
}
pub unsafe fn save_states(module_accessor: &mut app::BattleObjectModuleAccessor, category: i32) {
if !is_training_mode() {
return;
}
if category != 0 {
return;
}
@ -69,9 +104,6 @@ pub unsafe fn save_states(module_accessor: &mut app::BattleObjectModuleAccessor)
// move to camera bounds
if *save_state == CameraMove {
let mgr = *(FIGHTER_MANAGER_ADDR as *mut *mut app::FighterManager);
FighterManager::reset_fighter(mgr, false);
*save_state = PosMove;
let left_right = (PostureModule::pos_x(module_accessor) > 0.0) as i32 as f32
@ -85,20 +117,19 @@ pub unsafe fn save_states(module_accessor: &mut app::BattleObjectModuleAccessor)
};
PostureModule::set_pos(module_accessor, &pos);
// force aerial, because from aerial state we can move anywhere
if StatusModule::situation_kind(module_accessor) == SITUATION_KIND_GROUND {
StatusModule::change_status_request(
module_accessor,
*FIGHTER_STATUS_KIND_JUMP_SQUAT,
false,
);
}
StatusModule::change_status_request(
module_accessor,
*FIGHTER_STATUS_KIND_DEAD,
false,
);
return;
}
// move to correct pos
if *save_state == PosMove {
if StatusModule::situation_kind(module_accessor) == SITUATION_KIND_GROUND {
let mgr = *(FIGHTER_MANAGER_ADDR as *mut *mut app::FighterManager);
FighterManager::reset_fighter(mgr, false);
if StatusModule::prev_status_kind(module_accessor, 0) != FIGHTER_STATUS_KIND_REBIRTH {
return;
}