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

add flash on save state, update Hash40 init

Browse source
This commit is contained in:
jugeeya 2020-05-23 00:23:02 -07:00
parent f79908bcac
commit 4396dad31c
2 changed files with 32 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/hitbox_visualizer/mod.rs
View file

@ -1,6 +1,5 @@
use crate::common::{consts::*, *};
use smash::app::{self, lua_bind::*, sv_animcmd, sv_system};
use smash::hash40;
use smash::lib::{lua_const::*, L2CAgent, L2CValue};
use smash::phx::{Hash40, Vector3f};
@ -62,19 +61,8 @@ pub unsafe fn generate_hitbox_effects(
z2: Option<f32>,
color: Vector3f,
) {
let _red = L2CValue::new_num(color.x);
let _green = L2CValue::new_num(color.y);
let _blue = L2CValue::new_num(color.z);
let size_mult = 19.0 / 200.0;
let _shield_effect = L2CValue::new_int(hash40("sys_shield"));
let _zero_rot = L2CValue::new_num(0.0);
let _terminate = L2CValue::new_bool(true);
let _effect_size = L2CValue::new_num(size * size_mult);
let _rate = L2CValue::new_num(8.0);
let x_dist: f32;
let y_dist: f32;
let z_dist: f32;
@ -123,10 +111,8 @@ pub unsafe fn generate_hitbox_effects(
if is_fighter(module_accessor) {
EffectModule::req_on_joint(
module_accessor,
Hash40 {
hash: hash40("sys_shield"),
},
Hash40 { hash: bone },
Hash40::new("sys_shield"),
Hash40::new_raw(bone),
&pos,
&zeros,
size * size_mult,
@ -142,10 +128,8 @@ pub unsafe fn generate_hitbox_effects(
} else {
EffectModule::req_follow(
module_accessor,
Hash40 {
hash: hash40("sys_shield"),
},
Hash40 { hash: bone },
Hash40::new("sys_shield"),
Hash40::new_raw(bone),
&pos,
&zeros,
size * size_mult,
@ -188,16 +172,12 @@ pub unsafe fn get_command_flag_cat(
{
EffectModule::set_visible_kind(
module_accessor,
Hash40 {
hash: hash40("sys_shield"),
},
Hash40::new("sys_shield"),
false,
);
EffectModule::kill_kind(
module_accessor,
Hash40 {
hash: hash40("sys_shield"),
},
Hash40::new("sys_shield"),
false,
true,
);
@ -334,16 +314,12 @@ pub unsafe fn handle_set_rebound(
if !is_shielding(module_accessor) {
EffectModule::set_visible_kind(
module_accessor,
Hash40 {
hash: hash40("sys_shield"),
},
Hash40::new("sys_shield"),
false,
);
EffectModule::kill_kind(
module_accessor,
Hash40 {
hash: hash40("sys_shield"),
},
Hash40::new("sys_shield"),
false,
true,
);

25
src/training/save_states.rs
View file

@ -1,7 +1,7 @@
use crate::common::*;
use smash::app::{self, lua_bind::*};
use smash::lib::lua_const::*;
use smash::phx::Vector3f;
use smash::phx::{Vector3f, Hash40};
#[derive(PartialEq)]
enum SaveState {
@ -164,6 +164,29 @@ pub unsafe fn save_states(module_accessor: &mut app::BattleObjectModuleAccessor)
*save_state_lr = PostureModule::lr(module_accessor);
*save_state_percent = DamageModule::damage(module_accessor, 0);
*save_state_situation_kind = StatusModule::situation_kind(module_accessor);
let zeros = Vector3f {
x: 0.0,
y: 0.0,
z: 0.0,
};
EffectModule::req_on_joint(
module_accessor,
Hash40::new("sys_deku_flash"),
Hash40::new("top"),
&zeros,
&zeros,
0.25,
&zeros,
&zeros,
true,
*EFFECT_SUB_ATTRIBUTE_NO_JOINT_SCALE as u32
| *EFFECT_SUB_ATTRIBUTE_FOLLOW as u32
| *EFFECT_SUB_ATTRIBUTE_CONCLUDE_STATUS as u32,
0,
0,
);
}
}
}