mirror of
https://github.com/jugeeya/UltimateTrainingModpack.git
synced 2025-03-14 02:16:10 +00:00
begin reorganizing into training/ folder
This commit is contained in:
parent
56cfeaa74a
commit
b23c37374f
10 changed files with 516 additions and 450 deletions
|
@ -8,8 +8,8 @@ namespace app::lua_bind {
|
|||
u64 init_settings(u64,int situationKind,int,u64,int groundCliffCheckKind,bool,int,int,int,int) asm("_ZN3app8lua_bind32StatusModule__init_settings_implEPNS_26BattleObjectModuleAccessorENS_13SituationKindEijNS_20GroundCliffCheckKindEbiiii") LINKABLE;
|
||||
u64 is_changing(u64) asm("_ZN3app8lua_bind30StatusModule__is_changing_implEPNS_26BattleObjectModuleAccessorE") LINKABLE;
|
||||
u64 is_situation_changed(u64) asm("_ZN3app8lua_bind39StatusModule__is_situation_changed_implEPNS_26BattleObjectModuleAccessorE") LINKABLE;
|
||||
u64 prev_situation_kind(u64) asm("_ZN3app8lua_bind38StatusModule__prev_situation_kind_implEPNS_26BattleObjectModuleAccessorE") LINKABLE;
|
||||
u64 prev_status_kind(u64,u64) asm("_ZN3app8lua_bind35StatusModule__prev_status_kind_implEPNS_26BattleObjectModuleAccessorEj") LINKABLE;
|
||||
int prev_situation_kind(u64) asm("_ZN3app8lua_bind38StatusModule__prev_situation_kind_implEPNS_26BattleObjectModuleAccessorE") LINKABLE;
|
||||
int prev_status_kind(u64,u64) asm("_ZN3app8lua_bind35StatusModule__prev_status_kind_implEPNS_26BattleObjectModuleAccessorEj") LINKABLE;
|
||||
u64 set_keep_situation_air(u64,bool) asm("_ZN3app8lua_bind41StatusModule__set_keep_situation_air_implEPNS_26BattleObjectModuleAccessorEb") LINKABLE;
|
||||
u64 set_situation_kind(u64,int situationKind,bool) asm("_ZN3app8lua_bind37StatusModule__set_situation_kind_implEPNS_26BattleObjectModuleAccessorENS_13SituationKindEb") LINKABLE;
|
||||
u64 set_status_kind_interrupt(u64,int) asm("_ZN3app8lua_bind44StatusModule__set_status_kind_interrupt_implEPNS_26BattleObjectModuleAccessorEi") LINKABLE;
|
||||
|
|
|
@ -6,8 +6,6 @@
|
|||
#include "../../useful/useful.h"
|
||||
#include "lua_bind_hash.hpp"
|
||||
|
||||
u64 is_training_mode(void) asm("_ZN3app9smashball16is_training_modeEv") LINKABLE;
|
||||
|
||||
namespace lib {
|
||||
enum L2CVarType {
|
||||
L2C_void = 0,
|
||||
|
|
25
source/training/common.hpp
Normal file
25
source/training/common.hpp
Normal file
|
@ -0,0 +1,25 @@
|
|||
#pragma once
|
||||
#include "../acmd_wrapper.hpp"
|
||||
#include "../useful/const_value_table.h"
|
||||
#include "../taunt_toggles.h"
|
||||
|
||||
u64 fighter_manager_addr;
|
||||
|
||||
bool is_operation_cpu(u64 module_accessor) {
|
||||
int entry_id = WorkModule::get_int(module_accessor, FIGHTER_INSTANCE_WORK_ID_INT_ENTRY_ID);
|
||||
u64 fighter_information = FighterManager::get_fighter_information(LOAD64(fighter_manager_addr), entry_id);
|
||||
|
||||
return FighterInformation::is_operation_cpu(fighter_information);
|
||||
}
|
||||
|
||||
bool is_in_hitstun(u64 module_accessor) {
|
||||
int status_kind = StatusModule::status_kind(module_accessor);
|
||||
return status_kind >= FIGHTER_STATUS_KIND_DAMAGE &&
|
||||
status_kind <= FIGHTER_STATUS_KIND_DAMAGE_FALL;
|
||||
}
|
||||
|
||||
bool is_in_landing(u64 module_accessor) {
|
||||
int status_kind = StatusModule::status_kind(module_accessor);
|
||||
return status_kind >= FIGHTER_STATUS_KIND_LANDING &&
|
||||
status_kind <= FIGHTER_STATUS_KIND_LANDING_DAMAGE_LIGHT;
|
||||
}
|
36
source/training/directional_influence.hpp
Normal file
36
source/training/directional_influence.hpp
Normal file
|
@ -0,0 +1,36 @@
|
|||
#include "common.hpp"
|
||||
|
||||
namespace DirectionalInfluence {
|
||||
float get_float(u64 module_accessor, int var, bool* replace) {
|
||||
if (var == FIGHTER_STATUS_DAMAGE_WORK_FLOAT_VECOR_CORRECT_STICK_X ||
|
||||
var == FIGHTER_STATUS_DAMAGE_WORK_FLOAT_VECOR_CORRECT_STICK_Y) {
|
||||
if (is_training_mode() && is_operation_cpu(module_accessor) &&
|
||||
is_in_hitstun(module_accessor)) {
|
||||
if (DI_STATE != NONE) {
|
||||
float stick_x = 0.0, stick_y = 0.0;
|
||||
if (DI_STATE == SET_DI) {
|
||||
stick_x = DI_stick_x;
|
||||
stick_y = DI_stick_y;
|
||||
} else if (DI_STATE == DI_RANDOM_IN_AWAY) {
|
||||
// either 1.0 or -1.0
|
||||
stick_x = (float)(app::sv_math::rand(hash40("fighter"), 2) * 2.0) - 1;
|
||||
stick_y = 0.0;
|
||||
}
|
||||
|
||||
// If facing left, reverse stick x
|
||||
if (var == FIGHTER_STATUS_DAMAGE_WORK_FLOAT_VECOR_CORRECT_STICK_X) {
|
||||
*replace = true;
|
||||
return stick_x * -1 * PostureModule::lr(module_accessor);
|
||||
}
|
||||
if (var == FIGHTER_STATUS_DAMAGE_WORK_FLOAT_VECOR_CORRECT_STICK_Y) {
|
||||
*replace = true;
|
||||
return stick_y;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
*replace = false;
|
||||
return 0;
|
||||
}
|
||||
}
|
58
source/training/ledge.hpp
Normal file
58
source/training/ledge.hpp
Normal file
|
@ -0,0 +1,58 @@
|
|||
#include "common.hpp"
|
||||
|
||||
namespace Ledge {
|
||||
void enable_transition_term(u64 module_accessor, int transition_id) {
|
||||
if (ESCAPE_STATE == ESCAPE_LEDGE && is_training_mode() && is_operation_cpu(module_accessor)) {
|
||||
if (StatusModule::status_kind(module_accessor) == FIGHTER_STATUS_KIND_CLIFF_WAIT) {
|
||||
if (transition_id == FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_CLIFF_CLIMB) {
|
||||
int status = 0;
|
||||
int ledge_case = LEDGE_STATE;
|
||||
|
||||
if (LEDGE_STATE == RANDOM_LEDGE)
|
||||
ledge_case = app::sv_math::rand(hash40("fighter"), 4) + 1;
|
||||
|
||||
switch (ledge_case) {
|
||||
case NEUTRAL_LEDGE:
|
||||
status = FIGHTER_STATUS_KIND_CLIFF_CLIMB; break;
|
||||
case ROLL_LEDGE:
|
||||
status = FIGHTER_STATUS_KIND_CLIFF_ESCAPE; break;
|
||||
case JUMP_LEDGE:
|
||||
status = FIGHTER_STATUS_KIND_CLIFF_JUMP1; break;
|
||||
case ATTACK_LEDGE:
|
||||
status = FIGHTER_STATUS_KIND_CLIFF_ATTACK; break;
|
||||
}
|
||||
|
||||
StatusModule::change_status_request_from_script(module_accessor, status, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int get_command_flag_cat(u64 module_accessor, int category, int orig_flag) {
|
||||
int flag = 0;
|
||||
if (is_training_mode() && is_operation_cpu(module_accessor)) {
|
||||
if (ESCAPE_STATE == ESCAPE_LEDGE) {
|
||||
int prev_status = StatusModule::prev_status_kind(module_accessor, 1);
|
||||
if (prev_status == FIGHTER_STATUS_KIND_CLIFF_JUMP3 ||
|
||||
prev_status == FIGHTER_STATUS_KIND_CLIFF_JUMP2 ||
|
||||
prev_status == FIGHTER_STATUS_KIND_CLIFF_JUMP1) {
|
||||
flag |= FIGHTER_PAD_CMD_CAT1_FLAG_AIR_ESCAPE;
|
||||
} else if (prev_status == FIGHTER_STATUS_KIND_CLIFF_CLIMB ||
|
||||
prev_status == FIGHTER_STATUS_KIND_CLIFF_ATTACK ||
|
||||
prev_status == FIGHTER_STATUS_KIND_CLIFF_ESCAPE) {
|
||||
const int NUM_GROUND_COMMANDS = 2;
|
||||
int random_commands[NUM_GROUND_COMMANDS] = {
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_N,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ESCAPE,
|
||||
};
|
||||
|
||||
int random_cmd_index = app::sv_math::rand(hash40("fighter"), NUM_GROUND_COMMANDS);
|
||||
|
||||
flag |= random_commands[random_cmd_index];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return flag | orig_flag;
|
||||
}
|
||||
}
|
129
source/training/mash.hpp
Normal file
129
source/training/mash.hpp
Normal file
|
@ -0,0 +1,129 @@
|
|||
#include "common.hpp"
|
||||
|
||||
namespace Mash {
|
||||
int get_attack_air_kind(u64 module_accessor, bool* replace) {
|
||||
int kind = 0;
|
||||
if (is_training_mode() && is_operation_cpu(module_accessor)) {
|
||||
if (MASH_STATE == MASH_ATTACK) {
|
||||
*replace = true;
|
||||
switch (ATTACK_STATE) {
|
||||
case MASH_NAIR:
|
||||
kind = FIGHTER_COMMAND_ATTACK_AIR_KIND_N; break;
|
||||
case MASH_FAIR:
|
||||
kind = FIGHTER_COMMAND_ATTACK_AIR_KIND_F; break;
|
||||
case MASH_BAIR:
|
||||
kind = FIGHTER_COMMAND_ATTACK_AIR_KIND_B; break;
|
||||
case MASH_UPAIR:
|
||||
kind = FIGHTER_COMMAND_ATTACK_AIR_KIND_HI; break;
|
||||
case MASH_DAIR:
|
||||
kind = FIGHTER_COMMAND_ATTACK_AIR_KIND_LW; break;
|
||||
}
|
||||
return kind;
|
||||
}
|
||||
|
||||
if (MASH_STATE == MASH_RANDOM) {
|
||||
*replace = true;
|
||||
return app::sv_math::rand(hash40("fighter"), 5) + 1;
|
||||
}
|
||||
}
|
||||
|
||||
*replace = false;
|
||||
return kind;
|
||||
}
|
||||
|
||||
int get_command_flag_cat(u64 module_accessor, int category, int orig_flag) {
|
||||
int flag = 0;
|
||||
if (is_training_mode() && is_operation_cpu(module_accessor)) {
|
||||
if (is_in_hitstun(module_accessor) || is_in_landing(module_accessor)) {
|
||||
if (MASH_STATE == MASH_AIRDODGE)
|
||||
if (category == FIGHTER_PAD_COMMAND_CATEGORY1)
|
||||
flag |= FIGHTER_PAD_CMD_CAT1_FLAG_AIR_ESCAPE;
|
||||
|
||||
if (MASH_STATE == MASH_JUMP)
|
||||
if (category == FIGHTER_PAD_COMMAND_CATEGORY1)
|
||||
flag |= FIGHTER_PAD_CMD_CAT1_FLAG_JUMP_BUTTON;
|
||||
|
||||
if (MASH_STATE == MASH_ATTACK)
|
||||
if (category == FIGHTER_PAD_COMMAND_CATEGORY1) {
|
||||
switch (ATTACK_STATE) {
|
||||
case MASH_NAIR:
|
||||
case MASH_FAIR:
|
||||
case MASH_BAIR:
|
||||
case MASH_UPAIR:
|
||||
case MASH_DAIR:
|
||||
flag |= FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_N;
|
||||
break;
|
||||
case MASH_NEUTRAL_B:
|
||||
flag |= FIGHTER_PAD_CMD_CAT1_FLAG_SPECIAL_N;
|
||||
break;
|
||||
case MASH_SIDE_B:
|
||||
flag |= FIGHTER_PAD_CMD_CAT1_FLAG_SPECIAL_S;
|
||||
break;
|
||||
case MASH_UP_B:
|
||||
flag |= FIGHTER_PAD_CMD_CAT1_FLAG_SPECIAL_HI;
|
||||
break;
|
||||
case MASH_DOWN_B:
|
||||
flag |= FIGHTER_PAD_CMD_CAT1_FLAG_SPECIAL_LW;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (MASH_STATE == MASH_RANDOM)
|
||||
if (category == FIGHTER_PAD_COMMAND_CATEGORY1) {
|
||||
int situation_kind =
|
||||
StatusModule::situation_kind(module_accessor);
|
||||
|
||||
if (situation_kind == SITUATION_KIND_AIR) {
|
||||
const int NUM_AIR_COMMANDS = 11;
|
||||
int random_commands[NUM_AIR_COMMANDS] = {
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_AIR_ESCAPE,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_JUMP_BUTTON,
|
||||
// one for each aerial
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_N,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_N,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_N,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_N,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_N,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_SPECIAL_N,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_SPECIAL_S,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_SPECIAL_HI,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_SPECIAL_LW,
|
||||
};
|
||||
|
||||
int random_cmd_index = app::sv_math::rand(
|
||||
hash40("fighter"), NUM_AIR_COMMANDS);
|
||||
|
||||
flag |= random_commands[random_cmd_index];
|
||||
} else if (situation_kind == SITUATION_KIND_GROUND) {
|
||||
const int NUM_GROUND_COMMANDS = 16;
|
||||
int random_commands[NUM_GROUND_COMMANDS] = {
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_JUMP_BUTTON,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_N,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_S3,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_HI3,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_LW3,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_S4,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_HI4,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_LW4,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_SPECIAL_HI,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_SPECIAL_S,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_SPECIAL_HI,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_SPECIAL_LW,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_CATCH,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ESCAPE,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ESCAPE_F,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ESCAPE_B,
|
||||
};
|
||||
|
||||
int random_cmd_index = app::sv_math::rand(
|
||||
hash40("fighter"), NUM_GROUND_COMMANDS);
|
||||
|
||||
flag |= random_commands[random_cmd_index];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return flag | orig_flag;
|
||||
}
|
||||
}
|
112
source/training/save_states.hpp
Normal file
112
source/training/save_states.hpp
Normal file
|
@ -0,0 +1,112 @@
|
|||
#pragma once
|
||||
#include "common.hpp"
|
||||
|
||||
#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;
|
||||
|
||||
void save_states(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(module_accessor, FIGHTER_STATUS_KIND_WAIT, 0);
|
||||
else if (*save_state_situation_kind == SITUATION_KIND_AIR)
|
||||
StatusModule::change_status_request(module_accessor, FIGHTER_STATUS_KIND_FALL, 0);
|
||||
else if (*save_state_situation_kind == SITUATION_KIND_CLIFF)
|
||||
StatusModule::change_status_request(module_accessor, FIGHTER_STATUS_KIND_CLIFF_CATCH, 0);
|
||||
*/
|
||||
}
|
||||
|
||||
// Grab + Dpad down: 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);
|
||||
}
|
||||
}
|
||||
}
|
120
source/training/selection.hpp
Normal file
120
source/training/selection.hpp
Normal file
|
@ -0,0 +1,120 @@
|
|||
#include "common.hpp"
|
||||
|
||||
extern int vsnprintf(char* s, size_t maxlen, const char* format, va_list arg) LINKABLE;
|
||||
|
||||
int vsnprintf_intercept(char* s, size_t maxlen, const char* format, va_list arg) {
|
||||
if (strcmp(format, "mel_training_help_shift0") == 0) {
|
||||
TOGGLE_STATE = MASH_TOGGLES;
|
||||
if (MASH_STATE == NONE)
|
||||
format = "mel_shortmsg_1";
|
||||
if (MASH_STATE == MASH_AIRDODGE)
|
||||
format = "mel_shortmsg_2";
|
||||
if (MASH_STATE == MASH_JUMP)
|
||||
format = "mel_shortmsg_3";
|
||||
if (MASH_STATE == MASH_RANDOM)
|
||||
format = "mel_shortmsg_4";
|
||||
if (MASH_STATE == MASH_ATTACK)
|
||||
format = "mel_shortmsg_5";
|
||||
} else if (strcmp(format, "mel_training_help_shift1") == 0) {
|
||||
TOGGLE_STATE = ESCAPE_TOGGLES;
|
||||
if (ESCAPE_STATE == NONE)
|
||||
format = "mel_shortmsg_6";
|
||||
if (ESCAPE_STATE == ESCAPE_LEDGE)
|
||||
format = "mel_shortmsg_7";
|
||||
} else if (strcmp(format, "mel_training_help_shift2") == 0) {
|
||||
TOGGLE_STATE = SHIELD_TOGGLES;
|
||||
if (SHIELD_STATE == NONE)
|
||||
format = "mel_shortmsg_8";
|
||||
if (SHIELD_STATE == SHIELD_INFINITE)
|
||||
format = "mel_shortmsg_9";
|
||||
if (SHIELD_STATE == SHIELD_HOLD)
|
||||
format = "mel_shortmsg_10";
|
||||
}
|
||||
|
||||
if (strcmp(format, "mel_training_shift0") == 0)
|
||||
format = "mel_info_fighter_shulk_special_00"; // SMASH
|
||||
else if (strcmp(format, "mel_training_shift1") == 0)
|
||||
format = "mel_info_fighter_shulk_special_03"; // SPEED
|
||||
else if (strcmp(format, "mel_training_shift2") == 0)
|
||||
format = "mel_info_fighter_shulk_special_02"; // SHIELD
|
||||
|
||||
return vsnprintf(s, maxlen, format, arg);
|
||||
}
|
||||
|
||||
namespace Selection {
|
||||
void menu_replace() {
|
||||
SaltySDCore_ReplaceImport("vsnprintf", (void*)vsnprintf_intercept);
|
||||
}
|
||||
|
||||
void change_motion(u64 module_accessor, u64 motion_kind) {
|
||||
if (motion_kind == hash40("appeal_lw_l") || motion_kind == hash40("appeal_lw_r")) {
|
||||
if (is_training_mode()) {
|
||||
if (TOGGLE_STATE == MASH_TOGGLES) {
|
||||
MASH_STATE = (MASH_STATE + 1) % NUM_MASH_STATES;
|
||||
const char* toggle_strings[NUM_MASH_STATES] =
|
||||
{"NONE", "AIRDODGE", "JUMP", "RANDOM", "ATTACK"};
|
||||
|
||||
print_string(module_accessor, toggle_strings[MASH_STATE]);
|
||||
}
|
||||
|
||||
if (TOGGLE_STATE == ESCAPE_TOGGLES) {
|
||||
ESCAPE_STATE = (ESCAPE_STATE + 1) % NUM_ESCAPE_STATES;
|
||||
const char* toggle_strings[NUM_ESCAPE_STATES] =
|
||||
{"NONE", "LEDGE"};
|
||||
|
||||
print_string(module_accessor, toggle_strings[ESCAPE_STATE]);
|
||||
}
|
||||
|
||||
if (TOGGLE_STATE == SHIELD_TOGGLES) {
|
||||
SHIELD_STATE = (SHIELD_STATE + 1) % NUM_SHIELD_STATES;
|
||||
const char* toggle_strings[NUM_SHIELD_STATES] =
|
||||
{"NONE", "INFINITE", "HOLD"};
|
||||
|
||||
print_string(module_accessor, toggle_strings[SHIELD_STATE]);
|
||||
}
|
||||
}
|
||||
} else if (motion_kind == hash40("appeal_s_l") || motion_kind == hash40("appeal_s_r")) {
|
||||
if (is_training_mode()) {
|
||||
if (TOGGLE_STATE == ESCAPE_TOGGLES &&
|
||||
ESCAPE_STATE == ESCAPE_LEDGE) {
|
||||
LEDGE_STATE = (LEDGE_STATE + 1) % NUM_LEDGE_STATES;
|
||||
const char* LEDGE_strings[NUM_LEDGE_STATES] =
|
||||
{"RANDOM", "NORMAL", "ROLL", "JUMP", "ATTACK"};
|
||||
|
||||
print_string(module_accessor, LEDGE_strings[LEDGE_STATE]);
|
||||
} else if (MASH_STATE == MASH_ATTACK) {
|
||||
ATTACK_STATE = (ATTACK_STATE + 1) % NUM_ATTACK_STATES;
|
||||
const char* ATTACK_strings[NUM_ATTACK_STATES] =
|
||||
{"NAIR", "FAIR", "BAIR", "UPAIR", "DAIR",
|
||||
"NEUTRAL B", "SIDE B", "UP B", "DOWN B"};
|
||||
|
||||
print_string(module_accessor,
|
||||
ATTACK_strings[ATTACK_STATE]);
|
||||
} else {
|
||||
if (ControlModule::check_button_on(module_accessor, CONTROL_PAD_BUTTON_APPEAL_S_L)) {
|
||||
DI_STATE = DI_STATE == NONE ? DI_RANDOM_IN_AWAY : NONE;
|
||||
} else {
|
||||
DI_STATE = DI_STATE == NONE ? SET_DI : NONE;
|
||||
}
|
||||
|
||||
const char* DI_strings[NUM_DI_STATES] =
|
||||
{"NONE", "SET_DI", "RANDOM\nIN AWAY"};
|
||||
|
||||
print_string(module_accessor, DI_strings[DI_STATE]);
|
||||
if (DI_STATE == SET_DI) {
|
||||
DI_stick_x = ControlModule::get_stick_x(module_accessor);
|
||||
DI_stick_y = ControlModule::get_stick_y(module_accessor);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if (motion_kind == hash40("appeal_hi_l") || motion_kind == hash40("appeal_hi_r")) {
|
||||
if (is_training_mode()) {
|
||||
HITBOX_VIS = !HITBOX_VIS;
|
||||
if (HITBOX_VIS)
|
||||
print_string(module_accessor, "HITBOX\nVIS");
|
||||
else
|
||||
print_string(module_accessor, "NO\nHITBOX");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -17,65 +17,29 @@
|
|||
#include "saltysd/saltysd_helper.hpp"
|
||||
#include "taunt_toggles.h"
|
||||
|
||||
#include "training/common.hpp"
|
||||
#include "training/save_states.hpp"
|
||||
#include "training/directional_influence.hpp"
|
||||
#include "training/ledge.hpp"
|
||||
#include "training/mash.hpp"
|
||||
#include "training/selection.hpp"
|
||||
|
||||
using namespace lib;
|
||||
using namespace app::lua_bind;
|
||||
using namespace app::sv_animcmd;
|
||||
|
||||
u64 fighter_manager_addr;
|
||||
|
||||
bool is_operation_cpu(u64 module_accessor) {
|
||||
int entry_id = WorkModule::get_int(module_accessor, FIGHTER_INSTANCE_WORK_ID_INT_ENTRY_ID);
|
||||
u64 fighter_information = FighterManager::get_fighter_information(LOAD64(fighter_manager_addr), entry_id);
|
||||
|
||||
return FighterInformation::is_operation_cpu(fighter_information);
|
||||
}
|
||||
|
||||
bool is_in_hitstun(u64 module_accessor) {
|
||||
int status_kind = StatusModule::status_kind(module_accessor);
|
||||
return status_kind >= FIGHTER_STATUS_KIND_DAMAGE &&
|
||||
status_kind <= FIGHTER_STATUS_KIND_DAMAGE_FALL;
|
||||
}
|
||||
|
||||
bool is_in_landing(u64 module_accessor) {
|
||||
int status_kind = StatusModule::status_kind(module_accessor);
|
||||
return status_kind >= FIGHTER_STATUS_KIND_LANDING &&
|
||||
status_kind <= FIGHTER_STATUS_KIND_LANDING_DAMAGE_LIGHT;
|
||||
}
|
||||
|
||||
namespace app::lua_bind {
|
||||
namespace WorkModule {
|
||||
// Force DI
|
||||
float get_float_replace(u64 module_accessor, int var) {
|
||||
bool replace;
|
||||
float ret = DirectionalInfluence::get_float(module_accessor, var, &replace);
|
||||
if (replace)
|
||||
return ret;
|
||||
|
||||
u64 work_module = load_module(module_accessor, 0x50);
|
||||
float (*get_float)(u64, int) = (float (*)(u64, int)) load_module_impl(work_module, 0x58);
|
||||
|
||||
float ret_val = get_float(work_module, var);
|
||||
|
||||
if (var == FIGHTER_STATUS_DAMAGE_WORK_FLOAT_VECOR_CORRECT_STICK_X ||
|
||||
var == FIGHTER_STATUS_DAMAGE_WORK_FLOAT_VECOR_CORRECT_STICK_Y) {
|
||||
if (is_training_mode() && is_operation_cpu(module_accessor) &&
|
||||
is_in_hitstun(module_accessor)) {
|
||||
if (DI_STATE != NONE) {
|
||||
float stick_x = 0.0, stick_y = 0.0;
|
||||
if (DI_STATE == SET_DI) {
|
||||
stick_x = DI_stick_x;
|
||||
stick_y = DI_stick_y;
|
||||
} else if (DI_STATE == DI_RANDOM_IN_AWAY) {
|
||||
// either 1.0 or -1.0
|
||||
stick_x = (float)(app::sv_math::rand(hash40("fighter"), 2) * 2.0) - 1;
|
||||
stick_y = 0.0;
|
||||
}
|
||||
|
||||
// If facing left, reverse stick x
|
||||
if (var == FIGHTER_STATUS_DAMAGE_WORK_FLOAT_VECOR_CORRECT_STICK_X)
|
||||
return stick_x * -1 * PostureModule::lr(module_accessor);
|
||||
if (var == FIGHTER_STATUS_DAMAGE_WORK_FLOAT_VECOR_CORRECT_STICK_Y)
|
||||
return stick_y;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return ret_val;
|
||||
return get_float(work_module, var);
|
||||
}
|
||||
|
||||
float get_param_float_replace(u64 module_accessor, u64 param_type,
|
||||
|
@ -97,200 +61,39 @@ float get_param_float_replace(u64 module_accessor, u64 param_type,
|
|||
return get_param_float(work_module, param_type, param_hash);
|
||||
}
|
||||
|
||||
// Force ledge option
|
||||
u64 enable_transition_term_replace(u64 module_accessor, int transition_id) {
|
||||
if (ESCAPE_STATE == ESCAPE_LEDGE && is_training_mode() && is_operation_cpu(module_accessor)) {
|
||||
if (StatusModule::status_kind(module_accessor) == FIGHTER_STATUS_KIND_CLIFF_WAIT) {
|
||||
if (transition_id == FIGHTER_STATUS_TRANSITION_TERM_ID_CONT_CLIFF_CLIMB) {
|
||||
int status = 0;
|
||||
int ledge_case = LEDGE_STATE;
|
||||
void enable_transition_term_replace(u64 module_accessor, int transition_id) {
|
||||
Ledge::enable_transition_term(module_accessor, transition_id);
|
||||
|
||||
if (LEDGE_STATE == RANDOM_LEDGE)
|
||||
ledge_case = app::sv_math::rand(hash40("fighter"), 4) + 1;
|
||||
|
||||
switch (ledge_case) {
|
||||
case NEUTRAL_LEDGE:
|
||||
status = FIGHTER_STATUS_KIND_CLIFF_CLIMB; break;
|
||||
case ROLL_LEDGE:
|
||||
status = FIGHTER_STATUS_KIND_CLIFF_ESCAPE; break;
|
||||
case JUMP_LEDGE:
|
||||
status = FIGHTER_STATUS_KIND_CLIFF_JUMP1; break;
|
||||
case ATTACK_LEDGE:
|
||||
status = FIGHTER_STATUS_KIND_CLIFF_ATTACK; break;
|
||||
}
|
||||
|
||||
StatusModule::change_status_request_from_script(module_accessor,
|
||||
status, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// call original WorkModule::enable_transition_term_group_impl
|
||||
u64 work_module = load_module(module_accessor, 0x50);
|
||||
u64 (*enable_transition_term)(u64, int) =
|
||||
(u64(*)(u64, int))(load_module_impl(work_module, 0x188));
|
||||
|
||||
return enable_transition_term(work_module, transition_id);
|
||||
void (*enable_transition_term)(u64, int) = (void (*) (u64, int)) load_module_impl(work_module, 0x188);
|
||||
enable_transition_term(work_module, transition_id);
|
||||
}
|
||||
} // namespace WorkModule
|
||||
|
||||
namespace ControlModule {
|
||||
int get_attack_air_kind_replace(u64 module_accessor) {
|
||||
// call original
|
||||
bool replace;
|
||||
int 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);
|
||||
int kind = get_attack_air_kind(control_module);
|
||||
|
||||
if (is_training_mode() && is_operation_cpu(module_accessor)) {
|
||||
if (MASH_STATE == MASH_ATTACK) {
|
||||
switch (ATTACK_STATE) {
|
||||
case MASH_NAIR:
|
||||
kind = FIGHTER_COMMAND_ATTACK_AIR_KIND_N;
|
||||
break;
|
||||
case MASH_FAIR:
|
||||
kind = FIGHTER_COMMAND_ATTACK_AIR_KIND_F;
|
||||
break;
|
||||
case MASH_BAIR:
|
||||
kind = FIGHTER_COMMAND_ATTACK_AIR_KIND_B;
|
||||
break;
|
||||
case MASH_UPAIR:
|
||||
kind = FIGHTER_COMMAND_ATTACK_AIR_KIND_HI;
|
||||
break;
|
||||
case MASH_DAIR:
|
||||
kind = FIGHTER_COMMAND_ATTACK_AIR_KIND_LW;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (MASH_STATE == MASH_RANDOM) {
|
||||
kind = app::sv_math::rand(hash40("fighter"), 5) + 1;
|
||||
}
|
||||
}
|
||||
|
||||
return kind;
|
||||
return get_attack_air_kind(control_module);
|
||||
}
|
||||
|
||||
void save_states(u64);
|
||||
|
||||
int get_command_flag_cat_replace(u64 module_accessor, int category) {
|
||||
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);
|
||||
|
||||
//save_states(module_accessor);
|
||||
|
||||
// Pause Effect AnimCMD if hitbox visualization is active
|
||||
MotionAnimcmdModule::set_sleep_effect(module_accessor, is_training_mode() && HITBOX_VIS);
|
||||
|
||||
if (is_training_mode() && is_operation_cpu(module_accessor)) {
|
||||
if (is_in_hitstun(module_accessor) || is_in_landing(module_accessor)) {
|
||||
if (MASH_STATE == MASH_AIRDODGE)
|
||||
if (category == FIGHTER_PAD_COMMAND_CATEGORY1)
|
||||
flag |= FIGHTER_PAD_CMD_CAT1_FLAG_AIR_ESCAPE;
|
||||
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);
|
||||
|
||||
if (MASH_STATE == MASH_JUMP)
|
||||
if (category == FIGHTER_PAD_COMMAND_CATEGORY1)
|
||||
flag |= FIGHTER_PAD_CMD_CAT1_FLAG_JUMP_BUTTON;
|
||||
|
||||
if (MASH_STATE == MASH_ATTACK)
|
||||
if (category == FIGHTER_PAD_COMMAND_CATEGORY1) {
|
||||
switch (ATTACK_STATE) {
|
||||
case MASH_NAIR:
|
||||
case MASH_FAIR:
|
||||
case MASH_BAIR:
|
||||
case MASH_UPAIR:
|
||||
case MASH_DAIR:
|
||||
flag |= FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_N;
|
||||
break;
|
||||
case MASH_NEUTRAL_B:
|
||||
flag |= FIGHTER_PAD_CMD_CAT1_FLAG_SPECIAL_N;
|
||||
break;
|
||||
case MASH_SIDE_B:
|
||||
flag |= FIGHTER_PAD_CMD_CAT1_FLAG_SPECIAL_S;
|
||||
break;
|
||||
case MASH_UP_B:
|
||||
flag |= FIGHTER_PAD_CMD_CAT1_FLAG_SPECIAL_HI;
|
||||
break;
|
||||
case MASH_DOWN_B:
|
||||
flag |= FIGHTER_PAD_CMD_CAT1_FLAG_SPECIAL_LW;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (MASH_STATE == MASH_RANDOM)
|
||||
if (category == FIGHTER_PAD_COMMAND_CATEGORY1) {
|
||||
int situation_kind =
|
||||
StatusModule::situation_kind(module_accessor);
|
||||
|
||||
if (situation_kind == SITUATION_KIND_AIR) {
|
||||
const int NUM_AIR_COMMANDS = 11;
|
||||
int random_commands[NUM_AIR_COMMANDS] = {
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_AIR_ESCAPE,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_JUMP_BUTTON,
|
||||
// one for each aerial
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_N,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_N,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_N,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_N,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_N,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_SPECIAL_N,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_SPECIAL_S,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_SPECIAL_HI,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_SPECIAL_LW,
|
||||
};
|
||||
|
||||
int random_cmd_index = app::sv_math::rand(
|
||||
hash40("fighter"), NUM_AIR_COMMANDS);
|
||||
|
||||
flag |= random_commands[random_cmd_index];
|
||||
} else if (situation_kind == SITUATION_KIND_GROUND) {
|
||||
const int NUM_GROUND_COMMANDS = 16;
|
||||
int random_commands[NUM_GROUND_COMMANDS] = {
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_JUMP_BUTTON,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_N,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_S3,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_HI3,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_LW3,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_S4,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_HI4,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_LW4,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_SPECIAL_HI,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_SPECIAL_S,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_SPECIAL_HI,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_SPECIAL_LW,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_CATCH,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ESCAPE,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ESCAPE_F,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ESCAPE_B,
|
||||
};
|
||||
|
||||
int random_cmd_index = app::sv_math::rand(
|
||||
hash40("fighter"), NUM_GROUND_COMMANDS);
|
||||
|
||||
flag |= random_commands[random_cmd_index];
|
||||
}
|
||||
}
|
||||
|
||||
if (ESCAPE_STATE == ESCAPE_LEDGE) {
|
||||
int prev_status = StatusModule::prev_status_kind(module_accessor, 1);
|
||||
if (prev_status == FIGHTER_STATUS_KIND_CLIFF_JUMP3) {
|
||||
flag |= FIGHTER_PAD_CMD_CAT1_FLAG_AIR_ESCAPE;
|
||||
} else if (prev_status == FIGHTER_STATUS_KIND_CLIFF_CLIMB ||
|
||||
prev_status == FIGHTER_STATUS_KIND_CLIFF_ATTACK ||
|
||||
prev_status == FIGHTER_STATUS_KIND_CLIFF_ESCAPE) {
|
||||
const int NUM_GROUND_COMMANDS = 2;
|
||||
int random_commands[NUM_GROUND_COMMANDS] = {
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ATTACK_N,
|
||||
FIGHTER_PAD_CMD_CAT1_FLAG_ESCAPE,
|
||||
};
|
||||
|
||||
int random_cmd_index = app::sv_math::rand(hash40("fighter"), NUM_GROUND_COMMANDS);
|
||||
|
||||
flag |= random_commands[random_cmd_index];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
flag = Mash::get_command_flag_cat(module_accessor, category, flag);
|
||||
flag = Ledge::get_command_flag_cat(module_accessor, category, flag);
|
||||
|
||||
return flag;
|
||||
}
|
||||
|
@ -330,236 +133,20 @@ bool check_button_off_replace(u64 module_accessor, int button) {
|
|||
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;
|
||||
|
||||
void save_states(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(module_accessor, FIGHTER_STATUS_KIND_WAIT, 0);
|
||||
else if (*save_state_situation_kind == SITUATION_KIND_AIR)
|
||||
StatusModule::change_status_request(module_accessor, FIGHTER_STATUS_KIND_FALL, 0);
|
||||
else if (*save_state_situation_kind == SITUATION_KIND_CLIFF)
|
||||
StatusModule::change_status_request(module_accessor, FIGHTER_STATUS_KIND_CLIFF_CATCH, 0);
|
||||
*/
|
||||
}
|
||||
|
||||
// Grab + Dpad down: 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);
|
||||
}
|
||||
}
|
||||
}
|
||||
} // namespace ControlModule
|
||||
} // namespace app::lua_bind
|
||||
|
||||
extern int vsnprintf(char* s, size_t maxlen, const char* format, va_list arg) LINKABLE;
|
||||
|
||||
int vsnprintf_intercept(char* s, size_t maxlen, const char* format, va_list arg) {
|
||||
if (strcmp(format, "mel_training_help_shift0") == 0) {
|
||||
TOGGLE_STATE = MASH_TOGGLES;
|
||||
if (MASH_STATE == NONE)
|
||||
format = "mel_shortmsg_1";
|
||||
if (MASH_STATE == MASH_AIRDODGE)
|
||||
format = "mel_shortmsg_2";
|
||||
if (MASH_STATE == MASH_JUMP)
|
||||
format = "mel_shortmsg_3";
|
||||
if (MASH_STATE == MASH_RANDOM)
|
||||
format = "mel_shortmsg_4";
|
||||
if (MASH_STATE == MASH_ATTACK)
|
||||
format = "mel_shortmsg_5";
|
||||
} else if (strcmp(format, "mel_training_help_shift1") == 0) {
|
||||
TOGGLE_STATE = ESCAPE_TOGGLES;
|
||||
if (ESCAPE_STATE == NONE)
|
||||
format = "mel_shortmsg_6";
|
||||
if (ESCAPE_STATE == ESCAPE_LEDGE)
|
||||
format = "mel_shortmsg_7";
|
||||
} else if (strcmp(format, "mel_training_help_shift2") == 0) {
|
||||
TOGGLE_STATE = SHIELD_TOGGLES;
|
||||
if (SHIELD_STATE == NONE)
|
||||
format = "mel_shortmsg_8";
|
||||
if (SHIELD_STATE == SHIELD_INFINITE)
|
||||
format = "mel_shortmsg_9";
|
||||
if (SHIELD_STATE == SHIELD_HOLD)
|
||||
format = "mel_shortmsg_10";
|
||||
}
|
||||
|
||||
return vsnprintf(s, maxlen, format, arg);
|
||||
}
|
||||
|
||||
namespace app::lua_bind::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) {
|
||||
if (motion_kind == hash40("appeal_lw_l") || motion_kind == hash40("appeal_lw_r")) {
|
||||
if (is_training_mode()) {
|
||||
if (TOGGLE_STATE == MASH_TOGGLES) {
|
||||
MASH_STATE = (MASH_STATE + 1) % NUM_MASH_STATES;
|
||||
const char* toggle_strings[NUM_MASH_STATES] =
|
||||
{"NONE", "AIRDODGE", "JUMP", "RANDOM", "ATTACK"};
|
||||
Selection::change_motion(module_accessor, motion_kind);
|
||||
|
||||
print_string(module_accessor, toggle_strings[MASH_STATE]);
|
||||
}
|
||||
|
||||
if (TOGGLE_STATE == ESCAPE_TOGGLES) {
|
||||
ESCAPE_STATE = (ESCAPE_STATE + 1) % NUM_ESCAPE_STATES;
|
||||
const char* toggle_strings[NUM_ESCAPE_STATES] =
|
||||
{"NONE", "LEDGE"};
|
||||
|
||||
print_string(module_accessor, toggle_strings[ESCAPE_STATE]);
|
||||
}
|
||||
|
||||
if (TOGGLE_STATE == SHIELD_TOGGLES) {
|
||||
SHIELD_STATE = (SHIELD_STATE + 1) % NUM_SHIELD_STATES;
|
||||
const char* toggle_strings[NUM_SHIELD_STATES] =
|
||||
{"NONE", "INFINITE", "HOLD"};
|
||||
|
||||
print_string(module_accessor, toggle_strings[SHIELD_STATE]);
|
||||
}
|
||||
}
|
||||
} else if (motion_kind == hash40("appeal_s_l") || motion_kind == hash40("appeal_s_r")) {
|
||||
if (is_training_mode()) {
|
||||
if (TOGGLE_STATE == ESCAPE_TOGGLES &&
|
||||
ESCAPE_STATE == ESCAPE_LEDGE) {
|
||||
LEDGE_STATE = (LEDGE_STATE + 1) % NUM_LEDGE_STATES;
|
||||
const char* LEDGE_strings[NUM_LEDGE_STATES] =
|
||||
{"RANDOM", "NORMAL", "ROLL", "JUMP", "ATTACK"};
|
||||
|
||||
print_string(module_accessor, LEDGE_strings[LEDGE_STATE]);
|
||||
} else if (MASH_STATE == MASH_ATTACK) {
|
||||
ATTACK_STATE = (ATTACK_STATE + 1) % NUM_ATTACK_STATES;
|
||||
const char* ATTACK_strings[NUM_ATTACK_STATES] =
|
||||
{"NAIR", "FAIR", "BAIR", "UPAIR", "DAIR",
|
||||
"NEUTRAL B", "SIDE B", "UP B", "DOWN B"};
|
||||
|
||||
print_string(module_accessor,
|
||||
ATTACK_strings[ATTACK_STATE]);
|
||||
} else {
|
||||
if (ControlModule::check_button_on(module_accessor, CONTROL_PAD_BUTTON_APPEAL_S_L)) {
|
||||
DI_STATE = DI_STATE == NONE ? DI_RANDOM_IN_AWAY : NONE;
|
||||
} else {
|
||||
DI_STATE = DI_STATE == NONE ? SET_DI : NONE;
|
||||
}
|
||||
|
||||
const char* DI_strings[NUM_DI_STATES] =
|
||||
{"NONE", "SET_DI", "RANDOM\nIN AWAY"};
|
||||
|
||||
print_string(module_accessor, DI_strings[DI_STATE]);
|
||||
if (DI_STATE == SET_DI) {
|
||||
DI_stick_x = ControlModule::get_stick_x(module_accessor);
|
||||
DI_stick_y = ControlModule::get_stick_y(module_accessor);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if (motion_kind == hash40("appeal_hi_l") || motion_kind == hash40("appeal_hi_r")) {
|
||||
if (is_training_mode()) {
|
||||
HITBOX_VIS = !HITBOX_VIS;
|
||||
if (HITBOX_VIS)
|
||||
print_string(module_accessor, "HITBOX\nVIS");
|
||||
else
|
||||
print_string(module_accessor, "NO\nHITBOX");
|
||||
}
|
||||
}
|
||||
|
||||
// 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 app::lua_bind::MotionModule
|
||||
|
||||
|
@ -601,8 +188,7 @@ void training_mods_main() {
|
|||
"_ZN3app8lua_bind39ControlModule__get_attack_air_kind_implEPNS_26BattleObjectModuleAccessorE",
|
||||
(u64)&ControlModule::get_attack_air_kind_replace);
|
||||
|
||||
// Menu replacements
|
||||
SaltySDCore_ReplaceImport("vsnprintf", (void*)vsnprintf_intercept);
|
||||
Selection::menu_replace();
|
||||
}
|
||||
|
||||
#endif // TRAINING_MODS_H
|
||||
|
|
|
@ -13,6 +13,8 @@
|
|||
{char log_buf[0x200]; snprintf(log_buf, 0x200, __VA_ARGS__); \
|
||||
svcOutputDebugString(log_buf, strlen(log_buf));}
|
||||
|
||||
u64 is_training_mode(void) asm("_ZN3app9smashball16is_training_modeEv") LINKABLE;
|
||||
|
||||
typedef struct Hash40 {
|
||||
uint64_t hash : 40;
|
||||
} Hash40;
|
||||
|
|
Loading…
Add table
Reference in a new issue