diff --git a/source/hitbox_visualizer.hpp b/source/hitbox_visualizer.hpp
index 37ce1e6..3c579ea 100644
--- a/source/hitbox_visualizer.hpp
+++ b/source/hitbox_visualizer.hpp
@@ -12,10 +12,14 @@
#include "useful/const_value_table.h"
#include "taunt_toggles.h"
+#include "useful/raygun_printer.hpp"
+
using namespace lib;
using namespace app::lua_bind;
using namespace app::sv_animcmd;
+u64 effect_manager_addr;
+
void (*AttackModule_set_attack_lua_state)(u64, u64);
u64 Catch_jumpback;
@@ -71,6 +75,25 @@ namespace app::lua_bind::GrabModule {
}
}
+Vector3f EffectModule_last_get_scale_w(u64 effect_module)
+{
+ Vector3f ret;
+ uint handle = *(uint *)(effect_module + 36);
+ if ( handle && (signed int)handle >= 1 )
+ {
+ u64 effect = LOAD64(effect_manager_addr) + 768 * (handle >> 24);
+ bool is_exist_effect = effect && *(uint *)(effect + 4) == handle;
+ if ( is_exist_effect )
+ {
+ float* scale = (float*)(effect + 256);
+ ret.x = *(float *)(scale);
+ ret.y = *(float *)(scale+1);
+ ret.z = *(float *)(scale+2);
+ }
+ }
+ return ret;
+}
+
void generate_hitbox_effects(L2CAgent *l2c_agent, L2CValue *bone, L2CValue *size,
L2CValue *x, L2CValue *y, L2CValue *z, L2CValue *x2, L2CValue *y2, L2CValue *z2,
Vector3f *color) {
@@ -248,6 +271,8 @@ namespace app::sv_animcmd {
}
void hitbox_vis_main() {
+ effect_manager_addr = SaltySDCore_FindSymbol("_ZN3lib9SingletonINS_13EffectManagerEE9instance_E");
+
AttackModule_set_attack_lua_state = (void (*)(u64, u64))SaltySDCore_FindSymbol("_ZN3app10sv_animcmd6ATTACKEP9lua_State") + 0xD0 - 0x70;
Catch_jumpback = SaltySDCore_FindSymbol("_ZN3app10sv_animcmd5CATCHEP9lua_State") + (4*4);
SaltySD_function_replace_sym(
diff --git a/source/script_replacement.hpp b/source/script_replacement.hpp
index 7b2df06..5e19837 100644
--- a/source/script_replacement.hpp
+++ b/source/script_replacement.hpp
@@ -43,16 +43,16 @@ u64 appeal_lw_replace(L2CAgent* l2c_agent, void* variadic) {
if (acmd.is_excute()) {
if (is_training_mode()) {
TOGGLE_STATE = (TOGGLE_STATE + 1) % NUM_TOGGLE_STATES;
- if (TOGGLE_STATE == MASH_AIRDODGE)
- print_string(acmd.module_accessor, "MASH\nAIRDODGE");
- else if (TOGGLE_STATE == MASH_JUMP)
- print_string(acmd.module_accessor, "MASH\nJUMP");
- else if (TOGGLE_STATE == HOLD_SHIELD)
- print_string(acmd.module_accessor, "HOLD\nSHIELD");
- else if (TOGGLE_STATE == INFINITE_SHIELD)
- print_string(acmd.module_accessor, "INFINITE\nSHIELD");
- else
- print_string(acmd.module_accessor, "NONE");
+ const char* toggle_strings[NUM_TOGGLE_STATES] = {
+ "NONE",
+ "MASH\nAIRDODGE",
+ "MASH\nJUMP",
+ "INFINITE\nSHIELD",
+ "HOLD\nSHIELD",
+ "LEDGE\nOPTION"
+ };
+
+ print_string(acmd.module_accessor, toggle_strings[TOGGLE_STATE]);
}
}
@@ -83,8 +83,19 @@ u64 appeal_s_replace(L2CAgent* l2c_agent, void* variadic) {
if (acmd.is_excute()) {
if (is_training_mode()) {
DI_STATE = (DI_STATE + 1) % NUM_DI_STATES;
- const char* DI_strings[NUM_DI_STATES] = {"NONE", "AWAY", "DOWN AWAY", "DOWN", "DOWN IN",
- "IN", "UP IN", "UP", "UP AWAY", "RANDOM\nIN AWAY"};
+ const char* DI_strings[NUM_DI_STATES] = {
+ "NONE",
+ "AWAY",
+ "DOWN AWAY",
+ "DOWN",
+ "DOWN IN",
+ "IN",
+ "UP IN",
+ "UP",
+ "UP AWAY",
+ "RANDOM\nIN AWAY"
+ };
+
print_string(acmd.module_accessor, DI_strings[DI_STATE]);
}
}
diff --git a/source/taunt_toggles.h b/source/taunt_toggles.h
index e748942..ca3f00c 100644
--- a/source/taunt_toggles.h
+++ b/source/taunt_toggles.h
@@ -19,8 +19,9 @@ int DI_STATE = 0;
#define MASH_JUMP 2
#define INFINITE_SHIELD 3
#define HOLD_SHIELD 4
+#define LEDGE_OPTION 5
int TOGGLE_STATE = 0;
-#define NUM_TOGGLE_STATES 5
+#define NUM_TOGGLE_STATES 6
#endif // TAUNT_TOGGLES_H
diff --git a/source/training_mods.hpp b/source/training_mods.hpp
index a517828..ce53d34 100644
--- a/source/training_mods.hpp
+++ b/source/training_mods.hpp
@@ -88,6 +88,37 @@ namespace app::lua_bind {
return get_param_float(work_module, param_type, param_hash);
}
+
+ // Force option out of hitstun
+ u64 enable_transition_term_replace(u64 module_accessor, int transition_id) {
+ if (TOGGLE_STATE == LEDGE_OPTION && 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;
+
+ switch (app::sv_math::rand(hash40("fighter"), 4)) {
+ case 0:
+ status = FIGHTER_STATUS_KIND_CLIFF_CLIMB; break;
+ case 1:
+ status = FIGHTER_STATUS_KIND_CLIFF_ATTACK; break;
+ case 2:
+ status = FIGHTER_STATUS_KIND_CLIFF_ESCAPE; break;
+ case 3:
+ status = FIGHTER_STATUS_KIND_CLIFF_JUMP1; 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);
+ }
} // namespace WorkModule
namespace ControlModule {
@@ -98,14 +129,23 @@ namespace app::lua_bind {
(int (*)(u64, int))load_module_impl(control_module, 0x350);
int flag = get_command_flag_cat(control_module, category);
- if (is_training_mode() && is_operation_cpu(module_accessor) && is_in_hitstun(module_accessor)) {
- if (TOGGLE_STATE == MASH_AIRDODGE)
- if (category == FIGHTER_PAD_COMMAND_CATEGORY1)
- flag |= FIGHTER_PAD_CMD_CAT1_FLAG_AIR_ESCAPE;
+ if (is_training_mode() && is_operation_cpu(module_accessor)) {
+ if (is_in_hitstun(module_accessor)) {
+ if (TOGGLE_STATE == MASH_AIRDODGE)
+ if (category == FIGHTER_PAD_COMMAND_CATEGORY1)
+ flag |= FIGHTER_PAD_CMD_CAT1_FLAG_AIR_ESCAPE;
- if (TOGGLE_STATE == MASH_JUMP)
- if (category == FIGHTER_PAD_COMMAND_CATEGORY1)
- flag |= FIGHTER_PAD_CMD_CAT1_FLAG_JUMP_BUTTON;
+ if (TOGGLE_STATE == MASH_JUMP)
+ if (category == FIGHTER_PAD_COMMAND_CATEGORY1)
+ flag |= FIGHTER_PAD_CMD_CAT1_FLAG_JUMP_BUTTON;
+ }
+
+ if (StatusModule::status_kind(module_accessor) == FIGHTER_STATUS_KIND_CLIFF_WAIT) {
+ if (TOGGLE_STATE == LEDGE_OPTION) {
+ if (category == FIGHTER_PAD_COMMAND_CATEGORY1)
+ flag |= FIGHTER_PAD_CMD_CAT1_FLAG_WALK;
+ }
+ }
}
return flag;
@@ -283,6 +323,11 @@ void training_mods_main() {
"_ZN3app8lua_bind32WorkModule__get_param_float_implEPNS_26BattleObjectModuleAccessorEmm",
(u64)&WorkModule::get_param_float_replace);
+ // Ledge options
+ SaltySD_function_replace_sym(
+ "_ZN3app8lua_bind39WorkModule__enable_transition_term_implEPNS_26BattleObjectModuleAccessorEi",
+ (u64)&WorkModule::enable_transition_term_replace);
+
// Save states: in beta
/*SaltySD_function_replace_sym(
"_ZN3app8lua_bind32ControlModule__get_pad_flag_implEPNS_26BattleObjectModuleAccessorE",