Mirror/UltimateTrainingModpack
1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2025-06-08 04:20:36 +00:00
Code Issues Activity

fix greninja down b (due to get_float replace)

Browse source
This commit is contained in:
Josh Sambasivam 2019-06-09 11:37:14 -07:00
parent e470134641
commit 8c926eb79a
2 changed files with 13 additions and 12 deletions
source
imports/app/lua_bind
StatusModule.hpp
training_mods.hpp

4
source/imports/app/lua_bind/StatusModule.hpp
View file

@ -13,8 +13,8 @@ namespace app::lua_bind {
u64 set_keep_situation_air(u64,bool) asm("_ZN3app8lua_bind41StatusModule__set_keep_situation_air_implEPNS_26BattleObjectModuleAccessorEb") 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_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; u64 set_status_kind_interrupt(u64,int) asm("_ZN3app8lua_bind44StatusModule__set_status_kind_interrupt_implEPNS_26BattleObjectModuleAccessorEi") LINKABLE;
u64 situation_kind(u64) asm("_ZN3app8lua_bind33StatusModule__situation_kind_implEPNS_26BattleObjectModuleAccessorE") LINKABLE; int situation_kind(u64) asm("_ZN3app8lua_bind33StatusModule__situation_kind_implEPNS_26BattleObjectModuleAccessorE") LINKABLE;
u64 status_kind(u64) asm("_ZN3app8lua_bind30StatusModule__status_kind_implEPNS_26BattleObjectModuleAccessorE") LINKABLE; int status_kind(u64) asm("_ZN3app8lua_bind30StatusModule__status_kind_implEPNS_26BattleObjectModuleAccessorE") LINKABLE;
u64 status_kind_interrupt(u64) asm("_ZN3app8lua_bind40StatusModule__status_kind_interrupt_implEPNS_26BattleObjectModuleAccessorE") LINKABLE; u64 status_kind_interrupt(u64) asm("_ZN3app8lua_bind40StatusModule__status_kind_interrupt_implEPNS_26BattleObjectModuleAccessorE") LINKABLE;
u64 status_kind_next(u64) asm("_ZN3app8lua_bind35StatusModule__status_kind_next_implEPNS_26BattleObjectModuleAccessorE") LINKABLE; u64 status_kind_next(u64) asm("_ZN3app8lua_bind35StatusModule__status_kind_next_implEPNS_26BattleObjectModuleAccessorE") LINKABLE;
u64 status_kind_que_from_script(u64) asm("_ZN3app8lua_bind46StatusModule__status_kind_que_from_script_implEPNS_26BattleObjectModuleAccessorE") LINKABLE; u64 status_kind_que_from_script(u64) asm("_ZN3app8lua_bind46StatusModule__status_kind_que_from_script_implEPNS_26BattleObjectModuleAccessorE") LINKABLE;

21
source/training_mods.hpp
View file

@ -38,8 +38,15 @@ namespace app::lua_bind {
namespace WorkModule { namespace WorkModule {
// Force DI // Force DI
float get_float_replace(u64 module_accessor, int var) { float get_float_replace(u64 module_accessor, int var) {
if (is_training_mode() && is_operation_cpu(module_accessor)) { // call original WorkModule::get_float_impl
if (is_in_hitstun(module_accessor)) { 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) { if (DI_STATE != NONE) {
float angle = (DI_STATE - 1) * M_PI / 4.0; float angle = (DI_STATE - 1) * M_PI / 4.0;
@ -47,7 +54,6 @@ namespace app::lua_bind {
if (DI_STATE == DI_RANDOM_IN_AWAY) { if (DI_STATE == DI_RANDOM_IN_AWAY) {
angle = app::sv_math::rand(hash40("fighter"), 2) * M_PI; angle = app::sv_math::rand(hash40("fighter"), 2) * M_PI;
} }
// If facing left, reverse angle // 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;
@ -59,13 +65,8 @@ namespace app::lua_bind {
} }
} }
} }
// call original WorkModule::get_float_impl return ret_val;
u64 work_module = load_module(module_accessor, 0x50);
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) { float get_param_float_replace(u64 module_accessor, u64 param_type, u64 param_hash) {