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

save states; save states can't restore status

Browse source
This commit is contained in:
jugeeya 2019-06-04 00:08:25 -07:00
parent 762cfaaf7d
commit 1e90c2b634
4 changed files with 205 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
source/acmd_wrapper.hpp
View file

@ -37,8 +37,14 @@ namespace app::lua_bind {
namespace ControlModule {
bool check_button_on(u64, int) asm("_ZN3app8lua_bind35ControlModule__check_button_on_implEPNS_26BattleObjectModuleAccessorEi") LINKABLE;
bool check_button_trigger(u64, int) asm("_ZN3app8lua_bind40ControlModule__check_button_trigger_implEPNS_26BattleObjectModuleAccessorEi") LINKABLE;
}
namespace DamageModule {
float damage(u64, int) asm("_ZN3app8lua_bind25DamageModule__damage_implEPNS_26BattleObjectModuleAccessorEi") LINKABLE;
void add_damage(u64, float, int) asm("_ZN3app8lua_bind29DamageModule__add_damage_implEPNS_26BattleObjectModuleAccessorEfi") LINKABLE;
}
namespace EffectModule {
// boma, effect, joint, pos, rot, size, random_pos, random_rot, NO_SCALE?, attr?, unkint1, unkint2
uint req_on_joint(u64, u64, u64, const Vector3f*, const Vector3f*, float a6, const Vector3f*, const Vector3f*, bool, uint, int, int)
@ -55,6 +61,10 @@ namespace app::lua_bind {
bool is_operation_cpu(u64) asm("_ZN3app8lua_bind41FighterInformation__is_operation_cpu_implEPNS_18FighterInformationE") LINKABLE;
}
namespace FighterStatusModuleImpl {
u64 set_fighter_status_data(u64,bool,int,bool,bool,bool,u64,uint,uint,uint) asm("_ZN3app8lua_bind53FighterStatusModuleImpl__set_fighter_status_data_implEPNS_26BattleObjectModuleAccessorEbibbbmjjj") LINKABLE;
}
namespace MotionModule {
float frame(u64) asm("_ZN3app8lua_bind24MotionModule__frame_implEPNS_26BattleObjectModuleAccessorE") LINKABLE;
u64 motion_kind(u64) asm("_ZN3app8lua_bind30MotionModule__motion_kind_implEPNS_26BattleObjectModuleAccessorE") LINKABLE;
@ -62,15 +72,18 @@ namespace app::lua_bind {
namespace PostureModule {
float lr(u64) asm("_ZN3app8lua_bind22PostureModule__lr_implEPNS_26BattleObjectModuleAccessorE") LINKABLE;
void set_lr(u64, float) asm("_ZN3app8lua_bind26PostureModule__set_lr_implEPNS_26BattleObjectModuleAccessorEf") LINKABLE;
float pos_x(u64) asm("_ZN3app8lua_bind25PostureModule__pos_x_implEPNS_26BattleObjectModuleAccessorE") LINKABLE;
float pos_y(u64) asm("_ZN3app8lua_bind25PostureModule__pos_y_implEPNS_26BattleObjectModuleAccessorE") LINKABLE;
float set_pos(u64, const Vector3f*) asm("_ZN3app8lua_bind27PostureModule__set_pos_implEPNS_26BattleObjectModuleAccessorERKN3phx8Vector3fE") LINKABLE;
void set_pos(u64, const Vector3f*) asm("_ZN3app8lua_bind27PostureModule__set_pos_implEPNS_26BattleObjectModuleAccessorERKN3phx8Vector3fE") LINKABLE;
}
namespace StatusModule {
u64 change_status_request_from_script(u64, int, bool) asm("_ZN3app8lua_bind52StatusModule__change_status_request_from_script_implEPNS_26BattleObjectModuleAccessorEib") LINKABLE;
int status_kind(u64) asm("_ZN3app8lua_bind30StatusModule__status_kind_implEPNS_26BattleObjectModuleAccessorE") LINKABLE;
int situation_kind(u64) asm("_ZN3app8lua_bind33StatusModule__situation_kind_implEPNS_26BattleObjectModuleAccessorE") LINKABLE;
u64 set_situation_kind(u64,int,bool) asm("_ZN3app8lua_bind37StatusModule__set_situation_kind_implEPNS_26BattleObjectModuleAccessorENS_13SituationKindEb") LINKABLE;
u64 init_settings(u64,int,int,uint,int,bool,int,int,int,int) asm("_ZN3app8lua_bind32StatusModule__init_settings_implEPNS_26BattleObjectModuleAccessorENS_13SituationKindEijNS_20GroundCliffCheckKindEbiiii") LINKABLE;
}
namespace WorkModule {

2
source/l2c_imports.hpp
View file

@ -137,6 +137,8 @@ namespace lib {
u64 clear_lua_stack() asm("_ZN3lib8L2CAgent15clear_lua_stackEv") LINKABLE;
};
u64 L2CValue_int(L2CValue*, int) asm("_ZN3lib8L2CValueC1Ei") LINKABLE;
bool lua_bind_get_value(u64, int*) asm("_ZN3lib18lua_bind_get_valueIiEEbmRT_") LINKABLE;
int lua_const(const char* str) {

4
source/script_replacement.hpp
View file

@ -18,13 +18,17 @@
using namespace lib;
using namespace app::lua_bind;
void sv_replace_status_func(u64 l2c_agentbase, int status_kind, u64 key, void* func);
u64 appeal_lw_replace(L2CAgent* l2c_agent, void* variadic);
u64 appeal_hi_replace(L2CAgent* l2c_agent, void* variadic);
u64 appeal_s_replace(L2CAgent* l2c_agent, void* variadic);
u64 pre_GuardDamage_replace(L2CAgent* l2c_fighter, L2CAgent* l2c_agent);
void replace_scripts(L2CAgent* l2c_agent, u8 category, int kind) {
// fighter
if (category == BATTLE_OBJECT_CATEGORY_FIGHTER) {
// taunt toggles
l2c_agent->sv_set_function_hash(&appeal_lw_replace, hash40("effect_appeallwl"));
l2c_agent->sv_set_function_hash(&appeal_lw_replace, hash40("effect_appeallwr"));
l2c_agent->sv_set_function_hash(&appeal_hi_replace, hash40("effect_appealhil"));

229
source/training_mods.hpp
View file

@ -39,31 +39,36 @@ void perform_jump(u64 module_accessor) {
}
}
namespace app::lua_bind {
namespace WorkModule {
namespace app::lua_bind {
namespace WorkModule {
// Force option out of hitstun
u64 enable_transition_term_group_replace(u64 module_accessor, int transition_group) {
u64 enable_transition_term_group_replace(u64 module_accessor,
int transition_group) {
if (is_training_mode() && is_operation_cpu(module_accessor)) {
if (is_in_hitstun(module_accessor)) {
if (TOGGLE_STATE == MASH_AIRDODGE) { // airdodge
if (transition_group == FIGHTER_STATUS_TRANSITION_GROUP_CHK_AIR_ESCAPE)
StatusModule::change_status_request_from_script(module_accessor, FIGHTER_STATUS_KIND_ESCAPE_AIR, 1);
} else if (TOGGLE_STATE == MASH_JUMP) { // jump
if (transition_group == FIGHTER_STATUS_TRANSITION_GROUP_CHK_AIR_JUMP_AERIAL)
if (is_in_hitstun(module_accessor)) {
if (TOGGLE_STATE == MASH_AIRDODGE) { // airdodge
if (transition_group == FIGHTER_STATUS_TRANSITION_GROUP_CHK_AIR_ESCAPE)
StatusModule::change_status_request_from_script(
module_accessor, FIGHTER_STATUS_KIND_ESCAPE_AIR, 1);
} else if (TOGGLE_STATE == MASH_JUMP) { // jump
if (transition_group ==
FIGHTER_STATUS_TRANSITION_GROUP_CHK_AIR_JUMP_AERIAL)
perform_jump(module_accessor);
else if (transition_group == FIGHTER_STATUS_TRANSITION_GROUP_CHK_GROUND_JUMP)
else if (transition_group ==
FIGHTER_STATUS_TRANSITION_GROUP_CHK_GROUND_JUMP)
perform_jump(module_accessor);
}
}
}
}
// call original WorkModule::enable_transition_term_group_impl
u64 work_module = load_module(module_accessor, 0x50);
u64 (*enable_transition_term_group)(u64, u64) = (u64(*)(u64, u64))(load_module_impl(work_module, 0x140));
u64 (*enable_transition_term_group)(u64, u64) =
(u64(*)(u64, u64))(load_module_impl(work_module, 0x140));
return enable_transition_term_group(work_module, transition_group);
}
// Force DI
float get_float_replace(u64 module_accessor, int var) {
if (is_training_mode() && is_operation_cpu(module_accessor)) {
@ -77,8 +82,7 @@ namespace app::lua_bind {
}
// If facing left, reverse angle
if (PostureModule::lr(module_accessor) != -1.0)
angle -= M_PI;
if (PostureModule::lr(module_accessor) != -1.0) angle -= M_PI;
if (var == FIGHTER_STATUS_DAMAGE_WORK_FLOAT_VECOR_CORRECT_STICK_X)
return cos(angle);
@ -91,44 +95,48 @@ namespace app::lua_bind {
// call original WorkModule::get_float_impl
u64 work_module = load_module(module_accessor, 0x50);
float (*get_float)(u64, int) = (float (*)(u64, int))(load_module_impl(work_module, 0x58));
float (*get_float)(u64, int) =
(float (*)(u64, int))(load_module_impl(work_module, 0x58));
return get_float(work_module, var);
}
float get_param_float_replace(u64 module_accessor, u64 param_type, u64 param_hash) {
if (is_training_mode() && is_operation_cpu(module_accessor)) {
if (TOGGLE_STATE == INFINITE_SHIELD) {
if (param_type == hash40("common")) {
if (param_hash == hash40("shield_dec1"))
return 0.0;
if (param_hash == hash40("shield_recovery1"))
return 0.0;
// doesn't work, somehow. This parameter isn't checked?
if (param_hash == hash40("shield_damage_mul"))
return 0.0;
}
float get_param_float_replace(u64 module_accessor, u64 param_type,
u64 param_hash) {
if (is_training_mode()) {
if (TOGGLE_STATE == INFINITE_SHIELD) {
if (param_type == hash40("common")) {
if (param_hash == hash40("shield_dec1")) return 0.0;
if (param_hash == hash40("shield_recovery1")) return 999.0;
// doesn't work, somehow. This parameter isn't checked?
if (param_hash == hash40("shield_damage_mul")) return 0.0;
}
}
}
// call original
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));
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 MotionModule {
void change_motion_replace(u64 module_accessor, u64 motion_kind, float start_frame, float frame_speed_mult, bool unk1, float unk2, bool unk3, bool unk4) {
void change_motion_replace(u64 module_accessor, u64 motion_kind,
float start_frame, float frame_speed_mult, bool unk1,
float unk2, bool unk3, bool unk4) {
u64 curr_motion_kind = MotionModule::motion_kind(module_accessor);
if ((curr_motion_kind == hash40("damage_air_1") ||
curr_motion_kind == hash40("damage_air_2") ||
curr_motion_kind == hash40("damage_air_3")) && motion_kind == hash40("fall")) {
curr_motion_kind == hash40("damage_air_3")) &&
motion_kind == hash40("fall")) {
if (is_training_mode() && is_operation_cpu(module_accessor)) {
if (TOGGLE_STATE == MASH_AIRDODGE) // airdodge
StatusModule::change_status_request_from_script(module_accessor, FIGHTER_STATUS_KIND_ESCAPE_AIR, 1);
else if (TOGGLE_STATE == MASH_JUMP) // jump
if (TOGGLE_STATE == MASH_AIRDODGE) // airdodge
StatusModule::change_status_request_from_script(
module_accessor, FIGHTER_STATUS_KIND_ESCAPE_AIR, 1);
else if (TOGGLE_STATE == MASH_JUMP) // jump
perform_jump(module_accessor);
}
}
@ -136,15 +144,18 @@ namespace app::lua_bind {
// call original
u64 motion_module = load_module(module_accessor, 0x88);
void (*change_motion)(u64, u64, float, float, bool, float, bool, bool) =
(void (*)(u64, u64, float, float, bool, float, bool, bool)) load_module_impl(motion_module, 0xD8);
(void (*)(u64, u64, float, float, bool, float, bool,
bool))load_module_impl(motion_module, 0xD8);
change_motion(motion_module, motion_kind, start_frame, frame_speed_mult, unk1, unk2, unk3, unk4);
change_motion(motion_module, motion_kind, start_frame, frame_speed_mult, unk1,
unk2, unk3, unk4);
}
}
} // namespace MotionModule
namespace ControlModule {
bool check_button_on_replace(u64 module_accessor, int button) {
if (button == CONTROL_PAD_BUTTON_GUARD_HOLD || button == CONTROL_PAD_BUTTON_GUARD) {
if (button == CONTROL_PAD_BUTTON_GUARD_HOLD ||
button == CONTROL_PAD_BUTTON_GUARD) {
if (is_training_mode() && is_operation_cpu(module_accessor)) {
if (TOGGLE_STATE == HOLD_SHIELD || TOGGLE_STATE == INFINITE_SHIELD)
return true;
@ -153,12 +164,14 @@ namespace app::lua_bind {
// call original
u64 control_module = load_module(module_accessor, 0x48);
bool (*check_button_on)(u64, int) = (bool (*)(u64, int))load_module_impl(control_module, 0x260);
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) {
if (button == CONTROL_PAD_BUTTON_GUARD_HOLD || button == CONTROL_PAD_BUTTON_GUARD) {
if (button == CONTROL_PAD_BUTTON_GUARD_HOLD ||
button == CONTROL_PAD_BUTTON_GUARD) {
if (is_training_mode() && is_operation_cpu(module_accessor)) {
if (TOGGLE_STATE == HOLD_SHIELD || TOGGLE_STATE == INFINITE_SHIELD)
return false;
@ -167,11 +180,134 @@ namespace app::lua_bind {
// call original
u64 control_module = load_module(module_accessor, 0x48);
bool (*check_button_off)(u64, int) = (bool (*)(u64, int))load_module_impl(control_module, 0x268);
bool (*check_button_off)(u64, int) =
(bool (*)(u64, int))load_module_impl(control_module, 0x268);
return check_button_off(control_module, button);
}
}
}
#define SAVE_STATE 1
#define DEFAULT 2
#define CAMERA_MOVE 3
#define POS_MOVE 4
int save_state_player_state = DEFAULT;
int save_state_cpu_state = DEFAULT;
bool save_state_move_alert = false;
float save_state_x_player = 0;
float save_state_y_player = 0;
float save_state_percent_player = 0;
float save_state_lr_player = 1.0;
int save_state_situation_kind_player = 0;
float save_state_x_cpu = 0;
float save_state_y_cpu = 0;
float save_state_percent_cpu = 0;
float save_state_lr_cpu = 1.0;
int save_state_situation_kind_cpu = 0;
int get_pad_flag_replace(u64 module_accessor) {
if (is_training_mode()) {
float* save_state_x;
float* save_state_y;
float* save_state_percent;
float* save_state_lr;
int* save_state_situation_kind;
int* save_state;
if (is_operation_cpu(module_accessor)) {
save_state_x = &save_state_x_cpu;
save_state_y = &save_state_y_cpu;
save_state_percent = &save_state_percent_cpu;
save_state_lr = &save_state_lr_cpu;
save_state_situation_kind = &save_state_situation_kind_cpu;
save_state = &save_state_cpu_state;
} else {
save_state_x = &save_state_x_player;
save_state_y = &save_state_y_player;
save_state_percent = &save_state_percent_player;
save_state_lr = &save_state_lr_player;
save_state_situation_kind = &save_state_situation_kind_player;
save_state = &save_state_player_state;
}
// Grab + Dpad up: reset state
if (ControlModule::check_button_on(module_accessor,
CONTROL_PAD_BUTTON_CATCH) &&
ControlModule::check_button_trigger(module_accessor,
CONTROL_PAD_BUTTON_APPEAL_HI)) {
if (*save_state == DEFAULT) {
save_state_player_state = CAMERA_MOVE;
save_state_cpu_state = CAMERA_MOVE;
}
}
// move to camera bounds
if (*save_state == CAMERA_MOVE) {
*save_state = POS_MOVE;
float left_right = (*save_state_x > 0) - (*save_state_x < 0);
float y_pos = 0;
if (*save_state_situation_kind == SITUATION_KIND_GROUND) y_pos = -50;
Vector3f pos = {.x = left_right * 50, .y = y_pos, .z = 0};
PostureModule::set_pos(module_accessor, &pos);
StatusModule::set_situation_kind(module_accessor, SITUATION_KIND_AIR, 0);
}
// move to correct pos
if (*save_state == POS_MOVE) {
*save_state = DEFAULT;
Vector3f pos = {.x = *save_state_x, .y = *save_state_y, .z = 0};
PostureModule::set_pos(module_accessor, &pos);
PostureModule::set_lr(module_accessor, *save_state_lr);
DamageModule::add_damage(
module_accessor, -1.0 * DamageModule::damage(module_accessor, 0), 0);
DamageModule::add_damage(module_accessor, *save_state_percent, 0);
StatusModule::set_situation_kind(module_accessor,
*save_state_situation_kind, 0);
// Doesn't work, and I don't know why yet.
/*if (*save_state_situation_kind == SITUATION_KIND_GROUND)
StatusModule::change_status_request_from_script(module_accessor,
FIGHTER_STATUS_KIND_WAIT, 1); if (save_state_situtation_kind_player ==
SITUATION_KIND_AIR)
StatusModule::change_status_request_from_script(module_accessor,
FIGHTER_STATUS_KIND_FALL, 1); if (*save_state_situation_kind ==
SITUATION_KIND_CLIFF)
StatusModule::change_status_request_from_script(module_accessor,
FIGHTER_STATUS_KIND_CLIFF_CATCH, 1);
*/
}
// Grab + Dpad up: Save state
if (ControlModule::check_button_on(module_accessor,
CONTROL_PAD_BUTTON_CATCH) &&
ControlModule::check_button_trigger(module_accessor,
CONTROL_PAD_BUTTON_APPEAL_LW)) {
save_state_player_state = SAVE_STATE;
save_state_cpu_state = SAVE_STATE;
}
if (*save_state == SAVE_STATE) {
*save_state = DEFAULT;
*save_state_x = PostureModule::pos_x(module_accessor);
*save_state_y = PostureModule::pos_y(module_accessor);
*save_state_lr = PostureModule::lr(module_accessor);
*save_state_percent = DamageModule::damage(module_accessor, 0);
*save_state_situation_kind =
StatusModule::situation_kind(module_accessor);
}
}
// call original
u64 control_module = load_module(module_accessor, 0x48);
int (*get_pad_flag)(u64) =
(int (*)(u64))load_module_impl(control_module, 0x348);
return get_pad_flag(control_module);
}
} // namespace ControlModule
} // namespace app::lua_bind
void training_mods_main() {
fighter_manager_addr = SaltySDCore_FindSymbol("_ZN3lib9SingletonIN3app14FighterManagerEE9instance_E");
@ -198,4 +334,9 @@ void training_mods_main() {
SaltySD_function_replace_sym(
"_ZN3app8lua_bind32WorkModule__get_param_float_implEPNS_26BattleObjectModuleAccessorEmm",
(u64)&WorkModule::get_param_float_replace);
// Save states
SaltySD_function_replace_sym(
"_ZN3app8lua_bind32ControlModule__get_pad_flag_implEPNS_26BattleObjectModuleAccessorE",
(u64)&ControlModule::get_pad_flag_replace);
}