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

tech roll f/b fix, enable fastest defensive options

Browse source
This commit is contained in:
jugeeya 2019-10-30 21:29:34 -07:00
parent cd8ffd61e1
commit 8839eed65a
3 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/training/ledge.hpp
View file

@ -16,7 +16,7 @@ void force_option(u64 module_accessor) {
int ledge_case = menu.LEDGE_STATE;
if (menu.LEDGE_STATE == RANDOM_LEDGE)
ledge_case = app::sv_math::rand(hash40("fighter"), 4) + 1;
ledge_case = app::sv_math::rand(hash40("fighter"), 4) + 2;
switch (ledge_case) {
case NEUTRAL_LEDGE:
@ -45,8 +45,10 @@ void defensive_option(u64 module_accessor, int category, int& flag) {
if ((status == FIGHTER_STATUS_KIND_CLIFF_CLIMB ||
status == FIGHTER_STATUS_KIND_CLIFF_ATTACK ||
status == FIGHTER_STATUS_KIND_CLIFF_ESCAPE) &&
WorkModule::is_enable_transition_term(module_accessor, FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_ESCAPE)) {
status == FIGHTER_STATUS_KIND_CLIFF_ESCAPE ||
StatusModule::prev_status_kind(module_accessor, 0) == FIGHTER_STATUS_KIND_CLIFF_CLIMB) &&
(WorkModule::is_enable_transition_term(module_accessor, FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_ESCAPE) ||
CancelModule::is_enable_cancel(module_accessor))) {
perform_defensive_option(module_accessor);
}
}

3
source/training/tech.h
View file

@ -69,7 +69,8 @@ void get_command_flag_cat(u64 module_accessor, int category, int& flag) {
status == FIGHTER_STATUS_KIND_DOWN_STAND ||
status == FIGHTER_STATUS_KIND_DOWN_STAND_FB ||
status == FIGHTER_STATUS_KIND_DOWN_STAND_ATTACK) &&
WorkModule::is_enable_transition_term(module_accessor, FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_GUARD_ON)) {
(WorkModule::is_enable_transition_term(module_accessor, FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_GUARD_ON) ||
CancelModule::is_enable_cancel(module_accessor))) {
perform_defensive_option(module_accessor);
}
}

21
source/training_mods.hpp
View file

@ -166,6 +166,24 @@ void init_settings_replace(u64 module_accessor, int situationKind, int unk1, uin
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) {
if (menu.TECH_STATE != NONE && is_training_mode() && is_operation_cpu(module_accessor)) {
if (motion_kind == hash40("passive_stand_f") || motion_kind == hash40("passive_stand_b")) {
int rand_int = app::sv_math::rand(hash40("fighter"), 2);
if (rand_int) motion_kind = hash40("passive_stand_f");
else motion_kind = hash40("passive_stand_b");
}
}
u64 motion_module = load_module(module_accessor, 0x88);
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, 0xE0);
return change_motion(motion_module, motion_kind, unk1, unk2, unk3, unk4, unk5, unk6);
}
} // namespace MotionModule
} // namespace app::lua_bind
void training_mods_main() {
@ -211,6 +229,9 @@ void training_mods_main() {
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);
}
#endif // TRAINING_MODS_H