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

start training mods

Browse source
This commit is contained in:
jugeeya 2020-04-30 17:36:56 -07:00
parent 5b94e8907e
commit 06137d0929
4 changed files with 224 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/common/consts.rs
View file

@ -74,20 +74,4 @@ pub struct TrainingModpackMenu
pub MASH_STATE : i32,
pub SHIELD_STATE : i32,
pub DEFENSIVE_STATE : i32,
}
impl Default for TrainingModpackMenu {
fn default() -> TrainingModpackMenu {
TrainingModpackMenu {
HITBOX_VIS : true,
DI_STATE : NONE,
ATTACK_STATE : MASH_NAIR,
LEDGE_STATE : RANDOM_LEDGE,
TECH_STATE : RANDOM_TECH,
MASH_STATE : NONE,
SHIELD_STATE : NONE,
DEFENSIVE_STATE : RANDOM_DEFENSIVE,
}
}
}

7
src/common/mod.rs
View file

@ -42,8 +42,8 @@ pub unsafe fn is_operation_cpu(module_accessor: &mut app::BattleObjectModuleAcce
pub unsafe fn is_in_hitstun(module_accessor: &mut app::BattleObjectModuleAccessor) -> bool {
let status_kind = StatusModule::status_kind(module_accessor) as i32;
return status_kind >= FIGHTER_STATUS_KIND_DAMAGE &&
status_kind <= FIGHTER_STATUS_KIND_DAMAGE_FALL;
(FIGHTER_STATUS_KIND_DAMAGE..=FIGHTER_STATUS_KIND_DAMAGE_FALL)
.contains(&status_kind)
}
pub unsafe fn is_in_shieldstun(module_accessor: &mut app::BattleObjectModuleAccessor) -> bool {
@ -61,14 +61,13 @@ pub unsafe fn is_in_shieldstun(module_accessor: &mut app::BattleObjectModuleAcce
pub unsafe fn is_in_landing(module_accessor: &mut app::BattleObjectModuleAccessor) -> bool {
let status_kind = StatusModule::status_kind(module_accessor) as i32;
(FIGHTER_STATUS_KIND_LANDING..FIGHTER_STATUS_KIND_LANDING_DAMAGE_LIGHT)
(FIGHTER_STATUS_KIND_LANDING..=FIGHTER_STATUS_KIND_LANDING_DAMAGE_LIGHT)
.contains(&status_kind)
}
pub unsafe fn perform_defensive_option(module_accessor: &mut app::BattleObjectModuleAccessor, flag: &mut i32) {
if menu.DEFENSIVE_STATE == RANDOM_DEFENSIVE {
let NUM_DEFENSIVE_CMDS = 4;
let random_cmds = vec![
*FIGHTER_PAD_CMD_CAT1_FLAG_ESCAPE,
*FIGHTER_PAD_CMD_CAT1_FLAG_ESCAPE_F,

2
src/lib.rs
View file

@ -7,6 +7,7 @@
#![feature(with_options)]
mod hitbox_visualizer;
mod training;
mod common;
use smash::hash40;
@ -57,6 +58,7 @@ pub unsafe fn handle_load_module(
pub fn main() {
println!("Training modpack initialized.");
hitbox_visualizer::hitbox_visualization();
training::training_mods();
println!("OpenMode_Write: {} {}", nn::fs::OpenMode_OpenMode_Write, nn::fs::OpenMode_OpenMode_Write as i32);
let buffer = format!("{:x}", &common::menu as *const _ as u64);

219
src/training/mod.rs Normal file
View file

@ -0,0 +1,219 @@
use smash::hash40;
use smash::app::BattleObjectModuleAccessor;
use smash::app::sv_animcmd::{self};
use smash::app::lua_bind::*;
use smash::lib::{self, L2CAgent, L2CValue};
use smash::phx::{Hash40, Vector3f};
use smash::lib::lua_const::{*};
use smash::app::sv_system::{self};
use smash::app::{self};
use skyline::logging::hex_dump_ptr;
use crate::common::*;
#[allow(unused_unsafe)]
#[skyline::hook(replace = WorkModule::get_float)]
pub unsafe fn handle_get_float(module_accessor: *mut BattleObjectModuleAccessor, var: i32) -> f32 {
let mut replace = false;
//float ret = DirectionalInfluence::get_float(module_accessor, var, replace);
//if (replace) return ret;
original!()(module_accessor, var)
}
// float get_param_float_replace(u64 module_accessor, u64 param_type, u64 param_hash) {
// bool replace;
// float ret = Shield::get_param_float(module_accessor, param_type, param_hash, replace);
// if (replace) return ret;
// u64 work_module = load_module(module_accessor, 0x50);
// float (*get_param_float)(u64, u64, u64) = (float (*)(u64, u64, u64)) load_module_impl(work_module, 0x240);
// return get_param_float(work_module, param_type, param_hash);
// }
// } // namespace WorkModule
// namespace ControlModule {
// int get_attack_air_kind_replace(u64 module_accessor) {
// bool replace;
// int kind = InputRecorder::get_attack_air_kind(module_accessor, replace);
// if (replace) return kind;
// kind = Mash::get_attack_air_kind(module_accessor, replace);
// if (replace) return kind;
// u64 control_module = load_module(module_accessor, 0x48);
// int (*get_attack_air_kind)(u64) = (int (*)(u64)) load_module_impl(control_module, 0x3B0);
// return get_attack_air_kind(control_module);
// }
// int get_command_flag_cat_replace(u64 module_accessor, int category) {
// int (*prev_replace)(u64, int) = (int (*)(u64, int)) prev_get_command_flag_cat;
// if (prev_replace)
// prev_replace(module_accessor, category);
// //save_states(module_accessor);
// // Pause Effect AnimCMD if hitbox visualization is active
// int status_kind = StatusModule::status_kind(module_accessor);
// MotionAnimcmdModule::set_sleep_effect(module_accessor,
// is_training_mode() &&
// menu.HITBOX_VIS &&
// !((status_kind >= FIGHTER_STATUS_KIND_CATCH && status_kind <= FIGHTER_STATUS_KIND_TREAD_FALL) ||
// (status_kind >= FIGHTER_STATUS_KIND_WAIT && status_kind <= FIGHTER_STATUS_KIND_REBOUND_JUMP)));
// u64 control_module = load_module(module_accessor, 0x48);
// int (*get_command_flag_cat)(u64, int) = (int (*)(u64, int)) load_module_impl(control_module, 0x350);
// int flag = get_command_flag_cat(control_module, category);
// // bool replace;
// // int ret = InputRecorder::get_command_flag_cat(module_accessor, category, flag, replace);
// // if (replace) return ret;
// Mash::get_command_flag_cat(module_accessor, category, flag);
// Ledge::get_command_flag_cat(module_accessor, category, flag);
// Tech::get_command_flag_cat(module_accessor, category, flag);
// return flag;
// }
// int get_pad_flag(u64 module_accessor) {
// u64 control_module = load_module(module_accessor, 0x48);
// int (*get_pad_flag)(u64) = (int (*)(u64)) load_module_impl(control_module, 0x348);
// int pad_flag = get_pad_flag(control_module);
// bool replace;
// int ret = InputRecorder::get_pad_flag(module_accessor, replace);
// if (replace) return ret;
// return pad_flag;
// }
// float get_stick_x_replace(u64 module_accessor) {
// u64 control_module = load_module(module_accessor, 0x48);
// float (*get_stick_x)(u64) = (float (*)(u64)) load_module_impl(control_module, 0x178);
// float stick_x = get_stick_x(control_module);
// bool replace;
// float ret = InputRecorder::get_stick_x(module_accessor, replace);
// if (replace) return ret;
// return stick_x;
// }
// float get_stick_y_replace(u64 module_accessor) {
// u64 control_module = load_module(module_accessor, 0x48);
// float (*get_stick_y)(u64) = (float (*)(u64)) load_module_impl(control_module, 0x188);
// float stick_y = get_stick_y(control_module);
// bool replace;
// float ret = InputRecorder::get_stick_y(module_accessor, replace);
// if (replace) return ret;
// return stick_y;
// }
// bool check_button_on_replace(u64 module_accessor, int button) {
// bool replace;
// bool ret = Shield::check_button_on(module_accessor, button, replace);
// if (replace) return ret;
// ret = Mash::check_button_on(module_accessor, button, replace);
// if (replace) return ret;
// ret = Tech::check_button_on(module_accessor, button, replace);
// if (replace) return ret;
// ret = Ledge::check_button_on(module_accessor, button, replace);
// if (replace) return ret;
// u64 control_module = load_module(module_accessor, 0x48);
// bool (*check_button_on)(u64, int) = (bool (*)(u64, int)) load_module_impl(control_module, 0x260);
// return check_button_on(control_module, button);
// }
// bool check_button_off_replace(u64 module_accessor, int button) {
// bool replace;
// bool ret = Shield::check_button_off(module_accessor, button, replace);
// if (replace) return ret;
// u64 control_module = load_module(module_accessor, 0x48);
// bool (*check_button_off)(u64, int) = (bool (*)(u64, int)) load_module_impl(control_module, 0x268);
// return check_button_off(control_module, button);
// }
// } // namespace ControlModule
// namespace StatusModule {
// void init_settings_replace(u64 module_accessor, int situationKind, int unk1, uint unk2, int groundCliffCheckKind, bool unk3, int unk4, int unk5, int unk6, int unk7) {
// bool replace;
// Tech::init_settings(module_accessor, StatusModule::status_kind(module_accessor), replace);
// if (replace) return;
// u64 status_module = load_module(module_accessor, 0x40);
// void (*init_settings)(u64,int,int,uint,int,bool,int,int,int,int) =
// (void (*)(u64,int,int,uint,int,bool,int,int,int,int)) load_module_impl(status_module, 0x1C8);
// init_settings(status_module, situationKind, unk1, unk2, groundCliffCheckKind, unk3, unk4, unk5, unk6, unk7);
// }
// } // namespace StatusModule
// namespace MotionModule {
// u64 change_motion_replace(u64 module_accessor, u64 motion_kind, float unk1, float unk2, bool unk3, float unk4, bool unk5, bool unk6) {
// bool replace;
// u64 motion_kind_ret = Tech::change_motion(module_accessor, motion_kind, replace);
// if (replace) motion_kind = motion_kind_ret;
// u64 motion_module = load_module(module_accessor, 0x88);
// u64 change_motion_offset = 0;
// if (major < 4) change_motion_offset = 0xD8;
// else change_motion_offset = 0xE0;
// u64 (*change_motion)(u64,u64,float,float,bool,float,bool,bool) =
// (u64 (*)(u64,u64,float,float,bool,float,bool,bool)) load_module_impl(motion_module, change_motion_offset);
// return change_motion(motion_module, motion_kind, unk1, unk2, unk3, unk4, unk5, unk6);
// }
// } // namespace MotionModule
// } // namespace app::lua_bind
pub fn training_mods() {
println!("Applying hitbox visualization mods.");
// fighter_manager_addr = SaltySDCore_FindSymbol(
// "_ZN3lib9SingletonIN3app14FighterManagerEE9instance_E");
// // Mash airdodge/jump
// SaltySD_function_replace_sym_check_prev(
// "_ZN3app8lua_bind40ControlModule__get_command_flag_cat_implEPNS_26BattleObjectModuleAccessorEi",
// (u64)&ControlModule::get_command_flag_cat_replace,
// prev_get_command_flag_cat);
// Set DI
skyline::install_hook!(handle_get_float);
// Hold/Infinite shield
// SaltySD_function_replace_sym(
// "_ZN3app8lua_bind35ControlModule__check_button_on_implEPNS_26BattleObjectModuleAccessorEi",
// (u64)&ControlModule::check_button_on_replace);
// SaltySD_function_replace_sym(
// "_ZN3app8lua_bind36ControlModule__check_button_off_implEPNS_26BattleObjectModuleAccessorEi",
// (u64)&ControlModule::check_button_off_replace);
// SaltySD_function_replace_sym(
// "_ZN3app8lua_bind32WorkModule__get_param_float_implEPNS_26BattleObjectModuleAccessorEmm",
// (u64)&WorkModule::get_param_float_replace);
// // Mash attack
// SaltySD_function_replace_sym(
// "_ZN3app8lua_bind39ControlModule__get_attack_air_kind_implEPNS_26BattleObjectModuleAccessorE",
// (u64)&ControlModule::get_attack_air_kind_replace);
// // Input recorder
// SaltySD_function_replace_sym(
// "_ZN3app8lua_bind31ControlModule__get_stick_x_implEPNS_26BattleObjectModuleAccessorE",
// (u64)&ControlModule::get_stick_x_replace);
// SaltySD_function_replace_sym(
// "_ZN3app8lua_bind31ControlModule__get_stick_y_implEPNS_26BattleObjectModuleAccessorE",
// (u64)&ControlModule::get_stick_y_replace);
// // Tech options
// SaltySD_function_replace_sym(
// "_ZN3app8lua_bind32StatusModule__init_settings_implEPNS_26BattleObjectModuleAccessorENS_13SituationKindEijNS_20GroundCliffCheckKindEbiiii",
// (u64)&StatusModule::init_settings_replace);
// SaltySD_function_replace_sym(
// "_ZN3app8lua_bind32MotionModule__change_motion_implEPNS_26BattleObjectModuleAccessorEN3phx6Hash40Effbfbb",
// (u64)&MotionModule::change_motion_replace);
}