Mirror/UltimateTrainingModpack
1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2025-03-31 02:32:44 +00:00
Code Issues Activity

force options on landing; reduce size of raygun text

Browse source
This commit is contained in:
jugeeya 2019-06-22 12:21:42 -07:00
parent 92911a1008
commit 8e51de5cca
2 changed files with 18 additions and 2 deletions

11
source/training_mods.hpp
View file

@ -37,6 +37,12 @@ bool is_in_hitstun(u64 module_accessor) {
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
@ -172,7 +178,7 @@ int get_command_flag_cat_replace(u64 module_accessor, int category) {
int flag = get_command_flag_cat(control_module, category);
if (is_training_mode() && is_operation_cpu(module_accessor)) {
if (is_in_hitstun(module_accessor)) {
if (is_in_hitstun(module_accessor) || is_in_landing(module_accessor)) {
if (TOGGLE_STATE == MASH_AIRDODGE)
if (category == FIGHTER_PAD_COMMAND_CATEGORY1)
flag |= FIGHTER_PAD_CMD_CAT1_FLAG_AIR_ESCAPE;
@ -263,7 +269,8 @@ bool check_button_on_replace(u64 module_accessor, int button) {
if (is_training_mode() && is_operation_cpu(module_accessor)) {
if (TOGGLE_STATE == HOLD_SHIELD || TOGGLE_STATE == INFINITE_SHIELD)
return true;
if (TOGGLE_STATE == MASH_AIRDODGE && is_in_hitstun(module_accessor))
if (TOGGLE_STATE == MASH_AIRDODGE &&
(is_in_hitstun(module_accessor) || is_in_landing(module_accessor)))
return true;
}
}

9
source/useful/raygun_printer.hpp
View file

@ -111,6 +111,8 @@ void print_char(u64 module_accessor, char to_print, int line_num,
}
segment = segment_dict[index];
const float size_mult = 0.5;
float z = segment[0];
float y = segment[1] + lineOffset;
float x = segment[2] + horiz_offset;
@ -119,6 +121,13 @@ void print_char(u64 module_accessor, char to_print, int line_num,
if (facing_left == -1) zrot *= -1;
float size = segment[4];
x *= size_mult;
x += facing_left * 5;
y *= size_mult;
y += 5;
z *= size_mult;
size *= size_mult;
show_segment(module_accessor, z, y, x, zrot, size);
}
}