mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-09-07 11:11:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

b_dr equivalent, update dtk-template (#2327)

Browse Source 
* d_a_tag_allmato almost done

* d_a_swhit0 done

* some SSystem cleanup

* treesh done

* swball done, some other rel cleanup

* b_dr equivalent

* update dtk-template

* rename j3dframectrl mode enum
This commit is contained in:
TakaRikka
2025-03-14 01:46:21 -07:00
committed by GitHub
parent 34c5d8272e
commit 60748d0924
70 changed files with 5468 additions and 4064 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_e_s1.cpp
+34 -34
View File
@@ -480,7 +480,7 @@ static void e_s1_wait(e_s1_class* i_this) {
i_this->mTargetAngle = a_this->current.angle.y + var_r27;
i_this->mTimers[0] = cM_rndF(100.0f) + 100.0f;
i_this->mMode = 1;
anm_init(i_this, ANM_WALK, 15.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WALK, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
}
break;
@@ -489,12 +489,12 @@ static void e_s1_wait(e_s1_class* i_this) {
if (i_this->mTimers[0] == 0 || var_f30 > i_this->field_0x3068) {
i_this->mMode = 0;
i_this->mTimers[0] = cM_rndF(100.0f) + 100.0f;
anm_init(i_this, ANM_WAIT_02, 15.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WAIT_02, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
break;
case 2:
i_this->mMode = 3;
anm_init(i_this, ANM_WALK, 15.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WALK, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
/* fallthrough */
case 3:
angle_step = 0x100;
@@ -530,7 +530,7 @@ static void e_s1_roof(e_s1_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_STICK, 1.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_STICK, 1.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 1;
/* fallthrough */
case 1:
@@ -554,7 +554,7 @@ static void e_s1_roof(e_s1_class* i_this) {
i_this->mDrawShadow = true;
if (i_this->mAcch.ChkGroundHit()) {
anm_init(i_this, ANM_DOWN, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DOWN, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 4;
i_this->mSound.startCreatureSound(Z2SE_EN_NS_DOSA, 0, -1);
}
@@ -584,7 +584,7 @@ static void e_s1_fight_run(e_s1_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_DASH_01, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_DASH_01, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mpMorf->setFrame(cM_rndF(10.0f));
i_this->mMode = 1;
/* fallthrough */
@@ -614,18 +614,18 @@ static void e_s1_fight(e_s1_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_WAIT_01, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WAIT_01, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mTimers[0] = 30.0f + cM_rndF(30.0f);
i_this->mMode = 1;
break;
case 1:
if (i_this->mTimers[0] == 0) {
if (cM_rndF(1.0f) < 0.3333f) {
anm_init(i_this, ANM_ATTACK, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_ATTACK, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mSound.startCreatureVoice(Z2SE_EN_NS_V_ATTACK, -1);
i_this->mIsSlowAttack = 0;
} else {
anm_init(i_this, ANM_ATTACK_02, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_ATTACK_02, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mSound.startCreatureVoice(Z2SE_EN_NS_V_ATTACK2, -1);
i_this->mIsSlowAttack = 1;
}
@@ -672,7 +672,7 @@ static void e_s1_bibiri(e_s1_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_SHRINK, 5.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f + cM_rndFX(0.1f));
anm_init(i_this, ANM_SHRINK, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f + cM_rndFX(0.1f));
i_this->mpMorf->setFrame(cM_rndF(15.0f));
i_this->mTimers[0] = l_HIO.mReactionTime + cM_rndF(10.0f);
i_this->mMode = 1;
@@ -685,7 +685,7 @@ static void e_s1_bibiri(e_s1_class* i_this) {
}
if (i_this->mTimers[0] == 0) {
anm_init(i_this, ANM_SHRINK_DOWN, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_SHRINK_DOWN, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 2;
}
break;
@@ -709,7 +709,7 @@ static void e_s1_damage(e_s1_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_DAMAGED, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DAMAGED, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 1;
break;
case 1:
@@ -736,7 +736,7 @@ static void e_s1_path(e_s1_class* i_this) {
switch (i_this->mMode) {
case 0:
i_this->mMode = 1;
anm_init(i_this, ANM_WALK, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
/* fallthrough */
case 1:
i_this->mCurrentPathPointNo += i_this->mPathDirection;
@@ -773,7 +773,7 @@ static void e_s1_path(e_s1_class* i_this) {
if (JMAFastSqrt((sp14.x * sp14.x) + (sp14.z * sp14.z)) < 4.0f * l_HIO.mMoveSpeed) {
i_this->mMode = 3;
i_this->mTimers[0] = 50.0f + cM_rndF(100.0f);
anm_init(i_this, ANM_WAIT_02, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WAIT_02, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
path_check2(i_this);
@@ -940,11 +940,11 @@ static void e_s1_failwait(e_s1_class* i_this) {
switch (i_this->mMode) {
case 0:
if (cM_rndF(1.0f) < 0.3333f) {
anm_init(i_this, ANM_DEAD_02, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DEAD_02, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
} else if (cM_rndF(1.0f) < 0.5f) {
anm_init(i_this, ANM_DEAD_03, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DEAD_03, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
} else {
anm_init(i_this, ANM_DEAD_04, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DEAD_04, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
}
i_this->mMode = 1;
@@ -954,11 +954,11 @@ static void e_s1_failwait(e_s1_class* i_this) {
i_this->mMode = 2;
if (i_this->mAnm == ANM_DEAD_02) {
anm_init(i_this, ANM_DEADWAIT_02, 2.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_DEADWAIT_02, 2.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
} else if (i_this->mAnm == ANM_DEAD_03) {
anm_init(i_this, ANM_DEADWAIT_03, 2.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_DEADWAIT_03, 2.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
} else {
anm_init(i_this, ANM_DEADWAIT_04, 2.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_DEADWAIT_04, 2.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
}
break;
@@ -988,11 +988,11 @@ static void e_s1_failwait(e_s1_class* i_this) {
anm_init(i_this, ANM_DEAD_02, 2.0f, 0, 1.0f);
}
} else if (i_this->mAnm == ANM_DEADWAIT_02) {
anm_init(i_this, ANM_DEAD_02, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DEAD_02, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
} else if (i_this->mAnm == ANM_DEADWAIT_03) {
anm_init(i_this, ANM_DEAD_03, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DEAD_03, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
} else {
anm_init(i_this, ANM_DEAD_04, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DEAD_04, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
}
i_this->mpMorf->setFrame(10.0f);
@@ -1011,11 +1011,11 @@ static void e_s1_fail(e_s1_class* i_this) {
switch (i_this->mMode) {
case 0:
if (cM_rndF(1.0f) < 0.3333f) {
anm_init(i_this, ANM_DEAD_02, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DEAD_02, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
} else if (cM_rndF(1.0f) < 0.5f) {
anm_init(i_this, ANM_DEAD_03, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DEAD_03, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
} else {
anm_init(i_this, ANM_DEAD_04, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DEAD_04, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
}
if (dStage_stagInfo_GetSTType(staginfo) == ST_FIELD) {
@@ -1023,7 +1023,7 @@ static void e_s1_fail(e_s1_class* i_this) {
if (all_fail_check(i_this) && !dComIfGp_event_runCheck()) {
i_this->mDemoMode = 1;
anm_init(i_this, ANM_DEAD_02, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DEAD_02, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
}
} else {
i_this->mMode = 30;
@@ -1073,11 +1073,11 @@ static void e_s1_fail(e_s1_class* i_this) {
case 12:
if (i_this->mTimers[0] == 0) {
if (i_this->mAnm == ANM_DEAD_02) {
anm_init(i_this, ANM_DEADWAKE_02, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DEADWAKE_02, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
} else if (i_this->mAnm == ANM_DEAD_03) {
anm_init(i_this, ANM_DEADWAKE_03, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DEADWAKE_03, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
} else {
anm_init(i_this, ANM_DEADWAKE_04, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DEADWAKE_04, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
}
a_this->health = 50;
@@ -1136,7 +1136,7 @@ static void e_s1_shout(e_s1_class* i_this) {
switch (i_this->mMode) {
case 0:
a_this->health = 50;
anm_init(i_this, ANM_SHOUT, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_SHOUT, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 1;
i_this->mTimers[0] = KREG_S(6) + 10;
@@ -1195,7 +1195,7 @@ static void e_s1_warpappear(e_s1_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, ANM_DOWN, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 0.0f);
anm_init(i_this, ANM_DOWN, 1.0f, J3DFrameCtrl::EMode_NONE, 0.0f);
i_this->mMode = 1;
/* fallthrough */
case 1:
@@ -1224,11 +1224,11 @@ static void e_s1_warpappear(e_s1_class* i_this) {
/* fallthrough */
case 11:
i_this->mMode = 12;
anm_init(i_this, ANM_DOWN, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, ANM_DOWN, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
break;
case 12:
if (i_this->mpMorf->isStop()) {
anm_init(i_this, ANM_WAIT_02, 15.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, ANM_WAIT_02, 15.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 13;
}
break;