Work on d_a_npc_taro (#2386)

This commit is contained in:
hatal175
2025-04-11 02:42:52 +03:00
committed by GitHub
parent 3d2942960d
commit c7eb18a8bd
14 changed files with 3628 additions and 3222 deletions
+7 -7
View File
@@ -855,8 +855,8 @@ void daNpcT_JntAnm_c::calcJntRad(f32 param_0, f32 param_1, f32 param_2) {
* setParam__19daNpcT_DmgStagger_cFP10fopAc_ac_cP10fopAc_ac_cs */
void daNpcT_DmgStagger_c::setParam(fopAc_ac_c* i_actor1, fopAc_ac_c* i_actor2, s16 i_angle) {
if (i_actor2 && i_actor1) {
field_0xc[0] = 10922.0f;
field_0xc[1] = 7281.0f;
mPower[0] = 10922.0f;
mPower[1] = 7281.0f;
field_0x16 = fopAcM_searchActorAngleY(i_actor1, i_actor2) - i_angle;
mStagger = 0x4000;
}
@@ -866,14 +866,14 @@ void daNpcT_DmgStagger_c::setParam(fopAc_ac_c* i_actor1, fopAc_ac_c* i_actor2, s
void daNpcT_DmgStagger_c::calc(BOOL param_0) {
cXyz vec1, vec2;
mDoMtx_stack_c::YrotS(field_0x16);
cLib_addCalc2(&field_0xc[1], 0.0f, 0.1f, 125.0f);
cLib_addCalc2(&field_0xc[0], 0.0f, 0.1f, 125.0f);
cLib_addCalc2(&mPower[1], 0.0f, 0.1f, 125.0f);
cLib_addCalc2(&mPower[0], 0.0f, 0.1f, 125.0f);
for (int i = 0; i < 2; i++) {
vec1.set(0.0f, 0.0f, field_0xc[i] * cM_ssin(mStagger));
vec1.set(0.0f, 0.0f, mPower[i] * cM_ssin(mStagger));
mDoMtx_stack_c::multVec(&vec1, &vec2);
field_0x0[i].x = -vec2.z;
field_0x0[i].z = -vec2.x;
mAngle[i].x = -vec2.z;
mAngle[i].z = -vec2.x;
}
if (mStagger != 0) {